[arch-commits] Commit in mysql/repos (4 files)

Tue Feb 24 20:02:32 UTC 2009

Date: Tuesday, February 24, 2009 @ 15:02:32
  Author: douglas
Revision: 27681

Merged revisions 27680 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/mysql/trunk

........
  r27680 | douglas | 2009-02-24 17:01:55 -0300 (Ter, 24 Fev 2009) | 1 line
  
  upgpkg: mysql 5.0.77-1
........

Modified:
  mysql/repos/extra-i686/	(properties)
  mysql/repos/extra-i686/PKGBUILD
  mysql/repos/extra-i686/mysql-no-clients.patch
  mysql/repos/extra-i686/mysqld

------------------------+
 PKGBUILD               |   20 +++++++++++---------
 mysql-no-clients.patch |   37 ++++++++++++++++++-------------------
 mysqld                 |    6 ++++--
 3 files changed, 33 insertions(+), 30 deletions(-)


Property changes on: mysql/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mysql/trunk:1-25813
   + /mysql/trunk:1-27680

Modified: extra-i686/PKGBUILD
===================================================================

--- extra-i686/PKGBUILD	2009-02-24 20:01:55 UTC (rev 27680)
+++ extra-i686/PKGBUILD	2009-02-24 20:02:32 UTC (rev 27681)
@@ -1,9 +1,10 @@
 # $Id$
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: judd <jvinet at zeroflux.org>
+
 pkgname=mysql
-pkgver=5.0.75
-pkgrel=4
+pkgver=5.0.77
+pkgrel=1
 pkgdesc="A fast SQL database server"
 arch=(i686 x86_64)
 backup=(etc/my.cnf etc/conf.d/mysqld)
@@ -14,15 +15,16 @@
 optdepends=('perl-dbi' 'perl-dbd-mysql')
 license=('GPL')
 source=(ftp://ftp.pucpr.br/mysql/Downloads/MySQL-5.0/mysql-${pkgver}.tar.gz
-	mysql-no-clients.patch
-	mysqld
-	my.cnf
-	mysqld.conf.d)
+        mysql-no-clients.patch
+        mysqld
+        my.cnf
+        mysqld.conf.d)
 
 build() {
   # PIC
   cd ${startdir}/src/${pkgname}-${pkgver}
   patch -Np1 -i ${startdir}/src/mysql-no-clients.patch || return 1
+
   ./configure --prefix=/usr --libexecdir=/usr/sbin \
     --without-debug --without-docs --without-bench --without-readline \
     --with-innodb --enable-local-infile --with-openssl \
@@ -48,8 +50,8 @@
   install -D -m644 ../mysqld.conf.d ${startdir}/pkg/etc/conf.d/mysqld
   rm -f ${startdir}/pkg/usr/bin/mysql_config
 }
