diff options
-rw-r--r-- | security/sudo/distinfo | 6 | ||||
-rw-r--r-- | security/sudo/patches/patch-af | 34 | ||||
-rw-r--r-- | security/sudo/patches/patch-ag | 34 |
3 files changed, 23 insertions, 51 deletions
diff --git a/security/sudo/distinfo b/security/sudo/distinfo index 70a740fbb98..83fd43c56de 100644 --- a/security/sudo/distinfo +++ b/security/sudo/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.44 2007/11/04 12:07:25 taca Exp $ +$NetBSD: distinfo,v 1.45 2007/11/12 11:12:16 taca Exp $ SHA1 (sudo-1.6.9p8.tar.gz) = d4408550e4ebd2089edb2a7cc3f4ce9f7ba919f3 RMD160 (sudo-1.6.9p8.tar.gz) = a1e4d334d96a3a937a4e170d64c28cb8294989fa Size (sudo-1.6.9p8.tar.gz) = 575439 bytes SHA1 (patch-aa) = 5741d965cec49d7bb84bcdd7fd461edb2cc18465 -SHA1 (patch-af) = ca47e872e3faf63f2b359eb587600332240689a9 -SHA1 (patch-ag) = 6eb83833bcd6b05cfbd548a631fb7b7b0aa1a74b +SHA1 (patch-af) = c0a594c8b3a665dc0a84f40754a46bcd7e17ea49 +SHA1 (patch-ag) = c3442810139581c003e2c5d911df1bcbdcfc0008 diff --git a/security/sudo/patches/patch-af b/security/sudo/patches/patch-af index 7ebc7764a1a..e4152b639da 100644 --- a/security/sudo/patches/patch-af +++ b/security/sudo/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.18 2007/10/28 02:05:45 taca Exp $ +$NetBSD: patch-af,v 1.19 2007/11/12 11:12:16 taca Exp $ --- configure.in.orig 2007-10-25 01:43:25.000000000 +0900 +++ configure.in @@ -30,26 +30,12 @@ $NetBSD: patch-af,v 1.18 2007/10/28 02:05:45 taca Exp $ AC_ARG_WITH(passwd, [ --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) -@@ -1484,6 +1496,8 @@ case "$host" in - CHECKSHADOW="false" - test -z "$with_pam" && AUTH_EXCL_DEF="PAM" - : ${with_logincap='maybe'} -+ # We really want libutil. -+ SUDO_LIBS="${SUDO_LIBS} -lutil" - ;; - *-*-*openbsd*) - # OpenBSD has a real setreuid(2) starting with 3.3 but -@@ -1512,10 +1526,12 @@ case "$host" in - CHECKSHADOW="false" - test -z "$with_pam" && AUTH_EXCL_DEF="PAM" - : ${with_logincap='maybe'} -+ # We really want libutil. -+ SUDO_LIBS="${SUDO_LIBS} -lutil" - ;; - *-*-dragonfly*) - if test "$with_skey" = "yes"; then -- SUDO_LIBS="${SUDO_LIBS} -lmd" -+ SUDO_LIBS="${SUDO_LIBS} -lutil -lmd" - fi - CHECKSHADOW="false" - test -z "$with_pam" && AUTH_EXCL_DEF="PAM" +@@ -1634,7 +1646,7 @@ fi + if test ${with_logincap-'no'} != "no"; then + AC_CHECK_HEADERS(login_cap.h, [ + case "$OS" in +- freebsd|netbsd) SUDO_LIBS="${SUDO_LIBS} -lutil" ++ dragonfly*|freebsd*|netbsd*) SUDO_LIBS="${SUDO_LIBS} -lutil" + ;; + esac + ]) diff --git a/security/sudo/patches/patch-ag b/security/sudo/patches/patch-ag index e60a12237a6..b84c4ff384b 100644 --- a/security/sudo/patches/patch-ag +++ b/security/sudo/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.10 2007/10/28 02:05:45 taca Exp $ +$NetBSD: patch-ag,v 1.11 2007/11/12 11:12:16 taca Exp $ --- configure.orig 2007-10-24 02:19:18.000000000 +0900 +++ configure @@ -51,26 +51,12 @@ $NetBSD: patch-ag,v 1.10 2007/10/28 02:05:45 taca Exp $ # Check whether --with-passwd was given. if test "${with_passwd+set}" = set; then withval=$with_passwd; case $with_passwd in -@@ -11996,6 +12013,8 @@ done - CHECKSHADOW="false" - test -z "$with_pam" && AUTH_EXCL_DEF="PAM" - : ${with_logincap='maybe'} -+ # We really want libutil. -+ SUDO_LIBS="${SUDO_LIBS} -lutil" - ;; - *-*-*openbsd*) - # OpenBSD has a real setreuid(2) starting with 3.3 but -@@ -12024,10 +12043,12 @@ done - CHECKSHADOW="false" - test -z "$with_pam" && AUTH_EXCL_DEF="PAM" - : ${with_logincap='maybe'} -+ # We really want libutil. -+ SUDO_LIBS="${SUDO_LIBS} -lutil" - ;; - *-*-dragonfly*) - if test "$with_skey" = "yes"; then -- SUDO_LIBS="${SUDO_LIBS} -lmd" -+ SUDO_LIBS="${SUDO_LIBS} -lutil -lmd" - fi - CHECKSHADOW="false" - test -z "$with_pam" && AUTH_EXCL_DEF="PAM" +@@ -13675,7 +13692,7 @@ if test `eval echo '${'$as_ac_Header'}'` + _ACEOF + + case "$OS" in +- freebsd|netbsd) SUDO_LIBS="${SUDO_LIBS} -lutil" ++ dragonfly*|freebsd*|netbsd*) SUDO_LIBS="${SUDO_LIBS} -lutil" + ;; + esac + |