01e4eb5535
Fix FTBFS in openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/202104 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/debhelper?expand=0&rev=5
56 lines
2.6 KiB
Diff
56 lines
2.6 KiB
Diff
From: Joey Hess <joey@kitenet.net>
|
|
Date: Sat, 9 Feb 2013 21:38:42 +0000 (-0400)
|
|
Subject: Avoid find -perm +mode breakage caused by findutils 4.5.11, by instead using -perm...
|
|
X-Git-Tag: 9.20130504~7
|
|
X-Git-Url: http://anonscm.debian.org/gitweb/?p=debhelper%2Fdebhelper.git;a=commitdiff_plain;h=e9fe3cee83cdcc4df978fb1761009dfc124add92;hp=7765a25a48492d2d971c836c8e609422c540d721
|
|
|
|
Avoid find -perm +mode breakage caused by findutils 4.5.11, by instead using -perm /mode. Closes: #700200
|
|
---
|
|
|
|
Index: debhelper/Makefile
|
|
===================================================================
|
|
--- debhelper.orig/Makefile
|
|
+++ debhelper/Makefile
|
|
@@ -1,5 +1,5 @@
|
|
# List of files of dh_* commands. Sorted for debhelper man page.
|
|
-COMMANDS=$(shell find . -maxdepth 1 -type f -perm +100 -name "dh_*" -printf "%f\n" | sort)
|
|
+COMMANDS=$(shell find . -maxdepth 1 -type f -perm /100 -name "dh_*" -printf "%f\n" | sort)
|
|
|
|
# Find deprecated commands by looking at their synopsis.
|
|
DEPRECATED=$(shell egrep -l '^dh_.* - .*deprecated' $(COMMANDS))
|
|
@@ -41,7 +41,7 @@ PERLLIBDIR=$(shell perl -MConfig -e 'pri
|
|
POD2MAN=pod2man --utf8 -c Debhelper -r "$(VERSION)"
|
|
|
|
build: version debhelper.7
|
|
- find . -maxdepth 1 -type f -perm +100 -name "dh*" \
|
|
+ find . -maxdepth 1 -type f -perm /100 -name "dh*" \
|
|
-exec $(POD2MAN) {} {}.1 \;
|
|
|
|
version:
|
|
Index: debhelper/dh_shlibdeps
|
|
===================================================================
|
|
--- debhelper.orig/dh_shlibdeps
|
|
+++ debhelper/dh_shlibdeps
|
|
@@ -129,7 +129,7 @@ foreach my $package (@{$dh{DOPACKAGES}})
|
|
if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
|
|
$find_options="! \\( $dh{EXCLUDE_FIND} \\)";
|
|
}
|
|
- foreach my $file (split(/\n/,`find $tmp -type f \\( -perm +111 -or -name "*.so*" -or -name "*.cmxs" \\) $find_options -print`)) {
|
|
+ foreach my $file (split(/\n/,`find $tmp -type f \\( -perm /111 -or -name "*.so*" -or -name "*.cmxs" \\) $find_options -print`)) {
|
|
# Prune directories that contain separated debug symbols.
|
|
next if $file=~m!^\Q$tmp\E/usr/lib/debug/(lib|lib64|usr|bin|sbin|opt|dev|emul)/!;
|
|
# TODO this is slow, optimize. Ie, file can run once on
|
|
Index: debhelper/dh_suidregister
|
|
===================================================================
|
|
--- debhelper.orig/dh_suidregister
|
|
+++ debhelper/dh_suidregister
|
|
@@ -53,7 +53,7 @@ foreach my $package (@{$dh{DOPACKAGES}})
|
|
if (! @files && ! $suid) {
|
|
# No files specified (and no empty debian/suid file), so
|
|
# guess what files to process.
|
|
- @files=split(/\n/,`find $tmp -type f -perm +6000`);
|
|
+ @files=split(/\n/,`find $tmp -type f -perm /6000`);
|
|
|
|
# Strip the debian working directory off of the filenames.
|
|
$tostrip="$tmp/";
|