Merge branch '3.1' into 3.2

nss/.md5sum

@@ -1,3 +1,3 @@
-db83988499d1eb3b623d77ecf495b0f5  nss-3.20.tar.gz
+c285ef92de0031cb0a8caa60d396d618  nss-3.20.1.tar.gz
 17226659298a9d9bb3f323186d220f6f  nss-config.in
 a796e6ab6c87573ffb649ce8769bc07a  nss.pc.in

nss/Pkgfile

@@ -4,9 +4,9 @@
 # Depends on:  nspr sqlite3
 
 name=nss
-version=3.20
+version=3.20.1
 release=1
-source=(http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_RTM/src/$name-$version.tar.gz \
+source=(http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_1_RTM/src/$name-$version.tar.gz \
         nss-config.in nss.pc.in)
 
 build() {

php-ftp/.md5sum

@@ -1 +1 @@
-05d54cad22f393f4b5b0ec0ab06a2b91  php-5.5.29.tar.xz
+c726a86238017c2d9db0171b14d300e7  php-5.6.15.tar.xz

php-ftp/Pkgfile

@@ -1,10 +1,11 @@
-# Description:	FTP module for PHP
-# URL:		http://www.php.net
-# Maintainer:	Alan Mizrahi, alan at mizrahi dot com dot ve
-# Depends on: 
+# Description: FTP module for PHP
+# URL:         http://www.php.net
+# Maintainer:  Juergen Daubert, jue at crux dot nu
+# Packager:    Alan Mizrahi, alan at mizrahi dot com dot ve
+# Depends on:
 
 name=php-ftp
-version=5.5.29
+version=5.6.15
 release=1
 source=(http://www.php.net/distributions/php-$version.tar.xz)
 

php-gd/.md5sum

@@ -1 +1 @@
-05d54cad22f393f4b5b0ec0ab06a2b91  php-5.5.29.tar.xz
+c726a86238017c2d9db0171b14d300e7  php-5.6.15.tar.xz

php-gd/Pkgfile

@@ -1,10 +1,11 @@
-# Description:	GD module for PHP
-# URL:		http://www.php.net
-# Maintainer:	Alan Mizrahi, alan at mizrahi dot com dot ve
-# Depends on:	libgd
+# Description: GD module for PHP
+# URL:         http://www.php.net
+# Maintainer:  Juergen Daubert, jue at crux dot nu
+# Packager:    Alan Mizrahi, alan at mizrahi dot com dot ve
+# Depends on:  libgd
 
 name=php-gd
-version=5.5.29
+version=5.6.15
 release=1
 source=(http://www.php.net/distributions/php-$version.tar.xz)
 

php-gettext/.md5sum

@@ -1 +1 @@
-05d54cad22f393f4b5b0ec0ab06a2b91  php-5.5.29.tar.xz
+c726a86238017c2d9db0171b14d300e7  php-5.6.15.tar.xz

php-gettext/Pkgfile

@@ -1,10 +1,11 @@
-# Description:	Gettext module for PHP
-# URL:		http://www.php.net
-# Maintainer:	Alan Mizrahi, alan at mizrahi dot com dot ve
-# Depends on:	
+# Description: Gettext module for PHP
+# URL:         http://www.php.net
+# Maintainer:  Juergen Daubert, jue at crux dot nu
+# Packager:    Alan Mizrahi, alan at mizrahi dot com dot ve
+# Depends on:
 
 name=php-gettext
-version=5.5.29
+version=5.6.15
 release=1
 source=(http://www.php.net/distributions/php-$version.tar.xz)
 

php-sockets/.md5sum

@@ -1 +1 @@
-05d54cad22f393f4b5b0ec0ab06a2b91  php-5.5.29.tar.xz
+c726a86238017c2d9db0171b14d300e7  php-5.6.15.tar.xz

php-sockets/Pkgfile

@@ -1,10 +1,11 @@
-# Description:	Socket module for PHP
-# URL:		http://www.php.net
-# Maintainer:	Alan Mizrahi, alan at mizrahi dot com dot ve
+# Description: Socket module for PHP
+# URL:         http://www.php.net
+# Maintainer:  Juergen Daubert, jue at crux dot nu
+# Packager:    Alan Mizrahi, alan at mizrahi dot com dot ve
 # Depends on: 
 
 name=php-sockets
-version=5.5.29
+version=5.6.15
 release=1
 source=(http://www.php.net/distributions/php-$version.tar.xz)