[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 66d63a1381080be52ded9d1ca1e1df4ab0cdbed5
Arno Töll
debian at toell.net
Tue Mar 13 21:31:04 UTC 2012
The following commit has been merged in the next branch:
commit 66d63a1381080be52ded9d1ca1e1df4ab0cdbed5
Author: Arno Töll <debian at toell.net>
Date: Tue Mar 13 22:27:34 2012 +0100
Refactor patches (again)
* aggregate all apxs related patch into a single one, drop obsolete hunks
* give all patches a .patch sufifix, drop squence numbers quilt takes care about
the order
* Update references to the patch in debian/patches/series and debian/rules
diff --git a/debian/changelog b/debian/changelog
index 762a2d7..a9c97da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ apache2 (2.4.1-1) experimental; urgency=low
+ Supports CONNECT request through https. (Closes: #307298)
+ New Upstream (2.4). (Closes: #662115)
- * Refresh patches but leave all hunks unchanged where possible. Notable
- changes are:
+ * Refresh patches but leave all hunks unchanged where possible. Give all
+ * patches a ".patch" suffix, drop sequence numbers as they are not needed when
+ * using quilt. Notable changes are.
+ [AT] 202_suexec-custom: Keep functionality as is, but rewrite smaller
parts of the patch to build two binaries: suexec-pristine and
suexec-custom (see below)
@@ -32,8 +33,8 @@ apache2 (2.4.1-1) experimental; urgency=low
Include dir/*.conf must be used.
+ 009_apache2_has_dso: Upstream is no longer testing DSO is available. So
we don't need to remove that test anymore.
- + [JMV] Reresh 031_apxs2_sucks_more: <explain what you did>
-
+ + [AT] customize_apxs.patch: Aggregate changes from various apxs2 patches,
+ drop obsolete hunks
[ Arno Töll ]
@@ -155,7 +156,7 @@ apache2 (2.4.1-1) experimental; urgency=low
* Migrate patches to DEP-3 format. For particular changes see the summary
above.
- -- Arno Töll <debian at toell.net> Sun, 11 Mar 2012 01:00:01 +0100
+ -- Arno Töll <debian at toell.net> Tue, 13 Mar 2012 22:19:34 +0100
apache2 (2.2.22-1) unstable; urgency=low
diff --git a/debian/patches/031_apxs2_sucks_more b/debian/patches/031_apxs2_sucks_more
deleted file mode 100644
index 1d334c6..0000000
--- a/debian/patches/031_apxs2_sucks_more
+++ /dev/null
@@ -1,90 +0,0 @@
-Description: Make apxs2 use httpd.conf, instead of apache2.conf, plus other
- random fixes.
-Forwarded: no
-Author: Adam Conrad <adconrad at 0c3.net>
-Last-Update: 2012-02-25
-Index: apache2/support/apxs.in
-===================================================================
---- apache2.orig/support/apxs.in
-+++ apache2/support/apxs.in
-@@ -274,6 +274,7 @@
- $data =~ s|%TARGET%|$CFG_TARGET|sg;
- $data =~ s|%PREFIX%|$prefix|sg;
- $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
-+ $data =~ s|%DATADIR%|$datadir|sg;
-
- my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
-
-@@ -500,7 +501,7 @@
- if ($opt_i) {
- push(@cmds, "$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
-@@ -536,7 +537,8 @@
- $filename = "mod_${name}.c";
- }
- my $dir = $CFG_LIBEXECDIR;
-- $dir =~ s|^$CFG_PREFIX/?||;
-+ # Debian doesn't have a CFG_PREFIX, so this stuffs up:
-+ # $dir =~ s|^$CFG_PREFIX/?||;
- $dir =~ s|(.)$|$1/|;
- $t =~ s|\.la$|.so|;
- push(@lmd, sprintf("LoadModule %-18s %s", "${name}_module", "$dir$t"));
-@@ -547,17 +549,17 @@
-
- # activate module via LoadModule/AddModule directive
- if ($opt_a or $opt_A) {
-- if (not -f "$CFG_SYSCONFDIR/$CFG_TARGET.conf") {
-- error("Config file $CFG_SYSCONFDIR/$CFG_TARGET.conf not found");
-+ if (not -f "$CFG_SYSCONFDIR/httpd.conf") {
-+ error("Config file $CFG_SYSCONFDIR/httpd.conf not found");
- exit(1);
- }
-
-- open(FP, "<$CFG_SYSCONFDIR/$CFG_TARGET.conf") || die;
-+ open(FP, "<$CFG_SYSCONFDIR/httpd.conf") || die;
- my $content = join('', <FP>);
- close(FP);
-
- if ($content !~ m|\n#?\s*LoadModule\s+|) {
-- error("Activation failed for custom $CFG_SYSCONFDIR/$CFG_TARGET.conf file.");
-+ error("Activation failed for custom $CFG_SYSCONFDIR/httpd.conf file.");
- error("At least one `LoadModule' directive already has to exist.");
- exit(1);
- }
-@@ -636,15 +638,15 @@
- $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s;
- }
- $lmd =~ m|LoadModule\s+(.+?)_module.*|;
-- notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]");
-+ notice("[$what module `$1' in $CFG_SYSCONFDIR/httpd.conf]");
- }
- if (@lmd) {
-- if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) {
-+ if (open(FP, ">$CFG_SYSCONFDIR/httpd.conf.new")) {
- print FP $content;
- close(FP);
-- system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
-- "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
-- "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
-+ system("cp $CFG_SYSCONFDIR/httpd.conf $CFG_SYSCONFDIR/httpd.conf.bak && " .
-+ "cp $CFG_SYSCONFDIR/httpd.conf.new $CFG_SYSCONFDIR/httpd.conf && " .
-+ "rm $CFG_SYSCONFDIR/httpd.conf.new");
- } else {
- notice("unable to open configuration file");
- }
-@@ -668,8 +670,8 @@
- ##
-
- builddir=.
--top_srcdir=%PREFIX%
--top_builddir=%PREFIX%
-+top_srcdir=%DATADIR%
-+top_builddir=%DATADIR%
- include %INSTALLBUILDDIR%/special.mk
-
- # the used tools
diff --git a/debian/patches/034_apxs2_libtool_fixtastic b/debian/patches/034_apxs2_libtool_fixtastic
deleted file mode 100644
index e103d97..0000000
--- a/debian/patches/034_apxs2_libtool_fixtastic
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Make libtool happier
-Forwarded: no
-Author: Peter Samuelson <peter at p12n.org>
-Last-Update: 2012-02-25
-Index: apache2/support/apxs.in
-===================================================================
---- apache2.orig/support/apxs.in
-+++ apache2/support/apxs.in
-@@ -427,7 +427,7 @@
- $la =~ s|\.c$|.la|;
- my $o = $s;
- $o =~ s|\.c$|.o|;
-- push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");
-+ push(@cmds, "$libtool $ltflags --mode=compile --tag=disable-static $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");
- unshift(@objs, $lo);
- }
-
-@@ -467,7 +467,7 @@
- $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
- }
-
-- push(@cmds, "$libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
-+ push(@cmds, "$libtool $ltflags --mode=link --tag=disable-static $CFG_CC -o $dso_file $opt $lo");
-
- # execute the commands
- &execute_cmds(@cmds);
diff --git a/debian/patches/201_build_suexec-custom b/debian/patches/build_suexec-custom.patch
similarity index 100%
rename from debian/patches/201_build_suexec-custom
rename to debian/patches/build_suexec-custom.patch
diff --git a/debian/patches/076_apxs2_a2enmod b/debian/patches/customize_apxs.patch
similarity index 64%
rename from debian/patches/076_apxs2_a2enmod
rename to debian/patches/customize_apxs.patch
index 0ecddd4..28e8334 100644
--- a/debian/patches/076_apxs2_a2enmod
+++ b/debian/patches/customize_apxs.patch
@@ -1,13 +1,56 @@
-Description: Make apxs2 use a2enmod and /etc/apache2/mods-available
+Description: Adapt apxs to Debian specific changes
+ - Make apxs2 use a2enmod and /etc/apache2/mods-available
+ - Make libtool happier
Forwarded: not-needed
Author: Stefan Fritsch <sf at debian.org>
-Last-Update: 2012-02-25
-Index: apache2/support/apxs.in
-===================================================================
---- apache2.orig/support/apxs.in
-+++ apache2/support/apxs.in
-@@ -541,7 +541,7 @@
- # $dir =~ s|^$CFG_PREFIX/?||;
+Last-Update: 2012-03-17
+
+diff --git a/support/apxs.in b/support/apxs.in
+index 39ff16c..41bb26b 100644
+--- a/support/apxs.in
++++ b/support/apxs.in
+@@ -274,6 +274,7 @@ if ($opt_g) {
+ $data =~ s|%TARGET%|$CFG_TARGET|sg;
+ $data =~ s|%PREFIX%|$prefix|sg;
+ $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
++ $data =~ s|%DATADIR%|$datadir|sg;
+
+ my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
+
+@@ -426,7 +427,7 @@ if ($opt_c) {
+ $la =~ s|\.c$|.la|;
+ my $o = $s;
+ $o =~ s|\.c$|.o|;
+- push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");
++ push(@cmds, "$libtool $ltflags --mode=compile --tag=disable-static $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");
+ unshift(@objs, $lo);
+ }
+
+@@ -466,7 +467,7 @@ if ($opt_c) {
+ $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
+ }
+
+- push(@cmds, "$libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
++ push(@cmds, "$libtool $ltflags --mode=link --tag=disable-static $CFG_CC -o $dso_file $opt $lo");
+
+ # execute the commands
+ &execute_cmds(@cmds);
+@@ -500,7 +501,7 @@ if ($opt_i or $opt_e) {
+ if ($opt_i) {
+ push(@cmds, "$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
+@@ -536,10 +537,11 @@ if ($opt_i or $opt_e) {
+ $filename = "mod_${name}.c";
+ }
+ my $dir = $CFG_LIBEXECDIR;
+- $dir =~ s|^$CFG_PREFIX/?||;
++ # Debian doesn't have a CFG_PREFIX, so this stuffs up:
++ # $dir =~ s|^$CFG_PREFIX/?||;
$dir =~ s|(.)$|$1/|;
$t =~ s|\.la$|.so|;
- push(@lmd, sprintf("LoadModule %-18s %s", "${name}_module", "$dir$t"));
@@ -15,27 +58,41 @@ Index: apache2/support/apxs.in
}
# execute the commands
-@@ -549,108 +549,35 @@
+@@ -547,108 +549,35 @@ if ($opt_i or $opt_e) {
# activate module via LoadModule/AddModule directive
if ($opt_a or $opt_A) {
-- if (not -f "$CFG_SYSCONFDIR/httpd.conf") {
-- error("Config file $CFG_SYSCONFDIR/httpd.conf not found");
+- if (not -f "$CFG_SYSCONFDIR/$CFG_TARGET.conf") {
+- error("Config file $CFG_SYSCONFDIR/$CFG_TARGET.conf not found");
+ if (not -d "$CFG_SYSCONFDIR/mods-available") {
+ error("Config file $CFG_SYSCONFDIR/mods-available not found");
exit(1);
}
-- open(FP, "<$CFG_SYSCONFDIR/httpd.conf") || die;
+- open(FP, "<$CFG_SYSCONFDIR/$CFG_TARGET.conf") || die;
- my $content = join('', <FP>);
- close(FP);
--
++ my $entry;
++ foreach $entry (@lmd) {
++ my ($name, $lmd) = @{$entry};
++ my $filename = "$CFG_SYSCONFDIR/mods-available/$name.load";
++ if (-f $filename) {
++ my $cmd = "mv $filename $filename.bak~";
++ if (system($cmd) != 0) {
++ die "'$cmd' failed\n";
++ }
++ }
+
- if ($content !~ m|\n#?\s*LoadModule\s+|) {
-- error("Activation failed for custom $CFG_SYSCONFDIR/httpd.conf file.");
+- error("Activation failed for custom $CFG_SYSCONFDIR/$CFG_TARGET.conf file.");
- error("At least one `LoadModule' directive already has to exist.");
- exit(1);
- }
--
++ notice("[preparing module `$name' in $filename]");
++ open(FP, ">$filename") || die;
++ print FP "$lmd\n";
++ close(FP);
+
- my $lmd;
- my $c = '';
- $c = '#' if ($opt_A);
@@ -64,12 +121,8 @@ Index: apache2/support/apxs.in
- error('Configuration file is not valid. There are sections'
- . ' closed before opened.');
- exit(1);
-+ my $entry;
-+ foreach $entry (@lmd) {
-+ my ($name, $lmd) = @{$entry};
-+ my $filename = "$CFG_SYSCONFDIR/mods-available/$name.load";
-+ if (-f $filename) {
-+ my $cmd = "mv $filename $filename.bak~";
++ if ($opt_a) {
++ my $cmd = "a2enmod $name";
+ if (system($cmd) != 0) {
+ die "'$cmd' failed\n";
}
@@ -112,33 +165,22 @@ Index: apache2/support/apxs.in
- . 'sections opened and not closed.');
- exit(1);
- }
-+ }
-+
-+ notice("[preparing module `$name' in $filename]");
-+ open(FP, ">$filename") || die;
-+ print FP "$lmd\n";
-+ close(FP);
-+
-+ if ($opt_a) {
-+ my $cmd = "a2enmod $name";
-+ if (system($cmd) != 0) {
-+ die "'$cmd' failed\n";
- }
+- }
- } else {
- # replace already existing LoadModule line
- $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s;
}
- $lmd =~ m|LoadModule\s+(.+?)_module.*|;
-- notice("[$what module `$1' in $CFG_SYSCONFDIR/httpd.conf]");
+- notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]");
+
}
- if (@lmd) {
-- if (open(FP, ">$CFG_SYSCONFDIR/httpd.conf.new")) {
+- if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) {
- print FP $content;
- close(FP);
-- system("cp $CFG_SYSCONFDIR/httpd.conf $CFG_SYSCONFDIR/httpd.conf.bak && " .
-- "cp $CFG_SYSCONFDIR/httpd.conf.new $CFG_SYSCONFDIR/httpd.conf && " .
-- "rm $CFG_SYSCONFDIR/httpd.conf.new");
+- system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
+- "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
+- "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
- } else {
- notice("unable to open configuration file");
- }
@@ -146,3 +188,14 @@ Index: apache2/support/apxs.in
}
}
+@@ -668,8 +597,8 @@ __DATA__
+ ##
+
+ builddir=.
+-top_srcdir=%PREFIX%
+-top_builddir=%PREFIX%
++top_srcdir=%DATADIR%
++top_builddir=%DATADIR%
+ include %INSTALLBUILDDIR%/special.mk
+
+ # the used tools
diff --git a/debian/patches/033_dbm_read_hash_or_btree b/debian/patches/dbm_read_hash_or_btree.patch
similarity index 100%
rename from debian/patches/033_dbm_read_hash_or_btree
rename to debian/patches/dbm_read_hash_or_btree.patch
diff --git a/debian/patches/010_fhs_compliance b/debian/patches/fhs_compliance.patch
similarity index 100%
rename from debian/patches/010_fhs_compliance
rename to debian/patches/fhs_compliance.patch
diff --git a/debian/patches/008_make_include_safe b/debian/patches/make_include_safe.patch
similarity index 100%
rename from debian/patches/008_make_include_safe
rename to debian/patches/make_include_safe.patch
diff --git a/debian/patches/038_no_LD_LIBRARY_PATH b/debian/patches/no_LD_LIBRARY_PATH.patch
similarity index 100%
rename from debian/patches/038_no_LD_LIBRARY_PATH
rename to debian/patches/no_LD_LIBRARY_PATH.patch
diff --git a/debian/patches/series b/debian/patches/series
index e76ac37..f5dffe0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,16 +1,14 @@
-#008_make_include_safe # Probably to be droped in 2.4
-010_fhs_compliance
-031_apxs2_sucks_more
-#032_suexec_is_shared # Probably not needed in 2.4
-033_dbm_read_hash_or_btree
-034_apxs2_libtool_fixtastic
-038_no_LD_LIBRARY_PATH
-058_suexec-CVE-2007-1742
-076_apxs2_a2enmod
-201_build_suexec-custom
+#make_include_safe.patch # Probably to be droped in 2.4
+fhs_compliance.patch
+#suexec_is_shared.patch # Probably not needed in 2.4
+dbm_read_hash_or_btree.patch
+no_LD_LIBRARY_PATH.patch
+suexec-CVE-2007-1742.patch
+customize_apxs.patch
+build_suexec-custom.patch
# The patch below must not be applied by quilt at extraction time. It depends
# on some script-fu to be executed before. Have a look
# to debian/rules' prepare-custom-suexec target.
# If you're aware of that you can uncomment it at any time later and work on it
# as you wish.
-#202_suexec-custom
+#suexec-custom.patch
diff --git a/debian/patches/058_suexec-CVE-2007-1742 b/debian/patches/suexec-CVE-2007-1742.patch
similarity index 100%
rename from debian/patches/058_suexec-CVE-2007-1742
rename to debian/patches/suexec-CVE-2007-1742.patch
diff --git a/debian/patches/202_suexec-custom b/debian/patches/suexec-custom.patch
similarity index 100%
rename from debian/patches/202_suexec-custom
rename to debian/patches/suexec-custom.patch
diff --git a/debian/patches/032_suexec_is_shared b/debian/patches/suexec_is_shared.patch
old mode 100755
new mode 100644
similarity index 100%
rename from debian/patches/032_suexec_is_shared
rename to debian/patches/suexec_is_shared.patch
diff --git a/debian/rules b/debian/rules
index 5dc5151..a562ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ AP2_CPPFLAGS = -DPLATFORM='\"$(LSB_RELEASE)\"' $(shell dpkg-buildflags --get CPP
prepare-custom-suexec:
cp support/suexec.c support/suexec-custom.c
- patch -p1 < debian/patches/202_suexec-custom
+ patch -p1 < debian/patches/suexec-custom.patch
clean-config-vars:
--
Debian packaging for apache2 (Apache HTTPD 2.x)
More information about the Pkg-apache-commits
mailing list