[arch-commits] CVS update of extra (4 files)

Alexander Baldeck alexander at archlinux.org
Sun Dec 9 08:38:48 EST 2007


    Date: Sunday, December 9, 2007 @ 08:38:48
  Author: alexander
    Path: /home/cvs-extra/extra

Modified: daemons/mysql/PKGBUILD (1.86 -> 1.87)
          daemons/mysql/mysql-no-clients.patch (1.3 -> 1.4)
          lib/libmysqlclient/PKGBUILD (1.7 -> 1.8)
          network/mysql-clients/PKGBUILD (1.8 -> 1.9)

upgpkg: libmysqlclient 5.0.51
upgpkg: mysql-clients 5.0.51
upgpkg: mysql 5.0.51


--------------------------------------+
 daemons/mysql/PKGBUILD               |   19 +++++----
 daemons/mysql/mysql-no-clients.patch |   65 ++++++++++++++++-----------------
 lib/libmysqlclient/PKGBUILD          |   11 +++--
 network/mysql-clients/PKGBUILD       |   10 +++--
 4 files changed, 56 insertions(+), 49 deletions(-)


Index: extra/daemons/mysql/PKGBUILD
diff -u extra/daemons/mysql/PKGBUILD:1.86 extra/daemons/mysql/PKGBUILD:1.87
--- extra/daemons/mysql/PKGBUILD:1.86	Tue Jul 17 17:08:48 2007
+++ extra/daemons/mysql/PKGBUILD	Sun Dec  9 08:38:47 2007
@@ -1,23 +1,21 @@
-# $Id: PKGBUILD,v 1.86 2007/07/17 21:08:48 tpowa Exp $
+# $Id: PKGBUILD,v 1.87 2007/12/09 13:38:47 alexander Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=mysql
-pkgver=5.0.45
+pkgver=5.0.51
 pkgrel=1
 pkgdesc="A fast SQL database server"
 arch=(i686 x86_64)
 backup=(etc/my.cnf etc/conf.d/mysqld)
 depends=("mysql-clients>=${pkgver}" 'tcp_wrappers')
+makedepends=('libtool')
 url=('http://www.mysql.com/')
+options=('!libtool')
+license=('GPL')
 source=(ftp://mirror.services.wisc.edu/mirrors/mysql/Downloads/MySQL-5.0/mysql-${pkgver}.tar.gz
 	mysql-no-clients.patch
 	mysqld
 	my.cnf
 	mysqld.conf.d)
-md5sums=('a2a1c5a82bb22b45ab76a8ecab94e10d'
-         '71ea0c75c1483cf07037e730d6a31d23'
-         'df7db43b916c95d7dc34698955a8ced1'
-         '0ee035590ffc61d32de994f461fd2bd2'
-         '4a9077fc95ec6db1d5420e0cdc74d31c')
 
 build() {
   # PIC
@@ -32,7 +30,7 @@
     --with-libwrap --with-berkeley-db
 
   # fixes
-  sed -i -e 's/^.*HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE.*$/#define\ HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE/g' config.h || return 1
+  sed -i -e 's/^.*HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE.*$/#define\ HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE/g' include/config.h || return 1
   sed -i -e 's/size_socket/socklen_t/g' sql/mysqld.cc || return 1
 
   pushd include || return
@@ -49,3 +47,8 @@
   install -D -m644 ../mysqld.conf.d ${startdir}/pkg/etc/conf.d/mysqld
   rm -f ${startdir}/pkg/usr/bin/mysql_config
 }
