Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24859
Modified Files:
php5.info php5.patch
Log Message:
* Removed gd-libJPEG-Version.patch as it is no longer required
* Removed libxml2_ABIfix.patch as it is no longer required
* New upstream version 5.5.3+dfs
* Update patches for 5.5.3 release
* New upstream version 5.5.2+dfsg
* Update and refresh patches for 5.5.2 release
* Add handling for mpm_itk to libapache2-mod-php5{,filter}
(Closes: #720278)
* Add php5-readline to php5-cli Recommends to hint that it's needed
for functional php -a
Index: php5.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- php5.info 28 Aug 2013 15:40:28 -0000 1.19
+++ php5.info 9 Sep 2013 22:35:16 -0000 1.20
@@ -1,8 +1,8 @@
Info2: <<
Package: php5
-Version: 5.5.1
-Revision: 2.1
-Type: sapiver (20121212)
+Version: 5.5.3
+Revision: 1.1
+Type: sapiver (20121212), embedver (5)
###
BuildDepends: <<
fink (>= 0.34.99.git),
@@ -119,12 +119,12 @@
<<
###
Source: mirror:custom:distributions/php-%v.tar.gz
-Source-MD5: a7d9598c0e60b47960b8e803e51c4309
+Source-MD5: a5dfdd41ccf539942db966310f7429da
Source2: mirror:debian:/pool/main/p/php5/php5_%v+dfsg-1.debian.tar.gz
-Source2-MD5: 690d4b78319a0a57d0c224fe976bb536
+Source2-MD5: 6988c4ad9f9ddb37c7f04c91542cbc7b
Source2ExtractDir: php-%v
PatchFile: %n.patch
-PatchFile-MD5: 8b67afe7604c279ef49b96da926d8892
+PatchFile-MD5: e9b283912e327d58b51851884b1318c4
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
@@ -190,8 +190,6 @@
### Fink Specific stuff
patch -p1 < fink/patches/giconv_is_inferior.patch
- ##patch -p1 < fink/patches/gd-libJPEG-Version.patch
- ##patch -p1 < fink/patches/libxml2_ABIfix.patch
## Patch debian dir for debhelper stuff
perl -pi -e 's,.libs,libs,g' debian/*.apache2
@@ -575,8 +573,8 @@
install -m644 fink/debhelper/php5-maintscript-helper
debian/php5-common%p/share/php5/
# install embed SAPI
-install -d -m755 debian/libphp5-embed4
-cd embed-build && make install-headers install-build install-sapi
install-programs INSTALL_ROOT=%b/debian/libphp5-embed4
+install -d -m755 debian/libphp5-embed%type_raw[embedver]
+cd embed-build && make install-headers install-build install-sapi
install-programs INSTALL_ROOT=%b/debian/libphp5-embed%type_raw[embedver]
# install the apache modules' files
install -d -m755 debian/libapache2-mod-php5
@@ -626,7 +624,7 @@
# install extensions
ext=`debian/libapache2-mod-php5%p/bin/php-config --extension-dir`;\
-for i in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-cli
libphp5-embed4 php5-fpm; do \
+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 \
@@ -674,14 +672,14 @@
install -m 755 fink/php5-fpm-checkconf debian/php5-fpm%p/lib/php5/
# move and install -dev files
-cp -a debian/libphp5-embed4/* debian/php5-dev/
+cp -a debian/libphp5-embed%type_raw[embedver]/* debian/php5-dev/
cp -a debian/libapache2-mod-php5/* debian/php5-dev/
-rm -rf debian/libphp5-embed4%p/include/ \
- debian/libphp5-embed4%p/bin/ \
- debian/libphp5-embed4%p/lib/php5/build/ \
- debian/libphp5-embed4%p/lib/php5/%type_raw[sapiver] \
- debian/libphp5-embed4%p/lib/libphp5.dylib \
- debian/libphp5-embed4%p/share/man/
+rm -rf debian/libphp5-embed%type_raw[embedver]%p/include/ \
+ debian/libphp5-embed%type_raw[embedver]%p/bin/ \
+ debian/libphp5-embed%type_raw[embedver]%p/lib/php5/build/ \
+ debian/libphp5-embed%type_raw[embedver]%p/lib/php5/%type_raw[sapiver] \
+ debian/libphp5-embed%type_raw[embedver]%p/lib/libphp5.dylib \
+ debian/libphp5-embed%type_raw[embedver]%p/share/man/
rm -rf debian/libapache2-mod-php5%p/lib/php5/build/ \
debian/libapache2-mod-php5%p/include/ \
debian/libapache2-mod-php5%p/bin/ \
@@ -736,8 +734,8 @@
install -m755 fink/php5query debian/php5-common%p/sbin/php5query
# remove libtool files
-rm -f debian/libphp5-embed4%p/lib/libphp5.la
-rm -rf debian/libphp5-embed4%p/lib/php5
+rm -f debian/libphp5-embed%type_raw[embedver]%p/lib/libphp5.la
+rm -rf debian/libphp5-embed%type_raw[embedver]%p/lib/php5
# directories cleanup:
rm -rf debian/php-pear%p/share/lintian
@@ -809,16 +807,16 @@
touch debian/php5-${sapi}%p/share/php5/sapi/${sapi}; \
done; \
for sapi in embed; do \
- install -d -m755 debian/libphp5-${sapi}4/DEBIAN; \
+ install -d -m755
debian/libphp5-${sapi}%type_raw[embedver]/DEBIAN; \
sed -e "s/@sapi@/${sapi}/g; \
- s/@package@/libphp5-${sapi}4/g; \
+ s/@package@/libphp5-${sapi}%type_raw[embedver]/g; \
/#EXTRA#/ r fink/libphp5-${sapi}.${tmpl}.extra" \
< fink/php5-sapi.${tmpl} \
| sed -e '/#EXTRA#/ d' \
- > debian/libphp5-${sapi}4/DEBIAN/${tmpl}; \
- chmod 775 debian/libphp5-${sapi}4/DEBIAN/${tmpl}; \
- install -d -m755 debian/libphp5-${sapi}4%p/share/php5/sapi; \
- touch debian/libphp5-${sapi}4%p/share/php5/sapi/${sapi}; \
+ > debian/libphp5-${sapi}%type_raw[embedver]/DEBIAN/${tmpl}; \
+ chmod 775
debian/libphp5-${sapi}%type_raw[embedver]/DEBIAN/${tmpl}; \
+ install -d -m755
debian/libphp5-${sapi}%type_raw[embedver]%p/share/php5/sapi; \
+ touch
debian/libphp5-${sapi}%type_raw[embedver]%p/share/php5/sapi/${sapi}; \
done; \
for sapi in "" "filter"; do \
install -d -m755 debian/libapache2-mod-php5${sapi}/DEBIAN; \
@@ -840,7 +838,7 @@
ln -s php5-common debian/php5-$package%p/share/doc/php5-$package; \
done
-for package in php5-dbg php5-dev php5-cgi php5-cli php5-fpm
libapache2-mod-php5 libapache2-mod-php5filter libphp5-embed4; do \
+for package in php5-dbg php5-dev php5-cgi php5-cli php5-fpm
libapache2-mod-php5 libapache2-mod-php5filter libphp5-embed%type_raw[embedver];
do \
rm -rf debian/$package%p/share/doc/$package; \
install -d -m755 debian/$package%p/share/doc; \
ln -s php5-common debian/$package%p/share/doc/$package; \
@@ -867,10 +865,10 @@
install -d -m755
debian/libapache2-mod-php5filter%p/etc/php5/apache2filter/conf.d
install -d -m755 debian/libapache2-mod-php5filter%p/lib/apache2/modules
-#libphp5-embed4.dirs
-install -d -m755 debian/libphp5-embed4%p/etc/php5/embed
-install -d -m755 debian/libphp5-embed4%p/etc/php5/embed/conf.d
-install -d -m755 debian/libphp5-embed4%p/lib
+#libphp5-embed.dirs
+install -d -m755 debian/libphp5-embed%type_raw[embedver]%p/etc/php5/embed
+install -d -m755
debian/libphp5-embed%type_raw[embedver]%p/etc/php5/embed/conf.d
+install -d -m755 debian/libphp5-embed%type_raw[embedver]%p/lib
#php5-cgi.dirs
install -d -m755 debian/php5-cgi%p/etc/apache2/conf-available
@@ -916,7 +914,7 @@
BuildDependsOnly: true
Depends: <<
%N-common (= %v-%r),
- lib%N-embed4 (= %v-%r)
+ lib%N-embed%type_raw[embedver] (= %v-%r)
<<
DescUsage: <<
To use phpize you will need libtool2, since it is a BOD package you need to
@@ -965,7 +963,7 @@
<<
<<
SplitOff2: <<
- Package: lib%N-embed4
+ Package: lib%N-embed%type_raw[embedver]
Provides: phpapi-%type_raw[sapiver]
Replaces: lib%N-embed (<< 5.5.1)
Conflicts: lib%N-embed (<< 5.5.1)
@@ -978,7 +976,7 @@
libiconv,
libonig2-shlibs,
libpcre1-shlibs,
- libxml2-shlibs (>= 2.9.1-1)
+ libxml2-shlibs (>= 2.9.1-1),
openssl100-shlibs,
qdbm14-shlibs
<<
@@ -987,12 +985,12 @@
cp -a debian/%n/DEBIAN/* %i/../DEBIAN/
<<
Shlibs: <<
- %p/lib/libphp5.4.dylib 6.0.0 libphp5-embed4 (>= 5.5.1-1)
+ %p/lib/libphp5.5.dylib 6.0.0 libphp5-embed%type_raw[embedver] (>= 5.5.1-1)
<<
Description: HTML-embedded scripting language (Embedded SAPI library)
DescDetail: <<
This package provides the libphp5 dylib which can be used by
-application developers to embed4 PHP scripting functionality.
+application developers to embed%type_raw[embedver] PHP scripting functionality.
.
PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used open
source general-purpose scripting language that is especially suited for web
@@ -1825,6 +1823,7 @@
openssl100-shlibs,
qdbm14-shlibs
<<
+ Recommends: %N-readline
InstallScript: <<
cp -a debian/%n%p/* %i/
cp -a debian/%n/DEBIAN/* %i/../DEBIAN/
Index: php5.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- php5.patch 16 Aug 2013 23:25:10 -0000 1.14
+++ php5.patch 9 Sep 2013 22:35:16 -0000 1.15
@@ -1,6 +1,6 @@
-diff -ruN php-5.5.1.orig/fink/debhelper/dh_php5
php-5.5.1/fink/debhelper/dh_php5
---- php-5.5.1.orig/fink/debhelper/dh_php5 1969-12-31 17:00:00.000000000
-0700
-+++ php-5.5.1/fink/debhelper/dh_php5 2013-08-08 09:43:29.000000000 -0600
+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
@@ -0,0 +1,430 @@
+#! /usr/bin/perl
+
@@ -432,9 +432,9 @@
+}
[...1782 lines suppressed...]
-+++ php-5.5.1/fink/sessionclean 2013-08-08 10:15:17.000000000 -0600
+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
+
@@ -7751,9 +7655,9 @@
+
+# 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.1.orig/fink/setup-mysql.sh php-5.5.1/fink/setup-mysql.sh
---- php-5.5.1.orig/fink/setup-mysql.sh 1969-12-31 17:00:00.000000000 -0700
-+++ php-5.5.1/fink/setup-mysql.sh 2013-08-13 21:06:13.000000000 -0600
+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
@@ -0,0 +1,78 @@
+#!/bin/sh
+
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=51271111&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
