Date: 23 Aug 2010 19:11:49 +0400 From: "Alexey V.Degtyarev" <alexey@renatasystems.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/149912: security/sudo - fix package Message-ID: <20100823151149.55281.qmail@hs-9.renatasystems.org> Resent-Message-ID: <201008231520.o7NFK2GX038627@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 149912 >Category: ports >Synopsis: security/sudo - fix package >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Aug 23 15:20:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Alexey V. Degtyarev >Release: FreeBSD 8.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD renatasystems.org 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Sat Nov 21 15:02:08 UTC 2009 root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: With a fresh sudo-1.7.4.3 package install: 1. visudo concerns about #includedir for non-existent directory: # visudo >How-To-Repeat: >Fix: --- sudo-1.7.4.3_1.patch begins here --- diff -u -r sudo.orig/Makefile sudo/Makefile --- sudo.orig/Makefile 2010-08-22 17:34:45.000000000 +0000 +++ sudo/Makefile 2010-08-23 14:53:42.000000000 +0000 @@ -7,6 +7,7 @@ PORTNAME= sudo PORTVERSION= 1.7.4.3 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.sudo.ws/sudo/dist/ \ ftp://obsd.isc.org/pub/sudo/ \ @@ -102,5 +103,6 @@ if [ ! -f ${PREFIX}/etc/sudoers ]; then \ ${CP} -p ${PREFIX}/etc/sudoers.sample ${PREFIX}/etc/sudoers; \ fi + ${TOUCH} ${PREFIX}/etc/sudoers.d/.keep-me .include <bsd.port.post.mk> diff -u -r sudo.orig/pkg-plist sudo/pkg-plist --- sudo.orig/pkg-plist 2010-08-22 17:34:45.000000000 +0000 +++ sudo/pkg-plist 2010-08-23 14:46:22.000000000 +0000 @@ -6,7 +6,7 @@ @exec if [ ! -f %D/etc/sudoers ] ; then cp -p %D/%F %B/sudoers; fi @unexec if cmp -s %D/etc/pam.d/sudo.default %D/etc/pam.d/sudo; then rm -f %D/etc/pam.d/sudo ; fi etc/pam.d/sudo.default -@exec if [ ! -f %D/etc/pam.d/sudo ] ; then cp -p %D/%F %B/pam.d/sudo; fi +@exec if [ ! -f %D/etc/pam.d/sudo ] ; then cp -p %D/%F %B/sudo; fi libexec/sudo_noexec.so sbin/visudo %%PORTDOCS%%%%DOCSDIR%%/ChangeLog @@ -23,4 +23,5 @@ %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.OpenLDAP %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/sudoers2ldif %%PORTDOCS%%@dirrm %%DOCSDIR%% +etc/sudoers.d/.keep-me @dirrmtry etc/sudoers.d --- sudo-1.7.4.3_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: >>> /usr/local/etc/sudoers: /usr/local/etc/sudoers.d near line 96 <<< visudo: /usr/local/etc/sudoers.tmp unchanged >>> /usr/local/etc/sudoers: /usr/local/etc/sudoers.d near line 96 <<< What now? This is because pkg_create doesn't roll into tarball empty directories. So we should put some 'keep-me' file onto /usr/local/etc/sudoers.d. According to sudoers(5), dot-files are skipped when scanning for files in #includedir. 2. pkg_add fails install templates: cp: /usr/local/etc/pam.d/pam.d/sudo: No such file or directory pkg_add: command 'if [ ! -f /usr/local/etc/pam.d/sudo ] ; then cp -p /usr/local/etc/pam.d/sudo.default /usr/local/etc/pam.d/pam.d/sudo; fi' failed this is because of typo in pkg-plist file. The attached patch fixes both problems.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100823151149.55281.qmail>