+md5sums=('88c39c8cb77810febb83b7ee625364d7'
+         'e892aac36cbeb57f0e003ec0936afb3b'
+         'df7db43b916c95d7dc34698955a8ced1'
+         '0ee035590ffc61d32de994f461fd2bd2'
+         '4a9077fc95ec6db1d5420e0cdc74d31c')
Index: extra/daemons/mysql/mysql-no-clients.patch
diff -u extra/daemons/mysql/mysql-no-clients.patch:1.3 extra/daemons/mysql/mysql-no-clients.patch:1.4
--- extra/daemons/mysql/mysql-no-clients.patch:1.3	Tue Jul 17 17:08:48 2007
+++ extra/daemons/mysql/mysql-no-clients.patch	Sun Dec  9 08:38:47 2007
@@ -1,7 +1,19 @@
-diff -ru mysql-5.0.24/include/Makefile.in mysql-5.0.24.patched/include/Makefile.in
---- mysql-5.0.24/include/Makefile.in	2006-07-27 18:52:55.000000000 +0000
-+++ mysql-5.0.24.patched/include/Makefile.in	2006-08-25 21:32:13.000000000 +0000
-@@ -527,7 +527,6 @@
+diff -ruN mysql-5.0.51.orig/Makefile.in mysql-5.0.51/Makefile.in
+--- mysql-5.0.51.orig/Makefile.in	2007-12-07 12:59:21.000000000 +0000
++++ mysql-5.0.51/Makefile.in	2007-12-07 13:03:21.000000000 +0000
+@@ -376,7 +376,7 @@
+ SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
+ 			@readline_topdir@ sql-common scripts \
+ 			@thread_dirs@ pstack \
+-			@sql_union_dirs@ @man_dirs@ tests \
++			strings mysys dbug extra regex bdb innobase myisam myisammrg heap vio sql @man_dirs@ tests \
+ 			netware @libmysqld_dirs@ \
+ 			@bench_dirs@ support-files @tools_dirs@
+ 
+diff -ruN mysql-5.0.51.orig/include/Makefile.in mysql-5.0.51/include/Makefile.in
+--- mysql-5.0.51.orig/include/Makefile.in	2007-12-07 12:59:20.000000000 +0000
++++ mysql-5.0.51/include/Makefile.in	2007-12-07 13:00:12.000000000 +0000
+@@ -557,7 +557,6 @@
  	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
  	done
  install: $(BUILT_SOURCES)
@@ -9,40 +21,40 @@
  install-exec: install-exec-am
  install-data: install-data-am
  uninstall: uninstall-am
-diff -ru mysql-5.0.24/tests/Makefile.in mysql-5.0.24.patched/tests/Makefile.in
---- mysql-5.0.24/tests/Makefile.in	2006-07-27 18:53:37.000000000 +0000
-+++ mysql-5.0.24.patched/tests/Makefile.in	2006-08-25 21:34:30.000000000 +0000
-@@ -102,7 +102,7 @@
- @HAVE_NETWARE_TRUE@	mysql_client_test.$(OBJEXT) \
- @HAVE_NETWARE_TRUE@	$(am__objects_1) my_memmem.$(OBJEXT)
+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 @@
+ am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \
+ 	my_memmem.$(OBJEXT)
  mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
 -am__DEPENDENCIES_1 = $(top_builddir)/libmysql/libmysqlclient.la
 +am__DEPENDENCIES_1 = /usr/lib/mysql/libmysqlclient.so
  am__DEPENDENCIES_2 =
- @HAVE_NETWARE_FALSE at mysql_client_test_DEPENDENCIES =  \
- @HAVE_NETWARE_FALSE@	$(am__DEPENDENCIES_1) \
-@@ -117,7 +117,7 @@
+ mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2)
+@@ -106,7 +106,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)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -421,7 +421,7 @@
+@@ -405,7 +405,7 @@
  			$(openssl_includes)
  
  LDADD = @CLIENT_EXTRA_LDFLAGS@ \
 -                        $(top_builddir)/libmysql/libmysqlclient.la
 +                        /usr/lib/mysql/libmysqlclient.so
  
- @HAVE_NETWARE_FALSE at mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys
- @HAVE_NETWARE_TRUE at mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
-diff -ru mysql-5.0.24/tools/Makefile.in mysql-5.0.24.patched/tools/Makefile.in
---- mysql-5.0.24/tools/Makefile.in	2006-07-27 18:53:40.000000000 +0000
-+++ mysql-5.0.24.patched/tools/Makefile.in	2006-08-25 21:34:56.000000000 +0000
-@@ -376,7 +376,7 @@
+ 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@ \
@@ -51,14 +63,3 @@
  		@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
  
  mysqltestmanager_SOURCES = mysqlmanager.c
