diff options
Diffstat (limited to 'security/sudo')
-rw-r--r-- | security/sudo/Makefile | 5 | ||||
-rw-r--r-- | security/sudo/distinfo | 14 | ||||
-rw-r--r-- | security/sudo/patches/patch-af | 18 | ||||
-rw-r--r-- | security/sudo/patches/patch-ag | 26 |
4 files changed, 31 insertions, 32 deletions
diff --git a/security/sudo/Makefile b/security/sudo/Makefile index c5723fb1ab6..835ea6969f9 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.151 2016/03/05 11:29:27 jperkin Exp $ +# $NetBSD: Makefile,v 1.152 2016/09/12 17:12:24 taca Exp $ -DISTNAME= sudo-1.8.15 -PKGREVISION= 1 +DISTNAME= sudo-1.8.17p1 CATEGORIES= security MASTER_SITES= http://www.sudo.ws/dist/ \ ftp://ftp.sudo.ws/pub/sudo/ \ diff --git a/security/sudo/distinfo b/security/sudo/distinfo index 3aae910d112..33125ef6439 100644 --- a/security/sudo/distinfo +++ b/security/sudo/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.86 2016/01/09 11:22:12 adam Exp $ +$NetBSD: distinfo,v 1.87 2016/09/12 17:12:24 taca Exp $ -SHA1 (sudo-1.8.15.tar.gz) = acb5ff3f38fa9e0365f6a91a6620b9846e2ad843 -RMD160 (sudo-1.8.15.tar.gz) = 676ee3249c2ddacd64de54d6555b820912b56f6f -SHA512 (sudo-1.8.15.tar.gz) = f2bff92104ddc4cbea8c788da446043cbfe02c977cedf18d46b1c82e98d7227432cb5a61233e7a06af84e3637f906edd5e02bb88c03a2ce4a16df410469a5dab -Size (sudo-1.8.15.tar.gz) = 2660128 bytes +SHA1 (sudo-1.8.17p1.tar.gz) = e9bb729513cd15e99def42019c35917bc9a73536 +RMD160 (sudo-1.8.17p1.tar.gz) = c3af867a6047c21614c4550534fa2566d6540913 +SHA512 (sudo-1.8.17p1.tar.gz) = e9facd2d5578d4effb516931322b5f4f9578baa779cba281d36a3d0995b1fd9d085d6b141544b3dc698569fa294163bbad9f779166a05a0f18f4ad81a630b954 +Size (sudo-1.8.17p1.tar.gz) = 2786618 bytes SHA1 (patch-aa) = 63c89e6d4e530ab92b7452f4025fbbf2a45dad65 -SHA1 (patch-af) = 9ef912344d9cd4c3811a4d705d3424cd88621710 -SHA1 (patch-ag) = c62f063ffc9e8fb3fce7c94a8cba531ecb8b76ff +SHA1 (patch-af) = 19c7cb41432404050c2452c3c53f2e4f588b3ab1 +SHA1 (patch-ag) = cb03a0a7daf4b5ef203f23726ad3a335b712a718 SHA1 (patch-plugins_sudoers_Makefile.in) = d8612ac7bf2f5a892d9720c4df91810ca807f4ed SHA1 (patch-plugins_sudoers_logging.c) = a42e54af2b6057804aecb3b6a48c565e8ac4df82 SHA1 (patch-src_Makefile.in) = 43f7266d3d106fca69003ee040342c3b201fd262 diff --git a/security/sudo/patches/patch-af b/security/sudo/patches/patch-af index 84644ceb55f..b3652283925 100644 --- a/security/sudo/patches/patch-af +++ b/security/sudo/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.32 2016/01/01 17:00:49 spz Exp $ +$NetBSD: patch-af,v 1.33 2016/09/12 17:12:24 taca Exp $ * Add "--with-nbsdops" option, NetBSD standard options. * Link with util(3) in the case of DragonFly, too. @@ -7,9 +7,9 @@ $NetBSD: patch-af,v 1.32 2016/01/01 17:00:49 spz Exp $ functions (HAVE_KRB5_*). * Remove setting sysconfdir to "/etc". ---- configure.ac.orig 2015-10-31 23:35:24.000000000 +0000 +--- configure.ac.orig 2016-06-22 16:36:23.000000000 +0000 +++ configure.ac -@@ -434,6 +434,20 @@ AC_ARG_WITH(csops, [AS_HELP_STRING([--wi +@@ -439,6 +439,20 @@ AC_ARG_WITH(csops, [AS_HELP_STRING([--wi ;; esac]) @@ -30,7 +30,7 @@ $NetBSD: patch-af,v 1.32 2016/01/01 17:00:49 spz Exp $ AC_ARG_WITH(passwd, [AS_HELP_STRING([--without-passwd], [don't use passwd/shadow file for authentication])], [case $with_passwd in yes|no) AC_MSG_CHECKING(whether to use shadow/passwd file authentication) -@@ -1938,7 +1952,7 @@ case "$host" in +@@ -1951,7 +1965,7 @@ case "$host" in : ${mansectsu='1m'} : ${mansectform='4'} ;; @@ -39,7 +39,7 @@ $NetBSD: patch-af,v 1.32 2016/01/01 17:00:49 spz Exp $ shadow_funcs="getspnam" test -z "$with_pam" && AUTH_EXCL_DEF="PAM" ;; -@@ -2286,7 +2300,7 @@ SUDO_MAILDIR +@@ -2299,7 +2313,7 @@ SUDO_MAILDIR if test ${with_logincap-'no'} != "no"; then AC_CHECK_HEADERS([login_cap.h], [LOGINCAP_USAGE='[[-c class]] '; LCMAN=1 case "$OS" in @@ -48,7 +48,7 @@ $NetBSD: patch-af,v 1.32 2016/01/01 17:00:49 spz Exp $ SUDO_LIBS="${SUDO_LIBS} -lutil" SUDOERS_LIBS="${SUDOERS_LIBS} -lutil" ;; -@@ -3374,6 +3388,8 @@ if test ${with_kerb5-'no'} != "no"; then +@@ -3381,6 +3395,8 @@ if test ${with_kerb5-'no'} != "no"; then ]) AUTH_OBJS="$AUTH_OBJS kerb5.lo" fi @@ -57,12 +57,12 @@ $NetBSD: patch-af,v 1.32 2016/01/01 17:00:49 spz Exp $ _LIBS="$LIBS" LIBS="${LIBS} ${SUDOERS_LIBS}" AC_CHECK_FUNCS([krb5_verify_user krb5_init_secure_context]) -@@ -4167,7 +4183,7 @@ test "$datarootdir" = '${prefix}/share' +@@ -4220,7 +4236,7 @@ test "$datarootdir" = '${prefix}/share' test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)' test "$localedir" = '${datarootdir}/locale' && localedir='$(datarootdir)/locale' test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var' --test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc' -+dnl test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc' +-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc' ++dnl test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc' dnl dnl Substitute into the Makefile and man pages diff --git a/security/sudo/patches/patch-ag b/security/sudo/patches/patch-ag index 6491ce7fb55..7cbdebdc964 100644 --- a/security/sudo/patches/patch-ag +++ b/security/sudo/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.23 2016/01/01 17:00:49 spz Exp $ +$NetBSD: patch-ag,v 1.24 2016/09/12 17:12:24 taca Exp $ * Add "--with-nbsdops" option, NetBSD standard options. * Link with util(3) in the case of DragonFly, too. @@ -7,9 +7,9 @@ $NetBSD: patch-ag,v 1.23 2016/01/01 17:00:49 spz Exp $ functions (HAVE_KRB5_*). * Remove setting sysconfdir to "/etc". ---- configure.orig 2015-10-31 23:35:24.000000000 +0000 +--- configure.orig 2016-06-22 16:36:22.000000000 +0000 +++ configure -@@ -1561,7 +1561,7 @@ Fine tuning of the installation director +@@ -1562,7 +1562,7 @@ Fine tuning of the installation director --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] @@ -18,15 +18,15 @@ $NetBSD: patch-ag,v 1.23 2016/01/01 17:00:49 spz Exp $ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] -@@ -1658,6 +1658,7 @@ Optional Packages: +@@ -1661,6 +1661,7 @@ Optional Packages: --with-libraries additional libraries to link with --with-efence link with -lefence for malloc() debugging --with-csops add CSOps standard options + --with-nbsdops add NetBSD standard options --without-passwd don't use passwd/shadow file for authentication - --with-skey=DIR enable S/Key support - --with-opie=DIR enable OPIE support -@@ -4482,6 +4483,22 @@ $as_echo "$as_me: WARNING: Ignoring unkn + --with-skey[=DIR] enable S/Key support + --with-opie[=DIR] enable OPIE support +@@ -4499,6 +4500,22 @@ $as_echo "$as_me: WARNING: Ignoring unkn esac fi @@ -49,7 +49,7 @@ $NetBSD: patch-ag,v 1.23 2016/01/01 17:00:49 spz Exp $ # Check whether --with-passwd was given. -@@ -15163,7 +15180,7 @@ fi +@@ -15209,7 +15226,7 @@ fi : ${mansectsu='1m'} : ${mansectform='4'} ;; @@ -58,7 +58,7 @@ $NetBSD: patch-ag,v 1.23 2016/01/01 17:00:49 spz Exp $ shadow_funcs="getspnam" test -z "$with_pam" && AUTH_EXCL_DEF="PAM" ;; -@@ -17182,7 +17199,7 @@ if test "x$ac_cv_header_login_cap_h" = x +@@ -17228,7 +17245,7 @@ if test "x$ac_cv_header_login_cap_h" = x _ACEOF LOGINCAP_USAGE='[-c class] '; LCMAN=1 case "$OS" in @@ -67,7 +67,7 @@ $NetBSD: patch-ag,v 1.23 2016/01/01 17:00:49 spz Exp $ SUDO_LIBS="${SUDO_LIBS} -lutil" SUDOERS_LIBS="${SUDOERS_LIBS} -lutil" ;; -@@ -21870,6 +21887,8 @@ fi +@@ -21839,6 +21856,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext AUTH_OBJS="$AUTH_OBJS kerb5.lo" fi @@ -76,12 +76,12 @@ $NetBSD: patch-ag,v 1.23 2016/01/01 17:00:49 spz Exp $ _LIBS="$LIBS" LIBS="${LIBS} ${SUDOERS_LIBS}" for ac_func in krb5_verify_user krb5_init_secure_context -@@ -24184,7 +24203,7 @@ test "$datarootdir" = '${prefix}/share' +@@ -24341,7 +24360,7 @@ test "$datarootdir" = '${prefix}/share' test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)' test "$localedir" = '${datarootdir}/locale' && localedir='$(datarootdir)/locale' test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var' --test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc' -+# test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc' +-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc' ++# test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc' if test X"$INIT_SCRIPT" != X""; then ac_config_files="$ac_config_files init.d/$INIT_SCRIPT" |