diff options
Diffstat (limited to 'patches/httpd-2.0.64')
5 files changed, 0 insertions, 339 deletions
diff --git a/patches/httpd-2.0.64/0001-HACK-server-Makefile-fallback-to-gen_test_char-from-.patch b/patches/httpd-2.0.64/0001-HACK-server-Makefile-fallback-to-gen_test_char-from-.patch deleted file mode 100644 index 8073ca930..000000000 --- a/patches/httpd-2.0.64/0001-HACK-server-Makefile-fallback-to-gen_test_char-from-.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Thu, 26 Apr 2012 14:03:37 +0200 -Subject: [PATCH] HACK: server/Makefile: fallback to gen_test_char from $PATH - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - server/Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/server/Makefile.in b/server/Makefile.in -index 12dc7d8..3590f0e 100644 ---- a/server/Makefile.in -+++ b/server/Makefile.in -@@ -27,7 +27,7 @@ gen_test_char: $(gen_test_char_OBJECTS) - $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS) - - test_char.h: gen_test_char -- ./gen_test_char > test_char.h -+ ./gen_test_char > test_char.h || gen_test_char > test_char.h - - util.lo: test_char.h - diff --git a/patches/httpd-2.0.64/0002-HACK-srclib-pcre-Makefile-fallback-to-dftables-from-.patch b/patches/httpd-2.0.64/0002-HACK-srclib-pcre-Makefile-fallback-to-dftables-from-.patch deleted file mode 100644 index 6f1fabcdb..000000000 --- a/patches/httpd-2.0.64/0002-HACK-srclib-pcre-Makefile-fallback-to-dftables-from-.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Thu, 26 Apr 2012 14:03:37 +0200 -Subject: [PATCH] HACK: srclib/pcre/Makefile: fallback to dftables from $PATH - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - srclib/pcre/Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/srclib/pcre/Makefile.in b/srclib/pcre/Makefile.in -index 357ce6e..1e09c01 100644 ---- a/srclib/pcre/Makefile.in -+++ b/srclib/pcre/Makefile.in -@@ -15,6 +15,6 @@ dftables: dftables.lo - $(LINK) $(EXTRA_LDFLAGS) dftables.lo $(EXTRA_LIBS) - - $(srcdir)/chartables.c: dftables -- ./dftables > $@ -+ ./dftables > $@ || dftables > $@ - - pcre.lo: $(srcdir)/chartables.c diff --git a/patches/httpd-2.0.64/0003-HACK-support-apxs-don-t-execute-httpd.patch b/patches/httpd-2.0.64/0003-HACK-support-apxs-don-t-execute-httpd.patch deleted file mode 100644 index e4badfab7..000000000 --- a/patches/httpd-2.0.64/0003-HACK-support-apxs-don-t-execute-httpd.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Robert Schwebel <r.schwebel@pengutronix.de> -Date: Thu, 26 Apr 2012 15:07:30 +0200 -Subject: [PATCH] HACK: support/apxs: don't execute httpd - -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - support/apxs.in | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/support/apxs.in b/support/apxs.in -index 135544c..cbefb3a 100644 ---- a/support/apxs.in -+++ b/support/apxs.in -@@ -199,18 +199,18 @@ if ($0 =~ m:support/apxs$:) { - ($httpd = $0) =~ s:support/apxs$::; - } - --unless (-x "$httpd") { -- error("$httpd not found or not executable"); -- exit 1; --} -- --unless (grep /mod_so/, `. $envvars && $httpd -l`) { -- error("Sorry, no shared object support for Apache"); -- error("available under your platform. Make sure"); -- error("the Apache module mod_so is compiled into"); -- error("your server binary `$httpd'."); -- exit 1; --} -+#unless (-x "$httpd") { -+# error("$httpd not found or not executable"); -+# exit 1; -+#} -+ -+#unless (grep /mod_so/, `. $envvars && $httpd -l`) { -+# error("Sorry, no shared object support for Apache"); -+# error("available under your platform. Make sure"); -+# error("the Apache module mod_so is compiled into"); -+# error("your server binary `$httpd'."); -+# exit 1; -+#} - - sub get_config_vars{ - my ($file, $rh_config) = @_; diff --git a/patches/httpd-2.0.64/0004-HACK-support-apxs-don-t-try-to-modify-the-config-fil.patch b/patches/httpd-2.0.64/0004-HACK-support-apxs-don-t-try-to-modify-the-config-fil.patch deleted file mode 100644 index 9f9d1e695..000000000 --- a/patches/httpd-2.0.64/0004-HACK-support-apxs-don-t-try-to-modify-the-config-fil.patch +++ /dev/null @@ -1,244 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Fri, 27 Apr 2012 16:28:45 +0200 -Subject: [PATCH] HACK: support/apxs: don't try to modify the config file - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - support/apxs.in | 224 +++++++++++++++++++++++++++--------------------------- - 1 files changed, 112 insertions(+), 112 deletions(-) - -diff --git a/support/apxs.in b/support/apxs.in -index cbefb3a..2bde471 100644 ---- a/support/apxs.in -+++ b/support/apxs.in -@@ -527,118 +527,118 @@ if ($opt_i or $opt_e) { - &execute_cmds(@cmds); - - # 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"); -- exit(1); -- } -- -- open(FP, "<$CFG_SYSCONFDIR/$CFG_TARGET.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("At least one `LoadModule' directive already has to exist."); -- exit(1); -- } -- -- my $lmd; -- my $c = ''; -- $c = '#' if ($opt_A); -- foreach $lmd (@lmd) { -- my $what = $opt_A ? "preparing" : "activating"; -- my $lmd_re = $lmd; -- $lmd_re =~ s/\s+/\\s+/g; -- -- if ($content !~ m|\n#?\s*$lmd_re|) { -- # check for open <containers>, so that the new LoadModule -- # directive always appears *outside* of an <container>. -- -- my $before = ($content =~ m|^(.*\n)#?\s*LoadModule\s+[^\n]+\n|s)[0]; -- -- # the '()=' trick forces list context and the scalar -- # assignment counts the number of list members (aka number -- # of matches) then -- my $cntopen = () = ($before =~ m|^\s*<[^/].*$|mg); -- my $cntclose = () = ($before =~ m|^\s*</.*$|mg); -- -- if ($cntopen == $cntclose) { -- # fine. Last LoadModule is contextless. -- $content =~ s|^(.*\n#?\s*LoadModule\s+[^\n]+\n)|$1$c$lmd\n|s; -- } -- elsif ($cntopen < $cntclose) { -- error('Configuration file is not valid. There are sections' -- . ' closed before opened.'); -- exit(1); -- } -- else { -- # put our cmd after the section containing the last -- # LoadModule. -- my $found = -- $content =~ s!\A ( # string and capture start -- (?:(?: -- ^\s* # start of conf line with a -- (?:[^<]|<[^/]) # directive which does not -- # start with '</' -- -- .*(?:$)\n # rest of the line. -- # the '$' is in parentheses -- # to avoid misinterpreting -- # the string "$\" as -- # perl variable. -- -- )* # catch as much as possible -- # of such lines. (including -- # zero) -- -- ^\s*</.*(?:$)\n? # after the above, we -- # expect a config line with -- # a closing container (</) -- -- ) {$cntopen} # the whole pattern (bunch -- # of lines that end up with -- # a closing directive) must -- # be repeated $cntopen -- # times. That's it. -- # Simple, eh? ;-) -- -- ) # capture end -- !$1$c$lmd\n!mx; -- -- unless ($found) { -- error('Configuration file is not valid. There are ' -- . 'sections opened and not closed.'); -- exit(1); -- } -- } -- } 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/$CFG_TARGET.conf]"); -- } -- my $amd; -- foreach $amd (@amd) { -- if ($content !~ m|\n#?\s*$amd|) { -- $content =~ s|^(.*\n#?\s*AddModule\s+[^\n]+\n)|$1$c$amd\n|sg; -- } else { -- $content =~ s|^(.*\n)#?\s*$amd[^\n]*\n|$1$c$amd\n|sg; -- } -- } -- if (@lmd or @amd) { -- if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.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"); -- } else { -- notice("unable to open configuration file"); -- } -- } -- } -+ # if ($opt_a or $opt_A) { -+ # if (not -f "$CFG_SYSCONFDIR/$CFG_TARGET.conf") { -+ # error("Config file $CFG_SYSCONFDIR/$CFG_TARGET.conf not found"); -+ # exit(1); -+ # } -+ -+ # open(FP, "<$CFG_SYSCONFDIR/$CFG_TARGET.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("At least one `LoadModule' directive already has to exist."); -+ # exit(1); -+ # } -+ -+ # my $lmd; -+ # my $c = ''; -+ # $c = '#' if ($opt_A); -+ # foreach $lmd (@lmd) { -+ # my $what = $opt_A ? "preparing" : "activating"; -+ # my $lmd_re = $lmd; -+ # $lmd_re =~ s/\s+/\\s+/g; -+ -+ # if ($content !~ m|\n#?\s*$lmd_re|) { -+ # # check for open <containers>, so that the new LoadModule -+ # # directive always appears *outside* of an <container>. -+ -+ # my $before = ($content =~ m|^(.*\n)#?\s*LoadModule\s+[^\n]+\n|s)[0]; -+ -+ # # the '()=' trick forces list context and the scalar -+ # # assignment counts the number of list members (aka number -+ # # of matches) then -+ # my $cntopen = () = ($before =~ m|^\s*<[^/].*$|mg); -+ # my $cntclose = () = ($before =~ m|^\s*</.*$|mg); -+ -+ # if ($cntopen == $cntclose) { -+ # # fine. Last LoadModule is contextless. -+ # $content =~ s|^(.*\n#?\s*LoadModule\s+[^\n]+\n)|$1$c$lmd\n|s; -+ # } -+ # elsif ($cntopen < $cntclose) { -+ # error('Configuration file is not valid. There are sections' -+ # . ' closed before opened.'); -+ # exit(1); -+ # } -+ # else { -+ # # put our cmd after the section containing the last -+ # # LoadModule. -+ # my $found = -+ # $content =~ s!\A ( # string and capture start -+ # (?:(?: -+ # ^\s* # start of conf line with a -+ # (?:[^<]|<[^/]) # directive which does not -+ # # start with '</' -+ -+ # .*(?:$)\n # rest of the line. -+ # # the '$' is in parentheses -+ # # to avoid misinterpreting -+ # # the string "$\" as -+ # # perl variable. -+ -+ # )* # catch as much as possible -+ # # of such lines. (including -+ # # zero) -+ -+ # ^\s*</.*(?:$)\n? # after the above, we -+ # # expect a config line with -+ # # a closing container (</) -+ -+ # ) {$cntopen} # the whole pattern (bunch -+ # # of lines that end up with -+ # # a closing directive) must -+ # # be repeated $cntopen -+ # # times. That's it. -+ # # Simple, eh? ;-) -+ -+ # ) # capture end -+ # !$1$c$lmd\n!mx; -+ -+ # unless ($found) { -+ # error('Configuration file is not valid. There are ' -+ # . 'sections opened and not closed.'); -+ # exit(1); -+ # } -+ # } -+ # } 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/$CFG_TARGET.conf]"); -+ # } -+ # my $amd; -+ # foreach $amd (@amd) { -+ # if ($content !~ m|\n#?\s*$amd|) { -+ # $content =~ s|^(.*\n#?\s*AddModule\s+[^\n]+\n)|$1$c$amd\n|sg; -+ # } else { -+ # $content =~ s|^(.*\n)#?\s*$amd[^\n]*\n|$1$c$amd\n|sg; -+ # } -+ # } -+ # if (@lmd or @amd) { -+ # if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.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"); -+ # } else { -+ # notice("unable to open configuration file"); -+ # } -+ # } -+ # } - } - - sub error{ diff --git a/patches/httpd-2.0.64/series b/patches/httpd-2.0.64/series deleted file mode 100644 index ff12a99e3..000000000 --- a/patches/httpd-2.0.64/series +++ /dev/null @@ -1,7 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-HACK-server-Makefile-fallback-to-gen_test_char-from-.patch -0002-HACK-srclib-pcre-Makefile-fallback-to-dftables-from-.patch -0003-HACK-support-apxs-don-t-execute-httpd.patch -0004-HACK-support-apxs-don-t-try-to-modify-the-config-fil.patch -# 160b9c105b4f55538cd0ce5c82eda8fd - git-ptx-patches magic |