rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

merge

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=318
This commit is contained in:
Stephan Kulow
2010-07-29 09:22:03 +00:00
committed by Git OBS Bridge
parent 7085fd9ed8
commit 5540c687fa
5 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
httpd-2.2.0-apxs-a2enmod.dif
View File

@@ -1,7 +1,8 @@
diff -uNr httpd-2.2.0.orig/support/apxs.in httpd-2.2.0/support/apxs.in
--- httpd-2.2.0.orig/support/apxs.in 2005-06-10 11:18:14.000000000 +0200
+++ httpd-2.2.0/support/apxs.in 2005-12-07 11:04:38.337999601 +0100
@@ -527,105 +527,14 @@
Index: httpd-2.2.16/support/apxs.in
===================================================================
--- httpd-2.2.16.orig/support/apxs.in
+++ httpd-2.2.16/support/apxs.in
@@ -526,108 +526,14 @@ if ($opt_i or $opt_e) {
# activate module via LoadModule/AddModule directive
if ($opt_a or $opt_A) {
@@ -25,7 +26,10 @@ diff -uNr httpd-2.2.0.orig/support/apxs.in httpd-2.2.0/support/apxs.in
$c = '#' if ($opt_A);
foreach $lmd (@lmd) {
- my $what = $opt_A ? "preparing" : "activating";
- if ($content !~ m|\n#?\s*$lmd|) {
- 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>.
-
@@ -88,7 +92,7 @@ diff -uNr httpd-2.2.0.orig/support/apxs.in httpd-2.2.0/support/apxs.in
- }
- } else {
- # replace already existing LoadModule line
- $content =~ s|^(.*\n)#?\s*$lmd[^\n]*\n|$1$c$lmd\n|s;
- $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]");