-md5sums=('a234f0a60a7f8c290d9875cba3a2c5a2'
-         'e892aac36cbeb57f0e003ec0936afb3b'
-         '546af0d36a325f4d7b687bb4d681734b'
+md5sums=('6c30a20c9059daf053a301e927eb1667'
+         'c227818b5157bf2bdb4dd4bd549f2df8'
+         '2681261ef2623869e4d49f458f32ed76'
          '0ee035590ffc61d32de994f461fd2bd2'
          '4a9077fc95ec6db1d5420e0cdc74d31c')

Modified: extra-i686/mysql-no-clients.patch
===================================================================
--- extra-i686/mysql-no-clients.patch	2009-02-24 20:01:55 UTC (rev 27680)
+++ extra-i686/mysql-no-clients.patch	2009-02-24 20:02:32 UTC (rev 27681)
@@ -21,10 +21,21 @@
  install-exec: install-exec-am
  install-data: install-data-am
  uninstall: uninstall-am
-diff -ruN mysql-5.0.51.orig/tests/Makefile.in mysql-5.0.51/tests/Makefile.in
---- mysql-5.0.51.orig/tests/Makefile.in	2007-12-07 12:59:20.000000000 +0000
-+++ mysql-5.0.51/tests/Makefile.in	2007-12-07 13:01:51.000000000 +0000
-@@ -96,7 +96,7 @@
+diff -ruN mysql-5.0.51.orig/tools/Makefile.in mysql-5.0.51/tools/Makefile.in
+--- mysql-5.0.51.orig/tools/Makefile.in	2007-12-07 12:59:19.000000000 +0000
++++ mysql-5.0.51/tools/Makefile.in	2007-12-07 13:02:32.000000000 +0000
+@@ -369,7 +369,7 @@
+ 		$(openssl_includes)
+ 
+ LDADD = @CLIENT_EXTRA_LDFLAGS@ \
+-		$(top_builddir)/libmysql_r/libmysqlclient_r.la \
++		/usr/lib/mysql/libmysqlclient_r.so \
+ 		@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
+ 
+ mysqltestmanager_SOURCES = mysqlmanager.c
+--- mysql-5.0.51.orig/tests/Makefile.in.old	2009-02-24 15:39:22.000000000 -0300
++++ mysql-5.0.51.orig/tests/Makefile.in	2009-02-24 15:40:32.000000000 -0300
+@@ -92,7 +92,7 @@
  am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \
  	my_memmem.$(OBJEXT)
  mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
@@ -33,16 +44,16 @@
  am__DEPENDENCIES_2 =
  mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_2)
-@@ -106,7 +106,7 @@
+@@ -102,7 +102,7 @@
  thread_test_SOURCES = thread_test.c
  thread_test_OBJECTS = thread_test.$(OBJEXT)
  thread_test_LDADD = $(LDADD)
 -thread_test_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la
 +thread_test_DEPENDENCIES = /usr/lib/mysql/libmysqlclient.so
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/include
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -405,7 +405,7 @@
+@@ -398,7 +398,7 @@
  			$(openssl_includes)
  
  LDADD = @CLIENT_EXTRA_LDFLAGS@ \
@@ -51,15 +62,3 @@
  
  mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
  mysql_client_test_SOURCES = mysql_client_test.c\
-diff -ruN mysql-5.0.51.orig/tools/Makefile.in mysql-5.0.51/tools/Makefile.in
---- mysql-5.0.51.orig/tools/Makefile.in	2007-12-07 12:59:19.000000000 +0000
-+++ mysql-5.0.51/tools/Makefile.in	2007-12-07 13:02:32.000000000 +0000
-@@ -369,7 +369,7 @@
- 		$(openssl_includes)
- 
- LDADD = @CLIENT_EXTRA_LDFLAGS@ \
--		$(top_builddir)/libmysql_r/libmysqlclient_r.la \
-+		/usr/lib/mysql/libmysqlclient_r.so \
- 		@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
- 
- mysqltestmanager_SOURCES = mysqlmanager.c

Modified: extra-i686/mysqld
===================================================================
--- extra-i686/mysqld	2009-02-24 20:01:55 UTC (rev 27680)
+++ extra-i686/mysqld	2009-02-24 20:02:32 UTC (rev 27681)
@@ -9,7 +9,9 @@
 . /etc/rc.d/functions
 
 getPID() {
-  echo `pidof -o %PPID /usr/sbin/mysqld`
+   if [ -f $MYSQLD_ROOT/$HOSTNAME.pid ]; then
+       echo `cat $MYSQLD_ROOT/$HOSTNAME.pid`
+   fi
 }
 
 if [ ! `egrep '^mysql:' /etc/group` ]; then
@@ -44,7 +46,7 @@
           stat_fail
           exit 1
         else
-          echo $(getPID) >/var/run/mysqld.pid
+          cp $MYSQLD_ROOT/$HOSTNAME.pid /var/run/mysqld.pid
           add_daemon mysqld
           stat_done
         fi


