pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/sudo Update sudo to 1.6.9. We don't take the...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6dc8bfae0c89
branches: trunk
changeset: 531180:6dc8bfae0c89
user: tls <tls%pkgsrc.org@localhost>
date: Mon Jul 23 16:38:36 2007 +0000
description:
Update sudo to 1.6.9. We don't take the new default of PAM and no other
authentication; that can be enabled by adding pam to the package options
if users desire.
diffstat:
security/sudo/Makefile | 7 +-
security/sudo/distinfo | 17 +-
security/sudo/options.mk | 4 +-
security/sudo/patches/patch-aa | 14 +-
security/sudo/patches/patch-af | 64 +++-
security/sudo/patches/patch-ag | 506 +++++++++++++++++++++++++++-------------
security/sudo/patches/patch-ah | 31 --
security/sudo/patches/patch-ai | 27 --
8 files changed, 406 insertions(+), 264 deletions(-)
diffs (truncated from 796 to 300 lines):
diff -r 7329a78ea6e1 -r 6dc8bfae0c89 security/sudo/Makefile
--- a/security/sudo/Makefile Mon Jul 23 15:25:20 2007 +0000
+++ b/security/sudo/Makefile Mon Jul 23 16:38:36 2007 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.92 2007/07/04 20:37:50 jlam Exp $
+# $NetBSD: Makefile,v 1.93 2007/07/23 16:38:36 tls Exp $
#
-DISTNAME= sudo-1.6.8p12
-PKGNAME= sudo-1.6.8pl12
-PKGREVISION= 5
+DISTNAME= sudo-1.6.9
+PKGNAME= sudo-1.6.9
CATEGORIES= security
MASTER_SITES= http://www.courtesan.com/sudo/dist/ \
ftp://ftp.courtesan.com/pub/sudo/ \
diff -r 7329a78ea6e1 -r 6dc8bfae0c89 security/sudo/distinfo
--- a/security/sudo/distinfo Mon Jul 23 15:25:20 2007 +0000
+++ b/security/sudo/distinfo Mon Jul 23 16:38:36 2007 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.37 2007/07/02 06:04:02 tls Exp $
+$NetBSD: distinfo,v 1.38 2007/07/23 16:38:36 tls Exp $
-SHA1 (sudo-1.6.8p12.tar.gz) = a79631e9e1c0d0d3f2aa88ae685628e5fde61982
-RMD160 (sudo-1.6.8p12.tar.gz) = d7ff9f18ca0973615258c2e975300b94567451d5
-Size (sudo-1.6.8p12.tar.gz) = 585643 bytes
-SHA1 (patch-aa) = 02837d457786a4966c3a683918e0d592aaa32d2d
-SHA1 (patch-af) = 245761812dc600b3d2752fa135ba367bb0223370
-SHA1 (patch-ag) = 87c3263674ec98ccc9cc33f2108a2456eddaecc5
-SHA1 (patch-ah) = 142a8884aebdc1cffc256c3ca0ee9addc34f8054
-SHA1 (patch-ai) = 13ae982ea999a24b8ddc9d643cd788db84e2cfbd
+SHA1 (sudo-1.6.9.tar.gz) = 42fa0c9836bdaedeb1a7344f24f7822e598760b5
+RMD160 (sudo-1.6.9.tar.gz) = 141688a479f3dd915075eae98de8f7dc1a5c63f4
+Size (sudo-1.6.9.tar.gz) = 557692 bytes
+
+SHA1 (patch-aa) = 98ca6552bc305aeeb726d48f1d722480f792a0ba
+SHA1 (patch-af) = e411f12789f9d5b5fda8b88af3730c89859f5eda
+SHA1 (patch-ag) = fc3dc05e119ca53117266e4f083acff2b9d9aea5
diff -r 7329a78ea6e1 -r 6dc8bfae0c89 security/sudo/options.mk
--- a/security/sudo/options.mk Mon Jul 23 15:25:20 2007 +0000
+++ b/security/sudo/options.mk Mon Jul 23 16:38:36 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2006/05/31 18:22:26 ghen Exp $
+# $NetBSD: options.mk,v 1.12 2007/07/23 16:38:36 tls Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.sudo
@@ -14,6 +14,8 @@
. include "../../mk/pam.buildlink3.mk"
DL_AUTO_VARS= yes
CONFIGURE_ARGS+= --with-pam
+.else
+CONFIGURE_ARGS+= --without-pam
.endif
.if !empty(PKG_OPTIONS:Mkerberos)
diff -r 7329a78ea6e1 -r 6dc8bfae0c89 security/sudo/patches/patch-aa
--- a/security/sudo/patches/patch-aa Mon Jul 23 15:25:20 2007 +0000
+++ b/security/sudo/patches/patch-aa Mon Jul 23 16:38:36 2007 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.13 2007/06/26 15:05:50 jlam Exp $
+/* $NetBSD: patch-aa,v 1.14 2007/07/23 16:38:36 tls Exp $ */
---- Makefile.in.orig 2005-11-08 13:21:58.000000000 -0500
-+++ Makefile.in
-@@ -181,7 +181,7 @@ testsudoers: $(TESTOBJS) $(LIBOBJS)
- $(CC) -o $@ $(TESTOBJS) $(LIBOBJS) $(LDFLAGS) $(LIBS) $(NET_LIBS)
+--- Makefile.in.orig 2007-07-16 22:53:18.000000000 -0400
++++ Makefile.in 2007-07-23 05:50:01.000000000 -0400
+@@ -185,7 +185,7 @@
+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c
sudo_noexec.la: sudo_noexec.lo
- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
@@ -11,7 +11,7 @@
# Uncomment the following if you want "make distclean" to clean the parser
@DEV@PARSESRCS = sudo.tab.h sudo.tab.c lex.yy.c def_data.c def_data.h
-@@ -292,20 +292,20 @@ sudoers.man:: sudoers.man.in
+@@ -300,20 +300,20 @@
sudoers.cat: sudoers.man
@@ -36,7 +36,7 @@
install-noexec: sudo_noexec.la
$(LIBTOOL) --mode=install $(INSTALL) sudo_noexec.la $(DESTDIR)$(noexecdir)
-@@ -315,15 +315,15 @@ bininst-noexec: sudo_noexec.la
+@@ -323,15 +323,15 @@
install-sudoers:
test -f $(DESTDIR)$(sudoersdir)/sudoers || \
diff -r 7329a78ea6e1 -r 6dc8bfae0c89 security/sudo/patches/patch-af
--- a/security/sudo/patches/patch-af Mon Jul 23 15:25:20 2007 +0000
+++ b/security/sudo/patches/patch-af Mon Jul 23 16:38:36 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.14 2005/10/10 17:48:09 joerg Exp $
+/* $NetBSD: patch-af,v 1.15 2007/07/23 16:38:36 tls Exp $ */
---- configure.in.orig 2004-11-25 18:31:20.000000000 +0100
-+++ configure.in 2005-05-11 14:23:01.000000000 +0200
-@@ -118,7 +118,6 @@
+--- configure.in.orig 2007-07-16 22:51:21.000000000 -0400
++++ configure.in 2007-07-23 11:15:42.000000000 -0400
+@@ -123,7 +123,6 @@
test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
@@ -10,7 +10,7 @@
dnl
dnl Deprecated --with options (these all warn or generate an error)
-@@ -244,6 +243,19 @@
+@@ -246,6 +245,19 @@
;;
esac])
@@ -30,20 +30,52 @@
AC_ARG_WITH(passwd, [ --without-passwd don't use passwd/shadow file for authentication],
[case $with_passwd in
yes) ;;
-@@ -1513,7 +1525,7 @@
- esac
+@@ -1466,7 +1478,7 @@
+ AC_CHECK_FUNCS(auth_challenge, [with_bsdauth=maybe])
fi
;;
- *-*-freebsd*)
+ *-*-freebsd*|*-*-dragonfly*)
# FreeBSD has a real setreuid(2) starting with 2.1 and
# backported to 2.0.5. We just take 2.1 and above...
- case "`echo $host_os | sed 's/^freebsd\([[0-9\.]]*\).*$/\1/'`" in
-@@ -1894,6 +1906,7 @@
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_HEIMDAL)
- SUDO_LIBS="${SUDO_LIBS} -lkrb5 -ldes -lcom_err -lasn1"
-+ AC_CHECK_LIB(crypto, main, [SUDO_LIBS="${SUDO_LIBS} -lcrypto"])
- AC_CHECK_LIB(roken, main, [SUDO_LIBS="${SUDO_LIBS} -lroken"])
- ], [
- AC_MSG_RESULT(no)
+ case "$OSREV" in
+@@ -1482,6 +1494,8 @@
+ fi
+ : ${with_pam='maybe'}
+ : ${with_logincap='maybe'}
++ # We really want libutil.
++ SUDO_LIBS="${SUDO_LIBS} -lutil"
+ ;;
+ *-*-*openbsd*)
+ # OpenBSD has a real setreuid(2) starting with 3.3 but
+@@ -1515,10 +1529,12 @@
+ : ${with_logincap='maybe'}
+ dnl future versions of NetBSD (> 2.0) may include pam
+ : ${with_pam='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
+ if test "$CHECKSHADOW" = "true"; then
+ CHECKSHADOW="false"
+@@ -1895,16 +1911,6 @@
+ fi
+
+ dnl
+-dnl Some systems put login_cap(3) in libutil
+-dnl
+-if test "$with_logincap" = "yes"; then
+- case "$OS" in
+- freebsd|netbsd) SUDO_LIBS="${SUDO_LIBS} -lutil"
+- ;;
+- esac
+-fi
+-
+-dnl
+ dnl PAM support. Systems that might support PAM set with_pam=maybe
+ dnl and we do that actual tests here.
+ dnl
diff -r 7329a78ea6e1 -r 6dc8bfae0c89 security/sudo/patches/patch-ag
--- a/security/sudo/patches/patch-ag Mon Jul 23 15:25:20 2007 +0000
+++ b/security/sudo/patches/patch-ag Mon Jul 23 16:38:36 2007 +0000
@@ -1,16 +1,52 @@
-$NetBSD: patch-ag,v 1.6 2005/10/10 17:48:10 joerg Exp $
+/* $NetBSD: patch-ag,v 1.7 2007/07/23 16:38:36 tls Exp $ */
---- configure.orig 2004-11-26 21:04:30.000000000 +0100
-+++ configure 2005-05-10 21:38:19.000000000 +0200
-@@ -1051,6 +1051,7 @@
+--- configure.orig 2007-07-16 22:47:55.000000000 -0400
++++ configure 2007-07-23 11:16:44.000000000 -0400
+@@ -561,7 +561,7 @@
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) ac_optarg=yes ;;
+ esac
+- eval enable_$ac_feature='$ac_optarg' ;;
++ eval "enable_$ac_feature='$ac_optarg'" ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -743,7 +743,7 @@
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) ac_optarg=yes ;;
+ esac
+- eval with_$ac_package='$ac_optarg' ;;
++ eval "with_$ac_package='$ac_optarg'" ;;
+
+ -without-* | --without-*)
+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+@@ -968,7 +968,7 @@
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
+- --sysconfdir=DIR read-only single-machine data [/etc]
++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+@@ -1032,6 +1032,7 @@
--with-devel add development options
--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
-@@ -1622,7 +1623,6 @@
+ --with-skey=DIR enable S/Key support
+ --with-opie=DIR enable OPIE support
+@@ -1310,7 +1311,7 @@
+ -* ) ac_must_keep_next=true ;;
+ esac
+ fi
+- ac_configure_args="$ac_configure_args$ac_sep\"$ac_arg\""
++ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+ # Get rid of the leading space.
+ ac_sep=" "
+ ;;
+@@ -1634,7 +1635,6 @@
test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
@@ -18,7 +54,7 @@
-@@ -1820,6 +1820,22 @@
+@@ -1826,6 +1826,23 @@
fi;
@@ -38,183 +74,315 @@
+esac
+fi;
+
++
# Check whether --with-passwd or --without-passwd was given.
if test "${with_passwd+set}" = set; then
withval="$with_passwd"
-@@ -5228,7 +5244,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--freebsd*)
-+freebsd*|dragonfly*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
-@@ -8440,7 +8456,7 @@
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
-+ dragonfly*|freebsd*)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
-@@ -9071,11 +9087,11 @@
- dynamic_linker=no
- ;;
+@@ -7066,7 +7083,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 7069 "configure"
++#line 7086 "configure"
+ #include "confdefs.h"
--freebsd*)
-+dragonfly*|freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
-- freebsd-elf*)
-+ dragonfly*|freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- ;;
- freebsd-*)
Home |
Main Index |
Thread Index |
Old Index