Re: [UPDATE] php5 to version 5.1.2 (IMPORTANT)

2006-05-06 Thread Maxim Bourmistrov 
PHP 5.1.2 compiles and works fine on i386.
Tested only with simple phpinfo().
Extensions not tested.

Thanks for updates Robert!

//maxim

On Friday 28 April 2006 01:59, Robert Nagy wrote:
 Hi.
 
 Finally after fighting with pear I've managed to create a working update
 for the php5 port.
 The PHP guys have changed the installation method of pear to use some crappy
 PHP_Archive. With this move they broke the installation of pear on serveral
 linux distros (e.g. Frugalware), OpenDarwin and on OpenBSD of course.
 Any other crappy package managements where they install files directly to 
 ${LOCALBASE}
 this was not an issue. When others reported this issue they just closed the 
 bugreport
 and did nothing. When I told them that it is fucked, they did nothing. This 
 is sad.
 A PHP guy told me that they will totally remove PEAR from the PHP tarball and
 people must install it sperately. (With go-pear or something.) They are just
 making the installation method worse every time.
 
 How does it work now?
 Well I went back to the old installation method of pear. From now on pear 
 comes 
 with a separate distfile. This distfile contains the old install-pear.php, the
 needed tarballs (PEAR, Archive_Tar, Console_Getopt...) and a patch which is
 applied at pre-configure time. This patch is needed to use our special pear
 directories and stuff. (These patches were in the php port itself but I moved 
 them.)
 Everything seems backward compatible so you can upgarde safely.
 Please test this diff as much as you can (with different FLAVORS) because it 
 is important
 to get this php update in. Thank you.
 
 P.S.: mbalmer and i want to rework the pear infrastructure and i hope we can 
 create
 some ideas together at c2k6. But for now, just test the diff please. :)
 And be sure to CC me if you report something because I am going to miss mails 
 on
 lists like [EMAIL PROTECTED]
 
 Index: Makefile.inc
 ===
 RCS file: /cvs/ports/www/php5/Makefile.inc,v
 retrieving revision 1.7
 diff -u -r1.7 Makefile.inc
 --- Makefile.inc  29 Dec 2005 23:03:29 -  1.7
 +++ Makefile.inc  27 Apr 2006 23:54:31 -
 @@ -4,8 +4,8 @@
  # and has Apache that supports DSO's.
  NOT_FOR_ARCHS=   ${NO_SHARED_ARCHS}
  
 -V=   5.0.5
 -DISTNAME=php-${V}
 +V=   5.1.2
 +DISTNAME?=   php-${V}
  CATEGORIES=  www lang
  
  MAINTAINER=  Robert Nagy [EMAIL PROTECTED]
 @@ -15,6 +15,7 @@
   http://se.php.net/distributions/ \
   http://no.php.net/distributions/ \
   http://uk.php.net/distributions/
 +MASTER_SITES0=   http://anoncvs.silihost.hu/
  
  # UPGRADERS: please read BOTH the PHP and Zend licenses
  # and make sure they are safe before an upgrade
 Index: distinfo
 ===
 RCS file: /cvs/ports/www/php5/distinfo,v
 retrieving revision 1.7
 diff -u -r1.7 distinfo
 --- distinfo  29 Dec 2005 23:03:29 -  1.7
 +++ distinfo  27 Apr 2006 23:54:31 -
 @@ -1,4 +1,8 @@
 -MD5 (php-5.0.5.tar.gz) = ae36a2aa35cfaa58bdc5b9a525e6f451
 -RMD160 (php-5.0.5.tar.gz) = f94cd33d13a298b5b5d2389a2d2b2079fe231fce
 -SHA1 (php-5.0.5.tar.gz) = 031ac2b1f56f4f6b20b17206a52627790b51f3bb
 -SIZE (php-5.0.5.tar.gz) = 6082082
 +MD5 (pear-20060428.tar.gz) = 28ab6f44a90cbcb5dd9ed0aef32d2fa9
 +MD5 (php-5.1.2.tar.gz) = b5b6564e8c6a0d5bc1d2b4787480d792
 +RMD160 (pear-20060428.tar.gz) = 34bac3122dfc8218efdce0ea7df046da031e72e7
 +RMD160 (php-5.1.2.tar.gz) = 7cc4f943e9495d7a70304b1670aede00ea2a7af7
 +SHA1 (pear-20060428.tar.gz) = 09713b3052904c1c45acba015dc067ddad0136cb
 +SHA1 (php-5.1.2.tar.gz) = ff9d3ae3ccf6f1995f2b88f14703be7114b472bc
 +SIZE (pear-20060428.tar.gz) = 619353
 +SIZE (php-5.1.2.tar.gz) = 8064193
 Index: core/Makefile
 ===
 RCS file: /cvs/ports/www/php5/core/Makefile,v
 retrieving revision 1.13
 diff -u -r1.13 Makefile
 --- core/Makefile 8 Feb 2006 04:54:50 -   1.13
 +++ core/Makefile 27 Apr 2006 23:54:31 -
 @@ -1,4 +1,4 @@
 -# $OpenBSD: Makefile,v 1.13 2006/02/08 04:54:50 david Exp $
 +# $OpenBSD: Makefile,v 1.12 2005/12/29 23:03:29 sturm Exp $
  
  MULTI_PACKAGES=  -pear
  SUBPACKAGE?=
 @@ -7,6 +7,8 @@
  COMMENT-pear=base classes for common PHP tasks
  PKGNAME= php5-core-${V}
  FULLPKGNAME-pear= php5-pear-${V}
 +DISTFILES=   php-${V}.tar.gz \
 + pear-20060428.tar.gz:0
  
  CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
   --without-mysql \
 @@ -42,7 +44,7 @@
  PHPXS_SUBST+= -e 's,${i},${${i}},'
  .endfor
  
 -WANTLIB= c crypto des m ssl stdc++ z
 +WANTLIB= c crypto m ssl stdc++ z
  
  .if defined(PACKAGING)  !empty(SUBPACKAGE)
  PREFIX=  ${CHROOT_DIR}
 @@ -55,19 +57,36 @@
  
  pre-fake:
   ${INSTALL_DATA_DIR} ${PREFIX}/${APACHE_MODULE_SUBDIR}
 -
 -INSTALL_TARGET= install-pear install-headers install-build install-programs

