[Midnightbsd-cvs] mports [18243] trunk/security/sudo: sudo 1.8.12

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Mar 19 21:26:14 EDT 2015


Revision: 18243
          http://svnweb.midnightbsd.org/mports/?rev=18243
Author:   laffer1
Date:     2015-03-19 21:26:13 -0400 (Thu, 19 Mar 2015)
Log Message:
-----------
sudo 1.8.12

Modified Paths:
--------------
    trunk/security/sudo/Makefile
    trunk/security/sudo/distinfo
    trunk/security/sudo/files/patch-plugins__sudoers__Makefile.in
    trunk/security/sudo/files/patch-plugins__sudoers__audit.c
    trunk/security/sudo/pkg-plist

Modified: trunk/security/sudo/Makefile
===================================================================
--- trunk/security/sudo/Makefile	2015-03-19 23:53:23 UTC (rev 18242)
+++ trunk/security/sudo/Makefile	2015-03-20 01:26:13 UTC (rev 18243)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	sudo
-DISTVERSION=	1.8.10p3
+DISTVERSION=	1.8.12
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SUDO}
 
@@ -8,8 +8,13 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Allow others to run commands as root
 
-LICENSE=	other
+LICENSE=	sudo
+LICENSE_NAME=	Sudo license
+LICENSE_FILE=	${WRKSRC}/doc/LICENSE
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+USES=		libtool
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-lgcc
 LDFLAGS+=	-lssp_nonshared
@@ -22,8 +27,9 @@
 		--with-long-otp-prompt
 
 OPTIONS_DEFINE=	LDAP INSULTS DISABLE_ROOT_SUDO DISABLE_AUTH NOARGS_SHELL \
-		AUDIT OPIE NLS
-OPTIONS_DEFAULT=	AUDIT NLS
+		AUDIT OPIE NLS SSSD DOCS
+OPTIONS_DEFAULT=	AUDIT
+OPTIONS_SUB=	yes
 
 INSULTS_DESC=	Enable insults on failures
 DISABLE_ROOT_SUDO_DESC=	Do not allow root to run sudo
@@ -31,8 +37,9 @@
 NOARGS_SHELL_DESC=	Run a shell if no arguments are given
 AUDIT_DESC=	Enable BSM audit support
 OPIE_DESC=	Enable one-time passwords (no PAM support)
+SSSD_DESC=	Enable SSSD backend support.
 
-LOGFAC?=	local2
+LOGFAC?=	authpriv
 CONFIGURE_ARGS+=	--with-logfac=${LOGFAC}
 
 # This is intentionally not an option.
@@ -42,61 +49,40 @@
 CONFIGURE_ARGS+=	--with-secure-path="${SUDO_SECURE_PATH}"
 .endif
 
-.include <bsd.mport.options.mk>
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+NLS_LDFLAGS=	-L${LOCALBASE}/lib -lintl
+NLS_CFLAGS=	-I${LOCALBASE}/include
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-CFLAGS+=	-I${LOCALBASE}/include
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+INSULTS_CONFIGURE_ON=	--with-insults
+INSULTS_CONFIGURE_ON+=	--with-all-insults
 
-.if ${PORT_OPTIONS:MINSULTS}
-CONFIGURE_ARGS+=	--with-insults
-CONFIGURE_ARGS+=	--with-all-insults
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=	--with-ldap=${PREFIX}
+LDAP_USE=	OPENLDAP=yes
+LDAP_CONFIGURE_ON=	--with-ldap=${PREFIX}
 SUDO_LDAP_CONF?=	ldap.conf
-CONFIGURE_ARGS+=	--with-ldap-conf-file=${PREFIX}/etc/${SUDO_LDAP_CONF}
-PLIST_SUB+=	LDAP=""
-.else
-PLIST_SUB+=	LDAP="@comment "
-.endif
+LDAP_CONFIGURE_ON+=	--with-ldap-conf-file=${PREFIX}/etc/${SUDO_LDAP_CONF}
 
-.if ${PORT_OPTIONS:MDISABLE_ROOT_SUDO}
-CONFIGURE_ARGS+=--disable-root-sudo
-.endif
+DISABLE_ROOT_SUDO_CONFIGURE_ON=	--disable-root-sudo
+DISABLE_AUTH_CONFIGURE_ON=	--disable-authentication
+NOARGS_SHELL_CONFIGURE_ENABLE=	noargs-shell
+AUDIT_CONFIGURE_WITH=	bsm-audit
+OPIE_CONFIGURE_ON=	--with-opie
+OPIE_CONFIGURE_OFF=	--with-pam
+SSSD_CONFIGURE_ON=	--with-sssd
+SSSD_RUN_DEPENDS=	sssd:${PORTSDIR}/security/sssd
 
