Update edit-utils to v2.43, fixing security advisory CVE-2008-2142

against the xemacs{,-current} packages.

While here, listen to pkglint some.

From the edit-utils changelog:

2008-06-09  Aidan Kehoe  <kehoea@parhasard.net>

        * fast-lock.el (fast-lock-cache-directories):
        Remove the directory the file is in, to avoid running code from
        arbitrary other users. Update the docstring to motivate this.
        Also, mark it as a risky local variable to prevent it being
        evaluated in file local variable sections.
        Thank you Ulrich Müller, thank you Hans de Graaff.


XXX The package versions this pkg installs are positively behind the bend.

3 files changed, 20 insertions, 17 deletions

diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 0cc1f2e36e2..1068b800ac1 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2011/07/04 22:23:12 jym Exp $
+# $NetBSD: Makefile,v 1.57 2012/04/24 15:43:32 hauke Exp $
 
 DISTNAME=	xemacs-packages
 PKGNAME=	xemacs-packages-1.16
-PKGREVISION=	1
+PKGREVISION=	2
 
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=packages/}
@@ -29,7 +29,7 @@ DISTFILES=	\
 		edebug-1.20-pkg.tar.gz \
 		edict-1.16-pkg.tar.gz \
 		ediff-1.49-pkg.tar.gz \
-		edit-utils-2.11-pkg.tar.gz \
+		edit-utils-2.43-pkg.tar.gz \
 		edt-1.13-pkg.tar.gz \
 		efs-1.32-pkg.tar.gz \
 		egg-its-1.27-pkg.tar.gz \
@@ -141,7 +141,7 @@ DIST_SUBDIR=	${PKGBASE}
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
 
-USE_TOOLS+=	gtar
+USE_TOOLS+=	printf gtar gawk
 
 FONTS_DIRS.x11+=	${PREFIX}/lib/xemacs/xemacs-packages/etc/x-symbol/fonts
 FONTS_DIRS.x11+=	${PREFIX}/lib/xemacs/xemacs-packages/etc/x-symbol/origfonts
@@ -185,7 +185,6 @@ PLIST_SUBST+=	ELSUFX=
 .if defined(PKG_DEVELOPER) && ${OPSYS} == "NetBSD"
 ED=	/bin/ed
 FTP=	/usr/bin/ftp
-PRINTF=	/usr/bin/printf
 
 # Make a list of packages from a directory list output
 .PHONY: xemacs-make-package-list
@@ -197,12 +196,12 @@ xemacs-fetch-package-list:
 # Merge package list data into Makefile
 .PHONY: xemacs-merge-package-list
 xemacs-merge-package-list:
