Merge branch '2.6' into 2.7

2010-07-23 17:58:01 +02:00 · 2010-07-23 17:58:01 +02:00 · a99812cbf8
commit a99812cbf8
parent de1d4e2dad 27efec8ff9
18 changed files with 62 additions and 43 deletions
--- a/lvm2/.md5sum
+++ b/lvm2/.md5sum
@ -1 +1 @@
-20357ea7918c4e967e558de53ec74969  LVM2.2.02.68.tgz
+39c26d5a821754cc347d7a19e82d4a24  LVM2.2.02.70.tgz
--- a/lvm2/Pkgfile
+++ b/lvm2/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  libdevmapper

 name=lvm2
-version=2.02.68
+version=2.02.70
 release=1
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$version.tgz)

--- a/mod_php/.md5sum
+++ b/mod_php/.md5sum
@ -1 +1 @@
-eb4d0766dc4fb9667f05a68b6041e7d1  php-5.2.13.tar.bz2
+bfdfc0e62fe437020cc04078269d1414  php-5.2.14.tar.bz2
--- a/mod_php/Pkgfile
+++ b/mod_php/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  apache libxml2

 name=mod_php
-version=5.2.13
+version=5.2.14
 release=1
 source=(http://www.php.net/distributions/php-$version.tar.bz2)

--- a/mysql/.md5sum
+++ b/mysql/.md5sum
@ -1,4 +1,4 @@
 907c4ac28c33b2508750bca8a29ef9b9  my.cnf
-a2ffcadadfd8b2cda80f3dddbc8933fe  mysql-5.1-gcc45-apicheck.patch
-d04c54d1cfbd8c6c8650c8d078f885b2  mysql-5.1.48.tar.gz
+fda6e1139f11cc501ca600070424caa8  mysql-5.1-gcc45-apicheck.patch
+a90d87a71fa3c23dff6d78afc8e3184c  mysql-5.1.49.tar.gz
 642a596f13ebd7e459c5ff2fd382f06b  mysqld
--- a/mysql/Pkgfile
+++ b/mysql/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  ncurses readline zlib

 name=mysql
-version=5.1.48
+version=5.1.49
 release=1
 source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/$name-$version.tar.gz \
        my.cnf mysqld mysql-5.1-gcc45-apicheck.patch)
--- a/mysql/mysql-5.1-gcc45-apicheck.patch
+++ b/mysql/mysql-5.1-gcc45-apicheck.patch
@ -1,31 +1,49 @@
 # http://bugs.mysql.com/bug.php?id=52514

-diff -Nru mysql-5.1.47.orig/Makefile.in mysql-5.1.47/Makefile.in
--- mysql-5.1.47.orig/Makefile.in	2010-05-25 21:39:20.411815787 +0200
-+++ mysql-5.1.47/Makefile.in	2010-05-25 21:40:35.201822062 +0200
-@@ -1132,24 +1132,7 @@
- 	$(MAKE) abi_headers="$^" do_abi_check
- 
+diff -Nru mysql-5.1.49.orig/Makefile.in mysql-5.1.49/Makefile.in
+--- mysql-5.1.49.orig/Makefile.in	2010-07-23 11:19:04.883436681 +0200
+++ mysql-5.1.49/Makefile.in	2010-07-23 11:24:08.673443229 +0200
+@@ -1097,9 +1097,10 @@
+ # 1) Generate preprocessor output for the files that need to
+ #    be tested for abi/api changes. use -nostdinc to prevent
+ #    generation of preprocessor output for system headers. This
+-#    results in messages in stderr saying that these headers
+-#    were not found. Redirect the stderr output to /dev/null
+-#    to prevent seeing these messages.
+#    results in messages in stderr saying that these headers were not found
+#    with older gccs and in an error with newer ones. Redirect the stderr
+#    output to /dev/null to prevent seeing these messages, and guard includes
+#    with #ifndef mysql_abi_check; define mysql_abi_check for the abi check.
+ # 2) sed the output to 
+ #    2.1) remove blank lines and lines that begin with "# "
+ #    2.2) When gcc -E is run on the Mac OS  and solaris sparc platforms it
+@@ -1135,7 +1136,7 @@
 do_abi_check:
-	set -ex; \
-	for file in $(abi_headers); do \
+ 	set -ex; \
+ 	for file in $(abi_headers); do \
 -	         @CC@ -E -nostdinc -dI \
-	                  -I$(top_srcdir)/include \
-	                  -I$(top_srcdir)/include/mysql \
-	                  -I$(top_srcdir)/sql \
-	                  -I$(top_builddir)/include \
-	                  -I$(top_builddir)/include/mysql \
-	                  -I$(top_builddir)/sql \
-	                                 $$file 2>/dev/null | \
-	                  @SED@ -e '/^# /d' \
-	                            -e '/^[ 	]*$$/d' \
-	                            -e '/^#pragma GCC set_debug_pwd/d' \
-	                            -e '/^#ident/d' > \
-	                                       $(top_builddir)/abi_check.out; \
-	                  @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
-	                  @RM@ $(top_builddir)/abi_check.out; \
-	done
-+	echo "Skipping do_abi_check"
+	         @CC@ -Dmysql_abi_check -E -nostdinc -dI \
+ 	                  -I$(top_srcdir)/include \
+ 	                  -I$(top_srcdir)/include/mysql \
+ 	                  -I$(top_srcdir)/sql \
+diff -Nru mysql-5.1.49.orig/include/mysql.h mysql-5.1.49/include/mysql.h
+--- mysql-5.1.49.orig/include/mysql.h	2010-07-23 11:19:05.353433926 +0200
+++ mysql-5.1.49/include/mysql.h	2010-07-23 11:24:08.673443229 +0200
+@@ -44,7 +44,9 @@
+ #endif
 
