- up to 2.4.59

[packages/apache.git] / apache-apxs.patch

diff --git a/apache-apxs.patch b/apache-apxs.patch
index 08f4567ee3ee699be94af9cdcbace021866f79dc..7dc3930e3cf0260234fe996334029c8db030e8af 100644 (file)
--- a/apache-apxs.patch
+++ b/apache-apxs.patch
@@ -1,47 +1,39 @@
---- httpd-2.0.50/support/apxs.in.orig  2004-07-25 21:25:37.955097000 +0000
-+++ httpd-2.0.50/support/apxs.in       2004-07-25 22:25:01.093725664 +0000
-@@ -198,11 +198,10 @@
-     ($httpd = $0) =~ s:support/apxs$::;
- }
- 
--unless (-x "$httpd") {
--      error("$httpd not found or not executable");
--      exit 1;
-+if (not -x "$httpd") {
-+      print STDERR "Note: $httpd not found or not executable.\n";
- }
--
-+else {
- unless (grep /mod_so/, `. $envvars && $httpd -l`) {
-     error("Sorry, no shared object support for Apache");
-     error("available under your platform. Make sure");
-@@ -210,7 +209,7 @@
-     error("your server binary `$httpd'.");
-     exit 1;
- }
--
-+}
- sub get_config_vars{
-     my ($file, $rh_config) = @_;
- 
---- httpd-2.2.0/support/apxs.in        2005-12-27 00:22:41.000000000 +0200
-+++ /usr/sbin/apxs     2005-12-28 16:06:45.000000000 +0200
-@@ -44,6 +44,7 @@
+diff -urNp -x '*.orig' httpd-2.4.46.org/support/apxs.in httpd-2.4.46/support/apxs.in
+--- httpd-2.4.46.org/support/apxs.in   2020-03-20 14:00:44.000000000 +0100
++++ httpd-2.4.46/support/apxs.in       2021-06-16 09:20:17.513003551 +0200
+@@ -45,6 +45,7 @@ my $CFG_PREFIX     = $prefix;
+ my $exec_prefix    = get_vars("exec_prefix");
+ my $datadir        = get_vars("datadir");
+ my $localstatedir  = get_vars("localstatedir");
++my $libdir       = get_vars("libdir");
+ my $CFG_TARGET     = get_vars("progname");
+ my $CFG_SYSCONFDIR = get_vars("sysconfdir");
+ my $CFG_CFLAGS     = join ' ', map { get_vars($_) }
+@@ -56,6 +57,7 @@ my $CFG_INCLUDEDIR = eval qq("$includedi
  my $CFG_CC         = get_vars("CC");
- my $libexecdir     = get_vars("libexecdir");
+ my $libexecdir     = $destdir . get_vars("libexecdir");
  my $CFG_LIBEXECDIR = eval qq("$libexecdir");
-+my $DESTDIR        = $ENV{'DESTDIR'};
++my $CFG_DESTDIR    = '';
  my $sbindir        = get_vars("sbindir");
  my $CFG_SBINDIR    = eval qq("$sbindir");
  my $ltflags        = $ENV{'LTFLAGS'};
-@@ -478,8 +479,8 @@
+@@ -183,7 +185,7 @@ if (@opt_S) {
+           my ($val) = $2;
+           my $oldval = eval "\$CFG_$var";
+ 
+-          unless ($var and $oldval) {
++          unless ($var and defined $oldval) {
+               print STDERR "apxs:Error: no config variable $var\n";
+               &usage;
+           }
+@@ -512,8 +514,8 @@ if ($opt_i or $opt_e) {
          $t =~ s|\.[^./\\]+$|\.so|;
          if ($opt_i) {
-           push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
+           push(@cmds, $destdir . "$installbuilddir/instdso.sh SH_LIBTOOL='" .
 -                 "$libtool' $f $CFG_LIBEXECDIR");
 -          push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
-+                 "$libtool' $f $DESTDIR$CFG_LIBEXECDIR");
-+          push(@cmds, "chmod 755 $DESTDIR$CFG_LIBEXECDIR/$t");
++                 "$libtool' $f $CFG_DESTDIR$CFG_LIBEXECDIR");
++          push(@cmds, "chmod 755 $CFG_DESTDIR$CFG_LIBEXECDIR/$t");
          }
  
          #   determine module symbolname and filename