- updated for 1.30

Changed files:
    apache-perl-rh.patch -> 1.2
    apache1-mod_perl-optimize.patch -> 1.2

diff --git a/apache-perl-rh.patch b/apache-perl-rh.patch
index 5fdbf5907e2ac65a06edae5a8de3d907bbe574d0..b8b64c6c257d6192b403d1fd9403da8a306820bc 100644 (file)
--- a/apache-perl-rh.patch
+++ b/apache-perl-rh.patch
@@ -1,6 +1,6 @@
---- mod_perl-1.16/Makefile.PL.rh       Fri Oct  2 18:50:15 1998
-+++ mod_perl-1.16/Makefile.PL  Mon Dec 21 11:51:46 1998
-@@ -244,6 +244,7 @@
+--- mod_perl-1.30/Makefile.PL.orig     2007-03-30 07:12:49.000000000 +0200
++++ mod_perl-1.30/Makefile.PL  2007-11-04 18:49:50.747251450 +0100
+@@ -300,6 +300,7 @@
  $callback_alias{PERL_CLEANUP} = "PERL_LOG";
  %callback_hooks = map { $_,0 } @callback_hooks;
  $callback_hooks{PERL_HANDLER} = 1; #PerlHandler always on
@@ -8,29 +8,12 @@
  %cant_hook = ();
  
  my @mm_args;
-@@ -317,11 +318,11 @@
- *          We recommend linking mod_perl static instead         *
- EOF
-     print "*" x 65, $/;
--    my $ans = prompt("Continue?", "n");
--    if($ans =~ /^n$/i) {
--        print "Aborting build process\n";
--        exit;
--    }
-+#    my $ans = prompt("Continue?", "n");
-+#    if($ans =~ /^n$/i) {
-+#        print "Aborting build process\n";
-+#        exit;
-+#    }
+@@ -476,7 +477,7 @@
  }
  
- if($USE_APXS) {
-@@ -356,7 +357,7 @@
- }
- 
- if($EVERYTHING) {
+ if ($EVERYTHING) {
 -    @callback_hooks{qw(PERL_STACKED_HANDLERS PERL_METHOD_HANDLERS)} = (1) x 2;
-+    @callback_hooks{qw(PERL_METHOD_HANDLERS)} = (1) x 2;
-     for(qw(ALL_HOOKS PERL_SSI PERL_SECTIONS PERL_DIRECTIVE_HANDLERS 
-          PERL_LOG_API PERL_URI_API PERL_UTIL_API PERL_TABLE_API PERL_FILE_API)) {
-        $$_ = 1;
++    @callback_hooks{qw(PERL_METHOD_HANDLERS)} = (1);
+     for (qw(
+            ALL_HOOKS PERL_SSI PERL_SECTIONS PERL_DIRECTIVE_HANDLERS
+            PERL_LOG_API PERL_URI_API PERL_UTIL_API PERL_TABLE_API PERL_FILE_API

diff --git a/apache1-mod_perl-optimize.patch b/apache1-mod_perl-optimize.patch
index a3ed7ed39ecee7dcc9fbf1baf92f9a226a6dddba..ffcff421211c3fa7aaef971324947ee0df8679e7 100644 (file)
--- a/apache1-mod_perl-optimize.patch
+++ b/apache1-mod_perl-optimize.patch
@@ -1,35 +1,25 @@
-diff -ur mod_perl-1.29.orig/Makefile.PL mod_perl-1.29/Makefile.PL
---- mod_perl-1.29.orig/Makefile.PL     2003-11-21 14:50:04.000000000 +0000
-+++ mod_perl-1.29/Makefile.PL  2003-11-21 15:32:07.000000000 +0000
-@@ -1420,16 +1420,16 @@
+--- mod_perl-1.30/Makefile.PL.orig     2007-11-04 18:50:38.513973519 +0100
++++ mod_perl-1.30/Makefile.PL  2007-11-04 18:54:54.052535832 +0100
+@@ -1458,16 +1458,16 @@
        (cd ./apaci && $(MAKE) distclean)
  
  apxs_libperl:
--      (cd ./apaci && $(PERL5LIB) $(MAKE))
-+      (cd ./apaci && $(PERL5LIB) $(MAKE) OPTIMIZE="$(OPTIMIZE)")
+-      (cd ./apaci && $(PERL5LIB_ENV) $(MAKE))
++      (cd ./apaci && $(PERL5LIB_ENV) $(MAKE) OPTIMIZE="$(OPTIMIZE)")
  
  apxs_install: apxs_libperl
        (cd ./apaci && $(MAKE) install;)
  
  apache_httpd: $(APACHE_SRC)/Makefile.tmpl
--      (cd $(APACHE_SRC) && $(PERL5LIB) $(SHRPENV) $(MAKE) CC="$(CC)";)
-+      (cd $(APACHE_SRC) && $(PERL5LIB) $(SHRPENV) $(MAKE) CC="$(CC)" OPTIMIZE="$(OPTIMIZE)";)
+-      (cd $(APACHE_SRC) && $(PERL5LIB_ENV) $(SHRPENV) $(MAKE) CC="$(CC)";)
++      (cd $(APACHE_SRC) && $(PERL5LIB_ENV) $(SHRPENV) $(MAKE) CC="$(CC)" OPTIMIZE="$(OPTIMIZE)";)
  
  apaci_httpd: 
--      (cd $(APACHE_ROOT) && $(PERL5LIB) $(MAKE))
-+      (cd $(APACHE_ROOT) && $(PERL5LIB) $(MAKE) OPTIMIZE="$(OPTIMIZE)")
+-      (cd $(APACHE_ROOT) && $(PERL5LIB_ENV) $(MAKE))
++      (cd $(APACHE_ROOT) && $(PERL5LIB_ENV) $(MAKE) OPTIMIZE="$(OPTIMIZE)")
  
  apaci_install: 
        (cd $(APACHE_ROOT) && $(MAKE) install)
-@@ -1448,7 +1448,7 @@
-       -e 's,^$(APACHE_SRC),,;' \
-       -e 'system "echo src$$_ >> MANIFEST";' \
-       -e '}' 
--      $(MAKE) dist
-+      $(MAKE) dist OPTIMIZE="$(OPTIMIZE)"
-       $(RM_RF) src/include/
-       $(RM) src/Makefile.config
-       $(MV) MANIFEST.orig MANIFEST
 diff -ur mod_perl-1.29.orig/apaci/Makefile.tmpl mod_perl-1.29/apaci/Makefile.tmpl
 --- mod_perl-1.29.orig/apaci/Makefile.tmpl     2001-02-11 15:33:12.000000000 +0000
 +++ mod_perl-1.29/apaci/Makefile.tmpl  2003-11-21 15:23:36.000000000 +0000