app-portage/conf-update: Integrate patch for grep 2.7 (bug #338414)

(Portage version: 2.2_rc67_p185/cvs/Linux i686)

3 files changed, 91 insertions, 2 deletions

diff --git a/app-portage/conf-update/ChangeLog b/app-portage/conf-update/ChangeLog
index 3a1197150017..42dd103f12bf 100644
--- a/app-portage/conf-update/ChangeLog
+++ b/app-portage/conf-update/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/conf-update
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/conf-update/ChangeLog,v 1.21 2009/01/04 14:57:16 angelos Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/conf-update/ChangeLog,v 1.22 2010/10/04 19:22:54 sping Exp $
+
+*conf-update-1.0-r1 (04 Oct 2010)
+
+  04 Oct 2010; Sebastian Pipping <sping@gentoo.org>
+  +conf-update-1.0-r1.ebuild, +files/conf-update-1.0-regex-classes.patch:
+  Integrate Jan Psota's regex patch ("[:space:]" to "[[:space:]]") from bug
+  #338414
 
   04 Jan 2009; Christoph Mende <angelos@gentoo.org>
   +files/conf-update-1.0-asneeded.patch, conf-update-1.0.ebuild:
diff --git a/app-portage/conf-update/conf-update-1.0-r1.ebuild b/app-portage/conf-update/conf-update-1.0-r1.ebuild
new file mode 100644
index 000000000000..0de9a7aa2ebe
--- /dev/null
+++ b/app-portage/conf-update/conf-update-1.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/conf-update/conf-update-1.0-r1.ebuild,v 1.1 2010/10/04 19:22:54 sping Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="${PN} is a ncurses-based config management utility"
+HOMEPAGE="gopher://blubb.ch/11/software/conf-update"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="colordiff"
+
+RDEPEND=">=dev-libs/glib-2.6
+		dev-libs/openssl
+		colordiff? ( app-misc/colordiff )"
+DEPEND="dev-util/pkgconfig
+		${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-asneeded.patch \
+			"${FILESDIR}"/${P}-regex-classes.patch
+	sed -i -e "s/\$Rev:.*\\$/${PVR}/" conf-update.h || die 'version-sed failed'
+
+	# -Wno-pointer-sign is gcc-4.1 only
+	sed -i -e "s:-Wno-pointer-sign::g" \
+		-e "s: -g::" Makefile || die 'gcc-sed failed'
+
+	if use colordiff ; then
+		sed -i -e "s/diff_tool=diff/diff_tool=colordiff/" ${PN}.conf || \
+			die 'colordiff-sed failed'
+	fi
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) || die 'emake failed'
+}
+
+src_install() {
+	into /usr
+	dosbin ${PN} || die 'dosbin failed'
+
+	insinto /etc
+	doins ${PN}.conf
+
+	doman ${PN}.1
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.12.0"
+	previous_less_than_0_12_0=$?
+}
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_12_0 = 0 ]] ; then
+		ewarn "Note that the format for /etc/conf-update.conf changed in this"
+		ewarn "version. You should merge the update of that file with e.g."
+		ewarn "etc-update."
+	fi
+}
diff --git a/app-portage/conf-update/files/conf-update-1.0-regex-classes.patch b/app-portage/conf-update/files/conf-update-1.0-regex-classes.patch
new file mode 100644
index 000000000000..58c27647317a
--- /dev/null
+++ b/app-portage/conf-update/files/conf-update-1.0-regex-classes.patch
@@ -0,0 +1,17 @@
+--- conf-update-1.0/conf-update.c.orig	2006-10-09 13:23:33.000000000 +0200
++++ conf-update-1.0/conf-update.c	2010-09-23 08:58:54.982551103 +0200
+@@ -133,12 +133,12 @@
+ 				esc_myfile = g_shell_quote(myfile);
+ 				highest = get_highest_update(protected, protected[i]);
+ 				esc_highest = g_shell_quote(highest);
+-				cmd = (char *)calloc(strlen("diff -Nu % % | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][:space:]*$\" " ) + strlen(esc_highest) + strlen(esc_myfile), sizeof(char));
++				cmd = (char *)calloc(strlen("diff -Nu % % | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][[:space:]]*$\" " ) + strlen(esc_highest) + strlen(esc_myfile), sizeof(char));
+ 				strcpy(cmd, "diff -Nu ");
+ 				strcat(cmd, esc_myfile);
+ 				strcat(cmd, " ");
+ 				strcat(cmd, esc_highest);
+-				strcat(cmd, " | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][:space:]*$\"");
++				strcat(cmd, " | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][[:space:]]*$\"");
+ 				
+ 				free(myfile);
+ 				free(esc_myfile);