[Build-common-hackers] Bug#300465: cdbs: evil_patches_that_do_nasty_things seems broken in dpatch.mk

[Marc Haber]

Package: cdbs
Version: 0.4.27-3
Severity: normal

Hi,

the handling of evil_patches_that_do_nasty thing seems broken.

(1) DEB_PATCHES isn't initialized

(2) the egrep expression needs to have the $ doubled, or the shell
will complain.

The following patch tries to fix the issues. Please notice that I
don't really understand the code.

Greetings
Marc

--- dpatch.mk.orig	2005-03-19 22:06:39.650295034 +0000
+++ dpatch.mk	2005-03-19 22:22:48.169176152 +0000
@@ -43,11 +43,23 @@
 _cdbs_dpatch_apply_rule := apply-dpatches
 _cdbs_dpatch_unapply_rule := deapply-dpatches
 
+DEB_PATCH_SUFFIX ?= .dpatch
+DEB_PATCHDIRS ?= debian/patches
+close_parenthesis ?= )
+DEB_PATCHES := $(shell\
+for dir in $(DEB_PATCHDIRS) ; do \
+	for file in $$dir/* ; do \
+		for suffix in $(DEB_PATCH_SUFFIX) ; do \
+			case $$file in *$$suffix$(close_parenthesis) echo $$file ;; esac ; \
+		done ; \
+	done ; \
+done)
+
 CDBS_BUILD_DEPENDS    := $(CDBS_BUILD_DEPENDS), patchutils
 evil_patches_that_do_nasty_things := $(shell\
 if lsdiff=`which lsdiff` ; then \
   $$lsdiff -H $(DEB_PATCHES) \
-  | egrep "/config\.(guess|sub|rpath)$" | tr "\n" " " ; \
+  | egrep "/config\.(guess|sub|rpath)$$" | tr "\n" " " ; \
 fi)
 ifneq (, $(evil_patches_that_do_nasty_things))
 $(warning WARNING:  The following patches are modifiing auto-updated files.  This can result in serious trouble:  $(evil_patches_that_do_nasty_things))


-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.9-zgserver
Locale: LANG=C, LC_CTYPE=de_DE (charmap=ISO-8859-1)

-- no debconf information