X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_fixperms;h=d6e237bc93a270501fa95ac5770cdcb0d403b286;hb=fb8f18f4a98669c3b85e1bd7920fbabfc00b886e;hp=10261493fe85516f612e7cb8ad59cc03ce5a6b0f;hpb=7bbc9917c046d06f7d7e8d7cad10b9e3b27a8ec9;p=debhelper.git

diff --git a/dh_fixperms b/dh_fixperms
index 1026149..d6e237b 100755
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -15,17 +15,17 @@ B<dh_fixperms> [S<I<debhelper options>>] [B<-X>I<item>]
 
 =head1 DESCRIPTION
 
-dh_fixperms is a debhelper program that is responsible for setting the
+B<dh_fixperms> is a debhelper program that is responsible for setting the
 permissions of files and directories in package build directories to a
 sane state -- a state that complies with Debian policy.
 
-dh_fixperms makes all files in usr/share/doc in the package build directory
-(excluding files in the examples/ directory) be mode 644. It also changes
+B<dh_fixperms> makes all files in F<usr/share/doc> in the package build directory
+(excluding files in the F<examples/> directory) be mode 644. It also changes
 the permissions of all man pages to mode 644. It makes all files be owned
 by root, and it removes group and other write permission from all files. It
-removes execute permissions from any libraries, headers, perl modules, or
-desktop files that have it set. It makes all files in the standard bin and
-sbin directories, usr/games/ and etc/init.d executable (since v4). Finally,
+removes execute permissions from any libraries, headers, Perl modules, or
+desktop files that have it set. It makes all files in the standard F<bin> and
+F<sbin> directories, F<usr/games/> and F<etc/init.d> executable (since v4). Finally,
 it removes the setuid and setgid bits from all files in the package.
 
 =head1 OPTIONS
@@ -34,7 +34,7 @@ it removes the setuid and setgid bits from all files in the package.
 
 =item B<-X>I<item>, B<--exclude> I<item>
 
-Exclude files that contain "item" anywhere in their filename from having
+Exclude files that contain I<item> anywhere in their filename from having
 their permissions changed. You may use this option multiple times to build
 up a list of things to exclude.
 
@@ -72,7 +72,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	# ..and so are executable shared and static libraries 
 	# (and .la files from libtool) ..
 	complex_doit("find $tmp -perm -5 -type f",
-		"\\( -name '*.so*' -or -name '*.la' -or -name '*.a' \\) $find_options -print0",
+		"\\( -name '*.so.*' -or -name '*.so' -or -name '*.la' -or -name '*.a' \\) $find_options -print0",
 		"2>/dev/null | xargs -0r chmod 644");
 	
 	# ..and header files ..
@@ -105,11 +105,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 	
 	# ADA ali files should be mode 444 to avoid recompilation
-	if (-d "$tmp/usr/lib/ada") {
-		complex_doit("find $tmp/usr/lib/ada -type f",
-			"-name '*.ali' $find_options -print0",
-			"2>/dev/null | xargs -0r chmod uga-w");
-	}
+	complex_doit("find $tmp/usr/lib -type f",
+		"-name '*.ali' $find_options -print0",
+		"2>/dev/null | xargs -0r chmod uga-w");
 
 	# Lintian overrides should never be executable, too.
 	if (-d "$tmp/usr/share/lintian") {
@@ -117,6 +115,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			"-type f $find_options -print0",
 			"2>/dev/null | xargs -0r chmod 644");
 	}
+
+	# Files in $tmp/etc/sudoers.d/ must be mode 440.
+	if (-d "$tmp/etc/sudoers.d") {
+		complex_doit("find $tmp/etc/sudoers.d",
+			"-type f ! -perm 440 $find_options -print0",
+			"2>/dev/null | xargs -0r chmod 440");
+	}
 }
 
 =head1 SEE ALSO