[pkg-lighttpd] r299 - lighttpd/trunk/debian
madcoder at alioth.debian.org
madcoder at alioth.debian.org
Sun Mar 16 09:31:46 UTC 2008
Author: madcoder
Date: 2008-03-16 09:31:45 +0000 (Sun, 16 Mar 2008)
New Revision: 299
Modified:
lighttpd/trunk/debian/changelog
lighttpd/trunk/debian/lighty-enable-mod
Log:
448682
Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog 2008-03-16 09:28:44 UTC (rev 298)
+++ lighttpd/trunk/debian/changelog 2008-03-16 09:31:45 UTC (rev 299)
@@ -6,6 +6,10 @@
+ remove 05_fdevent_fix.patch (merged upstream).
+ remove 06_mod_cgi_vuln_fix.patch (merged upstream).
+ refresh the rest of the series.
+ * debian/lighty-enable-mod:
+ + Reindent and remove trailing spaces.
+ + don't fail to remove a module that is already removed.
+ Patch from Michal Čihař (Closes: 448682).
-- Pierre Habouzit <madcoder at debian.org> Sun, 16 Mar 2008 10:11:45 +0100
Modified: lighttpd/trunk/debian/lighty-enable-mod
===================================================================
--- lighttpd/trunk/debian/lighty-enable-mod 2008-03-16 09:28:44 UTC (rev 298)
+++ lighttpd/trunk/debian/lighty-enable-mod 2008-03-16 09:31:45 UTC (rev 299)
@@ -38,11 +38,11 @@
#--- list of available modules
my @files = bsd_glob($confdir.'conf-available/*.conf');
print "Available modules: ";
-foreach my $file (@files) {
- if (basename($file) =~ /^\d+\-([\w\-]+)\.conf$/) {
+foreach my $file (@files) {
+ if (basename($file) =~ /^\d+\-([\w\-]+)\.conf$/) {
$available{$1} = $file;
print qq{$1 };
- }
+ }
}
print "\n";
@@ -50,9 +50,9 @@
@files = bsd_glob($confdir.'conf-enabled/*.conf');
print "Already enabled modules: ";
foreach my $file (@files) {
- if (basename($file) =~ /^\d+\-([\w\-]+)\.conf$/) {
+ if (basename($file) =~ /^\d+\-([\w\-]+)\.conf$/) {
$enabled{$1} = $file;
- print qq{$1 };
+ print qq{$1 };
}
}
print "\n";
@@ -71,13 +71,13 @@
#--- activate (link) or deactivate (remove) module
foreach my $do (@todo) {
-
- next unless defined($available{$do});
- my $target = sprintf("%s/conf-enabled/%s", $confdir,basename($available{$do}));
-
+
+
if ($enabling) {
+ next unless defined($available{$do});
+ my $target = sprintf("%s/conf-enabled/%s", $confdir,basename($available{$do}));
print qq{Enabling $do: };
-
+
my $st = stat($target);
unless ( -f $target ) {
if (symlink($available{$do}, $target)) {
@@ -101,8 +101,13 @@
}
}
else {
- print qq{Disabling $do\n};
- unlink($target);
+ if (defined($enabled{$do})) {
+ print qq{Disabling $do\n};
+ my $target = sprintf("%s/conf-enabled/%s", $confdir,basename($enabled{$do}));
+ unlink($target);
+ } else {
+ print qq{Already disabled $do\n};
+ }
}
}
More information about the pkg-lighttpd-maintainers
mailing list