From owner-svn-ports-head@freebsd.org Mon Jul 20 12:30:57 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3634C9A6F95; Mon, 20 Jul 2015 12:30:57 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 11BC3E1; Mon, 20 Jul 2015 12:30:57 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6KCUueL046830; Mon, 20 Jul 2015 12:30:56 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6KCUt5T046331; Mon, 20 Jul 2015 12:30:55 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201507201230.t6KCUt5T046331@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Mon, 20 Jul 2015 12:30:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392564 - in head/security/sudo: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jul 2015 12:30:57 -0000 Author: garga Date: Mon Jul 20 12:30:54 2015 New Revision: 392564 URL: https://svnweb.freebsd.org/changeset/ports/392564 Log: - Replace DISTVERSION by PORTVERSION otherwise it ends up as 1.8.14.p1, what is < 1.8.14. [1] - While I'm here silence portlint warnings re-generating patches with make makepatch and removing unnecessary DOCS check Reported by: Robert Burmeister [1] Modified: head/security/sudo/Makefile head/security/sudo/files/patch-install-sh head/security/sudo/files/patch-plugins__sudoers__Makefile.in head/security/sudo/files/patch-plugins__sudoers__audit.c head/security/sudo/files/patch-plugins__sudoers__sudoers.in Modified: head/security/sudo/Makefile ============================================================================== --- head/security/sudo/Makefile Mon Jul 20 11:43:00 2015 (r392563) +++ head/security/sudo/Makefile Mon Jul 20 12:30:54 2015 (r392564) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sudo -DISTVERSION= 1.8.14p1 +PORTVERSION= 1.8.14p1 CATEGORIES= security MASTER_SITES= SUDO @@ -85,13 +85,11 @@ post-patch: ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e 's,$$(srcdir)/sudoers2ldif $$(DESTDIR)$$(docdir),$$(srcdir)/sudoers2ldif $$(DESTDIR)$$(bindir),' \ ${WRKSRC}/plugins/sudoers/Makefile.in -.if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e 's/mkinstalldirs $$(DESTDIR)$$(docdir)/mkinstalldirs/' \ -e '/for f in $$(OTHER_DOCS); do/d;/@LDAP@for f in $$(OTHER_DOCS_LDAP); do/d' \ ${WRKSRC}/doc/Makefile.in @${REINPLACE_CMD} -e 's/$$(DESTDIR)$$(sudoersdir) $$(DESTDIR)$$(docdir)/$$(DESTDIR)$$(sudoersdir)/' \ ${WRKSRC}/plugins/sudoers/Makefile.in -.endif post-install: ${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/sudo.default Modified: head/security/sudo/files/patch-install-sh ============================================================================== --- head/security/sudo/files/patch-install-sh Mon Jul 20 11:43:00 2015 (r392563) +++ head/security/sudo/files/patch-install-sh Mon Jul 20 12:30:54 2015 (r392564) @@ -1,6 +1,6 @@ ---- install-sh.orig 2014-09-24 01:40:15.000000000 +0900 -+++ install-sh 2014-10-10 07:26:54.000000000 +0900 -@@ -171,12 +171,6 @@ +--- install-sh.orig 2015-07-15 18:38:05 UTC ++++ install-sh +@@ -171,12 +171,6 @@ if ${DIRMODE} ; then if [ ! -d "${DEST}" ] ; then ${MKDIR} "${DEST}" || exit 1 fi @@ -13,7 +13,7 @@ if ${CHMODIT} ; then ${CHMOD} "${MODE}" "${DEST}" || exit 1 fi -@@ -227,12 +221,6 @@ +@@ -227,12 +221,6 @@ fi if ${STRIPIT} ; then ${STRIP} "${DEST}" || exit 1 fi Modified: head/security/sudo/files/patch-plugins__sudoers__Makefile.in ============================================================================== --- head/security/sudo/files/patch-plugins__sudoers__Makefile.in Mon Jul 20 11:43:00 2015 (r392563) +++ head/security/sudo/files/patch-plugins__sudoers__Makefile.in Mon Jul 20 12:30:54 2015 (r392564) @@ -1,6 +1,6 @@ ---- 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 @@ +--- plugins/sudoers/Makefile.in.orig 2015-07-15 18:44:07 UTC ++++ plugins/sudoers/Makefile.in +@@ -336,8 +336,7 @@ install-plugin: sudoers.la install-dirs install-sudoers: install-dirs $(INSTALL) -d $(INSTALL_OWNER) -m 0750 $(DESTDIR)$(sudoersdir)/sudoers.d @@ -9,4 +9,4 @@ + $(INSTALL) $(INSTALL_OWNER) -m $(sudoers_mode) sudoers $(DESTDIR)$(sudoersdir)/sudoers uninstall: - -$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/sudoers.la + -$(LIBTOOL) $(LTFLAGS) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/sudoers.la Modified: head/security/sudo/files/patch-plugins__sudoers__audit.c ============================================================================== --- head/security/sudo/files/patch-plugins__sudoers__audit.c Mon Jul 20 11:43:00 2015 (r392563) +++ head/security/sudo/files/patch-plugins__sudoers__audit.c Mon Jul 20 12:30:54 2015 (r392564) @@ -1,6 +1,6 @@ ---- 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 @@ +--- plugins/sudoers/audit.c.orig 2015-07-15 18:44:07 UTC ++++ plugins/sudoers/audit.c +@@ -24,6 +24,7 @@ #ifdef HAVE_BSM_AUDIT # include "bsm_audit.h" Modified: head/security/sudo/files/patch-plugins__sudoers__sudoers.in ============================================================================== --- head/security/sudo/files/patch-plugins__sudoers__sudoers.in Mon Jul 20 11:43:00 2015 (r392563) +++ head/security/sudo/files/patch-plugins__sudoers__sudoers.in Mon Jul 20 12:30:54 2015 (r392564) @@ -1,6 +1,6 @@ ---- ./plugins/sudoers/sudoers.in.orig 2010-08-18 07:45:38.000000000 -0400 -+++ ./plugins/sudoers/sudoers.in 2011-04-11 12:47:45.440272893 -0400 -@@ -31,6 +31,14 @@ +--- plugins/sudoers/sudoers.in.orig 2015-07-15 18:44:07 UTC ++++ plugins/sudoers/sudoers.in +@@ -32,6 +32,14 @@ ## ## Defaults specification ##