Updated net/tacacs-shrubbery to 4.0.4.25

9 files changed, 39 insertions, 121 deletions

diff --git a/net/tacacs-shrubbery/Makefile b/net/tacacs-shrubbery/Makefile
index 32041e20270..a24343ac8a9 100644
--- a/net/tacacs-shrubbery/Makefile
+++ b/net/tacacs-shrubbery/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/01/24 08:46:03 pettai Exp $
+# $NetBSD: Makefile,v 1.3 2012/05/10 19:01:08 schwarz Exp $
 #
 
-DISTNAME=	tacacs+-F4.0.4.22
+DISTNAME=	tacacs+-F4.0.4.25
 PKGNAME=	${DISTNAME:S,-F,-,}
 CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/tac_plus/
@@ -37,10 +37,6 @@ BUILD_DEFS+=		VARBASE
 CPPFLAGS+=		-Duint16_t=u_int16_t -Duint32_t=u_int32_t
 .endif
 
-.if exists(/usr/include/pam/pam_appl.h) # MacOS X prior to 10.6
-CPPFLAGS+=		-DPAM-PAM
-.endif
-
 INSTALLATION_DIRS=	lib sbin ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 \
 			${PKGMANDIR}/man8 share/doc/tacacs
 
diff --git a/net/tacacs-shrubbery/distinfo b/net/tacacs-shrubbery/distinfo
index 649f4932452..997de82440f 100644
--- a/net/tacacs-shrubbery/distinfo
+++ b/net/tacacs-shrubbery/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.2 2012/01/24 08:46:03 pettai Exp $
+$NetBSD: distinfo,v 1.3 2012/05/10 19:01:08 schwarz Exp $
 
-SHA1 (tacacs+-F4.0.4.22.tar.gz) = a9d3f5293bb2df3e4adc6e61d523148eac2c8c4c
-RMD160 (tacacs+-F4.0.4.22.tar.gz) = d241670b515846341d062446740a75897867922a
-Size (tacacs+-F4.0.4.22.tar.gz) = 508611 bytes
-SHA1 (patch-ag) = f0cad7741f8127668d9c2929dcb74e0ed96d0db2
-SHA1 (patch-ah) = 5935a8150b5af461c16dcec21b19d7c1e7ffd322
-SHA1 (patch-aj) = 618c6ff411502bd32af40e9f48c6e2f7ec55e996
-SHA1 (patch-ak) = df059f82a38fb394b726ee46fa87aa0ea04681c3
-SHA1 (patch-al) = 85e964f23aa228f3d1debf0f407d5d8857ff2bcf
-SHA1 (patch-am) = 880e3821a335e2605beb03dc145b3cd9a020fb2f
+SHA1 (tacacs+-F4.0.4.25.tar.gz) = 5cd564dfa162054109c49693fb5703b125582e6d
+RMD160 (tacacs+-F4.0.4.25.tar.gz) = 48851123866cdb2880e60d92957c66a1675ccde7
+Size (tacacs+-F4.0.4.25.tar.gz) = 501998 bytes
+SHA1 (patch-ag) = 3ddc4916cfd85b0d501be8957c1e6dcc42cf523a
+SHA1 (patch-ah) = 43698e384eba7fe091a155fc005c21a077aa0cf3
+SHA1 (patch-aj) = 9da6c0e2bb520d776accb16acf9674e259a743ed
+SHA1 (patch-ak) = dae79bec642dc1b3b14a6d61d64cb424dc3b84dd
+SHA1 (patch-al) = 34bb3e4f733763ad5fd9d30db32ba172befa8d7c
diff --git a/net/tacacs-shrubbery/options.mk b/net/tacacs-shrubbery/options.mk
index bca7df86716..7cbff9bfbe5 100644
--- a/net/tacacs-shrubbery/options.mk
+++ b/net/tacacs-shrubbery/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2011/11/30 23:47:29 pettai Exp $
+# $NetBSD: options.mk,v 1.2 2012/05/10 19:01:08 schwarz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tacacs-shrubbery
 PKG_SUPPORTED_OPTIONS=	tacacs-shrubbery-acls-support tacacs-shrubbery-drop-root-privileges tcpwrappers skey
@@ -33,11 +33,14 @@ CONFIGURE_ARGS+=	--without-libwrap
 
 .if !empty(PKG_OPTIONS:Mskey)
 CONFIGURE_ARGS+=	--with-skey=${BUILDLINK_PREFIX.skey}
-. include "../../security/skey/buildlink3.mk"
-. if (defined(IS_BUILTIN.skey) && ${IS_BUILTIN.skey} == no ) || ${OPSYS} == "OpenBSD"
+CHECK_BUILTIN.skey:=yes
+. include "../../security/skey/builtin.mk"
+CHECK_BUILTIN.skey:=no
+. if !empty(USE_BUILTIN.skey:M[nN][oO]) || ${OPSYS} == "OpenBSD"
 # pkgsrc's version uses three arguments only, as does OpenBSD's
 CPPFLAGS+=		-DOLDSKEY
 . endif
+. include "../../security/skey/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-skey
 .endif
