libmysql, maj 5.5.11-1

3 files changed, 134 insertions, 101 deletions

diff --git a/base/libmysql/.footprint.x86_64 b/base/libmysql/.footprint.x86_64
index 48df410f4..83dca7eec 100644
--- a/base/libmysql/.footprint.x86_64
+++ b/base/libmysql/.footprint.x86_64
@@ -1,95 +1,75 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/mysql_client_test_embedded
 -rwxr-xr-x	root/root	usr/bin/mysql_config
--rwxr-xr-x	root/root	usr/bin/mysqltest_embedded
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/mysql/
--rw-r--r--	root/root	usr/include/mysql/base64.h
--rw-r--r--	root/root	usr/include/mysql/config-netware.h
--rw-r--r--	root/root	usr/include/mysql/config-win.h
--rw-r--r--	root/root	usr/include/mysql/config.h
 -rw-r--r--	root/root	usr/include/mysql/decimal.h
 -rw-r--r--	root/root	usr/include/mysql/errmsg.h
--rw-r--r--	root/root	usr/include/mysql/ft_global.h
--rw-r--r--	root/root	usr/include/mysql/hash.h
--rw-r--r--	root/root	usr/include/mysql/heap.h
--rw-r--r--	root/root	usr/include/mysql/help_end.h
--rw-r--r--	root/root	usr/include/mysql/help_start.h
 -rw-r--r--	root/root	usr/include/mysql/keycache.h
 -rw-r--r--	root/root	usr/include/mysql/m_ctype.h
 -rw-r--r--	root/root	usr/include/mysql/m_string.h
--rw-r--r--	root/root	usr/include/mysql/my_aes.h
--rw-r--r--	root/root	usr/include/mysql/my_alarm.h
 -rw-r--r--	root/root	usr/include/mysql/my_alloc.h
 -rw-r--r--	root/root	usr/include/mysql/my_attribute.h
--rw-r--r--	root/root	usr/include/mysql/my_base.h
--rw-r--r--	root/root	usr/include/mysql/my_bit.h
--rw-r--r--	root/root	usr/include/mysql/my_bitmap.h
 -rw-r--r--	root/root	usr/include/mysql/my_compiler.h
 -rw-r--r--	root/root	usr/include/mysql/my_config.h
 -rw-r--r--	root/root	usr/include/mysql/my_dbug.h
 -rw-r--r--	root/root	usr/include/mysql/my_dir.h
 -rw-r--r--	root/root	usr/include/mysql/my_getopt.h
 -rw-r--r--	root/root	usr/include/mysql/my_global.h
--rw-r--r--	root/root	usr/include/mysql/my_handler.h
--rw-r--r--	root/root	usr/include/mysql/my_libwrap.h
 -rw-r--r--	root/root	usr/include/mysql/my_list.h
--rw-r--r--	root/root	usr/include/mysql/my_md5.h
 -rw-r--r--	root/root	usr/include/mysql/my_net.h
--rw-r--r--	root/root	usr/include/mysql/my_no_pthread.h
--rw-r--r--	root/root	usr/include/mysql/my_nosys.h
 -rw-r--r--	root/root	usr/include/mysql/my_pthread.h
--rw-r--r--	root/root	usr/include/mysql/my_stacktrace.h
 -rw-r--r--	root/root	usr/include/mysql/my_sys.h
--rw-r--r--	root/root	usr/include/mysql/my_time.h
--rw-r--r--	root/root	usr/include/mysql/my_tree.h
--rw-r--r--	root/root	usr/include/mysql/my_trie.h
--rw-r--r--	root/root	usr/include/mysql/my_uctype.h
--rw-r--r--	root/root	usr/include/mysql/my_user.h
--rw-r--r--	root/root	usr/include/mysql/my_vle.h
 -rw-r--r--	root/root	usr/include/mysql/my_xml.h
--rw-r--r--	root/root	usr/include/mysql/myisam.h
--rw-r--r--	root/root	usr/include/mysql/myisammrg.h
--rw-r--r--	root/root	usr/include/mysql/myisampack.h
 -rw-r--r--	root/root	usr/include/mysql/mysql.h
