updated to 4.0.5

Changed files:
    php-DESTDIR.patch -> 1.2
    php-imap.patch -> 1.4

diff --git a/php-DESTDIR.patch b/php-DESTDIR.patch
index ba57a2e3987f47464fde060b2444347240e1d92a..bbbe173938fe023bf3599954cdeca408696f3fd1 100644 (file)
--- a/php-DESTDIR.patch
+++ b/php-DESTDIR.patch
@@ -1,54 +1,7 @@
---- php4-4.0.4final.orig/Makefile.in
-+++ php4-4.0.4final/Makefile.in
-@@ -1,4 +1,4 @@
--
-+DESTDIR =
- ZEND_DIR = $(srcdir)/Zend
- SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
- 
-@@ -32,7 +32,7 @@
- 
- install-sapi:
-       @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
--      -@$(mkinstalldirs) $(bindir)
-+      -@$(mkinstalldirs) $(DESTDIR)$(bindir)
-       -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
-               for i in 0.0.0 0.0 0; do \
-                       if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
-@@ -45,10 +45,10 @@
- 
- install-modules:
-       @test -d modules && \
--      $(mkinstalldirs) $(moduledir) && \
-+      $(mkinstalldirs) $(DESTDIR)$(moduledir) && \
-       echo "installing shared modules into $(moduledir)" && \
-       rm -f modules/*.la && \
--      cp modules/* $(moduledir) >/dev/null 2>&1 || true
-+      cp modules/* $(DESTDIR)$(moduledir) >/dev/null 2>&1 || true
- 
- install-su: install-modules
-       (cd pear && $(MAKE) install)
---- php4-4.0.4final.orig/pear/Makefile.in
-+++ php4-4.0.4final/pear/Makefile.in
-@@ -17,6 +17,7 @@
-       File \
-       HTML \
-       Mail \
-+      Math \
-       Net \
-       Payment \
-       PEAR \
-@@ -45,6 +46,8 @@
-       Mail.php \
-       Mail/sendmail.php \
-       Mail/smtp.php \
-+      Math/Fraction.php \
-+      Math/Util.php \
-       Net/SMTP.php \
-       Net/Socket.php \
-       PEAR/Installer.php \
-@@ -52,24 +55,24 @@
-       XML/Parser.php
+--- php-4.0.5/pear/Makefile.in.wiget   Mon Mar 12 20:35:28 2001
++++ php-4.0.5/pear/Makefile.in Fri May  4 13:12:17 2001
+@@ -94,24 +94,24 @@
+       XML/RPC.php
  
  install-data-local: PEAR.php
 -      @if $(mkinstalldirs) $(peardir); then \
@@ -78,8 +31,8 @@
  
  BUILD_FILES = \
        pear/pear.m4 \
-@@ -89,13 +92,13 @@
- bin_PROGRAMS = phpize php-config pear
+@@ -131,15 +131,15 @@
+ bin_SCRIPTS = phpize php-config pear
  
  install-build:
 -      $(mkinstalldirs) $(phpbuilddir) $(bindir) && \
@@ -88,15 +41,17 @@
 +      (cd $(top_srcdir) && cp $(BUILD_FILES) $(DESTDIR)$(phpbuilddir))
  
  install-programs:
--      $(INSTALL) -m 755 $(srcdir)/phpextdist $(bindir)/phpextdist
-+      $(INSTALL) -m 755 $(srcdir)/phpextdist $(DESTDIR)$(bindir)/phpextdist
-       for prog in $(bin_PROGRAMS); do \
--              $(INSTALL) -m 755 $$prog $(bindir)/$$prog; \
-+              $(INSTALL) -m 755 $$prog $(DESTDIR)$(bindir)/$$prog; \
+       for prog in $(bin_SCRIPTS); do \
+-              $(INSTALL) -m 755 scripts/$$prog $(bindir)/$$prog; \
++              $(INSTALL) -m 755 scripts/$$prog $(DESTDIR)$(bindir)/$$prog; \
+       done; \
+       for prog in phpextdist; do \
+-              $(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(bindir)/$$prog; \
++              $(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(DESTDIR)$(bindir)/$$prog; \
        done
  
  HEADER_DIRS = \
-@@ -111,13 +114,13 @@
+@@ -155,13 +155,13 @@
  
  install-headers:
        -@for i in $(HEADER_DIRS); do \
@@ -113,4 +68,33 @@
        done
  
  Makefile: Makefile.in $(top_builddir)/config.status
-
+--- php-4.0.5/Makefile.in.wiget        Tue Mar 20 19:15:10 2001
++++ php-4.0.5/Makefile.in      Fri May  4 13:09:20 2001
+@@ -1,4 +1,4 @@
+-
++DESTDIR =
+ ZEND_DIR = $(srcdir)/Zend
+ SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
+ 
+@@ -32,7 +32,7 @@
+ 
+ install-sapi:
+       @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
+-      -@$(mkinstalldirs) $(bindir)
++      -@$(mkinstalldirs) $(DESTDIR)$(bindir)
+       -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
+               for i in 0.0.0 0.0 0; do \
+                       if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
+@@ -45,10 +45,10 @@
+ 
+ install-modules:
+       @test -d modules && \
+-      $(mkinstalldirs) $(moduledir) && \
++      $(mkinstalldirs) $(DESTDIR)$(moduledir) && \
+       echo "installing shared modules into $(moduledir)" && \
+       rm -f modules/*.la && \
+-      cp modules/* $(moduledir) >/dev/null 2>&1 || true
++      cp modules/* $(DESTDIR)$(moduledir) >/dev/null 2>&1 || true
+ 
+ install-su: install-modules
+       (cd pear && $(MAKE) install)

diff --git a/php-imap.patch b/php-imap.patch
index e508eb5389e4b291683b3f78795d8717155dc2b3..a4884e6078232441d7741047a91809d7971a5d2b 100644 (file)
--- a/php-imap.patch
+++ b/php-imap.patch
@@ -1,6 +1,6 @@
---- php-4.0RC2/ext/imap/php_imap.c.wiget       Tue May  2 02:44:23 2000
-+++ php-4.0RC2/ext/imap/php_imap.c     Thu May 11 03:30:48 2000
-@@ -386,25 +386,23 @@
+--- php-4.0.5/ext/imap/php_imap.c.wiget        Tue Apr 24 16:17:41 2001
++++ php-4.0.5/ext/imap/php_imap.c      Fri May  4 13:07:19 2001
+@@ -428,28 +428,28 @@
  
  
  #if 1
@@ -19,13 +19,18 @@
        mail_link(&mbxdriver);       /* link in the mbx driver */
        mail_link(&tenexdriver);     /* link in the tenex driver */
        mail_link(&mtxdriver);       /* link in the mtx driver */
++#endif
 -#ifndef PHP_WIN32
++#if 0
        mail_link(&mmdfdriver);      /* link in the mmdf driver */
        mail_link(&newsdriver);      /* link in the news driver */
        mail_link(&philedriver);     /* link in the phile driver */
--      auth_link(&auth_log);        /* link in the log authenticator */
++#endif
+       auth_link(&auth_log);        /* link in the log authenticator */
+ #ifdef  HAVE_IMAP_SSL
+       ssl_onceonlyinit ();
+       auth_link (&auth_ssl);       /* link in the ssl authenticator */
+-#endif
  #endif
-+      auth_link(&auth_log);        /* link in the log authenticator */
        mail_link(&dummydriver);     /* link in the dummy driver */
  #else
-       /* link in the c-client mail and auth drivers */