summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey>2002-05-23 01:37:24 +0000
committerjoey <joey>2002-05-23 01:37:24 +0000
commite5fd7eb1e142ccf2b2dcea5993168102219c5b9d (patch)
treec0ada27135ea5d5b9478a8ef9282aa2e8d1e5e66
parent4f601f037fad476c5b3bbc8ad196048a755c9ac9 (diff)
r526: * Don't leak regex characters from -X when generating DH_EXCLUDE_FIND.
-rw-r--r--Debian/Debhelper/Dh_Lib.pm5
-rw-r--r--debian/changelog6
2 files changed, 10 insertions, 1 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index b14afd1..d1c67b5 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -52,7 +52,10 @@ sub init {
if ($dh{EXCLUDE}) {
$dh{EXCLUDE_FIND}='';
foreach (@{$dh{EXCLUDE}}) {
- $dh{EXCLUDE_FIND}.="-regex ".escape_shell(".*$_.*")." -or ";
+ my $x=$_;
+ $x=escape_shell($x);
+ $x=~s/\./\\\\./g;
+ $dh{EXCLUDE_FIND}.="-regex .\\*$x.\\* -or ";
}
$dh{EXCLUDE_FIND}=~s/ -or $//;
}
diff --git a/debian/changelog b/debian/changelog
index dc4bb83..0429fd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (4.0.8) unstable; urgency=low
+
+ * Don't leak regex characters from -X when generating DH_EXCLUDE_FIND.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 22 May 2002 21:03:38 -0400
+
debhelper (4.0.7) unstable; urgency=low
* dh_strip: If a file is an ELF shared binary, does not have a .so.* in its