+drwxr-xr-x	root/root	usr/include/mysql/mysql/
+-rw-r--r--	root/root	usr/include/mysql/mysql/client_plugin.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/innodb_priv.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/plugin.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/plugin_audit.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/plugin_auth.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/plugin_auth_common.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/plugin_ftparser.h
+drwxr-xr-x	root/root	usr/include/mysql/mysql/psi/
+-rw-r--r--	root/root	usr/include/mysql/mysql/psi/mysql_file.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/psi/mysql_thread.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/psi/psi.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/psi/psi_abi_v1.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/psi/psi_abi_v2.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/service_my_snprintf.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/service_thd_alloc.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/service_thd_wait.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/service_thread_scheduler.h
+-rw-r--r--	root/root	usr/include/mysql/mysql/services.h
 -rw-r--r--	root/root	usr/include/mysql/mysql_com.h
 -rw-r--r--	root/root	usr/include/mysql/mysql_embed.h
 -rw-r--r--	root/root	usr/include/mysql/mysql_time.h
 -rw-r--r--	root/root	usr/include/mysql/mysql_version.h
 -rw-r--r--	root/root	usr/include/mysql/mysqld_ername.h
 -rw-r--r--	root/root	usr/include/mysql/mysqld_error.h
--rw-r--r--	root/root	usr/include/mysql/mysys_err.h
 -rw-r--r--	root/root	usr/include/mysql/plugin.h
--rw-r--r--	root/root	usr/include/mysql/queues.h
--rw-r--r--	root/root	usr/include/mysql/rijndael.h
--rw-r--r--	root/root	usr/include/mysql/sha1.h
+-rw-r--r--	root/root	usr/include/mysql/plugin_audit.h
+-rw-r--r--	root/root	usr/include/mysql/plugin_ftparser.h
 -rw-r--r--	root/root	usr/include/mysql/sql_common.h
 -rw-r--r--	root/root	usr/include/mysql/sql_state.h
 -rw-r--r--	root/root	usr/include/mysql/sslopt-case.h
 -rw-r--r--	root/root	usr/include/mysql/sslopt-longopts.h
 -rw-r--r--	root/root	usr/include/mysql/sslopt-vars.h
--rw-r--r--	root/root	usr/include/mysql/t_ctype.h
--rw-r--r--	root/root	usr/include/mysql/thr_alarm.h
--rw-r--r--	root/root	usr/include/mysql/thr_lock.h
 -rw-r--r--	root/root	usr/include/mysql/typelib.h