Re: [UPDATE] php5 to version 5.1.2 (IMPORTANT)

2006-05-03 Thread Robert Nagy 
5.1.3 eerr.

Re: [UPDATE] php5 to version 5.1.2 (IMPORTANT)

2006-05-03 Thread Robert Nagy 
Hi.

5.0.3 is out so here is a new diff. Test it please.

Index: Makefile
===
RCS file: /cvs/ports/www/php5/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile2 Oct 2004 11:32:35 -   1.1.1.1
+++ Makefile3 May 2006 17:05:19 -
@@ -1,7 +1,9 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2004/10/02 11:32:35 robert Exp $
 
 SUBDIR += core
+SBUDIR += core,hardened
 SUBDIR += extensions
+SUBDIR += extensions,hardened
 SUBDIR += extensions,no_x11
 
 .include bsd.port.subdir.mk
Index: Makefile.inc
===
RCS file: /cvs/ports/www/php5/Makefile.inc,v
retrieving revision 1.7
diff -u -r1.7 Makefile.inc
--- Makefile.inc29 Dec 2005 23:03:29 -  1.7
+++ Makefile.inc3 May 2006 17:05:19 -
@@ -2,23 +2,24 @@
 
 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
-NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
+NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
 
-V= 5.0.5
-DISTNAME=  php-${V}
-CATEGORIES=www lang
-
-MAINTAINER=Robert Nagy [EMAIL PROTECTED]
-HOMEPAGE=  http://www.php.net/
-
-MASTER_SITES=  http://us2.php.net/distributions/ \
-   http://se.php.net/distributions/ \
-   http://no.php.net/distributions/ \
-   http://uk.php.net/distributions/
+V= 5.1.3
+DISTNAME?= php-${V}
+CATEGORIES=www lang
+
+MAINTAINER=Robert Nagy [EMAIL PROTECTED]
+HOMEPAGE=  http://www.php.net/
+
+MASTER_SITES=  http://us2.php.net/distributions/ \
+   http://se.php.net/distributions/ \
+   http://no.php.net/distributions/ \
+   http://uk.php.net/distributions/
+MASTER_SITES0= http://anoncvs.silihost.hu/
+MASTER_SITES1= http://www.hardened-php.net/
 
 # UPGRADERS: please read BOTH the PHP and Zend licenses
 # and make sure they are safe before an upgrade
-
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP= Yes
 PERMIT_DISTFILES_CDROM= Yes
@@ -41,6 +42,7 @@
 PHP_LDFLAGS=   -lstdc++ -lm
 .endif
 
+USE_LIBTOOL=   Yes
 CONFIGURE_STYLE=   autoconf
 AUTOCONF_VERSION=  2.52
 CONFIGURE_ENV=  CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
@@ -65,3 +67,14 @@
 CHECKSUM_FILE= ${.CURDIR}/../distinfo
 PATCH_LIST=${.CURDIR}/../patches/patch-* \
