From 01e4eb553523536171cf54eb72e342b284fa245c6c840fe46ae1059f5c05c531 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Fri, 4 Oct 2013 03:11:03 +0000 Subject: [PATCH 1/2] Accepting request 202104 from home:flichtenheld 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 --- debhelper-findutils.patch | 55 +++++++++++++++++++++++++++++++++ debhelper-pod2man-no-utf8.patch | 2 +- debhelper.changes | 7 +++++ debhelper.spec | 5 ++- 4 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 debhelper-findutils.patch diff --git a/debhelper-findutils.patch b/debhelper-findutils.patch new file mode 100644 index 0000000..b675429 --- /dev/null +++ b/debhelper-findutils.patch @@ -0,0 +1,55 @@ +From: Joey Hess +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/"; diff --git a/debhelper-pod2man-no-utf8.patch b/debhelper-pod2man-no-utf8.patch index 9e99f7b..294fa54 100644 --- a/debhelper-pod2man-no-utf8.patch +++ b/debhelper-pod2man-no-utf8.patch @@ -10,4 +10,4 @@ Index: debhelper/Makefile +POD2MAN=pod2man -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*" \ diff --git a/debhelper.changes b/debhelper.changes index 5fa0cec..4746311 100644 --- a/debhelper.changes +++ b/debhelper.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 4 02:43:46 UTC 2013 - frank.lichtenheld@sophos.com + +- import upstream patch from Git +* Avoid find -perm +mode breakage caused by findutils 4.5.11, + by instead using -perm /mode (deb#700200) + ------------------------------------------------------------------- Thu Sep 27 22:31:33 UTC 2012 - frank.lichtenheld@sophos.com diff --git a/debhelper.spec b/debhelper.spec index e4ae24f..7ea1294 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -1,7 +1,7 @@ # # spec file for package debhelper # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,8 @@ Source0: debhelper_%{version}.tar.gz Patch0: debhelper-no-localized-manpages.patch # PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages. Patch1: debhelper-pod2man-no-utf8.patch +# PATCH-FIX-UPSTREAM fix problems with new findutils +Patch2: debhelper-findutils.patch Requires: dpkg %if 0%{?suse_version} Requires: perl = %{perl_version} @@ -49,6 +51,7 @@ as part of their build process. %setup -q -n %{name} %patch0 -p1 +%patch2 -p1 %if 0%{?suse_version} && 0%{?suse_version} < 1130 %patch1 -p1 %endif From 94a237016f8273e43fdf2dfcf0d5f4527dfde22fbd9f2e4e38eb490b08642602 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Fri, 4 Oct 2013 11:01:28 +0000 Subject: [PATCH 2/2] Accepting request 202138 from home:flichtenheld Mention patch name in .changes OBS-URL: https://build.opensuse.org/request/show/202138 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/debhelper?expand=0&rev=6 --- debhelper-findutils.patch | 55 --------------------------------- debhelper-pod2man-no-utf8.patch | 2 +- debhelper.changes | 2 +- debhelper.spec | 5 +-- 4 files changed, 3 insertions(+), 61 deletions(-) delete mode 100644 debhelper-findutils.patch diff --git a/debhelper-findutils.patch b/debhelper-findutils.patch deleted file mode 100644 index b675429..0000000 --- a/debhelper-findutils.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Joey Hess -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/"; diff --git a/debhelper-pod2man-no-utf8.patch b/debhelper-pod2man-no-utf8.patch index 294fa54..9e99f7b 100644 --- a/debhelper-pod2man-no-utf8.patch +++ b/debhelper-pod2man-no-utf8.patch @@ -10,4 +10,4 @@ Index: debhelper/Makefile +POD2MAN=pod2man -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*" \ diff --git a/debhelper.changes b/debhelper.changes index 4746311..0d379e3 100644 --- a/debhelper.changes +++ b/debhelper.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Oct 4 02:43:46 UTC 2013 - frank.lichtenheld@sophos.com -- import upstream patch from Git +- import upstream patch debhelper-findutils.patch from Git * Avoid find -perm +mode breakage caused by findutils 4.5.11, by instead using -perm /mode (deb#700200) diff --git a/debhelper.spec b/debhelper.spec index 7ea1294..e4ae24f 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -1,7 +1,7 @@ # # spec file for package debhelper # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,8 +29,6 @@ Source0: debhelper_%{version}.tar.gz Patch0: debhelper-no-localized-manpages.patch # PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages. Patch1: debhelper-pod2man-no-utf8.patch -# PATCH-FIX-UPSTREAM fix problems with new findutils -Patch2: debhelper-findutils.patch Requires: dpkg %if 0%{?suse_version} Requires: perl = %{perl_version} @@ -51,7 +49,6 @@ as part of their build process. %setup -q -n %{name} %patch0 -p1 -%patch2 -p1 %if 0%{?suse_version} && 0%{?suse_version} < 1130 %patch1 -p1 %endif