--rw-r--r--	root/root	usr/include/mysql/violite.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libmysqlclient.so -> libmysqlclient.so.16
-lrwxrwxrwx	root/root	usr/lib/libmysqlclient.so.1 -> libmysqlclient.so.16
-lrwxrwxrwx	root/root	usr/lib/libmysqlclient.so.16 -> mysql/libmysqlclient.so.16
-lrwxrwxrwx	root/root	usr/lib/libmysqlclient_r.so -> libmysqlclient_r.so.16
-lrwxrwxrwx	root/root	usr/lib/libmysqlclient_r.so.1 -> libmysqlclient_r.so.16
-lrwxrwxrwx	root/root	usr/lib/libmysqlclient_r.so.16 -> mysql/libmysqlclient_r.so.16
-drwxr-xr-x	root/root	usr/lib/mysql/
--rw-r--r--	root/root	usr/lib/mysql/libmysqlclient.a
--rwxr-xr-x	root/root	usr/lib/mysql/libmysqlclient.la
-lrwxrwxrwx	root/root	usr/lib/mysql/libmysqlclient.so -> libmysqlclient.so.16.0.0
-lrwxrwxrwx	root/root	usr/lib/mysql/libmysqlclient.so.16 -> libmysqlclient.so.16.0.0
--rwxr-xr-x	root/root	usr/lib/mysql/libmysqlclient.so.16.0.0
--rw-r--r--	root/root	usr/lib/mysql/libmysqlclient_r.a
--rwxr-xr-x	root/root	usr/lib/mysql/libmysqlclient_r.la
-lrwxrwxrwx	root/root	usr/lib/mysql/libmysqlclient_r.so -> libmysqlclient_r.so.16.0.0
-lrwxrwxrwx	root/root	usr/lib/mysql/libmysqlclient_r.so.16 -> libmysqlclient_r.so.16.0.0
--rwxr-xr-x	root/root	usr/lib/mysql/libmysqlclient_r.so.16.0.0
--rw-r--r--	root/root	usr/lib/mysql/libmysqld.a
+-rw-r--r--	root/root	usr/lib/libmysqlclient.a
+lrwxrwxrwx	root/root	usr/lib/libmysqlclient.so -> libmysqlclient.so.18
+lrwxrwxrwx	root/root	usr/lib/libmysqlclient.so.18 -> libmysqlclient.so.18.0.0
+-rwxr-xr-x	root/root	usr/lib/libmysqlclient.so.18.0.0
+lrwxrwxrwx	root/root	usr/lib/libmysqlclient_r.a -> libmysqlclient.a
+lrwxrwxrwx	root/root	usr/lib/libmysqlclient_r.so -> libmysqlclient.so
+lrwxrwxrwx	root/root	usr/lib/libmysqlclient_r.so.18 -> libmysqlclient.so
+lrwxrwxrwx	root/root	usr/lib/libmysqlclient_r.so.18.0.0 -> libmysqlclient.so
+-rw-r--r--	root/root	usr/lib/libmysqld.a
+-rw-r--r--	root/root	usr/lib/libmysqlservices.a
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/mysql_client_test_embedded.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysql_config.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysqltest_embedded.1.gz
diff --git a/base/libmysql/.md5sum.x86_64 b/base/libmysql/.md5sum.x86_64
index 985d9ace4..c2ff66857 100644
--- a/base/libmysql/.md5sum.x86_64
+++ b/base/libmysql/.md5sum.x86_64
@@ -1 +1 @@
-e07e79edad557874d0870c914c9c81e1  mysql-5.1.55.tar.gz
+befa4e0d0aa95be6c8f6f143ae3b0641  mysql-5.5.11.tar.gz
diff --git a/base/libmysql/Pkgfile b/base/libmysql/Pkgfile
index 3da21da1a..f38e51fda 100644
--- a/base/libmysql/Pkgfile
+++ b/base/libmysql/Pkgfile
@@ -4,52 +4,105 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=libmysql
-version=5.1.55
-release=2
-source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/mysql-$version.tar.gz )
+version=5.5.11
+#5.1.55
+release=1
+source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/mysql-$version.tar.gz )
 
 build () {
+	cd $SRC
+	mkdir build
+  	cd build
+
 	CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer"
 	CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing  -DBIG_JOINS=1 -felide-constructors -fno-rtti"
-	cd mysql-$version
-	./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --libexecdir=/usr/sbin \
-                --localstatedir=/srv/mysql \
-                --enable-assembler \
-                --enable-thread-safe-client \
-                --enable-local-infile \
-                --with-unix-socket-path=/var/run/mysql/mysql.sock \
-                --with-extra-charsets=all \
-                --with-berkeley-db \
-                --without-debug \
-                --without-readline \
-                --without-docs \
-                --without-bench 
-	for dir in include strings \
-	mysys dbug storage regex extra vio sql; do
-	pushd $dir
-		make -j2
-	popd
-	done
-	for dir in libmysql libmysql_r libmysqld; do
-	pushd $dir
-		make link_sources
-		make -j2
-		make DESTDIR=$PKG install
-	popd
-	done
-	cd include
-	make DESTDIR=$PKG install
-	install -m644 *.h $PKG/usr/include/mysql
-	cd ../scripts
-	make mysql_config
-	install -D -m755 mysql_config $PKG/usr/bin/mysql_config
 	
-	ln -sf mysql/libmysqlclient.so.16 $PKG/usr/lib/libmysqlclient.so.16
-	ln -sf libmysqlclient.so.16 $PKG/usr/lib/libmysqlclient.so
-	ln -sf libmysqlclient.so.16 $PKG/usr/lib/libmysqlclient.so.1
-	ln -sf mysql/libmysqlclient_r.so.16 $PKG/usr/lib/libmysqlclient_r.so.16
-	ln -sf libmysqlclient_r.so.16 $PKG/usr/lib/libmysqlclient_r.so
-	ln -sf libmysqlclient_r.so.16 $PKG/usr/lib/libmysqlclient_r.so.1
+	cmake ../mysql-$version \
+	    -DCMAKE_BUILD_TYPE=Release \
+	    -DCMAKE_INSTALL_PREFIX=/usr \
+	    -DMYSQL_DATADIR=/var/lib/mysql \
+	    -DSYSCONFDIR=/etc/mysql \
+	    -DINSTALL_INFODIR=share/mysql/docs \
+	    -DINSTALL_MANDIR=share/man \
+	    -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
+	    -DINSTALL_SCRIPTDIR=bin \
+	    -DINSTALL_INCLUDEDIR=include/mysql \
+	    -DINSTALL_DOCREADMEDIR=share/mysql \
+	    -DINSTALL_SUPPORTFILESDIR=share/mysql \
+	    -DINSTALL_MYSQLSHAREDIR=share/mysql \
+	    -DINSTALL_SHAREDIR=share/mysql \
+	    -DWITH_READLINE=ON \
+	    -DWITH_ZLIB=system \
+	    -DWITH_SSL=system \
+	    -DWITH_LIBWRAP=ON \
+	    -DDEFAULT_CHARSET=utf8 \
+	    -DDEFAULT_COLLATION=utf8_general_ci \
+	    -DWITH_EXTRA_CHARSETS=complex \
+	    -DWITH_EMBEDDED_SERVER=ON \
+	    -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+	    -DENABLED_LOCAL_INFILE=ON \
+	    -DWITH_PARTITION_STORAGE_ENGINE=1 \
+	    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+	    -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
+	    -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
+ 	    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+	    -DWITH_INNOBASE_STORAGE_ENGINE=1
+
+	make
+
+	cd $SRC/build
+  	for dir in include libmysql libmysqld libservices; do
+    		make -C ${dir} DESTDIR=$PKG install
+  	done
+
+	install -d $PKG/usr/bin
+  	install -m755 scripts/mysql_config $PKG/usr/bin/
+  	install -d $PKG/usr/share/man/man1
+  	for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
+    		install -m644 $SRC/mysql-$version/man/$man.1 $PKG/usr/share/man/man1/$man.1
+  	done
+
+#	cd mysql-$version
+#	./configure --prefix=/usr \
+#                --sysconfdir=/etc \
+#                --libexecdir=/usr/sbin \
+#                --localstatedir=/srv/mysql \
+#                --enable-assembler \
+#                --enable-thread-safe-client \
+#                --enable-local-infile \
+#                --with-unix-socket-path=/var/run/mysql/mysql.sock \
+#                --with-extra-charsets=all \
+#                --with-berkeley-db \
+#                --without-debug \
+#                --without-readline \
+#                --without-docs \
+#                --without-bench
+#
+#	cd $SRC/build 
+#	for dir in include strings \
+#	mysys dbug storage regex extra vio sql; do
+#	pushd $dir
+#		make -j2
+#	popd
+#	done
+#	for dir in libmysql libmysql_r libmysqld; do
+#	pushd $dir
+#		make link_sources
+#		make -j2
+#		make DESTDIR=$PKG install
+#	popd
+#	done
+#	cd include
+#	make DESTDIR=$PKG install
+#	install -m644 *.h $PKG/usr/include/mysql
+#	cd ../scripts
+#	make mysql_config
+#	install -D -m755 mysql_config $PKG/usr/bin/mysql_config
+#	
+#	ln -sf mysql/libmysqlclient.so.16 $PKG/usr/lib/libmysqlclient.so.16
+#	ln -sf libmysqlclient.so.16 $PKG/usr/lib/libmysqlclient.so
+#	ln -sf libmysqlclient.so.16 $PKG/usr/lib/libmysqlclient.so.1
+#	ln -sf mysql/libmysqlclient_r.so.16 $PKG/usr/lib/libmysqlclient_r.so.16
+#	ln -sf libmysqlclient_r.so.16 $PKG/usr/lib/libmysqlclient_r.so
+#	ln -sf libmysqlclient_r.so.16 $PKG/usr/lib/libmysqlclient_r.so.1
 }