patch-*
+
+# the hardened flavor is used by both core and extensions
+FLAVORS+=  hardened
+FLAVOR?=
+
+.if ${FLAVOR:L:Mhardened}
+HARDENED_V=0.4.9
+PATCHFILES=hardening-patch-${V}-${HARDENED_V}.patch.gz:1
+SUPDISTFILES=  ${PATCHFILES}
+PATCH_DIST_STRIP=  -p1
+.endif
Index: distinfo
===
RCS file: /cvs/ports/www/php5/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo29 Dec 2005 23:03:29 -  1.7
+++ distinfo3 May 2006 17:05:19 -
@@ -1,4 +1,12 @@
-MD5 (php-5.0.5.tar.gz) = ae36a2aa35cfaa58bdc5b9a525e6f451
-RMD160 (php-5.0.5.tar.gz) = f94cd33d13a298b5b5d2389a2d2b2079fe231fce
-SHA1 (php-5.0.5.tar.gz) = 031ac2b1f56f4f6b20b17206a52627790b51f3bb
-SIZE (php-5.0.5.tar.gz) = 6082082
+MD5 (hardening-patch-5.1.3-0.4.9.patch.gz) = 5603a75a960a9a5ba32c697c7ec7fd9b
+MD5 (pear-20060428.tar.gz) = 28ab6f44a90cbcb5dd9ed0aef32d2fa9
+MD5 (php-5.1.3.tar.gz) = 6fa84f22af9dcfa50f901f6d0391b190
+RMD160 (hardening-patch-5.1.3-0.4.9.patch.gz) = 
0b798a0b03243fb8f6637241c4ed05b93cb012c0
+RMD160 (pear-20060428.tar.gz) = 34bac3122dfc8218efdce0ea7df046da031e72e7
+RMD160 (php-5.1.3.tar.gz) = 52d76288498b270e0b81d02ce85a52578c213a09
+SHA1 (hardening-patch-5.1.3-0.4.9.patch.gz) = 
cc939abae8b56c250e8354c88f7600b0e7917a53
+SHA1 (pear-20060428.tar.gz) = 09713b3052904c1c45acba015dc067ddad0136cb
+SHA1 (php-5.1.3.tar.gz) = ca1e61f9772cc82c2217bc674d63decbd442d963
+SIZE (hardening-patch-5.1.3-0.4.9.patch.gz) = 57748
+SIZE (pear-20060428.tar.gz) = 619353
+SIZE (php-5.1.3.tar.gz) = 7585574
Index: core/Makefile
===
RCS file: /cvs/ports/www/php5/core/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- core/Makefile   8 Feb 2006 04:54:50 -   1.13
+++ core/Makefile   3 May 2006 17:05:19 -
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2006/02/08 04:54:50 david Exp $
+# $OpenBSD: Makefile,v 1.12 2005/12/29 23:03:29 sturm Exp $
 
 MULTI_PACKAGES=-pear
 SUBPACKAGE?=
@@ -7,8 +7,10 @@
 COMMENT-pear=  base classes for common PHP tasks
 PKGNAME=   php5-core-${V}
 FULLPKGNAME-pear= php5-pear-${V}
+DISTFILES= php-${V}.tar.gz \
+   pear-20060428.tar.gz:0
 
-CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
+CONFIGURE_ARGS+=--with-apxs=/usr/sbin/apxs \
--without-mysql \

Re: [UPDATE] php5 to version 5.1.2 (IMPORTANT)

2006-05-01 Thread Robert Nagy 
Hi.

I haven't recieved a single test report, but I still get
letters about asking for an update. How's that?
This tarball also includes mysqli, fastcgi and hardened php support:
http://gi.unideb.hu/~robert/php.tar.gz