diff --git a/net/tacacs-shrubbery/patches/patch-ag b/net/tacacs-shrubbery/patches/patch-ag
index 4582c4ba501..33848a5c26e 100644
--- a/net/tacacs-shrubbery/patches/patch-ag
+++ b/net/tacacs-shrubbery/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.1.1.1 2011/11/30 23:47:29 pettai Exp $
+$NetBSD: patch-ag,v 1.2 2012/05/10 19:01:09 schwarz Exp $
 
 Older implementations of skeychallenge() only have three arguments.
 
---- skey_fn.c.orig	2009-03-17 19:40:29.000000000 +0100
-+++ skey_fn.c	2009-04-19 12:33:05.000000000 +0200
+--- skey_fn.c.orig	2012-05-06 23:33:13.000000000 +0200
++++ skey_fn.c	2012-05-06 23:33:48.000000000 +0200
 @@ -164,7 +164,11 @@
  		return(1);
  	    }
@@ -15,5 +15,5 @@ Older implementations of skeychallenge() only have three arguments.
 +#endif
 +                                                            ) == 0) {
  		char buf[256];
- 		sprintf(buf, "%s\nS/Key challenge: ", skeyprompt);
+ 		snprintf(buf, sizeof(buf), "%s\nS/Key challenge: ", skeyprompt);
  		data->server_msg = tac_strdup(buf);
diff --git a/net/tacacs-shrubbery/patches/patch-ah b/net/tacacs-shrubbery/patches/patch-ah
index 99b1dd68be5..6278c4a9242 100644
--- a/net/tacacs-shrubbery/patches/patch-ah
+++ b/net/tacacs-shrubbery/patches/patch-ah
@@ -1,19 +1,10 @@
-$NetBSD: patch-ah,v 1.2 2012/01/24 08:46:04 pettai Exp $
+$NetBSD: patch-ah,v 1.3 2012/05/10 19:01:09 schwarz Exp $
 
 Handle IRIX the same way as Solaris
 
---- do_acct.c.orig	2012-01-24 07:39:56.000000000 +0000
-+++ do_acct.c
-@@ -214,7 +214,7 @@ wtmp_entry(char *line, char *name, char 
-     if (!wtmpfile) {
- 	return(1);
-     }
--#if HAVE_UTMPX_H
-+#if HAVE_UTMPX_H && !HAVE_UTMP_H
- # define ut_name	ut_user
- #endif
- 
-@@ -230,7 +230,7 @@ wtmp_entry(char *line, char *name, char 
+--- do_acct.c.orig	2012-05-06 23:28:47.000000000 +0200
++++ do_acct.c	2012-05-06 23:31:37.000000000 +0200
+@@ -230,7 +230,7 @@
      else
  	memcpy(entry.ut_name, name, sizeof(entry.ut_name));
  
diff --git a/net/tacacs-shrubbery/patches/patch-aj b/net/tacacs-shrubbery/patches/patch-aj
index 61df64e5c50..5a3068d86b2 100644
--- a/net/tacacs-shrubbery/patches/patch-aj
+++ b/net/tacacs-shrubbery/patches/patch-aj
@@ -1,10 +1,10 @@
-$NetBSD: patch-aj,v 1.1.1.1 2011/11/30 23:47:29 pettai Exp $
+$NetBSD: patch-aj,v 1.2 2012/05/10 19:01:09 schwarz Exp $
 
 Fix a typo in the comments :-)
 
---- aclocal.m4.orig	2011-11-30 18:00:22.000000000 +0100
-+++ aclocal.m4	2011-11-30 18:00:28.000000000 +0100
-@@ -8101,7 +8101,7 @@
+--- aclocal.m4.orig	2012-05-06 23:35:28.000000000 +0200
++++ aclocal.m4	2012-05-06 23:35:54.000000000 +0200
+@@ -8582,7 +8582,7 @@
  
  # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
  # written in clear, in which case automake, when reading aclocal.m4,
diff --git a/net/tacacs-shrubbery/patches/patch-ak b/net/tacacs-shrubbery/patches/patch-ak
index db7d0044039..c7d968c1320 100644
--- a/net/tacacs-shrubbery/patches/patch-ak
+++ b/net/tacacs-shrubbery/patches/patch-ak
@@ -1,10 +1,10 @@
-$NetBSD: patch-ak,v 1.1.1.1 2011/11/30 23:47:29 pettai Exp $
+$NetBSD: patch-ak,v 1.2 2012/05/10 19:01:09 schwarz Exp $
 
-Don't mess with CPPFLAGS and LDFLAGS as pkgsrc handle them
+Don't mess with CPPFLAGS and LDFLAGS as pkgsrc handles them
 
---- configure.orig	2011-11-30 18:01:46.000000000 +0100
-+++ configure	2011-11-30 18:01:54.000000000 +0100
-@@ -3262,8 +3262,8 @@
+--- configure.orig	2012-05-06 23:37:04.000000000 +0200
++++ configure	2012-05-06 23:37:14.000000000 +0200
+@@ -3145,8 +3145,8 @@
  	# XXX: not sure if /usr/local is necessary.
  	# XXX: linux libwrap needs -lnsl. configure should check for
  	#      existence of libnsl instead of hard-coding
@@ -15,7 +15,7 @@ Don't mess with CPPFLAGS and LDFLAGS as pkgsrc handle them
  	LIBS="-lnsl -lcrypt $LIBS"; export LIBS
          $as_echo "#define LINUX 1" >>confdefs.h
  
-@@ -3271,15 +3271,15 @@
+@@ -3154,15 +3154,15 @@
  	# XXX: does linux need glibc: -DGLIBC
      ;;
      *mips* )
diff --git a/net/tacacs-shrubbery/patches/patch-al b/net/tacacs-shrubbery/patches/patch-al
index 01b00455ba8..3e8c892db67 100644
--- a/net/tacacs-shrubbery/patches/patch-al
+++ b/net/tacacs-shrubbery/patches/patch-al
@@ -1,10 +1,10 @@
-$NetBSD: patch-al,v 1.1.1.1 2011/11/30 23:47:29 pettai Exp $
+$NetBSD: patch-al,v 1.2 2012/05/10 19:01:09 schwarz Exp $
 
 Also compile on systems that do not have PAM
 
---- config.c.orig	2009-04-19 12:39:42.000000000 +0200
-+++ config.c	2009-04-19 12:41:16.000000000 +0200
-@@ -65,7 +65,9 @@
+--- config.c.orig	2012-05-06 23:38:46.000000000 +0200
++++ config.c	2012-05-06 23:38:51.000000000 +0200
+@@ -72,7 +72,9 @@
  				skey |
  				cleartext <password> |
  				des <password> |
@@ -14,13 +14,3 @@ Also compile on systems that do not have PAM
  				nopassword
  
     <user_attr>		:=	name	= <string> |
-@@ -79,6 +81,9 @@
- #endif
- 				pap	= cleartext <string> |
- 				pap	= des <string> |
-+#ifdef HAVE_PAM
-+				pap	= PAM |
-+#endif
- 				opap	= cleartext <string> |
- 				global	= cleartext <string> |
- 				msg	= <string>
diff --git a/net/tacacs-shrubbery/patches/patch-am b/net/tacacs-shrubbery/patches/patch-am
deleted file mode 100644
index 78e4cd34866..00000000000
--- a/net/tacacs-shrubbery/patches/patch-am
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2011/11/30 23:47:29 pettai Exp $
-
-Properly handle PAM support header file on MacOS prior to 10.6;
-added patch for PAM support for pap.
-(http://www.shrubbery.net/pipermail/tac_plus/2008-October/000282.html)
-
---- pwlib.c.orig	2011-11-30 18:02:45.000000000 +0100
-+++ pwlib.c	2011-11-30 18:02:54.000000000 +0100
-@@ -31,7 +31,7 @@
- #endif
- 
- #if HAVE_PAM
--# ifdef __APPLE__	/* MacOS X */
-+# ifdef PAM-PAM	/* MacOS X prior to 10.6 */
- #  include <pam/pam_appl.h>
- # else
- #  include <security/pam_appl.h>
-@@ -50,6 +50,9 @@
- #endif
- static int passwd_file_verify(char *, char *, struct authen_data *, char *);
- 
-+// Global password variable for pap PAM support
-+static char *predef_passwd;
-+
- /* Adjust data->status depending on whether a user has expired or not */
- void
- set_expiration_status(char *exp_date, struct authen_data *data)
-@@ -490,10 +493,13 @@
- 		report(LOG_DEBUG, "%s %s: PAM_PROMPT_ECHO_OFF", session.peer,
- 		       session.port);
- 
--	    send_authen_reply(TAC_PLUS_AUTHEN_STATUS_GETPASS,
--			      (char *)pmpp[i]->msg,
--			      pmpp[i]->msg ? strlen(pmpp[i]->msg) : 0,
--			      NULL, 0, TAC_PLUS_AUTHEN_FLAG_NOECHO);
-+	    if (strcmp(predef_passwd, "") != 0) {
-+		prpp[i]->resp = predef_passwd;
-+	    } else {
-+		send_authen_reply(TAC_PLUS_AUTHEN_STATUS_GETPASS,
-+		(char *)pmpp[i]->msg,
-+		pmpp[i]->msg ? strlen(pmpp[i]->msg) : 0,
-+		NULL, 0, TAC_PLUS_AUTHEN_FLAG_NOECHO);
- 	    reply = get_authen_continue();
- 	    if (!reply) {
- 		/* Typically due to a premature connection close */
-@@ -513,6 +519,7 @@
- 	    prpp[i]->resp[acp->user_msg_len] = '\0';
- 
- 	    free(reply);
-+	    }
- 	    break;
- 	case PAM_PROMPT_ECHO_ON:
- 	    if (debug & DEBUG_PASSWD_FLAG)
-@@ -588,6 +595,7 @@
-     int			pam_flag;
-     struct pam_conv	conv = { pam_tacacs, NULL };
-     pam_handle_t	*pamh = NULL;
-+    predef_passwd = passwd;
- 
-     if (debug & DEBUG_PASSWD_FLAG)
- 	report(LOG_DEBUG, "pam_verify %s %s", user, passwd);