---- mysql-5.0.24/Makefile.in	2006-08-25 22:17:54.000000000 +0000
-+++ mysql-5.0.24.patched/Makefile.in	2006-08-25 22:18:14.000000000 +0000
-@@ -372,7 +372,7 @@
- SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
- 			@readline_topdir@ sql-common scripts \
- 			@thread_dirs@ pstack \
--			@sql_union_dirs@ @man_dirs@ tests \
-+			strings mysys dbug extra regex bdb innobase myisam myisammrg heap vio sql @man_dirs@ tests \
- 			netware @libmysqld_dirs@ \
- 			@bench_dirs@ support-files @tools_dirs@
- 
Index: extra/lib/libmysqlclient/PKGBUILD
diff -u extra/lib/libmysqlclient/PKGBUILD:1.7 extra/lib/libmysqlclient/PKGBUILD:1.8
--- extra/lib/libmysqlclient/PKGBUILD:1.7	Tue Jul 17 16:31:12 2007
+++ extra/lib/libmysqlclient/PKGBUILD	Sun Dec  9 08:38:47 2007
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD,v 1.7 2007/07/17 20:31:12 tpowa Exp $
+# $Id: PKGBUILD,v 1.8 2007/12/09 13:38:47 alexander Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=libmysqlclient
-pkgver=5.0.45
+pkgver=5.0.51
 pkgrel=1
 pkgdesc="MySQL client libraries"
 arch=(i686 x86_64)
 depends=('openssl' 'zlib')
-makedepends=('gcc' 'readline' 'tcp_wrappers')
-options=('nolibtool')
+makedepends=('gcc' 'readline' 'tcp_wrappers' 'libtool')
+options=('!libtool')
+license=('GPL')
 url=('http://www.mysql.com/')
 source=(ftp://mirror.services.wisc.edu/mirrors/mysql/Downloads/MySQL-5.0/mysql-${pkgver}.tar.gz)
-md5sums=('a2a1c5a82bb22b45ab76a8ecab94e10d')
 
 build() {
   # PIC
@@ -53,3 +53,4 @@
   ln -sf libmysqlclient_r.so.15 $startdir/pkg/usr/lib/libmysqlclient_r.so
   ln -sf libmysqlclient_r.so.15 $startdir/pkg/usr/lib/libmysqlclient_r.so.1
 }
+md5sums=('88c39c8cb77810febb83b7ee625364d7')
Index: extra/network/mysql-clients/PKGBUILD
diff -u extra/network/mysql-clients/PKGBUILD:1.8 extra/network/mysql-clients/PKGBUILD:1.9
--- extra/network/mysql-clients/PKGBUILD:1.8	Thu Sep 20 12:33:26 2007
+++ extra/network/mysql-clients/PKGBUILD	Sun Dec  9 08:38:48 2007
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD,v 1.8 2007/09/20 16:33:26 alexander Exp $
+# $Id: PKGBUILD,v 1.9 2007/12/09 13:38:48 alexander Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=mysql-clients
-pkgver=5.0.45
+pkgver=5.0.51
 pkgrel=1
 pkgdesc="MySQL client tools"
 arch=(i686 x86_64)
 depends=("libmysqlclient>=${pkgver}" 'gcc' 'readline')
-makedepends=('tcp_wrappers')
+makedepends=('tcp_wrappers' 'libtool')
 url=('http://www.mysql.com/')
+options=('!libtool')
+license=('GPL')
 source=(ftp://mirror.services.wisc.edu/mirrors/mysql/Downloads/MySQL-5.0/mysql-${pkgver}.tar.gz)
-md5sums=('a2a1c5a82bb22b45ab76a8ecab94e10d')
 
 build() {
   # PIC
@@ -34,3 +35,4 @@
   make || return 1
   make DESTDIR=${startdir}/pkg install
 }
+md5sums=('88c39c8cb77810febb83b7ee625364d7')




More information about the arch-commits mailing list