SliTaz Repositories

     1.1 --- a/mysql/receipt	Mon Jun 05 16:48:55 2017 +0300
     1.2 +++ b/mysql/receipt	Thu Jun 14 00:03:13 2018 +0300
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="mysql"
     1.7 -VERSION="5.5.56"
     1.8 +VERSION="5.5.59"
     1.9  CATEGORY="database"
    1.10  SHORT_DESC="SQL database system"
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -12,17 +12,16 @@
    1.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.14  WGET_URL="ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${VERSION%.*}/$TARBALL"
    1.15  
    1.16 -BUILD_DEPENDS="cmake openssl-dev zlib-dev ncurses-dev readline-dev"
    1.17 -SPLIT="libmysqlclient mysql-client mysql-test mysql-dev"
    1.18 +BUILD_DEPENDS="cmake zlib-dev ncurses-dev readline-dev libunistring-dev \
    1.19 +libaio-dev"
    1.20 +SPLIT="libmysqlclient mysql-client mysql-test mysql-dev mysql"
    1.21  
    1.22 -# Rules to configure and make the package.
    1.23 -compile_rules()
    1.24 -{
    1.25 +compile_rules() {
    1.26  	mkdir build; cd build
    1.27  
    1.28  	# CFLAGS/CXXFLAGS as suggested upstream
    1.29  	CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
    1.30 -	CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
    1.31 +	CXXFLAGS="-fPIC ${CXXFLAGS} -std=gnu++98 -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
    1.32  	cmake .. \
    1.33  		-DCMAKE_BUILD_TYPE=Release \
    1.34  		-DCMAKE_INSTALL_PREFIX=/usr \
    1.35 @@ -44,7 +43,7 @@
    1.36  		-DINSTALL_SHAREDIR=share/mysql \
    1.37  		-DWITH_READLINE=ON \
    1.38  		-DWITH_ZLIB=system \
    1.39 -		-DWITH_SSL=system \
    1.40 +		-DWITH_SSL=bundled \
    1.41  		-DWITH_LIBWRAP=OFF \
    1.42  		-DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
    1.43  		-DWITH_EXTRA_CHARSETS=complex \
    1.44 @@ -55,49 +54,33 @@
    1.45  		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
    1.46  		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
    1.47  		-DWITHOUT_FEDERATED_STORAGE_ENGINE=1 &&
    1.48 -	make && make DESTDIR=$DESTDIR install
    1.49 +	make && make DESTDIR=$DESTDIR install || return 1
    1.50  
    1.51  	# fix paths
    1.52  	mv $install/usr/mysql-test $install/usr/share/mysql-test
    1.53  	mv $install/usr/sql-bench  $install/usr/share/sql-bench
    1.54  
    1.55  	# Configuration file
    1.56 -	mkdir -p $install/etc
    1.57 -	cp -a $stuff/etc/init.d $install/etc
    1.58 -	cp -a $stuff/etc/mysql  $install/etc
    1.59 -	chown -R root:root $install/etc
    1.60 +	mkdir -p                   $install/etc
    1.61 +	cp    -a $stuff/etc/init.d $install/etc
    1.62 +	cp    -a $stuff/etc/mysql  $install/etc
    1.63 +	chown -R root:root         $install/etc
    1.64  }
    1.65  
    1.66 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.67 -genpkg_rules()
    1.68 -{
    1.69 -	# client binaries (plus /usr/bin/mysql), see $src/build/client
    1.70 -	client="mysql_plugin mysql_upgrade mysqladmin mysqlbinlog mysqlcheck \
    1.71 -	mysqldump mysqlimport mysqlshow mysqlslap mysqltest"
    1.72 -
    1.73 +genpkg_rules() {
    1.74  	case $PACKAGE in
    1.75 -		mysql)
    1.76 -			copy etc/ bin/ plugin/ /usr/share/mysql/
    1.77 -			for i in $client mysql mysql_config; do
    1.78 -				rm $fs/usr/bin/$i
    1.79 -			done
    1.80 -			find $fs -name '*.m4' -delete
    1.81 -			DEPENDS="libmysqlclient mysql-client slitaz-base-files \
    1.82 -			libcrypto libssl ncurses zlib"
    1.83 -			CONFIG_FILES="/etc/mysql"
    1.84 -			DATABASE_FILES="/var/lib/mysql"
    1.85 -			TAZPANEL_DAEMON="man|edit::/etc/mysql/my.cnf|options|web::$WEB_SITE"
    1.86 -			;;
    1.87  		libmysqlclient)
    1.88  			copy libmysqlclient*so*
    1.89  			CAT="database|client libraries"
    1.90 -			DEPENDS="libcrypto libssl zlib"
    1.91 +			DEPENDS="zlib"
    1.92  			;;
    1.93  		mysql-client)
    1.94 -			copy /bin/mysql $client
    1.95 +			# client binaries (plus /usr/bin/mysql), see $src/build/client
    1.96 +			copy /bin/mysql mysql_plugin mysql_upgrade mysqladmin mysqlbinlog \
    1.97 +			mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap mysqltest
    1.98  			CAT="database|client files"
    1.99  			PROVIDE="mysql_or_postgresql"
   1.100 -			DEPENDS="libmysqlclient   libcrypto libssl ncurses zlib"
   1.101 +			DEPENDS="libmysqlclient ncurses zlib"
   1.102  			;;
   1.103  		mysql-test)
   1.104  			copy mysql-test/ sql-bench/ db.opt
   1.105 @@ -108,20 +91,25 @@
   1.106  			copy @dev mysql_config
   1.107  			rm -r $fs/usr/share/mysql-test
   1.108  			;;
   1.109 +		mysql)
   1.110 +			copy @std @rm
   1.111 +			DEPENDS="libmysqlclient libaio mysql-client slitaz-base-files \
   1.112 +			ncurses zlib"
   1.113 +			CONFIG_FILES="/etc/mysql"
   1.114 +			DATABASE_FILES="/var/lib/mysql"
   1.115 +			TAZPANEL_DAEMON="man|edit::/etc/mysql/my.cnf|options|web::$WEB_SITE"
   1.116 +			;;
   1.117  	esac
   1.118  }
   1.119  
   1.120 -# Pre and post install commands for Tazpkg.
   1.121 -pre_install_mysql()
   1.122 -{
   1.123 +pre_install_mysql() {
   1.124  	# Cleanup old files
   1.125  	rm -f "$1/usr/libexec/mysql"*
   1.126  	# Move old config
   1.127  	[ -f "$1/etc/my.cnf" ] && mv -f "$1/etc/my.cnf" "$1/etc/mysql/my.cnf"
   1.128  }
   1.129  
   1.130 -post_install_mysql()
   1.131 -{
   1.132 +post_install_mysql() {
   1.133  	chmod 600 "$1/etc/mysql/my.cnf"
   1.134  
   1.135  	local user=mysql group=mysql
   1.136 @@ -145,24 +133,22 @@
   1.137  	chroot "$1/" mysql_install_db --user=$user --basedir=/usr
   1.138  
   1.139  	[ -n "$quiet" ] || cat <<EOF
   1.140 -----
   1.141 -To start mysql server you can run:
   1.142  
   1.143 -    /etc/init.d/mysql start
   1.144 -
   1.145 -Or add mysql to RUN_DAEMONS in /etc/rcS.conf
   1.146 -----
   1.147 +	.----------------------------------------------.
   1.148 +	| To start mysql server you can run:           |
   1.149 +	|     /etc/init.d/mysql start                  |
   1.150 +	|                                              |
   1.151 +	| Or add mysql to RUN_DAEMONS in /etc/rcS.conf |
   1.152 +	'----------------------------------------------'
   1.153  EOF
   1.154  }
   1.155  
   1.156 -post_remove_mysql()
   1.157 -{
   1.158 +post_remove_mysql() {
   1.159  	echo "Removing user/group mysql"
   1.160  	chroot "$1/" deluser mysql
   1.161  }
   1.162  
   1.163 -post_install_mysql_test()
   1.164 -{
   1.165 +post_install_mysql_test() {
   1.166  	chmod 2777 "$1/usr/share/mysql-test"
   1.167  	chmod 2777 "$1/usr/share/sql-bench"
   1.168  }