[arch-commits] Commit in mysql/trunk (4 files)
Andrea Scarpino
andrea at archlinux.org
Wed Dec 22 00:25:46 UTC 2010
Date: Tuesday, December 21, 2010 @ 19:25:45
Author: andrea
Revision: 103631
upgpkg: mysql 5.5.8-1
new major version
Modified:
mysql/trunk/PKGBUILD
mysql/trunk/my.cnf
mysql/trunk/mysql.install
Deleted:
mysql/trunk/skip-abi-check.patch
----------------------+
PKGBUILD | 95 ++++++++++++++++++++++++++-----------------------
my.cnf | 53 ++++++++++++---------------
mysql.install | 2 +
skip-abi-check.patch | 13 ------
4 files changed, 79 insertions(+), 84 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-12-22 00:03:02 UTC (rev 103630)
+++ PKGBUILD 2010-12-22 00:25:45 UTC (rev 103631)
@@ -5,73 +5,75 @@
pkgbase=mysql
pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.51
+pkgver=5.5.8
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.mysql.com/"
-makedepends=('tcp_wrappers' 'zlib' 'perl' 'openssl' 'libtool' 'patch')
+makedepends=('cmake' 'openssl' 'tcp_wrappers')
options=('!libtool')
-source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz"
+source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
'mysqld'
- 'my.cnf'
- 'skip-abi-check.patch')
-md5sums=('c12bf24493688c51c6cff5e8c6563830'
+ 'my.cnf')
+md5sums=('42e866302b61f5e213afd33e04677017'
'2234207625baa29b2ff7d7b4f088abce'
- '0337741fa9afbe57939993636081a827'
- 'a97e574945e19de3908575b956241026')
+ '69336edb8a16294b18eaec22fee7ea68')
build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- patch -Np0 -i "${srcdir}/skip-abi-check.patch"
+ cd "${srcdir}"
+ mkdir build
+ cd build
+
# CFLAGS/CXXFLAGS as suggested upstream
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" \
- ./configure --prefix=/usr \
- --libexecdir=/usr/sbin \
- --localstatedir=/var \
- --sysconfdir=/etc/mysql \
- --without-docs \
- --without-readline \
- --with-ssl \
- --with-libwrap \
- --with-charset=utf8 \
- --with-collation=utf8_general_ci \
- --with-extra-charsets=complex \
- --with-embedded-server \
- --with-unix-socket-path=/var/run/mysqld/mysqld.sock \
- --enable-local-infile \
- --with-plugins=partition,ftexample,archive,blackhole,federated,heap,innobase,innodb_plugin,ndbcluster
+
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DMYSQL_DATADIR=/var/lib/mysql \
+ -DINSTALL_INFODIR=/usr/share/mysql/docs \
+ -DINSTALL_MANDIR=/usr/share/man \
+ -DINSTALL_SCRIPTDIR=/usr/bin \
+ -DINSTALL_DOCREADMEDIR=/usr/share/mysql \
+ -DINSTALL_SUPPORTFILESDIR=/usr/share/mysql \
+ -DWITH_READLINE=OFF \
+ -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 \
+ -DWITH_EXAMPLE_STORAGE_ENGINE=1 \
+ -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+ -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
+ -DWITH_FEDERATED_STORAGE_ENGINE=1 \
+ -DWITH_INNOBASE_STORAGE_ENGINE=1
+
make
}
package_libmysqlclient(){
pkgdesc="MySQL client libraries"
- depends=('openssl' 'zlib' 'gcc-libs' 'tcp_wrappers')
+ depends=('openssl' 'gcc-libs' 'tcp_wrappers')
- cd "${srcdir}/${pkgbase}-${pkgver}"
- for dir in include libmysql libmysql_r libmysqld; do
+ cd "${srcdir}"/build
+ for dir in include libmysql libmysqld libservices; do
make -C ${dir} DESTDIR="${pkgdir}" install
done
- install -m644 include/*.h "${pkgdir}/usr/include/mysql/"
install -d "${pkgdir}/usr/bin"
install -m755 scripts/mysql_config "${pkgdir}/usr/bin/"
-
- # create library symlinks in /usr/lib
- ln -sf mysql/libmysqlclient.so.16 ${pkgdir}/usr/lib/libmysqlclient.so.16
- ln -sf libmysqlclient.so.16 ${pkgdir}/usr/lib/libmysqlclient.so
- ln -sf libmysqlclient.so.16 ${pkgdir}/usr/lib/libmysqlclient.so.1
- ln -sf mysql/libmysqlclient_r.so.16 ${pkgdir}/usr/lib/libmysqlclient_r.so.16
- ln -sf libmysqlclient_r.so.16 ${pkgdir}/usr/lib/libmysqlclient_r.so
- ln -sf libmysqlclient_r.so.16 ${pkgdir}/usr/lib/libmysqlclient_r.so.1
}
package_mysql-clients(){
pkgdesc="MySQL client tools"
depends=('libmysqlclient')
- cd "${srcdir}/${pkgbase}-${pkgver}/client"
+ cd "${srcdir}"/build/client
make DESTDIR="${pkgdir}" install
# provided by libmysqlclient
@@ -83,12 +85,12 @@
package_mysql(){
pkgdesc="A fast SQL database server"
- backup=('etc/my.cnf' 'etc/mysql/my.cnf')
+ backup=('etc/mysql/my.cnf')
install=mysql.install
depends=('mysql-clients')
optdepends=('perl-dbi' 'perl-dbd-mysql')
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${srcdir}"/build
make DESTDIR=${pkgdir} install
install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
@@ -96,9 +98,10 @@
# provided by libmysqlclient
rm -f ${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
- rm -f ${pkgdir}/usr/lib/mysql/libmysqlclient*
- rm -f ${pkgdir}/usr/lib/mysql/libmysqld.a
- rm -f ${pkgdir}/usr/include/mysql/*.h
+ rm -f ${pkgdir}/usr/lib/libmysqlclient*
+ rm -f ${pkgdir}/usr/lib/libmysqld.a
+ rm -f ${pkgdir}/usr/lib/libmysqlservices.a
+ rm -rf ${pkgdir}/usr/include/
# provided by mysql-clients
rm -f ${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
@@ -106,4 +109,10 @@
# not needed
rm -rf ${pkgdir}/usr/{mysql-test,sql-bench}
rm -f ${pkgdir}/usr/lib/mysql/plugin/*.a
+
+ # These shouldn't be here
+ rm -rf ${pkgdir}/usr/docs
+ install -d ${pkgdir}/var/lib/mysql
+ mv ${pkgdir}/usr/data/* ${pkgdir}/var/lib/mysql/
+ chmod -R 700 ${pkgdir}/var/lib/mysql/
}
Modified: my.cnf
===================================================================
--- my.cnf 2010-12-22 00:03:02 UTC (rev 103630)
+++ my.cnf 2010-12-22 00:25:45 UTC (rev 103631)
@@ -1,12 +1,18 @@
-# mysql config file for medium systems.
+# MySQL config file for medium systems.
#
# This is for a system with little memory (32M - 64M) where MySQL plays
-# a important part and systems up to 128M where MySQL is used together with
-# other programs (like a web server)
+# an important part, or systems up to 128M where MySQL is used together with
+# other programs (such as a web server)
#
-# One can in this file use all long options that the program supports.
-# If you want to know which options a program support, run the program
-# with --help option.
+# MySQL programs look for option files in a set of
+# locations which depend on the deployment platform.
+# You can copy this option file to one of those
+# locations. For information about these locations, see:
+# http://dev.mysql.com/doc/mysql/en/option-files.html
+#
+# In this file, you can use all long options that a program supports.
+# If you want to know which options a program supports, run the program
+# with the "--help" option.
# The following options will be passed to all MySQL clients
[client]
@@ -22,11 +28,13 @@
socket = /var/run/mysqld/mysqld.sock
datadir = /var/lib/mysql
skip-external-locking
-key_buffer = 16M
+key_buffer_size = 16M
max_allowed_packet = 1M
-table_cache = 64
+table_open_cache = 64
sort_buffer_size = 512K
-net_buffer_length = 16K
+net_buffer_length = 8K
+read_buffer_size = 256K
+read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
# Don't listen on a TCP/IP port at all. This can be a security enhancement,
@@ -35,12 +43,15 @@
# Note that using this option without enabling named pipes on Windows
# (via the "enable-named-pipe" option) will render mysqld useless!
#
-skip-networking
+#skip-networking
# Replication Master Server (default)
# binary logging is required for replication
-#log-bin
+log-bin=mysql-bin
+# binary logging format - mixed recommended
+binlog_format=mixed
+
# required unique id between 1 and 2^32 - 1
# defaults to 1 if master-host is not set
# but will not function as a master if omitted
@@ -99,16 +110,8 @@
#master-port = <port>
#
# binary logging - not required for slaves, but recommended
-#log-bin
+#log-bin=mysql-bin
-# Point the following paths to different dedicated disks
-#tmpdir = /tmp/
-#log-update = /path-to-dedicated-directory/hostname
-
-# Uncomment the following if you are using BDB tables
-#bdb_cache_size = 4M
-#bdb_max_lock = 10000
-
# Uncomment the following if you are using InnoDB tables
#innodb_data_home_dir = /var/lib/mysql
#innodb_data_file_path = ibdata1:10M:autoextend
@@ -128,18 +131,12 @@
max_allowed_packet = 16M
[mysql]
-#no-auto-rehash
+no-auto-rehash
# Remove the next comment character if you are not familiar with SQL
#safe-updates
-[isamchk]
-key_buffer = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
[myisamchk]
-key_buffer = 20M
+key_buffer_size = 20M
sort_buffer_size = 20M
read_buffer = 2M
write_buffer = 2M
Modified: mysql.install
===================================================================
--- mysql.install 2010-12-22 00:03:02 UTC (rev 103630)
+++ mysql.install 2010-12-22 00:25:45 UTC (rev 103631)
@@ -8,6 +8,8 @@
post_upgrade(){
getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+
+ echo " >> Major version update. Consider running mysql_upgrade."
}
post_remove(){
Deleted: skip-abi-check.patch
===================================================================
--- skip-abi-check.patch 2010-12-22 00:03:02 UTC (rev 103630)
+++ skip-abi-check.patch 2010-12-22 00:25:45 UTC (rev 103631)
@@ -1,13 +0,0 @@
---- Makefile.in.orig 2010-05-28 20:03:46.507224494 +0200
-+++ Makefile.in 2010-05-28 20:04:05.737221909 +0200
-@@ -1126,10 +1126,8 @@
- #
-
- abi_check: $(API_PREPROCESSOR_HEADER)
-- $(MAKE) abi_headers="$^" do_abi_check
-
- abi_check_all: $(TEST_PREPROCESSOR_HEADER)
-- $(MAKE) abi_headers="$^" do_abi_check
-
- do_abi_check:
- set -ex; \
More information about the arch-commits
mailing list