From 2eeb62e38ae17a3523ad3cd81c3de9f20f9e7742 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 25 May 2024 06:41:28 +0200
Subject: Adding debian version 2.4.59-1~deb10u1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/patches/customize_apxs.patch | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'debian/patches/customize_apxs.patch')

diff --git a/debian/patches/customize_apxs.patch b/debian/patches/customize_apxs.patch
index 9c75ff1..281b910 100644
--- a/debian/patches/customize_apxs.patch
+++ b/debian/patches/customize_apxs.patch
@@ -8,7 +8,7 @@ Last-Update: 2012-03-17
 
 --- a/support/apxs.in
 +++ b/support/apxs.in
-@@ -38,7 +38,7 @@
+@@ -48,7 +48,7 @@
  my $CFG_TARGET     = get_vars("progname");
  my $CFG_SYSCONFDIR = get_vars("sysconfdir");
  my $CFG_CFLAGS     = join ' ', map { get_vars($_) }
@@ -16,8 +16,8 @@ Last-Update: 2012-03-17
 +  qw(SHLTCFLAGS CFLAGS CPPFLAGS NOTEST_CPPFLAGS EXTRA_CPPFLAGS EXTRA_CFLAGS);
  my $CFG_LDFLAGS    = join ' ', map { get_vars($_) }
    qw(LDFLAGS NOTEST_LDFLAGS SH_LDFLAGS);
- my $includedir     = get_vars("includedir");
-@@ -49,7 +49,7 @@
+ my $includedir     = $destdir . get_vars("includedir");
+@@ -59,7 +59,7 @@
  my $sbindir        = get_vars("sbindir");
  my $CFG_SBINDIR    = eval qq("$sbindir");
  my $ltflags        = $ENV{'LTFLAGS'};
@@ -26,7 +26,7 @@ Last-Update: 2012-03-17
  
  my %internal_vars = map {$_ => 1}
      qw(TARGET CC CFLAGS CFLAGS_SHLIB LD_SHLIB LDFLAGS_SHLIB LIBS_SHLIB
-@@ -276,6 +276,7 @@
+@@ -286,6 +286,7 @@
      $data =~ s|%TARGET%|$CFG_TARGET|sg;
      $data =~ s|%PREFIX%|$prefix|sg;
      $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
@@ -34,7 +34,7 @@ Last-Update: 2012-03-17
  
      my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
  
-@@ -428,7 +429,7 @@
+@@ -438,7 +439,7 @@
          $la =~ s|\.c$|.la|;
          my $o = $s;
          $o =~ s|\.c$|.o|;
@@ -43,7 +43,7 @@ Last-Update: 2012-03-17
          unshift(@objs, $lo);
      }
  
-@@ -469,7 +470,7 @@
+@@ -479,7 +480,7 @@
          $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
      }
  
@@ -52,16 +52,16 @@ Last-Update: 2012-03-17
  
      #   execute the commands
      &execute_cmds(@cmds);
-@@ -503,7 +504,7 @@
+@@ -513,7 +514,7 @@
          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");
 +	    push(@cmds, "chmod 644 $CFG_LIBEXECDIR/$t");
          }
  
          #   determine module symbolname and filename
-@@ -539,10 +540,11 @@
+@@ -549,10 +550,11 @@
              $filename = "mod_${name}.c";
          }
          my $dir = $CFG_LIBEXECDIR;
@@ -75,7 +75,7 @@ Last-Update: 2012-03-17
      }
  
      #   execute the commands
-@@ -550,108 +552,35 @@
+@@ -560,108 +562,35 @@
  
      #   activate module via LoadModule/AddModule directive
      if ($opt_a or $opt_A) {
@@ -207,7 +207,7 @@ Last-Update: 2012-03-17
      }
  }
  
-@@ -671,8 +600,8 @@
+@@ -681,8 +610,8 @@
  ##
  
  builddir=.
-- 
cgit v1.2.3