-.if ${PORT_OPTIONS:MDISABLE_AUTH}
-CONFIGURE_ARGS+=	--disable-authentication
-.endif
+.include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MNOARGS_SHELL}
-CONFIGURE_ARGS+=	--enable-noargs-shell
+.if ${ARCH} == "arm"
+CONFIGURE_ARGS+=	--disable-pie
 .endif
 
-.if ${PORT_OPTIONS:MAUDIT}
-CONFIGURE_ARGS+=	--with-bsm-audit
-.endif
-
-.if ${PORT_OPTIONS:MOPIE}
-CONFIGURE_ARGS+=	--with-opie
-.else
-CONFIGURE_ARGS+=	--with-pam
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -E '/install-(binaries|noexec):/,/^$$/ \
 		s/\$$\(INSTALL\)/& ${STRIP}/;s/-b\~/-b ~/' \
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's,$$(srcdir)/sudoers2ldif $$(DESTDIR)$$(docdir),$$(srcdir)/sudoers2ldif $$(DESTDIR)$$(bindir),' ${WRKSRC}/plugins/sudoers/Makefile.in
-.if ! ${PORT_OPTIONS:MDOCS}
+.if empty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} -e 's/mkinstalldirs $$(DESTDIR)$$(docdir)/mkinstalldirs/' \
 		${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -e '/for f in $$(OTHER_DOCS); do/d;/@LDAP at for f in $$(OTHER_DOCS_LDAP); do/d' ${WRKSRC}/doc/Makefile.in
@@ -104,14 +90,13 @@
 .endif
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/pam.conf ${PREFIX}/etc/pam.d/sudo.default
-	if [ ! -f ${PREFIX}/etc/pam.d/sudo ]; then \
-		${CP} -p ${PREFIX}/etc/pam.d/sudo.default \
-		${PREFIX}/etc/pam.d/sudo ; \
-	fi
-	if [ ! -f ${PREFIX}/etc/sudoers ]; then \
-		${CP} -p ${PREFIX}/etc/sudoers.sample ${PREFIX}/etc/sudoers; \
-	fi
-	${TOUCH} ${PREFIX}/etc/sudoers.d/.keep-me
+	${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/sudo.default
+	${TOUCH} ${STAGEDIR}${PREFIX}/etc/sudoers.d/.keep-me
+	${MV} ${STAGEDIR}${PREFIX}/etc/sudoers ${STAGEDIR}${PREFIX}/etc/sudoers.sample
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sudoreplay
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/visudo
+.for f in group_file.so libsudo_util.so sudoers.so system_group.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/sudo/${f}
+.endfor
 
 .include <bsd.port.mk>

Modified: trunk/security/sudo/distinfo
===================================================================
--- trunk/security/sudo/distinfo	2015-03-19 23:53:23 UTC (rev 18242)
+++ trunk/security/sudo/distinfo	2015-03-20 01:26:13 UTC (rev 18243)
@@ -1,2 +1,2 @@
-SHA256 (sudo-1.8.10p3.tar.gz) = 6eda135fa68163108f1c24de6975de5ddb09d75730bb62d6390bda7b04345400
-SIZE (sudo-1.8.10p3.tar.gz) = 2262370
+SHA256 (sudo-1.8.12.tar.gz) = 163b51841de8ad19276581a6782d61f5948f1f72a0a843371a1c167d3dc4f3b0
+SIZE (sudo-1.8.12.tar.gz) = 2493373

Modified: trunk/security/sudo/files/patch-plugins__sudoers__Makefile.in
===================================================================
--- trunk/security/sudo/files/patch-plugins__sudoers__Makefile.in	2015-03-19 23:53:23 UTC (rev 18242)
+++ trunk/security/sudo/files/patch-plugins__sudoers__Makefile.in	2015-03-20 01:26:13 UTC (rev 18243)
@@ -1,14 +1,12 @@
---- ./plugins/sudoers/Makefile.in.orig	2011-04-11 08:28:33.000000000 -0400
-+++ ./plugins/sudoers/Makefile.in	2011-04-17 09:38:29.349385961 -0400
-@@ -358,9 +358,8 @@
+--- plugins/sudoers/Makefile.in.orig	2014-10-08 05:26:20.000000000 +0900
++++ plugins/sudoers/Makefile.in	2014-10-10 07:23:21.000000000 +0900
+@@ -323,8 +323,7 @@
+ 
  install-sudoers: install-dirs
- 	$(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -m 0750 \
- 	    $(DESTDIR)$(sudoersdir)/sudoers.d
+ 	$(INSTALL) -d $(INSTALL_OWNER) -m 0750 $(DESTDIR)$(sudoersdir)/sudoers.d
 -	test -r $(DESTDIR)$(sudoersdir)/sudoers || \
--	    $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -m $(sudoers_mode) \
--		sudoers $(DESTDIR)$(sudoersdir)/sudoers
-+	$(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -m $(sudoers_mode) \
-+		sudoers $(DESTDIR)$(sudoersdir)/sudoers.sample
+-	    $(INSTALL) $(INSTALL_OWNER) -m $(sudoers_mode) sudoers $(DESTDIR)$(sudoersdir)/sudoers
++	$(INSTALL) $(INSTALL_OWNER) -m $(sudoers_mode) sudoers $(DESTDIR)$(sudoersdir)/sudoers
  
  uninstall:
- 	-rm -f $(DESTDIR)$(plugindir)/sudoers$(soext)
+ 	-$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/sudoers.la

Modified: trunk/security/sudo/files/patch-plugins__sudoers__audit.c
===================================================================
--- trunk/security/sudo/files/patch-plugins__sudoers__audit.c	2015-03-19 23:53:23 UTC (rev 18242)
+++ trunk/security/sudo/files/patch-plugins__sudoers__audit.c	2015-03-20 01:26:13 UTC (rev 18243)
@@ -1,10 +1,10 @@
---- ./plugins/sudoers/audit.c.orig	2013-06-04 11:48:28.000000000 +0200
-+++ ./plugins/sudoers/audit.c	2013-07-05 13:10:01.000000000 +0200
-@@ -39,6 +39,7 @@
+--- plugins/sudoers/audit.c.orig	2014-09-24 01:40:15.000000000 +0900
++++ plugins/sudoers/audit.c	2014-10-10 07:24:43.000000000 +0900
+@@ -42,6 +42,7 @@
  
  #ifdef HAVE_BSM_AUDIT
  # include "bsm_audit.h"
-+# include "gettext.h"
++# include "sudo_gettext.h"
  #endif
  #ifdef HAVE_LINUX_AUDIT
  # include "linux_audit.h"

Modified: trunk/security/sudo/pkg-plist
===================================================================
--- trunk/security/sudo/pkg-plist	2015-03-19 23:53:23 UTC (rev 18242)
+++ trunk/security/sudo/pkg-plist	2015-03-20 01:26:13 UTC (rev 18243)
@@ -1,14 +1,15 @@
 bin/sudo
 bin/sudoedit
 bin/sudoreplay
- at unexec if cmp -s %D/etc/sudoers.sample %D/etc/sudoers; then rm -f %D/etc/sudoers; fi
-etc/sudoers.sample
- at exec if [ ! -f %D/etc/sudoers ] ; then cp -p %D/%F %B/sudoers; fi
+ at sample etc/sudoers.sample
 @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/sudo; fi
 include/sudo_plugin.h
 libexec/sudo/group_file.so
+libexec/sudo/libsudo_util.so
+libexec/sudo/libsudo_util.so.0
+libexec/sudo/libsudo_util.so.0.0.0
 libexec/sudo/sudo_noexec.so
 libexec/sudo/sudoers.so
 libexec/sudo/system_group.so
@@ -30,15 +31,16 @@
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TROUBLESHOOTING
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCSDIR%%/sample.pam
-%%PORTDOCS%%%%DOCSDIR%%/sample.sudo.conf
-%%PORTDOCS%%%%DOCSDIR%%/sample.sudoers
-%%PORTDOCS%%%%DOCSDIR%%/sample.syslog.conf
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/README.LDAP
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.OpenLDAP
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.iPlanet
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.ActiveDirectory
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pam.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sudo.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sudoers
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/syslog.conf
 %%NLS%%share/locale/ca/LC_MESSAGES/sudo.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/da/LC_MESSAGES/sudo.mo
@@ -45,6 +47,7 @@
 %%NLS%%share/locale/da/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/de/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/de/LC_MESSAGES/sudoers.mo
+%%NLS%%share/locale/el/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/es/LC_MESSAGES/sudo.mo
@@ -53,6 +56,7 @@
 %%NLS%%share/locale/fi/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/sudo.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/sudoers.mo
@@ -61,6 +65,8 @@
 %%NLS%%share/locale/ja/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/sudoers.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/sudo.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/sudo.mo
@@ -68,6 +74,7 @@
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/sudo.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/sudo.mo
@@ -82,7 +89,6 @@
 %%NLS%%share/locale/vi/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/sudoers.mo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 etc/sudoers.d/.keep-me
- at dirrm libexec/sudo
- at dirrmtry etc/sudoers.d
+ at dir /var/db/sudo
+ at dir /var/run/sudo



More information about the Midnightbsd-cvs mailing list