[cvs] experimental/thesin/finkinfo php5.info, 1.21, 1.22 php5.patch, 1.16, 1.17

Fri, 11 Oct 2013 12:51:23 -0700 

Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26983

Modified Files:
        php5.info php5.patch 
Log Message:
* New Upstream Release
  * In maintscripts not emit 'no action required' messages to
    console (closes: #724001).
  * Remove obsolete patches: 004-ldap_fix, 036-fd_setsize_fix,
    043-recode_size_t, 045-exif_nesting_level, 047-zts_with_dl and 
    108-64_bit_datetime.
  * Add patch info (description, author and bug number)
  * Delete patches we don't apply during build
  * Add a reference to GNU/Hurd porting guidelines
  * New upstream version 5.5.4+dfsg
  * Remove SHA2 broken test patch; merged upstream
  * Refresh patches for 5.5.4 release
* Move patching to use debian dir instead of duplicating all patches



Index: php5.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- php5.info   20 Sep 2013 22:48:30 -0000      1.21
+++ php5.info   11 Oct 2013 19:50:45 -0000      1.22
@@ -1,6 +1,6 @@
 Info2: <<
 Package: php5
-Version: 5.5.3
+Version: 5.5.4
 Revision: 1.1
 Type: sapiver (20121212), embedver (5)
 ###
@@ -119,74 +119,67 @@
 <<
 ###
 Source: mirror:custom:distributions/php-%v.tar.gz
-Source-MD5: a5dfdd41ccf539942db966310f7429da
+Source-MD5: bf842770ac64a47ff599f463e6cf1334
 Source2: mirror:debian:/pool/main/p/php5/php5_%v+dfsg-1.debian.tar.gz
-Source2-MD5: 6988c4ad9f9ddb37c7f04c91542cbc7b
+Source2-MD5: f19ab743f1f7d98fe0ffda2afba822f9
 Source2ExtractDir: php-%v
 PatchFile: %n.patch
-PatchFile-MD5: 0db6ab20012e4a9542c6cdd521a00bb8
+PatchFile-MD5: a8e912944940774a04dc44c6d43fcd93
 PatchScript: <<
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
   ### Apply some Debian Patches for Security and Build Issues
-  patch -p1 < fink/patches/001-libtool_fixes.patch
-  patch -p1 < fink/patches/002-static_openssl.patch
-  patch -p1 < fink/patches/004-ldap_fix.patch
+  patch -p1 < debian/patches/001-libtool_fixes.patch
+  patch -p1 < debian/patches/002-static_openssl.patch
 ### Use fink_quirks.patch instead
-#  patch -p1 < fink/patches/006-debian_quirks.patch
+#  patch -p1 < debian/patches/006-debian_quirks.patch
   patch -p1 < fink/patches/fink_quirks.patch
-  patch -p1 < fink/patches/libtool2.2.patch
-  patch -p1 < fink/patches/033-we_WANT_libtool.patch
-  patch -p1 < fink/patches/036-fd_setsize_fix.patch
-  patch -p1 < fink/patches/043-recode_size_t.patch
-  patch -p1 < fink/patches/044-strtod_arm_fix.patch
-  patch -p1 < fink/patches/045-exif_nesting_level.patch
-  patch -p1 < fink/patches/047-zts_with_dl.patch
-  patch -p1 < fink/patches/052-phpinfo_no_configure.patch
-  patch -p1 < fink/patches/053-extension_api.patch
-  patch -p1 < fink/patches/057-no_apache_installed.patch
-  patch -p1 < fink/patches/100-recode_is_shared.patch
-  patch -p1 < fink/patches/108-64_bit_datetime.patch
-  patch -p1 < fink/patches/112-proc_open.patch
-  patch -p1 < fink/patches/113-php.ini_securitynotes.patch
-  patch -p1 < fink/patches/116-posixness_fix.patch
-  patch -p1 < fink/patches/libdb_is_-ldb
-  patch -p1 < fink/patches/fix_broken_upstream_tests.patch
-  patch -p1 < fink/patches/use_embedded_timezonedb.patch
-  patch -p1 < fink/patches/force_libmysqlclient_r.patch
-  patch -p1 < fink/patches/mssql-null-exception.patch
-  patch -p1 < fink/patches/sybase-alias.patch
-  patch -p1 < fink/patches/strcmp_null-OnUpdateErrorLog.patch
-#  patch -p1 < fink/patches/deprecate_short_open_tag
-  patch -p1 < fink/patches/fix_broken_5.3_tests.patch
-  patch -p1 < fink/patches/dont-gitclean-in-build.patch
-#  patch -p1 < fink/patches/broken_5.3_test-posix_uname.patch
-  patch -p1 < fink/patches/shtool_mkdir_-p_-race-condition.patch
-  patch -p1 < fink/patches/qdbm-is-usr_include_qdbm.patch
-  patch -p1 < fink/patches/use_embedded_timezonedb_fixes.patch
-  patch -p1 < fink/patches/fix_broken_sha2_test.patch
+  patch -p1 < debian/patches/libtool2.2.patch
+  patch -p1 < debian/patches/033-we_WANT_libtool.patch
+  patch -p1 < debian/patches/044-strtod_arm_fix.patch
+  patch -p1 < debian/patches/052-phpinfo_no_configure.patch
+  patch -p1 < debian/patches/053-extension_api.patch
+  patch -p1 < debian/patches/057-no_apache_installed.patch
+  patch -p1 < debian/patches/100-recode_is_shared.patch
+  patch -p1 < debian/patches/112-proc_open.patch
+  patch -p1 < debian/patches/113-php.ini_securitynotes.patch
+  patch -p1 < debian/patches/116-posixness_fix.patch
+  patch -p1 < debian/patches/libdb_is_-ldb
+  patch -p1 < debian/patches/fix_broken_upstream_tests.patch
+  patch -p1 < debian/patches/use_embedded_timezonedb.patch
+  patch -p1 < debian/patches/force_libmysqlclient_r.patch
+  patch -p1 < debian/patches/mssql-null-exception.patch
+  patch -p1 < debian/patches/sybase-alias.patch
+  patch -p1 < debian/patches/strcmp_null-OnUpdateErrorLog.patch
+#  patch -p1 < debian/patches/deprecate_short_open_tag
+  patch -p1 < debian/patches/fix_broken_5.3_tests.patch
+  patch -p1 < debian/patches/dont-gitclean-in-build.patch
+#  patch -p1 < debian/patches/broken_5.3_test-posix_uname.patch
+  patch -p1 < debian/patches/shtool_mkdir_-p_-race-condition.patch
+  patch -p1 < debian/patches/qdbm-is-usr_include_qdbm.patch
+  patch -p1 < debian/patches/use_embedded_timezonedb_fixes.patch
   patch -p1 < fink/patches/session_save_path.patch
-#  patch -p1 < fink/patches/install-programs_parallel_FTBFS.patch
-  patch -p1 < fink/patches/php-fpm-man-section-and-cleanup.patch
+#  patch -p1 < debian/patches/install-programs_parallel_FTBFS.patch
+  patch -p1 < debian/patches/php-fpm-man-section-and-cleanup.patch
   patch -p1 < fink/patches/fpm-config.patch
-  patch -p1 < fink/patches/php-fpm-sysconfdir.patch
-  patch -p1 < fink/patches/lp564920-fix-big-files.patch
-  patch -p1 < fink/patches/temporary-path-fixes-for-multiarch.patch
-  patch -p1 < fink/patches/gdIOCtx.patch
-  patch -p1 < fink/patches/hurd-noptrace.diff
+  patch -p1 < debian/patches/php-fpm-sysconfdir.patch
+  patch -p1 < debian/patches/lp564920-fix-big-files.patch
+  patch -p1 < debian/patches/temporary-path-fixes-for-multiarch.patch
+  patch -p1 < debian/patches/gdIOCtx.patch
+  patch -p1 < debian/patches/hurd-noptrace.diff
   patch -p1 < fink/patches/php-5.3.9-mysqlnd.patch
-  patch -p1 < fink/patches/php-5.3.9-gnusrc.patch
-  patch -p1 < fink/patches/php-5.3.3-macropen.patch
-  patch -p1 < fink/patches/php-5.2.4-norpath.patch
+  patch -p1 < debian/patches/php-5.3.9-gnusrc.patch
+  patch -p1 < debian/patches/php-5.3.3-macropen.patch
+  patch -p1 < debian/patches/php-5.2.4-norpath.patch
   patch -p1 < fink/patches/php-fpm-listen-on-unix-socket.patch
-  patch -p1 < 
fink/patches/0001-Add-information-about-which-INI-file-is-which-inside.patch
+  patch -p1 < 
debian/patches/0001-Add-information-about-which-INI-file-is-which-inside.patch
 ### Use php-5.2.4-embed-darwin.patch instead
-#  patch -p1 < fink/patches/php-5.2.4-embed.patch
-  patch -p1 < fink/patches/php-5.2.4-embed-darwin.patch
-  patch -p1 < fink/patches/php-5.4.0-dlopen.patch
-  patch -p1 < fink/patches/php-fpm-m68k.patch
-  patch -p1 < fink/patches/expose_all_built_and_installed_apis.patch
-  patch -p1 < fink/patches/Zend_OpCache_GNUHurd_fix.patch
+#  patch -p1 < debian/patches/php-5.2.4-embed.patch
+  patch -p1 < fink/patches/php-5.2.4-embed.patch
+  patch -p1 < debian/patches/php-5.4.0-dlopen.patch
+  patch -p1 < debian/patches/php-fpm-m68k.patch
+  patch -p1 < debian/patches/expose_all_built_and_installed_apis.patch
+  patch -p1 < debian/patches/Zend_OpCache_GNUHurd_fix.patch
 
 ### Fink Specific stuff
   patch -p1 < fink/patches/giconv_is_inferior.patch
@@ -195,7 +188,6 @@
   perl -pi -e 's,.libs,libs,g' debian/*.apache2
   cp fink/*.conf debian/
   cp fink/*.load debian/
-  cp fink/*.ini debian/
 
   ## Patch user out of autoscripts
   perl -pi -er out of 
autoscriptsn/*.apache2ch.patchpis.patchs-which-inside.patch’"_Î5+r©_Î5+*Ò_ÿ€*Ò_ÿu*_Î5+€J`Î5+E€Î5+’8|Ï5+€*Ò_ÿ€PžÏ5+pÒ_ÿ@Ò_ÿk@_Î5+6
 èè!è!*Ò_ÿ€*Ò_ÿxô{Ï5+p 
Ò_ÿ’"_Î5+†@_Î5+*Ò_ÿ`"_Î5+O*Ò_ÿÀïßÏ5+u*_Î5+àßÏ5+ØäßÏ5+¨éßÏ5+€J`Î5+xô{Ï5+p
 
Ò_ÿ@Ò_ÿk@_Î5+à!à!*Ò_ÿ€*Ò_ÿH¾[Ï5+P!Ò_ÿ’"_Î5+†@_Î5+*Ò_ÿ`"_Î5+O*Ò_ÿ@*Ò_ÿ8*Ò_ÿ8K€Î5+Œp˜€*Ò_ÿu*_Î5+€J`Î5+P!Ò_ÿ
  
Ò_ÿk@_Î5+GHIJKMNOP*Ò_ÿ€*Ò_ÿHu2Ï5+ð"Ò_ÿ’"_Î5+†@_Î5+*Ò_ÿ0ïßÏ5+u*_Î5+|Ï5+
 ©Ï5+àßÏ5+ØäßÏ5+¨éßÏ5+€J`Î5+Hu2Ï5+ð"Ò_ÿ
 
0!Ò_ÿk@_Î5+8u2Ï5+ð"Ò_ÿ`!Ò_ÿk@_Î5+(u2Ï5+ð"Ò_ÿ!Ò_ÿk@_Î5+u2Ï5+ð"Ò_ÿÀ!Ò_ÿk@_Î5+
      
¨îßÏ5+u*_Î5+¨éßÏ5+@Ò_ÿŠøÏ5+e)_Î5+ØäßÏ5+`"Ò_ÿyøÏ5+e)_Î5+àßÏ5+"Ò_ÿZøÏ5+e)_Î5+ؤÏ5+|Ï5+
 
©Ï5+àßÏ5+Ø|Ï5+ØäßÏ5+¨éßÏ5+€J`Î5+8K€Î5+mÛÎ5+€*Ò_ÿp;Ï5+@$Ò_ÿ#Ò_ÿk@_Î5+5678:<=>?@BD*Ò_ÿ€*Ò_ÿ
 
qØÎ5+€*Ò_ÿu*_Î5+E€Î5+À"Ò_ÿmÛÎ5+e)_Î5+E€Î5+Õ_@fÆS
 Qöl±í샧Î5+€*Ò_ÿ qØÎ5+P%Ò_ÿ 
$Ò_ÿk@_Î5+u]ÞÓ     4Q 
÷U^Qʉ§¶uª¹ñìò*ēv*Ò_ÿ€*Ò_ÿH¾¤Î5+`'Ò_ÿ’"_Î5+†@_Î5+*Ò_ÿ`"_Î5+O*Ò_ÿ@*Ò_ÿ8*Ò_ÿ|Ï5+u*_Î5+Ø|Ï5+
     |Ï5+€J`Î5+`'Ò_ÿ%Ò_
 ÿk@_Î5+8¾¤Î5+`'Ò_ÿ@%Ò_ÿk@e 's,\/usr,%p,g' 
debian/debhelper/*-php5
@@ -482,7 +474,7 @@
               -e 's/-d output_buffering=1 -d open_basedir="" -d safe_mode=0/-d 
output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
               %b/pear-build%p/bin/peardev
        sed -i -re "s#('PEAR_CONFIG_SYSCONFDIR', PHP_SYSCONFDIR)#\1 . '/pear'#" 
%b/pear-build%p/share/php/PEAR/Config.php
-       patch -s -d %b/pear-build%p/share/php/ -p1 -i 
%b/fink/patches/PEAR-Builder-print-info-about-php5-dev.patch
+       patch -s -d %b/pear-build%p/share/php/ -p1 -i 
%b/debian/patches/PEAR-Builder-print-info-about-php5-dev.patch
 }
 
 create_test_results() {
@@ -633,7 +625,7 @@
 for i in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-cli 
libphp5-embed%type_raw[embedver] php5-fpm; do \
        install -d -m755 debian/$i/${ext}; \
 done; \
-cat fink/modulelist fink/extramodulelist | while read package extname dsoname 
priority; do \
+cat debian/modulelist debian/extramodulelist | while read package extname 
dsoname priority; do \
        if [ "$package" = "mysqlnd" ]; then \
                modulepath=cgi-build/modules; \
        elif [ "$package" = "readline" ]; then \
@@ -728,12 +720,12 @@
 install -d -m755 debian/php5-dev%p/share/debhelper/autoscripts/
 install -m644 debian/debhelper/*-php5 
debian/php5-dev%p/share/debhelper/autoscripts/
 install -d -m755 debian/php5-dev%p/lib/perl5/Debian/Debhelper/Sequence
-install -m644 fink/debhelper/php5.pm 
debian/php5-dev%p/lib/perl5/Debian/Debhelper/Sequence
+install -m644 debian/debhelper/php5.pm 
debian/php5-dev%p/lib/perl5/Debian/Debhelper/Sequence
 
 # install common files
 install -d -m755 debian/php5-common%p/lib/php5
 install -m755 fink/maxlifetime debian/php5-common%p/lib/php5
-install -m755 fink/sessionclean debian/php5-common%p/lib/php5
+install -m755 debian/sessionclean debian/php5-common%p/lib/php5
 install -d -m755 debian/php5-common%p/sbin
 install -m755 fink/php5enmod debian/php5-common%p/sbin/php5enmod
 ln -s php5enmod debian/php5-common%p/sbin/php5dismod
@@ -767,7 +759,7 @@
 # binary-arch
 # generate the config snippets for various php
 # modules from the templates.
-cat fink/modulelist fink/extramodulelist | while read package extname dsoname 
priority extension; do \
+cat debian/modulelist debian/extramodulelist | while read package extname 
dsoname priority extension; do \
        if [ -z "${dsoname}" ]; then dsoname=$package; fi; \
        if [ -z "${priority}" ]; then priority=20; fi; \
        if [ -z "${extension}" ]; then extension=extension; fi; \
@@ -776,14 +768,14 @@
                s/@dsoname@/${dsoname}/g; \
                s/@extension@/${extension}/g; \
                s/@priority@/${priority}/g" \
-       < fink/php5-module.ini \
+       < debian/php5-module.ini \
        > debian/php5-${package}%p/share/php5/${package}/${dsoname}.ini; \
        /bin/echo -n "${dsoname} " >> fink/php5-${package}.modules; \
 done
 
 # generate the maintscripts for various php
 # modules from the templates.
-cat fink/modulelist | while read package extname dsoname priority; do \
+cat debian/modulelist | while read package extname dsoname priority; do \
        install -d -m755 debian/php5-${package}/DEBIAN; \
        modules=$(cat fink/php5-${package}.modules); \
        for script in postinst preinst postrm prerm; do \
@@ -838,7 +830,7 @@
        done; \
 done
 
-cat fink/modulelist | grep -v common | while read package extname dsoname 
priority; do \
+cat debian/modulelist | grep -v common | while read package extname dsoname 
priority; do \
        rm -rf debian/php5-$package%p/share/doc/php5-$package; \
        install -d -m755 debian/php5-$package%p/share/doc; \
        ln -s php5-common debian/php5-$package%p/share/doc/php5-$package; \
@@ -920,7 +912,6 @@
   Provides: dh-php5
   BuildDependsOnly: true
   Depends: <<
-       libtool2,
        %N-common (= %v-%r),
        lib%N-embed%type_raw[embedver] (= %v-%r)
   <<

Index: php5.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- php5.patch  20 Sep 2013 22:48:30 -0000      1.16
+++ php5.patch  11 Oct 2013 19:50:46 -0000      1.17
@@ -1,6 +1,6 @@
-diff -ruN php-5.5.3.orig/fink/debhelper/dh_php5 
php-5.5.3/fink/debhelper/dh_php5
---- php-5.5.3.orig/fink/debhelper/dh_php5      1969-12-31 17:00:00.000000000 
-0700
-+++ php-5.5.3/fink/debhelper/dh_php5   2013-08-08 09:43:29.000000000 -0600
+diff -ruN php-5.5.4.orig/fink/debhelper/dh_php5 
php-5.5.4/fink/debhelper/dh_php5
+--- php-5.5.4.orig/fink/debhelper/dh_php5      1969-12-31 17:00:00.000000000 
-0700
++++ php-5.5.4/fink/debhelper/dh_php5   2013-08-08 09:43:29.000000000 -0600
 @@ -0,0 +1,430 @@
 +#! /usr/bin/perl
 +
@@ -432,9 +432,9 @@
 +}
[...5585 lines suppressed...]
-diff -ruN php-5.5.3.orig/fink/sessionclean php-5.5.3/fink/sessionclean
---- php-5.5.3.orig/fink/sessionclean   1969-12-31 17:00:00.000000000 -0700
-+++ php-5.5.3/fink/sessionclean        2013-08-08 10:15:17.000000000 -0600
-@@ -0,0 +1,7 @@
-+#!/bin/sh
-+
-+# first find all used files and touch them (hope it's not massive amount of 
files)
-+[ -x /usr/sbin/lsof ] && /usr/sbin/lsof -w -l +d "${1}" | awk -- '{ if (NR > 
1) { print $9; } }' | /usr/bin/xargs -I 'touch -c {}'
-+
-+# find all files older then maxlifetime
-+find "${1}" -depth -mindepth 1 -maxdepth 1 -type f -ignore_readdir_race -cmin 
+${2} -delete
-diff -ruN php-5.5.3.orig/fink/setup-mysql.sh php-5.5.3/fink/setup-mysql.sh
---- php-5.5.3.orig/fink/setup-mysql.sh 1969-12-31 17:00:00.000000000 -0700
-+++ php-5.5.3/fink/setup-mysql.sh      2013-08-13 21:06:13.000000000 -0600
+diff -ruN php-5.5.4.orig/fink/setup-mysql.sh php-5.5.4/fink/setup-mysql.sh
+--- php-5.5.4.orig/fink/setup-mysql.sh 1969-12-31 17:00:00.000000000 -0700
++++ php-5.5.4/fink/setup-mysql.sh      2013-08-13 21:06:13.000000000 -0600
 @@ -0,0 +1,78 @@
 +#!/bin/sh
 +



------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to