On (28/04/06 01:59), Robert Nagy wrote:
 Hi.
 
 Finally after fighting with pear I've managed to create a working update
 for the php5 port.
 The PHP guys have changed the installation method of pear to use some crappy
 PHP_Archive. With this move they broke the installation of pear on serveral
 linux distros (e.g. Frugalware), OpenDarwin and on OpenBSD of course.
 Any other crappy package managements where they install files directly to 
 ${LOCALBASE}
 this was not an issue. When others reported this issue they just closed the 
 bugreport
 and did nothing. When I told them that it is fucked, they did nothing. This 
 is sad.
 A PHP guy told me that they will totally remove PEAR from the PHP tarball and
 people must install it sperately. (With go-pear or something.) They are just
 making the installation method worse every time.
 
 How does it work now?
 Well I went back to the old installation method of pear. From now on pear 
 comes 
 with a separate distfile. This distfile contains the old install-pear.php, the
 needed tarballs (PEAR, Archive_Tar, Console_Getopt...) and a patch which is
 applied at pre-configure time. This patch is needed to use our special pear
 directories and stuff. (These patches were in the php port itself but I moved 
 them.)
 Everything seems backward compatible so you can upgarde safely.
 Please test this diff as much as you can (with different FLAVORS) because it 
 is important
 to get this php update in. Thank you.
 
 P.S.: mbalmer and i want to rework the pear infrastructure and i hope we can 
 create
 some ideas together at c2k6. But for now, just test the diff please. :)
 And be sure to CC me if you report something because I am going to miss mails 
 on
 lists like [EMAIL PROTECTED]
 
 Index: Makefile.inc
 ===
 RCS file: /cvs/ports/www/php5/Makefile.inc,v
 retrieving revision 1.7
 diff -u -r1.7 Makefile.inc
 --- Makefile.inc  29 Dec 2005 23:03:29 -  1.7
 +++ Makefile.inc  27 Apr 2006 23:54:31 -
 @@ -4,8 +4,8 @@
  # and has Apache that supports DSO's.
  NOT_FOR_ARCHS=   ${NO_SHARED_ARCHS}
  
 -V=   5.0.5
 -DISTNAME=php-${V}
 +V=   5.1.2
 +DISTNAME?=   php-${V}
  CATEGORIES=  www lang
  
  MAINTAINER=  Robert Nagy [EMAIL PROTECTED]
 @@ -15,6 +15,7 @@
   http://se.php.net/distributions/ \
   http://no.php.net/distributions/ \
   http://uk.php.net/distributions/
 +MASTER_SITES0=   http://anoncvs.silihost.hu/
  
  # UPGRADERS: please read BOTH the PHP and Zend licenses
  # and make sure they are safe before an upgrade
 Index: distinfo
 ===
 RCS file: /cvs/ports/www/php5/distinfo,v
 retrieving revision 1.7
 diff -u -r1.7 distinfo
 --- distinfo  29 Dec 2005 23:03:29 -  1.7
 +++ distinfo  27 Apr 2006 23:54:31 -
 @@ -1,4 +1,8 @@
 -MD5 (php-5.0.5.tar.gz) = ae36a2aa35cfaa58bdc5b9a525e6f451
 -RMD160 (php-5.0.5.tar.gz) = f94cd33d13a298b5b5d2389a2d2b2079fe231fce
 -SHA1 (php-5.0.5.tar.gz) = 031ac2b1f56f4f6b20b17206a52627790b51f3bb
 -SIZE (php-5.0.5.tar.gz) = 6082082
 +MD5 (pear-20060428.tar.gz) = 28ab6f44a90cbcb5dd9ed0aef32d2fa9
 +MD5 (php-5.1.2.tar.gz) = b5b6564e8c6a0d5bc1d2b4787480d792
 +RMD160 (pear-20060428.tar.gz) = 34bac3122dfc8218efdce0ea7df046da031e72e7
 +RMD160 (php-5.1.2.tar.gz) = 7cc4f943e9495d7a70304b1670aede00ea2a7af7
 +SHA1 (pear-20060428.tar.gz) = 09713b3052904c1c45acba015dc067ddad0136cb
 +SHA1 (php-5.1.2.tar.gz) = ff9d3ae3ccf6f1995f2b88f14703be7114b472bc
 +SIZE (pear-20060428.tar.gz) = 619353
 +SIZE (php-5.1.2.tar.gz) = 8064193
 Index: core/Makefile
 ===
 RCS file: /cvs/ports/www/php5/core/Makefile,v
 retrieving revision 1.13
 diff -u -r1.13 Makefile
 --- core/Makefile 8 Feb 2006 04:54:50 -   1.13
 +++ core/Makefile 27 Apr 2006 23:54:31 -
 @@ -1,4 +1,4 @@
 -# $OpenBSD: Makefile,v 1.13 2006/02/08 04:54:50 david Exp $
 +# $OpenBSD: Makefile,v 1.12 2005/12/29 23:03:29 sturm Exp $
  
  MULTI_PACKAGES=  -pear
  SUBPACKAGE?=
 @@ -7,6 +7,8 @@
  COMMENT-pear=base classes for common PHP tasks
  PKGNAME= php5-core-${V}
  FULLPKGNAME-pear= php5-pear-${V}
 +DISTFILES=   php-${V}.tar.gz \
 + pear-20060428.tar.gz:0
  
  CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
   --without-mysql \
 @@ -42,7 +44,7 @@
  PHPXS_SUBST+= -e 's,${i},${${i}},'
  .endfor
  
 -WANTLIB= c crypto des m ssl stdc++ z
 +WANTLIB= c crypto m ssl stdc++ z
  
  .if defined(PACKAGING)  !empty(SUBPACKAGE)
  PREFIX=  ${CHROOT_DIR}
 @@ -55,19 +57,36 @@
  
  pre-fake:
   ${INSTALL_DATA_DIR} ${PREFIX}/${APACHE_MODULE_SUBDIR}
 -