-	@{ \
+	{ \
 		${SED} '/^DISTFILES/q' ${PKGDIR}/Makefile; \
 		${SED} 's|^|		|' ${PKGDIR}/packages.list; \
 		${SED} -n '/^### DISTFILES/,$$p' ${PKGDIR}/Makefile; \
 	} >${PKGDIR}/Makefile.work
-	@{ \
+	{ \
 		${PRINTF} '/^DISTFILES\n+1\nka\n/^### DISTFILES\n-2\nkb\n'; \
 		${PRINTF} "'a,'b"'s/$$/ \\\\/\nw\nq\n'; \
 	} | ${ED} - ${PKGDIR}/Makefile.work
@@ -215,29 +214,29 @@ do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/xemacs/xemacs-packages
 .for DISTFILE in ${DISTFILES}
 	@${ECHO_MSG} -n "Extracting ${DISTFILE} ... "
-	@${GTAR} xCzf ${DESTDIR}${PREFIX}/lib/xemacs/xemacs-packages \
+	${GTAR} xCzf ${DESTDIR}${PREFIX}/lib/xemacs/xemacs-packages \
 		${DISTDIR}/${DIST_SUBDIR}/${DISTFILE}
 	@${ECHO_MSG} "done"
 .endfor
 	@${ECHO_MSG} -n "Fixing file ownerships ... "
-	@${CHOWN} -R ${BINOWN}:${BINGRP} \
+	${CHOWN} -R ${BINOWN}:${BINGRP} \
 		${DESTDIR}${PREFIX}/lib/xemacs/xemacs-packages
 	@${ECHO_MSG} "done"
 	@${ECHO_MSG} -n "Fixing file permissions ... "
-	@${CHMOD} -R g-w,o-w ${DESTDIR}${PREFIX}/lib/xemacs/xemacs-packages
+	${CHMOD} -R g-w,o-w ${DESTDIR}${PREFIX}/lib/xemacs/xemacs-packages
 	@${ECHO_MSG} "done"
 .for PROG in ${REPLACEMENT_PROGS}
 	@${ECHO_MSG} "Fixing ${PROG} paths"
 	for f in ${REPLACEMENTS.${PROG}}; do 			\
 		cp ${DESTDIR}$$f ${DESTDIR}$$f.pre;		\
-		sed -e 's|#!.*${PROG}|${PREFIX}/bin/${PROG}|'	\
+		${SED} -e 's|#!.*${PROG}|${PREFIX}/bin/${PROG}|'	\
 			${DESTDIR}$$f.pre > ${DESTDIR}$$f;	\
 		rm ${DESTDIR}$$f.pre;				\
 	done
 .endfor
 .if defined(MANZ)
 	@${ECHO_MSG} -n "Compressing \".el\" files ... "
-	@cd ${DESTDIR}${PREFIX} && \
+	cd ${DESTDIR}${PREFIX} && \
 		${GREP} '\$${ELSUFX}$$' ${PLIST_SRC} | \
 		${SED} -e 's#\$${ELSUFX}$$##' | \
 		${XARGS} ${GZIP_CMD}
diff --git a/editors/xemacs-packages/PLIST b/editors/xemacs-packages/PLIST
index 03e94b075f6..9791ed42adc 100644
--- a/editors/xemacs-packages/PLIST
+++ b/editors/xemacs-packages/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 17:50:28 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2012/04/24 15:43:32 hauke Exp $
 lib/xemacs/xemacs-packages/etc/BABYL
 lib/xemacs/xemacs-packages/etc/app-defaults/de/Emacs
 lib/xemacs/xemacs-packages/etc/app-defaults/fr/Emacs
@@ -2345,6 +2345,8 @@ lib/xemacs/xemacs-packages/lisp/edit-utils/compare-w.el${ELSUFX}
 lib/xemacs/xemacs-packages/lisp/edit-utils/compare-w.elc
 lib/xemacs/xemacs-packages/lisp/edit-utils/completion.el${ELSUFX}
 lib/xemacs/xemacs-packages/lisp/edit-utils/completion.elc
+lib/xemacs/xemacs-packages/lisp/edit-utils/crm.el${ELSUFX}
+lib/xemacs/xemacs-packages/lisp/edit-utils/crm.elc
 lib/xemacs/xemacs-packages/lisp/edit-utils/custom-load.el${ELSUFX}
 lib/xemacs/xemacs-packages/lisp/edit-utils/custom-load.elc
 lib/xemacs/xemacs-packages/lisp/edit-utils/dabbrev.el${ELSUFX}
@@ -2447,6 +2449,8 @@ lib/xemacs/xemacs-packages/lisp/edit-utils/vertical-mode.el${ELSUFX}
 lib/xemacs/xemacs-packages/lisp/edit-utils/vertical-mode.elc
 lib/xemacs/xemacs-packages/lisp/edit-utils/where-was-i-db.el${ELSUFX}
 lib/xemacs/xemacs-packages/lisp/edit-utils/where-was-i-db.elc
+lib/xemacs/xemacs-packages/lisp/edit-utils/wide-edit.el${ELSUFX}
+lib/xemacs/xemacs-packages/lisp/edit-utils/wide-edit.elc
 lib/xemacs/xemacs-packages/lisp/edit-utils/winring.el${ELSUFX}
 lib/xemacs/xemacs-packages/lisp/edit-utils/winring.elc
 lib/xemacs/xemacs-packages/lisp/edt/ChangeLog
diff --git a/editors/xemacs-packages/distinfo b/editors/xemacs-packages/distinfo
index 6c9812afedb..70035d7677e 100644
--- a/editors/xemacs-packages/distinfo
+++ b/editors/xemacs-packages/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2006/07/04 17:50:22 rpaulo Exp $
+$NetBSD: distinfo,v 1.19 2012/04/24 15:43:32 hauke Exp $
 
 SHA1 (xemacs-packages/Sun-1.15-pkg.tar.gz) = fb227f01bee8ce85fdb64c999393a1c9b936b8a0
 RMD160 (xemacs-packages/Sun-1.15-pkg.tar.gz) = 523658714111aaae8915ae164f98cdc2d39883b6
@@ -66,9 +66,9 @@ Size (xemacs-packages/edict-1.16-pkg.tar.gz) = 96111 bytes
 SHA1 (xemacs-packages/ediff-1.49-pkg.tar.gz) = 7dcbe3d4606cc8a659f62844a9dcae91d7609141
 RMD160 (xemacs-packages/ediff-1.49-pkg.tar.gz) = 8b524e98396e1ac4ac3b9f9ed4cf57d46b809d41
 Size (xemacs-packages/ediff-1.49-pkg.tar.gz) = 305252 bytes
-SHA1 (xemacs-packages/edit-utils-2.11-pkg.tar.gz) = 705f66ec4a9c6011704ea4ec272762082c292994
-RMD160 (xemacs-packages/edit-utils-2.11-pkg.tar.gz) = c4bd8704ee7bbf3fae1c6382275253fad4693ace
-Size (xemacs-packages/edit-utils-2.11-pkg.tar.gz) = 925407 bytes
+SHA1 (xemacs-packages/edit-utils-2.43-pkg.tar.gz) = 30699e245a1993454fb03997dabf3807b0e3cdf9
+RMD160 (xemacs-packages/edit-utils-2.43-pkg.tar.gz) = 87b6dcadab81f634f2d7deb83f69493075ae964d
+Size (xemacs-packages/edit-utils-2.43-pkg.tar.gz) = 958798 bytes
 SHA1 (xemacs-packages/edt-1.13-pkg.tar.gz) = af1e8cadf883b2150411a965fceae06a7366a34c
 RMD160 (xemacs-packages/edt-1.13-pkg.tar.gz) = f969a1f722fa2b88689a73fdc784960bc1a42cbf
 Size (xemacs-packages/edt-1.13-pkg.tar.gz) = 62754 bytes