- # Don't update the files from bitkeeper
- %::SCCS/s.%
+ #ifndef _global_h				/* If not standard header */
+#ifndef mysql_abi_check
+ #include <sys/types.h>
+#endif
+ #ifdef __LCC__
+ #include <winsock2.h>				/* For windows */
+ #endif
+diff -Nru mysql-5.1.49.orig/include/mysql.h.pp mysql-5.1.49/include/mysql.h.pp
+--- mysql-5.1.49.orig/include/mysql.h.pp	2010-07-23 11:19:05.353433926 +0200
+++ mysql-5.1.49/include/mysql.h.pp	2010-07-23 11:24:08.673443229 +0200
+@@ -1,4 +1,3 @@
+-#include <sys/types.h>
+ typedef char my_bool;
+ typedef int my_socket;
+ #include "mysql_version.h"
--- a/php-fcgi/.md5sum
+++ b/php-fcgi/.md5sum
@ -1,2 +1,2 @@
-eb4d0766dc4fb9667f05a68b6041e7d1  php-5.2.13.tar.bz2
+bfdfc0e62fe437020cc04078269d1414  php-5.2.14.tar.bz2
 6297748058441ee6c6b88e429ee54ba1  php-fcgi
--- a/php-fcgi/Pkgfile
+++ b/php-fcgi/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  libpcre libxml2

 name=php-fcgi
-version=5.2.13
+version=5.2.14
 release=1
 source=(http://www.php.net/distributions/php-$version.tar.bz2 
        php-fcgi)
--- a/php-mysql/.md5sum
+++ b/php-mysql/.md5sum
@ -1 +1 @@
-eb4d0766dc4fb9667f05a68b6041e7d1  php-5.2.13.tar.bz2
+bfdfc0e62fe437020cc04078269d1414  php-5.2.14.tar.bz2
--- a/php-mysql/Pkgfile
+++ b/php-mysql/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  mysql

 name=php-mysql
-version=5.2.13
+version=5.2.14
 release=1
 source=(http://www.php.net/distributions/php-$version.tar.bz2)

--- a/php/.footprint
+++ b/php/.footprint
@ -106,6 +106,7 @@ drwxr-xr-x	root/root	usr/include/php/ext/iconv/
 -rw-r--r--	root/root	usr/include/php/ext/iconv/php_have_iconv.h
 -rw-r--r--	root/root	usr/include/php/ext/iconv/php_have_libiconv.h
 -rw-r--r--	root/root	usr/include/php/ext/iconv/php_iconv.h
+-rw-r--r--	root/root	usr/include/php/ext/iconv/php_iconv_aliased_libiconv.h
 -rw-r--r--	root/root	usr/include/php/ext/iconv/php_iconv_supports_errno.h
 -rw-r--r--	root/root	usr/include/php/ext/iconv/php_php_iconv_h_path.h
 -rw-r--r--	root/root	usr/include/php/ext/iconv/php_php_iconv_impl.h
--- a/php/.md5sum
+++ b/php/.md5sum
@ -1,2 +1,2 @@
 683de3db60200bc38aa6e154aa925fa6  extensions.ini
-eb4d0766dc4fb9667f05a68b6041e7d1  php-5.2.13.tar.bz2
+bfdfc0e62fe437020cc04078269d1414  php-5.2.14.tar.bz2
--- a/php/Pkgfile
+++ b/php/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  ncurses readline libpcre libxml2 curl db gdbm zip

 name=php
-version=5.2.13
+version=5.2.14
 release=1
 source=(http://www.php.net/distributions/php-$version.tar.bz2 
        extensions.ini)
--- a/transmission-gtk/.md5sum
+++ b/transmission-gtk/.md5sum
@ -1 +1 @@
-87f939ee9adfaf78a674e9c5c01809bb  transmission-2.01.tar.xz
+ac5ed307a2ad89687a8ca82c9454cbbe  transmission-2.03.tar.xz
--- a/transmission-gtk/Pkgfile
+++ b/transmission-gtk/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  curl intltool gtk libevent

 name=transmission-gtk
-version=2.01
+version=2.03
 release=1
 source=(http://download.m0k.org/transmission/files/transmission-$version.tar.xz)

--- a/transmission/.md5sum
+++ b/transmission/.md5sum
@ -1 +1 @@
-87f939ee9adfaf78a674e9c5c01809bb  transmission-2.01.tar.xz
+ac5ed307a2ad89687a8ca82c9454cbbe  transmission-2.03.tar.xz
--- a/transmission/Pkgfile
+++ b/transmission/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  curl libevent

 name=transmission
-version=2.01
+version=2.03
 release=1
 source=(http://download.m0k.org/$name/files/$name-$version.tar.xz)