[arch-commits] Commit in mysql++/trunk (PKGBUILD)

[Sven-Hendrik Haase via arch-commits]

Date: Monday, July 29, 2019 @ 09:08:42
  Author: svenstaro
Revision: 494511

upgpkg: mysql++ 3.2.5-1

Modified:
  mysql++/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-29 09:08:02 UTC (rev 494510)
+++ PKGBUILD2019-07-29 09:08:42 UTC (rev 494511)
@@ -2,8 +2,8 @@
 # Contributor: Markus Härer 
 
 pkgname=mysql++
-pkgver=3.2.4
-pkgrel=3
+pkgver=3.2.5
+pkgrel=1
 pkgdesc="A C++ wrapper for MySQLs C API"
 arch=("x86_64")
 url="http://tangentsoft.net/mysql++/;
@@ -13,7 +13,7 @@
 source=("https://tangentsoft.net/mysqlpp/releases/$pkgname-$pkgver.tar.gz;
"mysql++-fix-cstring.patch"
"mysql++-fix-size_t.patch")
-sha256sums=('6b60727b36b1fed78e0c935d6510b31821c71ec0076967cd9fa5ecf4320d7d63'
+sha256sums=('b780beeb3a9cd9ce6a9043028527484df8e822c58c5274d4d67ec5ba2fc0a778'
 'c005b6a8736578f935996e5249e8048e887d7cfb9c76ab0428543710b7622af0'
 '22a1aed639923206b0b79ec1e3f2a1b3c1bd896b52519526fd0af08c54fd3762')
 

[arch-commits] Commit in mysql++/trunk (PKGBUILD)

[Felix Yan via arch-commits]

Date: Wednesday, January 16, 2019 @ 13:59:49
  Author: felixonmars
Revision: 423499

MariaDB 10.3 rebuild

Modified:
  mysql++/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-16 13:22:05 UTC (rev 423498)
+++ PKGBUILD2019-01-16 13:59:49 UTC (rev 423499)
@@ -3,7 +3,7 @@
 
 pkgname=mysql++
 pkgver=3.2.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A C++ wrapper for MySQLs C API"
 arch=("x86_64")
 url="http://tangentsoft.net/mysql++/;

[arch-commits] Commit in mysql++/trunk (PKGBUILD)

[Felix Yan via arch-commits]

Date: Wednesday, January 16, 2019 @ 11:20:35
  Author: felixonmars
Revision: 423488

MariaDB 10.3 rebuild

Modified:
  mysql++/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-16 10:47:27 UTC (rev 423487)
+++ PKGBUILD2019-01-16 11:20:35 UTC (rev 423488)
@@ -3,7 +3,7 @@
 
 pkgname=mysql++
 pkgver=3.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A C++ wrapper for MySQLs C API"
 arch=("x86_64")
 url="http://tangentsoft.net/mysql++/;

[arch-commits] Commit in mysql++/trunk (PKGBUILD)

[Sven-Hendrik Haase via arch-commits]

Date: Wednesday, August 22, 2018 @ 20:03:48
  Author: svenstaro
Revision: 373306

upgpkg: mysql++ 3.2.4-1

Modified:
  mysql++/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-22 19:48:31 UTC (rev 373305)
+++ PKGBUILD2018-08-22 20:03:48 UTC (rev 373306)
@@ -3,8 +3,8 @@
 # Contributor: Markus Härer 
 
 pkgname=mysql++
-pkgver=3.2.3
-pkgrel=2
+pkgver=3.2.4
+pkgrel=1
 pkgdesc="A C++ wrapper for MySQLs C API"
 arch=("x86_64")
 url="http://tangentsoft.net/mysql++/;
@@ -11,10 +11,10 @@
 license=("LGPL" "custom")
 depends=("libmariadbclient")
 options=('docs')
-source=("https://tangentsoft.net/mysql++/releases/$pkgname-$pkgver.tar.gz;
+source=("https://tangentsoft.net/mysqlpp/releases/$pkgname-$pkgver.tar.gz;
"mysql++-fix-cstring.patch"
"mysql++-fix-size_t.patch")
-sha256sums=('c804c38fe229caab62a48a6d0a5cb279460da319562f41a16ad2f0a0f55b6941'
+sha256sums=('6b60727b36b1fed78e0c935d6510b31821c71ec0076967cd9fa5ecf4320d7d63'
 'c005b6a8736578f935996e5249e8048e887d7cfb9c76ab0428543710b7622af0'
 '22a1aed639923206b0b79ec1e3f2a1b3c1bd896b52519526fd0af08c54fd3762')
 

[arch-commits] Commit in mysql++/trunk (PKGBUILD)

[Evangelos Foutras]

Date: Thursday, May 25, 2017 @ 22:59:29
  Author: foutrelis
Revision: 230317

MariaDB 10.2.6 rebuild

Modified:
  mysql++/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-25 22:58:25 UTC (rev 230316)
+++ PKGBUILD2017-05-25 22:59:29 UTC (rev 230317)
@@ -4,7 +4,7 @@
 
 pkgname=mysql++
 pkgver=3.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A C++ wrapper for MySQLs C API"
 arch=("i686" "x86_64")
 url="http://tangentsoft.net/mysql++/;

[arch-commits] Commit in mysql++/trunk (PKGBUILD)

[Sergej Pupykin]

Date: Monday, January 23, 2017 @ 11:39:24
  Author: spupykin
Revision: 208509

upgpkg: mysql++ 3.2.3-1

upd

Modified:
  mysql++/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-23 11:39:16 UTC (rev 208508)
+++ PKGBUILD2017-01-23 11:39:24 UTC (rev 208509)
@@ -3,8 +3,8 @@
 # Contributor: Markus Härer 
 
 pkgname=mysql++
-pkgver=3.2.2
-pkgrel=2
+pkgver=3.2.3
+pkgrel=1
 pkgdesc="A C++ wrapper for MySQLs C API"
 arch=("i686" "x86_64")
 url="http://tangentsoft.net/mysql++/;
@@ -14,7 +14,7 @@
 source=("https://tangentsoft.net/mysql++/releases/$pkgname-$pkgver.tar.gz;
"mysql++-fix-cstring.patch"
"mysql++-fix-size_t.patch")
-sha256sums=('55667bee79a5981b1a04e57e3a4fd8b03bf330e4e3371b023c2bf5ba0f50ed17'
+sha256sums=('c804c38fe229caab62a48a6d0a5cb279460da319562f41a16ad2f0a0f55b6941'
 'c005b6a8736578f935996e5249e8048e887d7cfb9c76ab0428543710b7622af0'
 '22a1aed639923206b0b79ec1e3f2a1b3c1bd896b52519526fd0af08c54fd3762')
 

[arch-commits] Commit in mysql++/trunk (PKGBUILD)

[Sergej Pupykin]

Date: Monday, November 14, 2016 @ 16:53:53
  Author: spupykin
Revision: 195784

Modified:
  mysql++/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-14 16:53:25 UTC (rev 195783)
+++ PKGBUILD2016-11-14 16:53:53 UTC (rev 195784)
@@ -11,12 +11,12 @@
 license=("LGPL" "custom")
 depends=("libmariadbclient")
 options=('docs')
-source=("http://tangentsoft.net/mysql++/releases/$pkgname-$pkgver.tar.gz;
+source=("https://tangentsoft.net/mysql++/releases/$pkgname-$pkgver.tar.gz;
"mysql++-fix-cstring.patch"
"mysql++-fix-size_t.patch")
-md5sums=('1397502eac7f0a9800116411e8b21187'
- '72f85a1bdba9d5285f0baf1d973033f8'
- '6dcfbf06072b81cf27530ca9a0df8a8e')
+sha256sums=('55667bee79a5981b1a04e57e3a4fd8b03bf330e4e3371b023c2bf5ba0f50ed17'
+'c005b6a8736578f935996e5249e8048e887d7cfb9c76ab0428543710b7622af0'
+'22a1aed639923206b0b79ec1e3f2a1b3c1bd896b52519526fd0af08c54fd3762')
 
 build() {
   unset LDFLAGS

[arch-commits] Commit in mysql++/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

Date: Monday, December 7, 2015 @ 00:44:58
  Author: bpiotrowski
Revision: 149378

C++11 ABI rebuild

Modified:
  mysql++/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 23:43:56 UTC (rev 149377)
+++ PKGBUILD2015-12-06 23:44:58 UTC (rev 149378)
@@ -4,7 +4,7 @@
 
 pkgname=mysql++
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A C++ wrapper for MySQLs C API"
 arch=("i686" "x86_64")
 url="http://tangentsoft.net/mysql++/;

[arch-commits] Commit in mysql++/trunk (PKGBUILD)

[Sergej Pupykin]

Date: Thursday, July 23, 2015 @ 12:42:59
  Author: spupykin
Revision: 137321

upgpkg: mysql++ 3.2.2-1

upd

Modified:
  mysql++/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-23 10:42:56 UTC (rev 137320)
+++ PKGBUILD2015-07-23 10:42:59 UTC (rev 137321)
@@ -3,7 +3,7 @@
 # Contributor: Markus Härer markus.hae...@gmx.net
 
 pkgname=mysql++
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc=A C++ wrapper for MySQLs C API
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@
 source=(http://tangentsoft.net/mysql++/releases/$pkgname-$pkgver.tar.gz;
mysql++-fix-cstring.patch
mysql++-fix-size_t.patch)
-md5sums=('7157dc36071872975b43d3dc9f970619'
+md5sums=('1397502eac7f0a9800116411e8b21187'
  '72f85a1bdba9d5285f0baf1d973033f8'
  '6dcfbf06072b81cf27530ca9a0df8a8e')
 

[arch-commits] Commit in mysql++/trunk (PKGBUILD)

[Sergej Pupykin]

Date: Monday, September 29, 2014 @ 12:36:19
  Author: spupykin
Revision: 119760

typo

Modified:
  mysql++/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-29 10:27:32 UTC (rev 119759)
+++ PKGBUILD2014-09-29 10:36:19 UTC (rev 119760)
@@ -5,7 +5,7 @@
 pkgname=mysql++
 pkgver=3.2.1
 pkgrel=1
-pkgdesc=A C++ wraper for MySQLs C API
+pkgdesc=A C++ wrapper for MySQLs C API
 arch=(i686 x86_64)
 url=http://tangentsoft.net/mysql++/;
 license=(LGPL custom)

[arch-commits] Commit in mysql++/trunk (PKGBUILD)

[Sergej Pupykin]

Date: Thursday, July 11, 2013 @ 14:03:11
  Author: spupykin
Revision: 93853

upgpkg: mysql++ 3.2.0-1

upd

Modified:
  mysql++/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-11 12:03:07 UTC (rev 93852)
+++ PKGBUILD2013-07-11 12:03:11 UTC (rev 93853)
@@ -3,8 +3,8 @@
 # Contributor: Markus Härer markus.hae...@gmx.net
 
 pkgname=mysql++
-pkgver=3.1.0
-pkgrel=4
+pkgver=3.2.0
+pkgrel=1
 pkgdesc=A C++ wraper for MySQLs C API
 arch=(i686 x86_64)
 url=http://tangentsoft.net/mysql++/;
@@ -14,7 +14,7 @@
 source=(http://tangentsoft.net/mysql++/releases/$pkgname-$pkgver.tar.gz;
mysql++-fix-cstring.patch
mysql++-fix-size_t.patch)
-md5sums=('d92769cc579b87a60e58a77099cc4f0e'
+md5sums=('d2220b74e000d8ede13f451fe99bad5a'
  '72f85a1bdba9d5285f0baf1d973033f8'
  '6dcfbf06072b81cf27530ca9a0df8a8e')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

Date: Wednesday, March 6, 2013 @ 05:36:54
  Author: bpiotrowski
Revision: 179527

upgpkg: mysql 5.5.30-7

Provide MariaDB.

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-06 02:34:29 UTC (rev 179526)
+++ PKGBUILD2013-03-06 04:36:54 UTC (rev 179527)
@@ -5,7 +5,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;
@@ -66,6 +66,8 @@
 package_libmysqlclient(){
   pkgdesc=MySQL client libraries
   depends=('openssl')
+  conflicts=('libmariadbclient')
+  provides=(libmariadbclient=$pkgver)
   
   cd build
   for dir in include libmysql libmysqld libservices; do
@@ -83,6 +85,8 @@
 package_mysql-clients(){
   pkgdesc=MySQL client tools
   depends=('libmysqlclient')
+  conflicts=('mariadb-clients')
+  provides=(mariadb-clients=$pkgver)
   
   cd build
   make -C client DESTDIR=${pkgdir} install
@@ -102,6 +106,8 @@
   backup=('etc/mysql/my.cnf')
   install=mysql.install
   depends=('mysql-clients' 'systemd-tools')
+  conflicts=('mariadb')
+  provides=(mariadb=$pkgver)
   options=('emptydirs')
 
   cd build

[arch-commits] Commit in mysql++/trunk (PKGBUILD)

[Sergej Pupykin]

Date: Monday, March 4, 2013 @ 12:35:33
  Author: spupykin
Revision: 85639

upgpkg: mysql++ 3.1.0-4

upd

Modified:
  mysql++/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-04 11:35:26 UTC (rev 85638)
+++ PKGBUILD2013-03-04 11:35:33 UTC (rev 85639)
@@ -4,12 +4,12 @@
 
 pkgname=mysql++
 pkgver=3.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc=A C++ wraper for MySQLs C API
 arch=(i686 x86_64)
 url=http://tangentsoft.net/mysql++/;
 license=(LGPL custom)
-depends=(libmysqlclient)
+depends=(libmariadbclient)
 options=('docs')
 source=(http://tangentsoft.net/mysql++/releases/$pkgname-$pkgver.tar.gz;
mysql++-fix-cstring.patch

[arch-commits] Commit in mysql/trunk (PKGBUILD mysql.install)

[Bartłomiej Piotrowski]

Date: Monday, February 25, 2013 @ 17:42:59
  Author: bpiotrowski
Revision: 178549

upgpkg: mysql 5.5.30-5

Simplify install script.

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysql.install

---+
 PKGBUILD  |2 +-
 mysql.install |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-25 16:39:24 UTC (rev 178548)
+++ PKGBUILD2013-02-25 16:42:59 UTC (rev 178549)
@@ -5,7 +5,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;

Modified: mysql.install
===
--- mysql.install   2013-02-25 16:39:24 UTC (rev 178548)
+++ mysql.install   2013-02-25 16:42:59 UTC (rev 178549)
@@ -1,7 +1,7 @@
+datadir=$(my_print_defaults mysqld | sed -n s/^--datadir=//p)
+[[ -z $datadir ]]  datadir=/var/lib/mysql 
+
 post_install(){
-  datadir=$(my_print_defaults mysqld | sed -n s/^--datadir=//p)
-  [[ -z $datadir ]]  datadir=/var/lib/mysql
-
   groupadd -g 89 mysql /dev/null
   useradd -u 89 -g mysql -d $datadir -s /bin/false mysql /dev/null
 
@@ -16,7 +16,7 @@
 
 post_upgrade(){
   getent group mysql /dev/null 21 || groupadd -g 89 mysql /dev/null
-  getent passwd mysql /dev/null 21 || useradd -u 89 -g mysql -d 
/var/lib/mysql -s /bin/false mysql /dev/null
+  getent passwd mysql /dev/null 21 || useradd -u 89 -g mysql -d $datadir -s 
/bin/false mysql /dev/null
 
   if [ $(vercmp $2 5.5) -lt 0 ]; then
 echo   

[arch-commits] Commit in mysql/trunk (PKGBUILD mysql.install)

[Bartłomiej Piotrowski]

Date: Monday, February 25, 2013 @ 18:58:07
  Author: bpiotrowski
Revision: 178604

upgpkg: mysql 5.5.30-6

- check if my_print_defaults is available
- pass $datadir to mysql_install_db

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysql.install

---+
 PKGBUILD  |2 +-
 mysql.install |6 --
 2 files changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-25 17:50:13 UTC (rev 178603)
+++ PKGBUILD2013-02-25 17:58:07 UTC (rev 178604)
@@ -5,7 +5,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;

Modified: mysql.install
===
--- mysql.install   2013-02-25 17:50:13 UTC (rev 178603)
+++ mysql.install   2013-02-25 17:58:07 UTC (rev 178604)
@@ -1,4 +1,6 @@
-datadir=$(my_print_defaults mysqld | sed -n s/^--datadir=//p)
+if [[ $(command -v my_print_defaults /dev/null 21) ]]; then
+  datadir=$(my_print_defaults mysqld | sed -n s/^--datadir=//p)
+fi
 [[ -z $datadir ]]  datadir=/var/lib/mysql 
 
 post_install(){
@@ -7,7 +9,7 @@
 
   if [[ ! -e $datadir ]]; then
 install -dm700 $datadir
-usr/bin/mysql_install_db --user=mysql --basedir=/usr
+usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
 chown -R mysql:mysql var/lib/mysql /dev/null
   fi
 

[arch-commits] Commit in mysql/trunk (PKGBUILD mysql.install)

[Bartłomiej Piotrowski]

Date: Wednesday, February 20, 2013 @ 18:18:07
  Author: bpiotrowski
Revision: 178354

upgpkg: mysql 5.5.30-4

- don't ship /var/lib/mysql in package
- run mysql_install_db only if MySQL datadir is not present
- enable ARCHIVE and BLACKHOLE storage engines (FS#33935)

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysql.install

---+
 PKGBUILD  |8 
 mysql.install |   13 ++---
 2 files changed, 14 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-20 17:01:28 UTC (rev 178353)
+++ PKGBUILD2013-02-20 17:18:07 UTC (rev 178354)
@@ -5,7 +5,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;
@@ -53,9 +53,9 @@
 -DWITH_EMBEDDED_SERVER=ON \
 -DWITH_INNOBASE_STORAGE_ENGINE=1 \
 -DWITH_PARTITION_STORAGE_ENGINE=1 \
+-DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+-DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
 -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
--DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
--DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
 -DCMAKE_C_FLAGS=-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-fomit-frame-pointer \
 -DCMAKE_CXX_FLAGS=-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-felide-constructors -fno-rtti
@@ -127,5 +127,5 @@
   rm -r ${pkgdir}/usr/{data,mysql-test,sql-bench}
   rm ${pkgdir}/usr/share/man/man1/mysql-test-run.pl.1
 
-  install -dm700 ${pkgdir}/var/lib/mysql
+  #install -dm700 ${pkgdir}/var/lib/mysql
 }

Modified: mysql.install
===
--- mysql.install   2013-02-20 17:01:28 UTC (rev 178353)
+++ mysql.install   2013-02-20 17:18:07 UTC (rev 178354)
@@ -1,9 +1,16 @@
 post_install(){
+  datadir=$(my_print_defaults mysqld | sed -n s/^--datadir=//p)
+  [[ -z $datadir ]]  datadir=/var/lib/mysql
+
   groupadd -g 89 mysql /dev/null
-  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql /dev/null
-  usr/bin/mysql_install_db --user=mysql --basedir=/usr
-  chown -R mysql:mysql var/lib/mysql /dev/null
+  useradd -u 89 -g mysql -d $datadir -s /bin/false mysql /dev/null
 
+  if [[ ! -e $datadir ]]; then
+install -dm700 $datadir
+usr/bin/mysql_install_db --user=mysql --basedir=/usr
+chown -R mysql:mysql var/lib/mysql /dev/null
+  fi
+
   usr/bin/systemd-tmpfiles --create mysqld.conf
 }
 

[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf mysqld-post.sh mysqld.service)

[Bartłomiej Piotrowski]

Date: Sunday, February 17, 2013 @ 19:32:53
  Author: bpiotrowski
Revision: 178170

upgpkg: mysql 5.5.30-2

- use sha256sums
- install my-medium.cnf as default config (it's the same as the trunk's my.cnf 
is)
- add additional condiction to mysqld.post ('access denied' means that service 
is up)
- write PID file
- make mysql's tmp private

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysqld-post.sh
  mysql/trunk/mysqld.service
Deleted:
  mysql/trunk/my.cnf

+
 PKGBUILD   |   17 ++
 my.cnf |  145 ---
 mysqld-post.sh |3 -
 mysqld.service |   10 +++
 4 files changed, 17 insertions(+), 158 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-17 17:21:40 UTC (rev 178169)
+++ PKGBUILD2013-02-17 18:32:53 UTC (rev 178170)
@@ -5,26 +5,23 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
-'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service')
-md5sums=('f0cdd56f89e781e800cf223bd9edd00c'
- '1351485633baf9894cfdf7c5bbffd7b5'
- '6ea6ceb360d09a774e87335ee098ddd5'
- '2fa6e456964d4ff5e6d4f9ff0126aed6'
- 'a0e1460c276a50a9666c331de83271f2')
+'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service')
+sha256sums=('909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053'
+'368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
+'2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
+'c34048bdc994f90b067204cf0e0b6a65cb6f38c30d1145186b6a7ae3b101fe84')
 
 build() {
   mkdir build
   cd build
 
-  # CFLAGS/CXXFLAGS as suggested upstream
-
   cmake ../${pkgbase}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
@@ -107,7 +104,7 @@
   cd build
   make DESTDIR=${pkgdir} install
 
-  install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
+  install -Dm644 ${pkgdir}/usr/share/mysql/my-medium.cnf 
${pkgdir}/etc/mysql/my.cnf
   install -Dm755 ${srcdir}/mysqld-post.sh ${pkgdir}/usr/bin/mysqld-post
   install -Dm644 ${srcdir}/mysqld-tmpfile.conf 
${pkgdir}/usr/lib/tmpfiles.d/mysqld.conf
   install -d ${pkgdir}/usr/lib/systemd/system

Deleted: my.cnf
===
--- my.cnf  2013-02-17 17:21:40 UTC (rev 178169)
+++ my.cnf  2013-02-17 18:32:53 UTC (rev 178170)
@@ -1,145 +0,0 @@
-# MySQL config file for medium systems.
-#
-# This is for a system with little memory (32M - 64M) where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# 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]
-#password  = your_password
-port   = 3306
-socket = /run/mysqld/mysqld.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-port   = 3306
-socket = /run/mysqld/mysqld.sock
-datadir= /var/lib/mysql
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
-sort_buffer_size = 512K
-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,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the enable-named-pipe option) will render mysqld useless!
-# 
-skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-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
-server-id  = 1
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#

[arch-commits] Commit in mysql/trunk (PKGBUILD mysqld.service)

[Bartłomiej Piotrowski]

Date: Sunday, February 17, 2013 @ 22:27:29
  Author: bpiotrowski
Revision: 178174

upgpkg: mysql 5.5.30-3

- verify source tarball signature
- remove PIDFile, as it is ignored if Type != forking
- service is already starting as mysql user, no need to specify it via --user 
parameter

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysqld.service

+
 PKGBUILD   |   11 +++
 mysqld.service |3 +--
 2 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-17 19:56:17 UTC (rev 178173)
+++ PKGBUILD2013-02-17 21:27:29 UTC (rev 178174)
@@ -5,18 +5,21 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
-source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
-'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service')
+source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz{,.asc}
+mysqld-post.sh
+mysqld-tmpfile.conf
+mysqld.service)
 sha256sums=('909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053'
+'27d3bba7b7f54f9f77cddba81a3fe124aeef918cc09eb28860338e9a4359e6f7'
 '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
 '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
-'c34048bdc994f90b067204cf0e0b6a65cb6f38c30d1145186b6a7ae3b101fe84')
+'50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556')
 
 build() {
   mkdir build

Modified: mysqld.service
===
--- mysqld.service  2013-02-17 19:56:17 UTC (rev 178173)
+++ mysqld.service  2013-02-17 21:27:29 UTC (rev 178174)
@@ -6,10 +6,9 @@
 User=mysql
 Group=mysql
 
-ExecStart=/usr/bin/mysqld --user=mysql --pid-file=/var/run/mysqld/mysqld.pid 
+ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid 
 ExecStartPost=/usr/bin/mysqld-post
 
-PIDFile=/var/run/mysqld/mysqld.pid
 Restart=always
 PrivateTmp=true
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Thursday, January 31, 2013 @ 16:45:43
  Author: andrea
Revision: 176797

Upstream release; drop the rc script

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-31 15:03:42 UTC (rev 176796)
+++ PKGBUILD2013-01-31 15:45:43 UTC (rev 176797)
@@ -4,7 +4,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.29
+pkgver=5.5.30
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,9 +12,8 @@
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
-'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 
'mysqld.service')
-md5sums=('e6b9f9cb82e990bd8f0474df7462904e'
- 'e7eb2faeab755cbb2fe03542bf328da9'
+'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service')
+md5sums=('f0cdd56f89e781e800cf223bd9edd00c'
  '1351485633baf9894cfdf7c5bbffd7b5'
  '6ea6ceb360d09a774e87335ee098ddd5'
  '2fa6e456964d4ff5e6d4f9ff0126aed6'
@@ -109,7 +108,6 @@
   make DESTDIR=${pkgdir} install
 
   install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
-  install -Dm755 ${srcdir}/mysqld.rc ${pkgdir}/etc/rc.d/mysqld
   install -Dm755 ${srcdir}/mysqld-post.sh ${pkgdir}/usr/bin/mysqld-post
   install -Dm644 ${srcdir}/mysqld-tmpfile.conf 
${pkgdir}/usr/lib/tmpfiles.d/mysqld.conf
   install -d ${pkgdir}/usr/lib/systemd/system

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Friday, December 21, 2012 @ 04:02:49
  Author: andrea
Revision: 173696

upgpkg: mysql 5.5.29-1

Upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-21 06:21:23 UTC (rev 173695)
+++ PKGBUILD2012-12-21 09:02:49 UTC (rev 173696)
@@ -4,7 +4,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.28
+pkgver=5.5.29
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,7 +13,7 @@
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 
'mysqld.service')
-md5sums=('da8ddb3d00e6e159153d2444360f52a8'
+md5sums=('e6b9f9cb82e990bd8f0474df7462904e'
  'e7eb2faeab755cbb2fe03542bf328da9'
  '1351485633baf9894cfdf7c5bbffd7b5'
  '6ea6ceb360d09a774e87335ee098ddd5'

[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf)

[Andrea Scarpino]

Date: Tuesday, October 9, 2012 @ 02:41:47
  Author: andrea
Revision: 168353

Fix socket path (FS#31841)

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/my.cnf

--+
 PKGBUILD |2 +-
 my.cnf   |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-09 04:09:46 UTC (rev 168352)
+++ PKGBUILD2012-10-09 06:41:47 UTC (rev 168353)
@@ -15,7 +15,7 @@
 'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 
'mysqld.service')
 md5sums=('da8ddb3d00e6e159153d2444360f52a8'
  'e7eb2faeab755cbb2fe03542bf328da9'
- '1c949c0dbea5206af0db14942d9927b6'
+ '1351485633baf9894cfdf7c5bbffd7b5'
  '6ea6ceb360d09a774e87335ee098ddd5'
  '2fa6e456964d4ff5e6d4f9ff0126aed6'
  'a0e1460c276a50a9666c331de83271f2')

Modified: my.cnf
===
--- my.cnf  2012-10-09 04:09:46 UTC (rev 168352)
+++ my.cnf  2012-10-09 06:41:47 UTC (rev 168353)
@@ -18,14 +18,14 @@
 [client]
 #password  = your_password
 port   = 3306
-socket = /var/run/mysqld/mysqld.sock
+socket = /run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 
 # The MySQL server
 [mysqld]
 port   = 3306
-socket = /var/run/mysqld/mysqld.sock
+socket = /run/mysqld/mysqld.sock
 datadir= /var/lib/mysql
 skip-external-locking
 key_buffer_size = 16M

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Saturday, September 29, 2012 @ 05:31:54
  Author: andrea
Revision: 167245

upgpkg: mysql 5.5.28-1

Upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-29 09:31:34 UTC (rev 167244)
+++ PKGBUILD2012-09-29 09:31:54 UTC (rev 167245)
@@ -4,8 +4,8 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.27
-pkgrel=4
+pkgver=5.5.28
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;
@@ -13,7 +13,7 @@
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 
'mysqld.service')
-md5sums=('82baf46acfced6eef072e9d8a479c86e'
+md5sums=('da8ddb3d00e6e159153d2444360f52a8'
  'e7eb2faeab755cbb2fe03542bf328da9'
  '1c949c0dbea5206af0db14942d9927b6'
  '6ea6ceb360d09a774e87335ee098ddd5'

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Thursday, September 6, 2012 @ 16:52:21
  Author: andrea
Revision: 166350

The plugin dir is no more absolute (FS#31437)

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-06 20:52:06 UTC (rev 166349)
+++ PKGBUILD2012-09-06 20:52:21 UTC (rev 166350)
@@ -5,7 +5,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.27
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;
@@ -37,7 +37,7 @@
 -DENABLED_LOCAL_INFILE=ON \
 -DINSTALL_INFODIR=share/mysql/docs \
 -DINSTALL_MANDIR=share/man \
--DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
+-DINSTALL_PLUGINDIR=lib/mysql/plugin \
 -DINSTALL_SCRIPTDIR=bin \
 -DINSTALL_INCLUDEDIR=include/mysql \
 -DINSTALL_DOCREADMEDIR=share/mysql \

[arch-commits] Commit in mysql/trunk (PKGBUILD mysqld-post.sh)

[Andrea Scarpino]

Date: Wednesday, August 15, 2012 @ 10:08:23
  Author: andrea
Revision: 165317

Add the shebang in the mysqld-post script (FS#31127); Install the tmpfile in 
/usr/lib

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysqld-post.sh

+
 PKGBUILD   |4 ++--
 mysqld-post.sh |2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-15 13:47:42 UTC (rev 165316)
+++ PKGBUILD2012-08-15 14:08:23 UTC (rev 165317)
@@ -5,7 +5,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.27
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;
@@ -111,7 +111,7 @@
   install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
   install -Dm755 ${srcdir}/mysqld.rc ${pkgdir}/etc/rc.d/mysqld
   install -Dm755 ${srcdir}/mysqld-post.sh ${pkgdir}/usr/bin/mysqld-post
-  install -Dm644 ${srcdir}/mysqld-tmpfile.conf 
${pkgdir}/etc/tmpfiles.d/mysqld.conf
+  install -Dm644 ${srcdir}/mysqld-tmpfile.conf 
${pkgdir}/usr/lib/tmpfiles.d/mysqld.conf
   install -d ${pkgdir}/usr/lib/systemd/system
   install -Dm644 ${srcdir}/mysqld.service ${pkgdir}/usr/lib/systemd/system/
 

Modified: mysqld-post.sh
===
--- mysqld-post.sh  2012-08-15 13:47:42 UTC (rev 165316)
+++ mysqld-post.sh  2012-08-15 14:08:23 UTC (rev 165317)
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 while true; do
 response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 21`  break
 echo $response | grep -q mysqld is alive  break

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Wednesday, August 15, 2012 @ 10:53:30
  Author: andrea
Revision: 165318

upgpkg: mysql 5.5.27-3

update checksum

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-15 14:08:23 UTC (rev 165317)
+++ PKGBUILD2012-08-15 14:53:30 UTC (rev 165318)
@@ -16,7 +16,7 @@
 md5sums=('82baf46acfced6eef072e9d8a479c86e'
  'e7eb2faeab755cbb2fe03542bf328da9'
  '1c949c0dbea5206af0db14942d9927b6'
- 'f772d69f43f6563c6e5434e988612b00'
+ '6ea6ceb360d09a774e87335ee098ddd5'
  '2fa6e456964d4ff5e6d4f9ff0126aed6'
  'a0e1460c276a50a9666c331de83271f2')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Friday, August 3, 2012 @ 03:56:45
  Author: andrea
Revision: 164696

upgpkg: mysql 5.5.27-1

Upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-03 06:11:02 UTC (rev 164695)
+++ PKGBUILD2012-08-03 07:56:45 UTC (rev 164696)
@@ -5,18 +5,17 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.25.a
-_pkgver=5.5.25a
+pkgver=5.5.27
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
-source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${_pkgver}.tar.gz;
+source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('0841fbc79872c5f467d8c8842f45257a'
+md5sums=('82baf46acfced6eef072e9d8a479c86e'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 
@@ -27,7 +26,7 @@
 
   # CFLAGS/CXXFLAGS as suggested upstream
 
-  cmake ../${pkgbase}-${_pkgver} \
+  cmake ../${pkgbase}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DSYSCONFDIR=/etc/mysql \
@@ -78,7 +77,7 @@
   install -m755 scripts/mysql_config ${pkgdir}/usr/bin/
   install -d ${pkgdir}/usr/share/man/man1
   for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
-install -m644 ${srcdir}/${pkgbase}-${_pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
+install -m644 ${srcdir}/${pkgbase}-${pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
   done
 }
 
@@ -92,7 +91,7 @@
   # install man pages
   install -d ${pkgdir}/usr/share/man/man1
   for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow 
mysqlslap; do
-install -m644 ${srcdir}/${pkgbase}-${_pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
+install -m644 ${srcdir}/${pkgbase}-${pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
   done
 
   # provided by mysql

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Friday, July 6, 2012 @ 03:03:19
  Author: andrea
Revision: 163035

upgpkg: mysql 5.5.25a-1

Upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-06 06:23:23 UTC (rev 163034)
+++ PKGBUILD2012-07-06 07:03:19 UTC (rev 163035)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.25
+pkgver=5.5.25a
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('9e2a3d5b41eac7fae41b93e5b71ea49c'
+md5sums=('0841fbc79872c5f467d8c8842f45257a'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Friday, July 6, 2012 @ 03:31:43
  Author: andrea
Revision: 163037

5.5.25a is lower than 5.5.25

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-06 07:03:58 UTC (rev 163036)
+++ PKGBUILD2012-07-06 07:31:43 UTC (rev 163037)
@@ -5,14 +5,15 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.25a
+pkgver=5.5.25.a
+_pkgver=5.5.25a
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
-source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
+source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${_pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
 md5sums=('0841fbc79872c5f467d8c8842f45257a'
@@ -26,7 +27,7 @@
 
   # CFLAGS/CXXFLAGS as suggested upstream
 
-  cmake ../${pkgbase}-${pkgver} \
+  cmake ../${pkgbase}-${_pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DSYSCONFDIR=/etc/mysql \
@@ -77,7 +78,7 @@
   install -m755 scripts/mysql_config ${pkgdir}/usr/bin/
   install -d ${pkgdir}/usr/share/man/man1
   for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
-install -m644 ${srcdir}/${pkgbase}-${pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
+install -m644 ${srcdir}/${pkgbase}-${_pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
   done
 }
 
@@ -91,7 +92,7 @@
   # install man pages
   install -d ${pkgdir}/usr/share/man/man1
   for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow 
mysqlslap; do
-install -m644 ${srcdir}/${pkgbase}-${pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
+install -m644 ${srcdir}/${pkgbase}-${_pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
   done
 
   # provided by mysql

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Wednesday, July 4, 2012 @ 09:16:24
  Author: andrea
Revision: 162970

Honor CFLAGS/CXXFLAGS (FS#30535)

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-04 13:03:55 UTC (rev 162969)
+++ PKGBUILD2012-07-04 13:16:24 UTC (rev 162970)
@@ -25,8 +25,6 @@
   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 \
 
   cmake ../${pkgbase}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
@@ -59,7 +57,9 @@
 -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
 -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
 -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
--DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+-DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+-DCMAKE_C_FLAGS=-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-felide-constructors -fno-rtti \
+-DCMAKE_CXX_FLAGS=-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-felide-constructors -fno-rtti
 
   make
 }

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Wednesday, July 4, 2012 @ 09:19:25
  Author: andrea
Revision: 162971

copy'n'paste error

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-04 13:16:24 UTC (rev 162970)
+++ PKGBUILD2012-07-04 13:19:25 UTC (rev 162971)
@@ -58,7 +58,7 @@
 -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
 -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
--DCMAKE_C_FLAGS=-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-felide-constructors -fno-rtti \
+-DCMAKE_C_FLAGS=-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-fomit-frame-pointer \
 -DCMAKE_CXX_FLAGS=-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-felide-constructors -fno-rtti
 
   make

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Tuesday, June 12, 2012 @ 14:05:39
  Author: andrea
Revision: 161632

upgpkg: mysql 5.5.25-1

Upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-12 16:40:20 UTC (rev 161631)
+++ PKGBUILD2012-06-12 18:05:39 UTC (rev 161632)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.24
+pkgver=5.5.25
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('dc84f8a0305e054c859533944e79f803'
+md5sums=('9e2a3d5b41eac7fae41b93e5b71ea49c'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Tuesday, May 8, 2012 @ 03:39:30
  Author: andrea
Revision: 158712

upgpkg: mysql 5.5.24-1

Upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-08 07:01:59 UTC (rev 158711)
+++ PKGBUILD2012-05-08 07:39:30 UTC (rev 158712)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.23
+pkgver=5.5.24
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('b614481967dc146c148027b598397b54'
+md5sums=('dc84f8a0305e054c859533944e79f803'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Friday, April 13, 2012 @ 03:50:41
  Author: andrea
Revision: 156075

upgpkg: mysql 5.5.23-1

Upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-12 21:13:25 UTC (rev 156074)
+++ PKGBUILD2012-04-13 07:50:41 UTC (rev 156075)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.22
+pkgver=5.5.23
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('c5b151a70e9ceed5308f108f1ece7b3b'
+md5sums=('b614481967dc146c148027b598397b54'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Wednesday, March 28, 2012 @ 13:34:12
  Author: andrea
Revision: 154441

upgpkg: mysql 5.5.22-1

Upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-28 11:37:35 UTC (rev 154440)
+++ PKGBUILD2012-03-28 17:34:12 UTC (rev 154441)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.21
+pkgver=5.5.22
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('86d6bd335054a0aed1756ed60574c16d'
+md5sums=('c5b151a70e9ceed5308f108f1ece7b3b'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Tuesday, February 21, 2012 @ 02:28:42
  Author: andrea
Revision: 150722

upgpkg: mysql 5.5.21-1

Upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-21 07:25:55 UTC (rev 150721)
+++ PKGBUILD2012-02-21 07:28:42 UTC (rev 150722)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.20
+pkgver=5.5.21
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('375794ebf84b4c7b63f1676bc7416cd0'
+md5sums=('86d6bd335054a0aed1756ed60574c16d'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Thursday, January 12, 2012 @ 03:02:19
  Author: andrea
Revision: 146509

upgpkg: mysql 5.5.20-1

Upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-12 08:01:12 UTC (rev 146508)
+++ PKGBUILD2012-01-12 08:02:19 UTC (rev 146509)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.19
+pkgver=5.5.20
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('a78cf450974e9202bd43674860349b5a'
+md5sums=('375794ebf84b4c7b63f1676bc7416cd0'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Friday, December 9, 2011 @ 12:18:18
  Author: andrea
Revision: 144909

Upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-09 17:03:39 UTC (rev 144908)
+++ PKGBUILD2011-12-09 17:18:18 UTC (rev 144909)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.18
+pkgver=5.5.19
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('38b65815249f3bcacf3b0ee85171c486'
+md5sums=('a78cf450974e9202bd43674860349b5a'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Thursday, November 24, 2011 @ 02:37:33
  Author: andrea
Revision: 143259

upgpkg: mysql 5.5.18-1

upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-24 04:22:51 UTC (rev 143258)
+++ PKGBUILD2011-11-24 07:37:33 UTC (rev 143259)
@@ -5,17 +5,17 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.17
+pkgver=5.5.18
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
-url=http://www.mysql.com/;
+url=https://www.mysql.com/products/community/;
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('dcb6a06e68c5e8f30f57b15300730c9c'
+md5sums=('38b65815249f3bcacf3b0ee85171c486'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Saturday, October 22, 2011 @ 13:58:14
  Author: andrea
Revision: 141054

Upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-22 16:30:06 UTC (rev 141053)
+++ PKGBUILD2011-10-22 17:58:14 UTC (rev 141054)
@@ -1,11 +1,11 @@
 # $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
+# Maintainer:
+# Contributor: Andrea Scarpino and...@archlinux.org
 # Contributor: Douglas Soares de Andrade doug...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.16
+pkgver=5.5.17
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('462ab3752dd666ec06ca32f92673b59e'
+md5sums=('dcb6a06e68c5e8f30f57b15300730c9c'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Tuesday, October 4, 2011 @ 17:42:50
  Author: andrea
Revision: 139751

This is no longer needed (FS#26255)

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-04 21:10:35 UTC (rev 139750)
+++ PKGBUILD2011-10-04 21:42:50 UTC (rev 139751)
@@ -102,7 +102,7 @@
   pkgdesc=A fast SQL database server
   backup=('etc/mysql/my.cnf')
   install=mysql.install
-  depends=('mysql-clients' 'net-tools')
+  depends=('mysql-clients')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
   options=('emptydirs')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Friday, September 16, 2011 @ 04:47:11
  Author: andrea
Revision: 138092

Upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-16 08:46:31 UTC (rev 138091)
+++ PKGBUILD2011-09-16 08:47:11 UTC (rev 138092)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.15
+pkgver=5.5.16
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('306b5549c7bd72e8e705a890db0da82b'
+md5sums=('462ab3752dd666ec06ca32f92673b59e'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 
@@ -95,7 +95,7 @@
   done
 
   # provided by mysql
-  rm ${pkgdir}/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest}
+  rm ${pkgdir}/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
 }
 
 package_mysql(){

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Thursday, July 28, 2011 @ 09:52:29
  Author: andrea
Revision: 133474

upgpkg: mysql 5.5.15-1
upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-28 12:43:05 UTC (rev 133473)
+++ PKGBUILD2011-07-28 13:52:29 UTC (rev 133474)
@@ -5,8 +5,8 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.14
-pkgrel=2
+pkgver=5.5.15
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('19f43bb9c72b1b5f7ff86a7f921c9244'
+md5sums=('306b5549c7bd72e8e705a890db0da82b'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Wednesday, July 13, 2011 @ 03:03:22
  Author: andrea
Revision: 131641

upgpkg: mysql 5.5.14-2
tcp_wrapper rebuild; minor fixes

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-13 03:16:06 UTC (rev 131640)
+++ PKGBUILD2011-07-13 07:03:22 UTC (rev 131641)
@@ -6,11 +6,11 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.14
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
-makedepends=('cmake' 'openssl' 'tcp_wrappers' 'zlib')
+makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
@@ -31,7 +31,6 @@
   cmake ../${pkgbase}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
--DMANUFACTURER=Arch Linux \
 -DSYSCONFDIR=/etc/mysql \
 -DMYSQL_DATADIR=/var/lib/mysql \
 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
@@ -51,7 +50,7 @@
 -DWITH_READLINE=ON \
 -DWITH_ZLIB=system \
 -DWITH_SSL=system \
--DWITH_LIBWRAP=ON \
+-DWITH_LIBWRAP=OFF \
 -DWITH_MYSQLD_LDFLAGS=${LDFLAGS} \
 -DWITH_EXTRA_CHARSETS=complex \
 -DWITH_EMBEDDED_SERVER=ON \
@@ -67,7 +66,7 @@
 
 package_libmysqlclient(){
   pkgdesc=MySQL client libraries
-  depends=('openssl' 'gcc-libs' 'tcp_wrappers')
+  depends=('openssl')
   
   cd ${srcdir}/build
   for dir in include libmysql libmysqld libservices; do
@@ -105,6 +104,7 @@
   install=mysql.install
   depends=('mysql-clients' 'net-tools')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
+  options=('emptydirs')
 
   cd ${srcdir}/build
   make DESTDIR=${pkgdir} install

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Wednesday, July 6, 2011 @ 03:48:11
  Author: andrea
Revision: 130378

upstream update

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-06 07:14:55 UTC (rev 130377)
+++ PKGBUILD2011-07-06 07:48:11 UTC (rev 130378)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.13
+pkgver=5.5.14
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('f0e519e90ee7c00fceb0730edf859d7b'
+md5sums=('19f43bb9c72b1b5f7ff86a7f921c9244'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Tuesday, June 21, 2011 @ 02:59:04
  Author: andrea
Revision: 128043

MySQL needs' hostname' during installation

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-21 06:56:19 UTC (rev 128042)
+++ PKGBUILD2011-06-21 06:59:04 UTC (rev 128043)
@@ -103,7 +103,7 @@
   pkgdesc=A fast SQL database server
   backup=('etc/mysql/my.cnf')
   install=mysql.install
-  depends=('mysql-clients')
+  depends=('mysql-clients' 'net-tools')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
 
   cd ${srcdir}/build

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Wednesday, June 1, 2011 @ 04:38:57
  Author: andrea
Revision: 126056

upgpkg: mysql 5.5.13-1
upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-01 05:33:34 UTC (rev 126055)
+++ PKGBUILD2011-06-01 08:38:57 UTC (rev 126056)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.12
+pkgver=5.5.13
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('53d31a0b24f3eb3176185090eff129b9'
+md5sums=('f0e519e90ee7c00fceb0730edf859d7b'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Monday, May 9, 2011 @ 15:50:38
  Author: andrea
Revision: 123293

Remove the test database from the package; set Manufacturer to Arch Linux; 
build using our LDFLAGS; sort options

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |   57 -
 1 file changed, 28 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-09 17:45:26 UTC (rev 123292)
+++ PKGBUILD2011-05-09 19:50:38 UTC (rev 123293)
@@ -31,8 +31,13 @@
   cmake ../${pkgbase}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
--DMYSQL_DATADIR=/var/lib/mysql \
+-DMANUFACTURER=Arch Linux \
 -DSYSCONFDIR=/etc/mysql \
+-DMYSQL_DATADIR=/var/lib/mysql \
+-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+-DDEFAULT_CHARSET=utf8 \
+-DDEFAULT_COLLATION=utf8_general_ci \
+-DENABLED_LOCAL_INFILE=ON \
 -DINSTALL_INFODIR=share/mysql/docs \
 -DINSTALL_MANDIR=share/man \
 -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
@@ -41,23 +46,21 @@
 -DINSTALL_DOCREADMEDIR=share/mysql \
 -DINSTALL_SUPPORTFILESDIR=share/mysql \
 -DINSTALL_MYSQLSHAREDIR=share/mysql \
+-DINSTALL_DOCDIR=share/mysql/docs \
 -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_MYSQLD_LDFLAGS=${LDFLAGS} \
 -DWITH_EXTRA_CHARSETS=complex \
 -DWITH_EMBEDDED_SERVER=ON \
--DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
--DENABLED_LOCAL_INFILE=ON \
+-DWITH_INNOBASE_STORAGE_ENGINE=1 \
 -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
+-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
 
   make
 }
@@ -71,11 +74,11 @@
 make -C ${dir} DESTDIR=${pkgdir} install
   done
 
-  install -d ${pkgdir}/usr/bin
-  install -m755 scripts/mysql_config ${pkgdir}/usr/bin/
-  install -d ${pkgdir}/usr/share/man/man1
+  install -d ${pkgdir}/usr/bin
+  install -m755 scripts/mysql_config ${pkgdir}/usr/bin/
+  install -d ${pkgdir}/usr/share/man/man1
   for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
-install -m644 ${srcdir}/${pkgbase}-${pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
+install -m644 ${srcdir}/${pkgbase}-${pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
   done
 }
 
@@ -87,9 +90,9 @@
   make -C client DESTDIR=${pkgdir} install
 
   # install man pages
-  install -d ${pkgdir}/usr/share/man/man1
+  install -d ${pkgdir}/usr/share/man/man1
   for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow 
mysqlslap; do
-install -m644 ${srcdir}/${pkgbase}-${pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
+install -m644 ${srcdir}/${pkgbase}-${pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
   done
 
   # provided by mysql
@@ -104,28 +107,24 @@
   optdepends=('perl-dbi' 'perl-dbd-mysql')
 
   cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  make DESTDIR=${pkgdir} install
 
-  install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
-  install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld
+  install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
+  install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld
 
   # provided by libmysqlclient
-  rm 
${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm ${pkgdir}/usr/lib/libmysql*
-  rm -r ${pkgdir}/usr/include/
-  rm 
${pkgdir}/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+  rm 
${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  rm ${pkgdir}/usr/lib/libmysql*
+  rm -r ${pkgdir}/usr/include/
+  rm 
${pkgdir}/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
   
   # provided by mysql-clients
-  rm 
${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-  rm 
${pkgdir}/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+  rm 
${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm 
${pkgdir}/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
 
   # not needed
-  rm -r ${pkgdir}/usr/{mysql-test,sql-bench}
+  rm -r ${pkgdir}/usr/{data,mysql-test,sql-bench}
+  rm ${pkgdir}/usr/share/man/man1/mysql-test-run.pl.1
 
-  # These shouldn't be here
-  rm -r ${pkgdir}/usr/docs
-  install -d ${pkgdir}/var/lib/mysql
-  cp -r ${pkgdir}/usr/data/* ${pkgdir}/var/lib/mysql/
-  chmod -R 700 ${pkgdir}/var/lib/mysql
-  rm -r ${pkgdir}/usr/data
+  install -dm700 ${pkgdir}/var/lib/mysql
 }

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Saturday, May 7, 2011 @ 06:07:11
  Author: andrea
Revision: 122912

upgpkg: mysql 5.5.12-1
upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-07 10:05:52 UTC (rev 122911)
+++ PKGBUILD2011-05-07 10:07:11 UTC (rev 122912)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.11
+pkgver=5.5.12
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('befa4e0d0aa95be6c8f6f143ae3b0641'
+md5sums=('53d31a0b24f3eb3176185090eff129b9'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Tuesday, March 15, 2011 @ 10:29:07
  Author: andrea
Revision: 114697

upgpkg: mysql 5.5.10-1
upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-15 13:56:37 UTC (rev 114696)
+++ PKGBUILD2011-03-15 14:29:07 UTC (rev 114697)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.9
+pkgver=5.5.10
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf')
-md5sums=('701c0c44b7f1c2300adc0dc45729f903'
+md5sums=('ee604aff531ff85abeb10cf332c1355a'
  '2234207625baa29b2ff7d7b4f088abce'
  '1c949c0dbea5206af0db14942d9927b6')
 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Saturday, February 5, 2011 @ 15:35:55
  Author: andrea
Revision: 109092

upgpkg: mysql 5.5.8-9
build using bundled readline (FS#22530) and zlib from system; move plugins to 
/usr/lib/mysql/plugins

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-05 20:31:30 UTC (rev 109091)
+++ PKGBUILD2011-02-05 20:35:55 UTC (rev 109092)
@@ -6,11 +6,11 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.8
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
-makedepends=('cmake' 'openssl' 'tcp_wrappers')
+makedepends=('cmake' 'openssl' 'tcp_wrappers' 'zlib' 'readline')
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
@@ -46,21 +46,21 @@
 -DSYSCONFDIR=/etc/mysql \
 -DINSTALL_INFODIR=share/mysql/docs \
 -DINSTALL_MANDIR=share/man \
--DINSTALL_PLUGINDIR=share/mysql/lib/plugin \
+-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=OFF \
+-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_TCP_PORT=3306 \
 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 -DENABLED_LOCAL_INFILE=ON \
 -DWITH_PARTITION_STORAGE_ENGINE=1 \
@@ -88,6 +88,9 @@
   for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
 install -m644 ${srcdir}/${pkgbase}-${pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
   done
+
+  #fix permissions
+  chmod 644 ${pkgdir}/usr/lib/libmysqlclient_r.a
 }
 
 package_mysql-clients(){
@@ -122,7 +125,7 @@
 
   # provided by libmysqlclient
   rm 
${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm -r ${pkgdir}/usr/lib/
+  rm ${pkgdir}/usr/lib/libmysql*
   rm -r ${pkgdir}/usr/include/
   rm 
${pkgdir}/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
   

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Saturday, February 5, 2011 @ 15:38:42
  Author: andrea
Revision: 109093

no needs for readline

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-05 20:35:55 UTC (rev 109092)
+++ PKGBUILD2011-02-05 20:38:42 UTC (rev 109093)
@@ -10,7 +10,7 @@
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
-makedepends=('cmake' 'openssl' 'tcp_wrappers' 'zlib' 'readline')
+makedepends=('cmake' 'openssl' 'tcp_wrappers' 'zlib')
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Angel Velásquez]

Date: Wednesday, January 26, 2011 @ 18:41:27
  Author: angvp
Revision: 107766

upgpkg: mysql 5.5.8-7
Adding partition tables features

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-26 23:11:01 UTC (rev 107765)
+++ PKGBUILD2011-01-26 23:41:27 UTC (rev 107766)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.8
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
@@ -57,7 +57,7 @@
 -DMYSQL_TCP_PORT=3306 \
 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 -DENABLED_LOCAL_INFILE=ON \
--DWITHOUT_PARTITION_STORAGE_ENGINE=1 \
+-DWITH_PARTITION_STORAGE_ENGINE=1 \
 -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
 -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
 -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Monday, January 3, 2011 @ 12:10:43
  Author: andrea
Revision: 104493

upgpkg: mysql 5.5.8-6
split documentation across packages (FS#22260)

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |   37 +++--
 1 file changed, 23 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-03 16:25:28 UTC (rev 104492)
+++ PKGBUILD2011-01-03 17:10:43 UTC (rev 104493)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.8
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
@@ -78,20 +78,27 @@
 
   install -d ${pkgdir}/usr/bin
   install -m755 scripts/mysql_config ${pkgdir}/usr/bin/
+  install -d ${pkgdir}/usr/share/man/man1
+  for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
+install -m644 ${srcdir}/${pkgbase}-${pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
+  done
 }
 
 package_mysql-clients(){
   pkgdesc=MySQL client tools
   depends=('libmysqlclient')
   
-  cd ${srcdir}/build/client
-  make DESTDIR=${pkgdir} install
+  cd ${srcdir}/build
+  make -C client DESTDIR=${pkgdir} install
 
-  # provided by libmysqlclient
-  rm -rf ${pkgdir}/usr/lib/
+  # install man pages
+  install -d ${pkgdir}/usr/share/man/man1
+  for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow 
mysqlslap; do
+install -m644 ${srcdir}/${pkgbase}-${pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
+  done
 
   # provided by mysql
-  rm -f ${pkgdir}/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest}
+  rm ${pkgdir}/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest}
 }
 
 package_mysql(){
@@ -108,20 +115,22 @@
   install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld
 
   # provided by libmysqlclient
-  rm -f 
${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm -rf ${pkgdir}/usr/lib/
-  rm -rf ${pkgdir}/usr/include/
+  rm 
${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  rm -r ${pkgdir}/usr/lib/
+  rm -r ${pkgdir}/usr/include/
+  rm 
${pkgdir}/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
   
   # provided by mysql-clients
-  rm -f 
${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm 
${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm 
${pkgdir}/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
 
   # not needed
-  rm -rf ${pkgdir}/usr/{mysql-test,sql-bench}
+  rm -r ${pkgdir}/usr/{mysql-test,sql-bench}
 
   # These shouldn't be here
-  rm -rf ${pkgdir}/usr/docs
+  rm -r ${pkgdir}/usr/docs
   install -d ${pkgdir}/var/lib/mysql
-  cp -rf ${pkgdir}/usr/data/* ${pkgdir}/var/lib/mysql/
+  cp -r ${pkgdir}/usr/data/* ${pkgdir}/var/lib/mysql/
   chmod -R 700 ${pkgdir}/var/lib/mysql
-  rm -rf ${pkgdir}/usr/data
+  rm -r ${pkgdir}/usr/data
 }

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Thursday, December 23, 2010 @ 05:23:59
  Author: andrea
Revision: 103794

upgpkg: mysql 5.5.8-5
move headers to include/mysql; set permission 700 to /var/lib/mysql

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-23 10:05:57 UTC (rev 103793)
+++ PKGBUILD2010-12-23 10:23:59 UTC (rev 103794)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.8
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
@@ -42,6 +42,7 @@
 -DINSTALL_MANDIR=share/man \
 -DINSTALL_PLUGINDIR=share/mysql/lib/plugin \
 -DINSTALL_SCRIPTDIR=bin \
+-DINSTALL_INCLUDEDIR=include/mysql \
 -DINSTALL_DOCREADMEDIR=share/mysql \
 -DINSTALL_SUPPORTFILESDIR=share/mysql \
 -DINSTALL_MYSQLSHAREDIR=share/mysql \
@@ -120,6 +121,7 @@
   # These shouldn't be here
   rm -rf ${pkgdir}/usr/docs
   install -d ${pkgdir}/var/lib/mysql
-  cp -rfa ${pkgdir}/usr/data/* ${pkgdir}/var/lib/mysql/
+  cp -rf ${pkgdir}/usr/data/* ${pkgdir}/var/lib/mysql/
+  chmod -R 700 ${pkgdir}/var/lib/mysql
   rm -rf ${pkgdir}/usr/data
 }

[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf)

[Andrea Scarpino]

Date: Wednesday, December 22, 2010 @ 08:41:29
  Author: andrea
Revision: 103660

upgpkg: mysql 5.5.8-2
enable skip-networking in default config; fix plugins and localization path

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/my.cnf

--+
 PKGBUILD |   16 
 my.cnf   |2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-22 13:39:56 UTC (rev 103659)
+++ PKGBUILD2010-12-22 13:41:29 UTC (rev 103660)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.8
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
@@ -17,7 +17,7 @@
 'my.cnf')
 md5sums=('42e866302b61f5e213afd33e04677017'
  '2234207625baa29b2ff7d7b4f088abce'
- '69336edb8a16294b18eaec22fee7ea68')
+ '1c949c0dbea5206af0db14942d9927b6')
 
 build() {
   cd ${srcdir}
@@ -34,9 +34,12 @@
 -DMYSQL_DATADIR=/var/lib/mysql \
 -DINSTALL_INFODIR=/usr/share/mysql/docs \
 -DINSTALL_MANDIR=/usr/share/man \
+-DINSTALL_PLUGINDIR=/usr/share/mysql/lib/plugin \
 -DINSTALL_SCRIPTDIR=/usr/bin \
 -DINSTALL_DOCREADMEDIR=/usr/share/mysql \
 -DINSTALL_SUPPORTFILESDIR=/usr/share/mysql \
+-DINSTALL_MYSQLSHAREDIR=/usr/share/mysql \
+-DINSTALL_SHAREDIR=/usr/share/mysql \
 -DWITH_READLINE=OFF \
 -DWITH_SSL=system \
 -DWITH_LIBWRAP=ON \
@@ -98,9 +101,7 @@
 
   # provided by libmysqlclient
   rm -f 
${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm -f ${pkgdir}/usr/lib/libmysqlclient*
-  rm -f ${pkgdir}/usr/lib/libmysqld.a
-  rm -f ${pkgdir}/usr/lib/libmysqlservices.a
+  rm -rf ${pkgdir}/usr/lib/
   rm -rf ${pkgdir}/usr/include/
   
   # provided by mysql-clients
@@ -108,11 +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/
+  cp -rfa ${pkgdir}/usr/data/* ${pkgdir}/var/lib/mysql/
+  rm -rf ${pkgdir}/usr/data
 }

Modified: my.cnf
===
--- my.cnf  2010-12-22 13:39:56 UTC (rev 103659)
+++ my.cnf  2010-12-22 13:41:29 UTC (rev 103660)
@@ -43,7 +43,7 @@
 # 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

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Wednesday, December 22, 2010 @ 09:28:56
  Author: andrea
Revision: 103680

upgpkg: mysql 5.5.8-3
set port and sysconf dir; workaround to fix plugin path

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-22 14:25:37 UTC (rev 103679)
+++ PKGBUILD2010-12-22 14:28:56 UTC (rev 103680)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.8
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
@@ -32,9 +32,10 @@
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DMYSQL_DATADIR=/var/lib/mysql \
+-DSYSCONFDIR=/etc/mysql \
 -DINSTALL_INFODIR=/usr/share/mysql/docs \
 -DINSTALL_MANDIR=/usr/share/man \
--DINSTALL_PLUGINDIR=/usr/share/mysql/lib/plugin \
+-DINSTALL_PLUGINDIR=share/mysql/lib/plugin \
 -DINSTALL_SCRIPTDIR=/usr/bin \
 -DINSTALL_DOCREADMEDIR=/usr/share/mysql \
 -DINSTALL_SUPPORTFILESDIR=/usr/share/mysql \
@@ -47,6 +48,7 @@
 -DDEFAULT_COLLATION=utf8_general_ci \
 -DWITH_EXTRA_CHARSETS=complex \
 -DWITH_EMBEDDED_SERVER=ON \
+-DMYSQL_TCP_PORT=3306 \
 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 -DENABLED_LOCAL_INFILE=ON \
 -DWITH_PARTITION_STORAGE_ENGINE=1 \

[arch-commits] Commit in mysql/trunk (PKGBUILD fix-set-default-charset.patch)

[Andrea Scarpino]

Date: Wednesday, December 22, 2010 @ 14:11:32
  Author: andrea
Revision: 103758

upgpkg: mysql 5.5.8-4
CMake options does not needed the prefix; patch to fix the default charset

Added:
  mysql/trunk/fix-set-default-charset.patch
Modified:
  mysql/trunk/PKGBUILD

---+
 PKGBUILD  |   35 ++---
 fix-set-default-charset.patch |   55 
 2 files changed, 75 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-22 17:34:56 UTC (rev 103757)
+++ PKGBUILD2010-12-22 19:11:32 UTC (rev 103758)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.8
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
@@ -14,12 +14,17 @@
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
-'my.cnf')
+'my.cnf'
+'fix-set-default-charset.patch')
 md5sums=('42e866302b61f5e213afd33e04677017'
  '2234207625baa29b2ff7d7b4f088abce'
- '1c949c0dbea5206af0db14942d9927b6')
+ '1c949c0dbea5206af0db14942d9927b6'
+ '6f72b482580d020933ea9a7a4f638051')
 
 build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  patch -Np1 -i ${srcdir}/fix-set-default-charset.patch
+
   cd ${srcdir}
   mkdir build
   cd build
@@ -33,14 +38,14 @@
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DMYSQL_DATADIR=/var/lib/mysql \
 -DSYSCONFDIR=/etc/mysql \
--DINSTALL_INFODIR=/usr/share/mysql/docs \
--DINSTALL_MANDIR=/usr/share/man \
+-DINSTALL_INFODIR=share/mysql/docs \
+-DINSTALL_MANDIR=share/man \
 -DINSTALL_PLUGINDIR=share/mysql/lib/plugin \
--DINSTALL_SCRIPTDIR=/usr/bin \
--DINSTALL_DOCREADMEDIR=/usr/share/mysql \
--DINSTALL_SUPPORTFILESDIR=/usr/share/mysql \
--DINSTALL_MYSQLSHAREDIR=/usr/share/mysql \
--DINSTALL_SHAREDIR=/usr/share/mysql \
+-DINSTALL_SCRIPTDIR=bin \
+-DINSTALL_DOCREADMEDIR=share/mysql \
+-DINSTALL_SUPPORTFILESDIR=share/mysql \
+-DINSTALL_MYSQLSHAREDIR=share/mysql \
+-DINSTALL_SHAREDIR=share/mysql \
 -DWITH_READLINE=OFF \
 -DWITH_SSL=system \
 -DWITH_LIBWRAP=ON \
@@ -51,11 +56,11 @@
 -DMYSQL_TCP_PORT=3306 \
 -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 \
+-DWITHOUT_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

Added: fix-set-default-charset.patch
===
--- fix-set-default-charset.patch   (rev 0)
+++ fix-set-default-charset.patch   2010-12-22 19:11:32 UTC (rev 103758)
@@ -0,0 +1,55 @@
+--- a/cmake/character_sets.cmake   2010-02-25 08:15:46 +
 b/cmake/character_sets.cmake   2010-12-22 09:23:08 +
+@@ -1,4 +1,4 @@
+-# Copyright (C) 2009 Sun Microsystems, Inc
++# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ # 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -13,17 +13,19 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
+ 
+-#Charsets and collations
++# Charsets and collations
+ IF(NOT DEFAULT_CHARSET)
+-SET(DEFAULT_CHARSET latin1)
++  SET(DEFAULT_CHARSET latin1)
+ ENDIF()
+ 
+-IF(NOT DEFAULT_COLLATIONS)
+-SET(DEFAULT_COLLATION latin1_swedish_ci)
++IF(NOT DEFAULT_COLLATION)
++  SET(DEFAULT_COLLATION latin1_swedish_ci)
+ ENDIF()
+ 
+ SET(CHARSETS ${DEFAULT_CHARSET} latin1 utf8 utf8mb4)
+-SET(CHARSETS_COMPLEX big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2 
sjis tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32)
++SET(CHARSETS_COMPLEX
++  big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2
++  sjis tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32)
+ 
+ SET(CHARSETS_AVAILABLE 
+ binary armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257
+
+=== modified file 'config.h.cmake'
+--- a/config.h.cmake   2010-12-21 12:00:26 +
 b/config.h.cmake   2010-12-22 09:23:08 +
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2009 Sun Microsystems, Inc
++/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+@@ -518,8 +518,8 @@
+ #cmakedefine CYBOZU 1
+ 
+ /* Character sets 

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Pierre Schmitz]

Date: Thursday, October 7, 2010 @ 05:15:08
  Author: pierre
Revision: 94437

upstream update

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-07 09:12:59 UTC (rev 94436)
+++ PKGBUILD2010-10-07 09:15:08 UTC (rev 94437)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.50
+pkgver=5.1.51
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,7 +16,7 @@
 'mysqld'
 'my.cnf'
 'skip-abi-check.patch')
-md5sums=('23bac4a0aafd683b077dac146ce2701f'
+md5sums=('c12bf24493688c51c6cff5e8c6563830'
  '2234207625baa29b2ff7d7b4f088abce'
  '0337741fa9afbe57939993636081a827'
  'a97e574945e19de3908575b956241026')

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Pierre Schmitz]

Date: Monday, August 23, 2010 @ 13:32:08
  Author: pierre
Revision: 88432

upgpkg: mysql 5.1.50-1
security update

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-23 16:59:32 UTC (rev 88431)
+++ PKGBUILD2010-08-23 17:32:08 UTC (rev 88432)
@@ -5,25 +5,25 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.47
+pkgver=5.1.50
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
 makedepends=('tcp_wrappers' 'zlib' 'perl' 'openssl' 'libtool' 'patch')
 options=('!libtool')
-source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz
-mysqld
-my.cnf
-skip-abi-check.patch)
-md5sums=('02b9964b3966832f3d6bc87524bfd73f'
+source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz;
+'mysqld'
+'my.cnf'
+'skip-abi-check.patch')
+md5sums=('23bac4a0aafd683b077dac146ce2701f'
  '2234207625baa29b2ff7d7b4f088abce'
  '0337741fa9afbe57939993636081a827'
  'a97e574945e19de3908575b956241026')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
-  patch -Np0 -i ${srcdir}/skip-abi-check.patch || return 1
+  patch -Np0 -i ${srcdir}/skip-abi-check.patch
   # 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 \
@@ -41,8 +41,8 @@
 --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
 || return 1
-  make || return 1
+
--with-plugins=partition,ftexample,archive,blackhole,federated,heap,innobase,innodb_plugin,ndbcluster
+  make
 }
 
 package_libmysqlclient(){
@@ -51,12 +51,12 @@
   
   cd ${srcdir}/${pkgbase}-${pkgver}
   for dir in include libmysql libmysql_r libmysqld; do
-make -C ${dir} DESTDIR=${pkgdir} install || return 1
+make -C ${dir} DESTDIR=${pkgdir} install
   done
-  install -m644 include/*.h ${pkgdir}/usr/include/mysql/ || return 1
+  install -m644 include/*.h ${pkgdir}/usr/include/mysql/
 
   install -d ${pkgdir}/usr/bin
-  install -m755 scripts/mysql_config ${pkgdir}/usr/bin/ || return 1
+  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
@@ -72,7 +72,7 @@
   depends=('libmysqlclient')
   
   cd ${srcdir}/${pkgbase}-${pkgver}/client
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 
   # provided by libmysqlclient
   rm -rf ${pkgdir}/usr/lib/
@@ -89,10 +89,10 @@
   optdepends=('perl-dbi' 'perl-dbd-mysql')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 
-  install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf || return 1
-  install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld || return 1
+  install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
+  install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld
 
   # provided by libmysqlclient
   rm -f 
${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Wednesday, May 19, 2010 @ 12:16:27
  Author: andrea
Revision: 80564

gcc 4.5 fix (FS#19520)

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-19 16:11:07 UTC (rev 80563)
+++ PKGBUILD2010-05-19 16:16:27 UTC (rev 80564)
@@ -13,10 +13,12 @@
 makedepends=('tcp_wrappers' 'zlib' 'perl' 'openssl' 'libtool' 'patch')
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz;
-'mysqld' 'my.cnf')
+'mysqld' 'my.cnf'
+   'gcc4.5.patch')
 md5sums=('04f7c1422199c73a88a3d408b9161b63'
  '2832c3ed6c70c198785ade1b2d9c0404'
- '0337741fa9afbe57939993636081a827')
+ '0337741fa9afbe57939993636081a827'
+'4cbf0fc3eb76057f7a8dd52a3e2a58e6')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -27,6 +29,8 @@
   CFLAGS=-fPIC ${CFLAGS} -fno-strict-aliasing
   CXXFLAGS=-fPIC ${CXXFLAGS} -fno-strict-aliasing
 
+  patch -Np1 -i ${srcdir}/gcc4.5.patch
+
   ./configure --prefix=/usr \
 --libexecdir=/usr/sbin \
 --localstatedir=/var \

[arch-commits] Commit in mysql/trunk (PKGBUILD mysqld)

[Andrea Scarpino]

Date: Wednesday, April 28, 2010 @ 05:56:22
  Author: andrea
Revision: 78827

use install to set permissions

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysqld

--+
 PKGBUILD |2 +-
 mysqld   |5 +
 2 files changed, 2 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-28 05:36:49 UTC (rev 78826)
+++ PKGBUILD2010-04-28 09:56:22 UTC (rev 78827)
@@ -15,7 +15,7 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz;
 'mysqld' 'my.cnf')
 md5sums=('04f7c1422199c73a88a3d408b9161b63'
- '92dac61b92253e0878f27318da1dc45f'
+ '2832c3ed6c70c198785ade1b2d9c0404'
  '0337741fa9afbe57939993636081a827')
 
 build() {

Modified: mysqld
===
--- mysqld  2010-04-28 05:36:49 UTC (rev 78826)
+++ mysqld  2010-04-28 09:56:22 UTC (rev 78827)
@@ -11,10 +11,7 @@
 case $1 in
   start)
 stat_busy Starting MySQL Server
-if [ ! -d /var/run/mysqld ]; then
-  install -d /var/run/mysqld /dev/null
-  chown mysql:mysql /var/run/mysqld /dev/null
-fi
+[ ! -d /var/run/mysqld ]  install -d -g mysql -o mysql /var/run/mysqld 
/dev/null
 if [ -z $(getPID) ]; then
/usr/bin/mysqld_safe --user=mysql /dev/null 
   if [ $? -gt 0 ]; then

[arch-commits] Commit in mysql/trunk (PKGBUILD fix-charsets.patch)

[Andrea Scarpino]

Date: Friday, April 23, 2010 @ 05:13:17
  Author: andrea
Revision: 78394

upgpkg: mysql 5.1.46-1
upstream release

Modified:
  mysql/trunk/PKGBUILD
Deleted:
  mysql/trunk/fix-charsets.patch

+
 PKGBUILD   |   15 +++---
 fix-charsets.patch |   76 ---
 2 files changed, 5 insertions(+), 86 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-23 07:41:14 UTC (rev 78393)
+++ PKGBUILD2010-04-23 09:13:17 UTC (rev 78394)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.45
+pkgver=5.1.46
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,12 +13,10 @@
 makedepends=('tcp_wrappers' 'zlib' 'perl' 'openssl' 'libtool' 'patch')
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz;
-'mysqld' 'my.cnf'
-   'fix-charsets.patch')
-md5sums=('06b5deb3a13c7600c38ba65b9f7e42c4'
- 'a564aaf42e62da454f27b62b7eaf01d5'
- '5b197896a429537fea7cbe52bbe440bc'
- '117c10003d0df905ce744d62d8c461d4')
+'mysqld' 'my.cnf')
+md5sums=('04f7c1422199c73a88a3d408b9161b63'
+ 'eb4104ab4cf0ba5b5232adaf78427db7'
+ '5b197896a429537fea7cbe52bbe440bc')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -29,9 +27,6 @@
   CFLAGS=-fPIC ${CFLAGS} -fno-strict-aliasing
   CXXFLAGS=-fPIC ${CXXFLAGS} -fno-strict-aliasing
 
-  # fixed upstream
-  patch -Np1 -i ${srcdir}/fix-charsets.patch
-
   ./configure --prefix=/usr \
 --libexecdir=/usr/sbin \
 --localstatedir=/var \

Deleted: fix-charsets.patch
===
--- fix-charsets.patch  2010-04-23 07:41:14 UTC (rev 78393)
+++ fix-charsets.patch  2010-04-23 09:13:17 UTC (rev 78394)
@@ -1,76 +0,0 @@
-# 3362 Staale Smedseng 2010-02-26
-#  Bug #45058 init_available_charsets uses double checked locking
-#  
-#  A client doing multiple mysql_library_init() and
-#  mysql_library_end() calls over the lifetime of the process may
-#  experience lost character set data, potentially even a
-#  SIGSEGV.
-#  
-#  This patch reinstates the reloading of character set data when
-#  a mysql_library_init() is done after a mysql_library_end().
-#
-=== modified file 'include/my_sys.h'
 a/include/my_sys.h 2009-12-12 18:11:25 +
-+++ b/include/my_sys.h 2010-02-26 14:30:14 +
-@@ -950,7 +950,7 @@ extern my_bool resolve_charset(const cha
- extern my_bool resolve_collation(const char *cl_name,
-  CHARSET_INFO *default_cl,
-  CHARSET_INFO **cl);
--
-+extern void free_charsets(void);
- extern char *get_charsets_dir(char *buf);
- extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);
- extern my_bool init_compiled_charsets(myf flags);
-
-=== modified file 'libmysql/libmysql.c'
 a/libmysql/libmysql.c  2009-12-18 18:44:24 +
-+++ b/libmysql/libmysql.c  2010-02-26 14:30:14 +
-@@ -211,6 +211,7 @@ void STDCALL mysql_server_end()
-   }
-   else
-   {
-+free_charsets();
- mysql_thread_end();
-   }
- 
-
-=== modified file 'mysys/charset.c'
 a/mysys/charset.c  2009-12-15 09:48:29 +
-+++ b/mysys/charset.c  2010-02-26 14:30:14 +
-@@ -427,6 +427,11 @@ static void init_available_charsets(void
- }
- 
- 
-+void free_charsets(void)
-+{
-+  charsets_initialized= MY_PTHREAD_ONCE_INIT;
-+}
-+
- uint get_collation_number(const char *name)
- {
-   my_pthread_once(charsets_initialized, init_available_charsets);
-
-=== modified file 'mysys/my_init.c'
 a/mysys/my_init.c  2009-12-12 18:11:25 +
-+++ b/mysys/my_init.c  2010-02-26 14:30:14 +
-@@ -165,6 +165,7 @@ void my_end(int infoflag)
-   my_print_open_files();
- }
-   }
-+  free_charsets();
-   my_error_unregister_all();
-   my_once_free();
- 
-
-=== modified file 'sql/mysqld.cc'
 a/sql/mysqld.cc2010-02-05 12:55:20 +
-+++ b/sql/mysqld.cc2010-02-26 14:30:14 +
-@@ -1287,6 +1287,7 @@ void clean_up(bool print_message)
-   lex_free(); /* Free some memory */
-   item_create_cleanup();
-   set_var_free();
-+  free_charsets();
-   if (!opt_noacl)
-   {
- #ifdef HAVE_DLOPEN
-

[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf mysql.install mysqld)

[Andrea Scarpino]

Date: Friday, April 23, 2010 @ 17:10:11
  Author: andrea
Revision: 78446

mysql_install_db will create /var/lib/mysql dir; fix skip-locking warning

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/my.cnf
  mysql/trunk/mysql.install
  mysql/trunk/mysqld

---+
 PKGBUILD  |   11 +++
 my.cnf|2 +-
 mysql.install |3 ++-
 mysqld|2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-23 20:26:35 UTC (rev 78445)
+++ PKGBUILD2010-04-23 21:10:11 UTC (rev 78446)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.1.46
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
@@ -15,8 +15,8 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz;
 'mysqld' 'my.cnf')
 md5sums=('04f7c1422199c73a88a3d408b9161b63'
- 'eb4104ab4cf0ba5b5232adaf78427db7'
- '5b197896a429537fea7cbe52bbe440bc')
+ '92dac61b92253e0878f27318da1dc45f'
+ '0337741fa9afbe57939993636081a827')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -102,7 +102,6 @@
   install=mysql.install
   depends=('mysql-clients')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
-  options=('emptydirs') # we need the empty /var/lib/mysql directory
 
   cd ${srcdir}/${pkgbase}-${pkgver}  
   make DESTDIR=${pkgdir} install
@@ -110,10 +109,6 @@
   install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf || return 1
   install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld || return 1
 
-  # create default MYSQLD_ROOT dir and set mysql rights
-  install -d ${pkgdir}/var/lib/mysql || return 1
-  chown 89:89 ${pkgdir}/var/lib/mysql
-
   # provided by libmysqlclient
   rm -f 
${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
   rm -rf ${pkgdir}/usr/{include,lib}

Modified: my.cnf
===
--- my.cnf  2010-04-23 20:26:35 UTC (rev 78445)
+++ my.cnf  2010-04-23 21:10:11 UTC (rev 78446)
@@ -21,7 +21,7 @@
 port   = 3306
 socket = /var/run/mysqld/mysqld.sock
 datadir= /var/lib/mysql
-skip-locking
+skip-external-locking
 key_buffer = 16M
 max_allowed_packet = 1M
 table_cache = 64

Modified: mysql.install
===
--- mysql.install   2010-04-23 20:26:35 UTC (rev 78445)
+++ mysql.install   2010-04-23 21:10:11 UTC (rev 78446)
@@ -1,7 +1,8 @@
 post_install(){
   groupadd -g 89 mysql /dev/null
   useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql /dev/null
-  usr/bin/mysql_install_db --datadir=var/lib/mysql --user=mysql
+  usr/bin/mysql_install_db --user=mysql
+  chown -R mysql:mysql var/lib/mysql /dev/null
 }
 
 post_upgrade(){

Modified: mysqld
===
--- mysqld  2010-04-23 20:26:35 UTC (rev 78445)
+++ mysqld  2010-04-23 21:10:11 UTC (rev 78446)
@@ -16,7 +16,7 @@
   chown mysql:mysql /var/run/mysqld /dev/null
 fi
 if [ -z $(getPID) ]; then
-   /usr/bin/mysqld_safe /dev/null 
+   /usr/bin/mysqld_safe --user=mysql /dev/null 
   if [ $? -gt 0 ]; then
 stat_fail
 exit 1

[arch-commits] Commit in mysql/trunk (PKGBUILD mysqld mysqld.conf.d)

[Andrea Scarpino]

Date: Tuesday, April 13, 2010 @ 06:44:34
  Author: andrea
Revision: 77444

removed conf.d/mysql; mysqld_safe takes datadir from my.cnf

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysqld
Deleted:
  mysql/trunk/mysqld.conf.d

---+
 PKGBUILD  |   10 +-
 mysqld|9 ++---
 mysqld.conf.d |1 -
 3 files changed, 7 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-13 10:32:23 UTC (rev 77443)
+++ PKGBUILD2010-04-13 10:44:34 UTC (rev 77444)
@@ -13,12 +13,11 @@
 makedepends=('tcp_wrappers' 'zlib' 'perl' 'openssl' 'libtool' 'patch')
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz;
-'mysqld' 'my.cnf' 'mysqld.conf.d'
+'mysqld' 'my.cnf'
'fix-charsets.patch')
 md5sums=('06b5deb3a13c7600c38ba65b9f7e42c4'
  'a564aaf42e62da454f27b62b7eaf01d5'
  '5b197896a429537fea7cbe52bbe440bc'
- '0d1e778ddeeaedffa0e63dc3f6e51fc4'
  '117c10003d0df905ce744d62d8c461d4')
 
 build() {
@@ -104,7 +103,7 @@
 
 package_mysql(){
   pkgdesc=A fast SQL database server
-  backup=('etc/my.cnf' 'etc/mysql/my.cnf' 'etc/conf.d/mysqld')
+  backup=('etc/my.cnf' 'etc/mysql/my.cnf')
   install=mysql.install
   depends=('mysql-clients')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
@@ -113,10 +112,8 @@
   cd ${srcdir}/${pkgbase}-${pkgver}  
   make DESTDIR=${pkgdir} install
 
-  rm -rf ${pkgdir}/usr/{mysql-test,sql-bench,lib,include}
   install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf || return 1
   install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld || return 1
-  install -Dm644 ${srcdir}/mysqld.conf.d ${pkgdir}/etc/conf.d/mysqld || return 
1
 
   # create default MYSQLD_ROOT dir and set mysql rights
   install -d ${pkgdir}/var/lib/mysql || return 1
@@ -128,4 +125,7 @@
   
   # provided by mysql-clients
   rm -f 
${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+
+  # not needed
+  rm -rf ${pkgdir}/usr/{mysql-test,sql-bench}
 }

Modified: mysqld
===
--- mysqld  2010-04-13 10:32:23 UTC (rev 77443)
+++ mysqld  2010-04-13 10:44:34 UTC (rev 77444)
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-MYSQLD_ROOT=/var/lib/mysql
-
-# source application-specific settings
-[ -f /etc/conf.d/mysqld ]  . /etc/conf.d/mysqld
-
 # general config
 . /etc/rc.conf
 . /etc/rc.d/functions
@@ -21,7 +16,7 @@
   chown mysql:mysql /var/run/mysqld /dev/null
 fi
 if [ -z $(getPID) ]; then
-   /usr/bin/mysqld_safe --datadir=$MYSQLD_ROOT /dev/null 
+   /usr/bin/mysqld_safe /dev/null 
   if [ $? -gt 0 ]; then
 stat_fail
 exit 1
@@ -68,7 +63,7 @@
 
   restart)
 $0 stop
-sleep 3
+sleep 5
 $0 start
 ;;
   *)

Deleted: mysqld.conf.d
===
--- mysqld.conf.d   2010-04-13 10:32:23 UTC (rev 77443)
+++ mysqld.conf.d   2010-04-13 10:44:34 UTC (rev 77444)
@@ -1 +0,0 @@
-#MYSQLD_ROOT=/var/lib/mysql

[arch-commits] Commit in mysql/trunk (PKGBUILD mysql.install)

[Andrea Scarpino]

Date: Tuesday, March 23, 2010 @ 13:37:18
  Author: andrea
Revision: 73176

set rights in PKGBUILD

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysql.install

---+
 PKGBUILD  |5 +
 mysql.install |   11 +++
 2 files changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-23 17:11:52 UTC (rev 73175)
+++ PKGBUILD2010-03-23 17:37:18 UTC (rev 73176)
@@ -108,6 +108,7 @@
   install=mysql.install
   depends=('mysql-clients')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
+  options=('emptydirs') # we need the empty /var/lib/mysql directory
 
   cd ${srcdir}/${pkgbase}-${pkgver}  
   make DESTDIR=${pkgdir} install
@@ -117,6 +118,10 @@
   install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld || return 1
   install -Dm644 ${srcdir}/mysqld.conf.d ${pkgdir}/etc/conf.d/mysqld || return 
1
 
+  # create default MYSQLD_ROOT dir and set mysql rights
+  install -d ${pkgdir}/var/lib/mysql || return 1
+  chown 89:89 ${pkgdir}/var/lib/mysql
+
   # provided by libmysqlclient
   rm -f 
${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
   rm -rf ${pkgdir}/usr/{include,lib}

Modified: mysql.install
===
--- mysql.install   2010-03-23 17:11:52 UTC (rev 73175)
+++ mysql.install   2010-03-23 17:37:18 UTC (rev 73176)
@@ -1,17 +1,12 @@
-MYSQLD_ROOT=/var/lib/mysql
-
 post_install(){
   groupadd -g 89 mysql /dev/null
-  useradd -u 89 -g mysql -d ${MYSQLD_ROOT} -s /bin/false mysql /dev/null
-  usr/bin/mysql_install_db --datadir=${MYSQLD_ROOT#/} --user=mysql
-  chown -R mysql:mysql ${MYSQLD_ROOT#/} /dev/null
+  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql /dev/null
+  usr/bin/mysql_install_db --datadir=var/lib/mysql --user=mysql
 }
 
 post_upgrade(){
-  [ -f etc/conf.d/mysqld ]  source etc/conf.d/mysqld /dev/null
   getent group mysql /dev/null 21 || groupadd -g 89 mysql /dev/null
-  getent passwd mysql /dev/null 21 || useradd -u 89 -g mysql -d 
${MYSQLD_ROOT} -s /bin/false mysql /dev/null
-  chown -R mysql:mysql ${MYSQLD_ROOT#/} /dev/null
+  getent passwd mysql /dev/null 21 || useradd -u 89 -g mysql -d 
/var/lib/mysql -s /bin/false mysql /dev/null
 }
 
 post_remove(){

[arch-commits] Commit in mysql/trunk (PKGBUILD fix-charsets.patch)

[Andrea Scarpino]

Date: Wednesday, March 17, 2010 @ 07:01:22
  Author: andrea
Revision: 72505

upgpkg: mysql 5.1.45-1
upstream release

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/fix-charsets.patch

+
 PKGBUILD   |6 ++---
 fix-charsets.patch |   56 ---
 2 files changed, 3 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-17 07:02:23 UTC (rev 72504)
+++ PKGBUILD2010-03-17 11:01:22 UTC (rev 72505)
@@ -5,7 +5,7 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.44
+pkgver=5.1.45
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,11 +15,11 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz;
 'mysqld' 'my.cnf' 'mysqld.conf.d'
'fix-charsets.patch')
-md5sums=('a16fa6d6c7f40a963919cbc1c5e86111'
+md5sums=('06b5deb3a13c7600c38ba65b9f7e42c4'
  'a564aaf42e62da454f27b62b7eaf01d5'
  '5b197896a429537fea7cbe52bbe440bc'
  '0d1e778ddeeaedffa0e63dc3f6e51fc4'
- '6813a3cc0bf28da3137a2bc8008a73ac')
+ '117c10003d0df905ce744d62d8c461d4')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}

Modified: fix-charsets.patch
===
--- fix-charsets.patch  2010-03-17 07:02:23 UTC (rev 72504)
+++ fix-charsets.patch  2010-03-17 11:01:22 UTC (rev 72505)
@@ -74,59 +74,3 @@
{
  #ifdef HAVE_DLOPEN
 
-
---===5369465324480993893==
-MIME-Version: 1.0
-Content-Type: text/bzr-bundle; charset=us-ascii;
-   name=bzr/staale.smeds...@stripped
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
-
-# Bazaar merge directive format 2 (Bazaar 0.90)
-# revision_id: staale.smeds...@stripped
-# target_branch: file:///export/home/tmp/ss156133/z/45058-akonadi-51/
-# testament_sha1: 3cda143e1bb6fc7c9cb3c50ddf3b76b575c7208f
-# timestamp: 2010-02-26 15:30:18 +0100
-# base_revision_id: sergey.gluk...@stripped\
-#   5pnihv36uax9kyzv
-# 
-# Begin bundle
-IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTCT28wABAtfgEAQWWf//37j
-3SC6YAhOPqAAAJAAaAAB9AaJI00bUGjQwIAGgAAZDQBocwJiaDCZMmTIwmCaaZGJgCGA5gTE
-0GEyZMmRhME00yMTAEMAxEmhGgJpoxGEGmQ0AAaZDJkBlJMg2UGmgeoAAAyGQAAACSQIACZBpNNM
-IJhCGUPTSeoB6ZRKkiVNyGWGa5vOElBBHTjDzjD0JvSGF1yQCMkGdNSirQckl85tKAB/aWK0gkuK
-d2DxqNQ2dhUt3jKBdFHCDnIqkIFKvcBGuEUKyFdCxYxpnEltPO8FI00WdRUiDLLoovNaGmta
-hmlgdYuiQj6tiYXjuvRGCm3+B1TMiEI3QQ7zh3NBGDEhhDOk8a+nXn2nX792kOHW+HVsQCnUaf3P
-ZIxSwarC7gBLYb7kg39Sw4ErhdCd8xLbqchZDFFIkcNprxXRWMdq0HFrhJnjxhOK2vNpE5/6worL
-LwYYpXFPZIOirWCA1i/VGiJSiiuvw450gLFiUHO4s+ZTCNiQPCCYQMIcI7Uk4Qa9CAh+8lErKPi4
-mmCRKgRmFRQKb8yLCc2lTh1yCdguwtQjBgR87qSUr6zw+VKtGwL42p3UhO1FNBbFMTD7hKGYopwl
-UZEnWzlitJ/hMsLdRuwyLdgiRGxYCeaiYtEv/IsKTUPSHDfimhrbXjTTZyuSQ6RI6DGSYMSKAnJz
-XOQqmWouQDojDEAofQwHqVlBgPmO8uO8oqiUs11Y0a4iV9giEJ7ScmcPMBi4qwmJiZoKJxJTbD0V
-1xSS30kS0ao4EDW8wJVGW4o1WX1PK4xyiksple8WGI7JPOY8cwk1409Bh8vjNLvze1BeW7MR52iY
-mHkhis4Fwcj+TIAbjTtZrsNb8DaQgX1GvVtJGZpzstiOGX4pO8nNxPsvgPnMTM4GqYxHSOtwh95E
-xMj37zQ5se47fDRe87TI3DiBdh+bL9hEfrWTCV5Kc0yNxGJOQ2tSUXveXm5LjxiPPDnUZnM5XLMZ
-myEOLBqTEpuM/m7+tB3Vm3HZaXWFqUiY1l+w4Gh1KBLA6GeFlMZYOKSspgrjORtJHZKkpKigkRoI
-HUSpyIlBiEnsXFxWMMRKSFZDKLnuaocwDUSCR0EqS8iOIjmv1pwidiAi4LR48sLR4x2CWtekAk17
-OJsUsEqCLCkVgS+AfzyjyNNAjKhafm3AyKSiFZdkRIAchCGP2B7MzxYRdnmyGkOosCamiLBIohJN
-W1euyTb865rcP6fj2ywGz71Szl+IR/Fn4/OzMW83vQ8Th6N7wP2CD/tIkwDK8sedCIL4nM+Z+gkx
-UfXzPiXnsViD9nnwNTHvPXzKCVf0ePM9hID0v+Yg/U+bVCw/xPTu+X1p2wMRL7EXiJwYoXyJVVnn
-A+il9Ndg31Lik5ch5rNZ/fkbyg5DHcQOJUbMa9fYHswfuU+ABwWDCYuGOh2XGBgZlw88RjuOWGy1
-bzXYzjXUdbt82zfYWOO4TzgUy4VRohckh8chLQ7ygoLaaSccOJ0TrMvN/aeJoYFKUiBJLsiTEtDa
-UFtolqNDdkSGqLR3ETX+JGhVCD+xs/g6n8bcmF47HReeLxI3nu3EzObvbELiRoMbCJxC1rRYmVDI
-43PQwoAUG4xxMR3B32ssEDy7vRdQO8id2soHVP7up6CB0UZRTkGXu7IqNlUCFAcnMDnUmvQ1ZKQp
-zU5LjeCvOtaQzFSo7otwSNBjQgrjUMce4ebDeYneUFR0PQqHEx5LAmm7YME7GQaIOAmw60Fn7ypP
-gx2MMQLBiZAZQCsmRE5kkBvKRDrFSRPNTzGzE/HZYae2s8D1lwaz3DD8hpgTIXUsW1+O0/f3GR6L
-2Oiy5JDV+OZ4D9bcGoAd208A9RKEZDUimXX1OfIAmXXpqA1NbVaiTen/PKePEFVUJP507ATjFLB4
-To1GBf3iWglE1E5xOweJONw0Oa2APmPQS9J9NC31L4zK48xUpTjgu9TvwIKy2SJPQDkPYXmb/gxq
-DV2TrOYdbAht9WdNtTPMDWOrNqSMiboqoGFovrMgP89InI3ci7kVe+v1Fddv5T9mQzEA/PhMoxDs
-xa2reJDtpc4R3jUikd88qGcOAkMOYZAPp5KCXsY52VRoEMyDa5epDw8Cff3RbwHajI8jkWvC2GPV
-JEBrwXlLzqROBcqHK123bPzV94BK3GAuvXok/pEW+wNnvNfqvK2nTnU+64bcUGhuO2gxd56yW6gt
-ghdxf2kSBQbiadk4EwcKsxJ8VtA8UfpxbUj12kwlt8no3Mn2FYTNWtjqDBs8JnA8REmYxHDwbYao
-5anvpFYice8ZiRyEHlyW/UTdBFVxIWAngmRxCtLuPigIlYtrMzMzM3Mx8mSLUa/vaTk6TIjpADie
-gkO3lJit26govHDMMMdN8jQjJHgIge1CQeQ/jHPpwOyEuIi3xOJeQXGrDDuMpFPIp1ATK1pgoCI7
-BMhgKihKihtMKQsRC6rE2SRaDjolheFZeDhlAwM7FG70mIgsD2Ijjzu+JArN526jPyNZ3zm4yLyy
-5UbCk6HwnuMlNgPJypCzcOOJaT3b+Uk5zBUmZaLmSKX4GaJCTyGxW2mglbePF2jZz4bj3mE0lmZm
-R2H/xdyRThQkDCT28wA=
-
-
---===5369465324480993893==--

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Pierre Schmitz]

Date: Tuesday, February 2, 2010 @ 00:43:31
  Author: pierre
Revision: 66957

upgpkg: mysql 5.1.42-2
downgrade to non-broken version

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-02 05:43:16 UTC (rev 66956)
+++ PKGBUILD2010-02-02 05:43:31 UTC (rev 66957)
@@ -5,18 +5,18 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.43
-pkgrel=1
+pkgver=5.1.42
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
 makedepends=('tcp_wrappers' 'zlib' 'perl' 'openssl' 'libtool' 'patch')
-options=('!libtool')
+options=('!libtool' 'force')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf'
 'mysqld.conf.d')
-md5sums=('451fd3e8c55eecdf4c3ed109dce62f01'
+md5sums=('b644b219e130b7c6bca81948f75d72d7'
  '7e1c46ccbd91553cc11df7199fbfca32'
  '5b197896a429537fea7cbe52bbe440bc'
 '4a9077fc95ec6db1d5420e0cdc74d31c')

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Sunday, January 31, 2010 @ 19:48:28
  Author: andrea
Revision: 66600

upgpkg: mysql 5.1.43-1
upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-01 00:09:33 UTC (rev 66599)
+++ PKGBUILD2010-02-01 00:48:28 UTC (rev 66600)
@@ -5,19 +5,18 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.42
+pkgver=5.1.43
 pkgrel=1
-pkgdesc=A fast SQL database server
 arch=('i686' 'x86_64')
 license=('GPL')
-url=('http://www.mysql.com/')
+url=http://www.mysql.com/;
 makedepends=('tcp_wrappers' 'zlib' 'perl' 'openssl' 'libtool' 'patch')
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf'
 'mysqld.conf.d')
-md5sums=('b644b219e130b7c6bca81948f75d72d7'
+md5sums=('451fd3e8c55eecdf4c3ed109dce62f01'
  '7e1c46ccbd91553cc11df7199fbfca32'
  '26589ea08b78fc38dd174caeb93b810c'
 '4a9077fc95ec6db1d5420e0cdc74d31c')
@@ -99,6 +98,7 @@
 }
 
 package_mysql(){
+  pkgdesc=A fast SQL database server
   backup=('etc/my.cnf' 'etc/mysql/my.cnf' 'etc/conf.d/mysqld')
   install=mysql.install
   depends=('mysql-clients')
@@ -122,4 +122,4 @@
 
   # create directory for PID and sock files
   install -d ${pkgdir}/var/run/mysqld
-}
+}
\ No newline at end of file

[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf)

[Andrea Scarpino]

Date: Sunday, January 31, 2010 @ 20:41:19
  Author: andrea
Revision: 66605

removed wrong line (FS#18083)

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/my.cnf

--+
 PKGBUILD |4 ++--
 my.cnf   |1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-01 01:34:40 UTC (rev 66604)
+++ PKGBUILD2010-02-01 01:41:19 UTC (rev 66605)
@@ -18,7 +18,7 @@
 'mysqld.conf.d')
 md5sums=('451fd3e8c55eecdf4c3ed109dce62f01'
  '7e1c46ccbd91553cc11df7199fbfca32'
- '26589ea08b78fc38dd174caeb93b810c'
+ '5b197896a429537fea7cbe52bbe440bc'
 '4a9077fc95ec6db1d5420e0cdc74d31c')
 
 build() {
@@ -122,4 +122,4 @@
 
   # create directory for PID and sock files
   install -d ${pkgdir}/var/run/mysqld
-}
\ No newline at end of file
+}

Modified: my.cnf
===
--- my.cnf  2010-02-01 01:34:40 UTC (rev 66604)
+++ my.cnf  2010-02-01 01:41:19 UTC (rev 66605)
@@ -113,7 +113,6 @@
 #innodb_data_home_dir = /var/lib/mysql
 #innodb_data_file_path = ibdata1:10M:autoextend
 #innodb_log_group_home_dir = /var/lib/mysql
-#innodb_log_arch_dir = /var/lib/mysql
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 16M

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Tuesday, January 5, 2010 @ 06:22:18
  Author: andrea
Revision: 62226

upgpkg: mysql 5.1.42-1
upstream release

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-04 15:45:46 UTC (rev 62225)
+++ PKGBUILD2010-01-05 11:22:18 UTC (rev 62226)
@@ -5,19 +5,19 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.41
-pkgrel=3
+pkgver=5.1.42
+pkgrel=1
 pkgdesc=A fast SQL database server
 arch=('i686' 'x86_64')
 license=('GPL')
 url=('http://www.mysql.com/')
 makedepends=('tcp_wrappers' 'zlib' 'perl' 'openssl' 'libtool' 'patch')
 options=('!libtool')
-source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/mysql-$pkgver.tar.gz;
+source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz;
 'mysqld'
 'my.cnf'
 'mysqld.conf.d')
-md5sums=('b5d39e8789174753f3c782959729e68c'
+md5sums=('b644b219e130b7c6bca81948f75d72d7'
  '7e1c46ccbd91553cc11df7199fbfca32'
  '26589ea08b78fc38dd174caeb93b810c'
 '4a9077fc95ec6db1d5420e0cdc74d31c')

[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Thursday, November 19, 2009 @ 21:22:47
  Author: andrea
Revision: 59058

upgpkg: mysql 5.1.41-3
fix build with gcc 4.4

Modified:
  mysql/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-19 23:17:23 UTC (rev 59057)
+++ PKGBUILD2009-11-20 02:22:47 UTC (rev 59058)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.1.41
-pkgrel=2
+pkgrel=3
 pkgdesc=A fast SQL database server
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -25,6 +25,12 @@
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
+  # fix build with gcc 4.4
+  # see http://bugs.archlinux.org/task/15242
+  # and http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
+  CFLAGS=-fPIC ${CFLAGS} -fno-strict-aliasing
+  CXXFLAGS=-fPIC ${CXXFLAGS} -fno-strict-aliasing
+
   ./configure --prefix=/usr \
 --libexecdir=/usr/sbin \
 --localstatedir=/var \

[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf mysql.install)

[Andrea Scarpino]

Date: Wednesday, November 18, 2009 @ 07:07:26
  Author: andrea
Revision: 58953

mysql.sock - mysqld.sock

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/my.cnf
Deleted:
  mysql/trunk/mysql.install

---+
 PKGBUILD  |5 ++---
 my.cnf|4 ++--
 mysql.install |4 
 3 files changed, 4 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-18 03:28:08 UTC (rev 58952)
+++ PKGBUILD2009-11-18 12:07:26 UTC (rev 58953)
@@ -19,8 +19,8 @@
 'mysqld.conf.d')
 md5sums=('32e7373c16271606007374396e6742ad'
  '09f64b1da689f0bc60e17172f9aa0b38'
- 'fcb0697f705fe129d50716b5057721f5'
- '4a9077fc95ec6db1d5420e0cdc74d31c')
+ '26589ea08b78fc38dd174caeb93b810c'
+'4a9077fc95ec6db1d5420e0cdc74d31c')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -110,7 +110,6 @@
   backup=('etc/my.cnf' 'etc/mysql/my.cnf' 'etc/conf.d/mysqld')
   depends=('mysql-clients')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
-  install=mysql.install
 
   cd ${srcdir}/${pkgbase}-${pkgver}
   pushd include || return

Modified: my.cnf
===
--- my.cnf  2009-11-18 03:28:08 UTC (rev 58952)
+++ my.cnf  2009-11-18 12:07:26 UTC (rev 58953)
@@ -12,14 +12,14 @@
 [client]
 #password  = your_password
 port   = 3306
-socket = /var/run/mysqld/mysql.sock
+socket = /var/run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 
 # The MySQL server
 [mysqld]
 port   = 3306
-socket = /var/run/mysqld/mysql.sock
+socket = /var/run/mysqld/mysqld.sock
 datadir= /var/lib/mysql
 skip-locking
 key_buffer = 16M

Deleted: mysql.install
===
--- mysql.install   2009-11-18 03:28:08 UTC (rev 58952)
+++ mysql.install   2009-11-18 12:07:26 UTC (rev 58953)
@@ -1,4 +0,0 @@
-post_upgrade() {
-  echo  MySQL configuration file now is into /etc/mysql/ directory.
-  echo  Remember to replace it with your old configuration file.
-}

[arch-commits] Commit in mysql/trunk (PKGBUILD mysql.install mysqld)

[Andrea Scarpino]

Date: Wednesday, November 18, 2009 @ 10:09:53
  Author: andrea
Revision: 58956

upgpkg: mysql 5.1.41-1
upstream release; create group and user in .install; fix /var/run/mysql 
permission

Added:
  mysql/trunk/mysql.install
Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysqld

---+
 PKGBUILD  |9 +
 mysql.install |   17 +
 mysqld|   18 --
 3 files changed, 22 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-18 12:52:13 UTC (rev 58955)
+++ PKGBUILD2009-11-18 15:09:53 UTC (rev 58956)
@@ -5,8 +5,8 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.40
-pkgrel=2
+pkgver=5.1.41
+pkgrel=1
 pkgdesc=A fast SQL database server
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,8 +17,8 @@
 'mysqld'
 'my.cnf'
 'mysqld.conf.d')
-md5sums=('32e7373c16271606007374396e6742ad'
- '09f64b1da689f0bc60e17172f9aa0b38'
+md5sums=('b5d39e8789174753f3c782959729e68c'
+ '7e1c46ccbd91553cc11df7199fbfca32'
  '26589ea08b78fc38dd174caeb93b810c'
 '4a9077fc95ec6db1d5420e0cdc74d31c')
 
@@ -108,6 +108,7 @@
 
 package_mysql(){
   backup=('etc/my.cnf' 'etc/mysql/my.cnf' 'etc/conf.d/mysqld')
+  install=mysql.install
   depends=('mysql-clients')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
 

Added: mysql.install
===
--- mysql.install   (rev 0)
+++ mysql.install   2009-11-18 15:09:53 UTC (rev 58956)
@@ -0,0 +1,17 @@
+post_install(){
+  groupadd -g 89 mysql /dev/null
+  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql /dev/null
+  usr/bin/mysql_install_db --datadir=/var/lib/mysql --user=mysql
+  chown -R mysql:mysql var/lib/mysql  /dev/null
+  chown mysql:mysql var/run/mysqld  /dev/null
+}
+
+post_upgrade(){
+  chown -R mysql:mysql var/lib/mysql  /dev/null
+  chown mysql:mysql var/run/mysqld
+}
+
+post_remove(){
+  userdel mysql /dev/null
+  groupdel mysql /dev/null
+}

Modified: mysqld
===
--- mysqld  2009-11-18 12:52:13 UTC (rev 58955)
+++ mysqld  2009-11-18 15:09:53 UTC (rev 58956)
@@ -12,24 +12,6 @@
echo $(pgrep -u mysql mysqld);
 }
 
-if [ ! `egrep '^mysql:' /etc/group` ]; then
-  stat_busy Adding mysql group
-  groupadd -g 89 mysql
-  stat_done
-fi
-if [ ! `egrep '^mysql:' /etc/passwd` ]; then
-  stat_busy Adding mysql user
-  useradd -u 89 -g mysql -d $MYSQLD_ROOT -s /bin/false mysql
-  [ -d $MYSQLD_ROOT ]  chown -R mysql:mysql $MYSQLD_ROOT
-  stat_done
-fi
-
-if [ ! -d $MYSQLD_ROOT ]; then
-  mkdir $MYSQLD_ROOT
-  /usr/bin/mysql_install_db --datadir=$MYSQLD_ROOT --user=mysql
-  chown -R mysql:mysql $MYSQLD_ROOT
-fi
-
 case $1 in
   start)
 stat_busy Starting MySQL

[arch-commits] Commit in mysql/trunk (PKGBUILD mysql.install)

[Andrea Scarpino]

Date: Wednesday, November 18, 2009 @ 21:03:21
  Author: andrea
Revision: 58999

set socket path as option in configure; remove useless make; create the user 
and the group if don't exist

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysql.install

---+
 PKGBUILD  |   49 +++--
 mysql.install |8 +---
 2 files changed, 20 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-18 21:06:15 UTC (rev 58998)
+++ PKGBUILD2009-11-19 02:03:21 UTC (rev 58999)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.1.41
-pkgrel=1
+pkgrel=2
 pkgdesc=A fast SQL database server
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -33,12 +33,14 @@
 --without-readline \
 --with-ssl \
 --with-libwrap \
---with-charset=latin1 \
---with-collation=latin1_general_ci \
+--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,ndbcluster
+
--with-plugins=partition,ftexample,archive,blackhole,federated,heap,innobase,innodb_plugin,ndbcluster
+  make || return 1
 }
 
 package_libmysqlclient(){
@@ -46,24 +48,18 @@
   depends=('openssl' 'zlib' 'gcc-libs' 'tcp_wrappers')
   
   cd ${srcdir}/${pkgbase}-${pkgver}
-  for dir in include strings mysys dbug storage regex extra vio sql; do
-pushd ${dir} || return 1
-make || return 1
-popd
-  done
   for dir in libmysql libmysql_r libmysqld; do
 pushd ${dir} || return 1
-make link_sources
-make || return 1
-make DESTDIR=${pkgdir} install
+  make DESTDIR=${pkgdir} install
 popd
   done
+  
   cd include
   make DESTDIR=${pkgdir} install
-
   # Copy missing includes
   install -m644 *.h ${pkgdir}/usr/include/mysql
 
+  # mysql_config
   cd ../scripts
   make mysql_config
   install -d ${pkgdir}/usr/bin
@@ -83,27 +79,17 @@
   depends=(libmysqlclient=${pkgver})
   
   cd ${srcdir}/${pkgbase}-${pkgver}
-  pushd include || return
-make || return 1
-  popd
-
   pushd libmysql
 make link_sources get_password.lo || return
-  popd 
+  popd
   
-  for dir in strings regex mysys dbug extra; do
-pushd ${dir} || return 1
-make || return 1
-popd
-  done
-
   cd client
-  make link_sources
-  make || return 1
   make DESTDIR=${pkgdir} install
 
-  # Removing libmysql stuff
+  # Removing libmysqlclient stuff
   rm -rf $pkgdir/usr/lib/
+  # These will be provided by mysql
+  rm -f ${pkgdir}/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest}
 }
 
 package_mysql(){
@@ -113,15 +99,10 @@
   optdepends=('perl-dbi' 'perl-dbd-mysql')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
-  pushd include || return
-make || return 1
-  popd
-
   pushd libmysql
 make link_sources get_password.lo || return
   popd
   
-  make || return 1
   make DESTDIR=${pkgdir} install
 
   rm -rf ${pkgdir}/usr/{mysql-test,sql-bench,lib,include}
@@ -129,8 +110,8 @@
   install -D -m755 ../mysqld ${pkgdir}/etc/rc.d/mysqld
   install -D -m644 ../mysqld.conf.d ${pkgdir}/etc/conf.d/mysqld
 
-  # Cleanup files provided by the other packages
-  rm -f 
${pkgdir}/usr/bin/{mysql,mysql_config,mysql_client_test_embedded,mysql_upgrade,mysqladmin,mysqlbinlog,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,mysqltest,mysqltest_embedded}
+  # Cleanup files provided by the others packages
+  rm -f 
${pkgdir}/usr/bin/{mysql,mysql_config,mysql_client_test_embedded,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,mysqltest_embedded}
   rm -rf ${pkgdir}/usr/{include,lib}
 
   # create directory for PID and sock files

Modified: mysql.install
===
--- mysql.install   2009-11-18 21:06:15 UTC (rev 58998)
+++ mysql.install   2009-11-19 02:03:21 UTC (rev 58999)
@@ -7,11 +7,13 @@
 }
 
 post_upgrade(){
+  getent group mysql /dev/null || groupadd -g 89 mysql /dev/null
+  getent passwd mysql /dev/null || useradd -u 89 -g mysql -d /var/lib/mysql 
-s /bin/false mysql /dev/null
   chown -R mysql:mysql var/lib/mysql  /dev/null
-  chown mysql:mysql var/run/mysqld
+  chown mysql:mysql var/run/mysqld  /dev/null
 }
 
 post_remove(){
-  userdel mysql /dev/null
-  groupdel mysql /dev/null
+  getent passwd mysql /dev/null || userdel mysql /dev/null
+  getent group mysql /dev/null || groupdel mysql /dev/null
 }

Re: [arch-commits] Commit in mysql/trunk (PKGBUILD mysql.install)

[Andrea Scarpino]

On 19/11/2009, Andrea Scarpino and...@archlinux.org wrote:
 Date: Wednesday, November 18, 2009 @ 21:03:21
   Author: andrea
 Revision: 58999

 set socket path as option in configure; remove useless make; create the user
 and the group if don't exist
changed default charset to utf8; enabled the new innodb plugin;

-- 
Andrea `bash` Scarpino
Arch Linux Developer