12 files changed, 40 insertions, 36 deletions

diff --git a/net/tac_plus4/Makefile b/net/tac_plus4/Makefile
index ac501ce3e98f..129930817fe8 100644
--- a/net/tac_plus4/Makefile
+++ b/net/tac_plus4/Makefile
@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	tac_plus
-PORTVERSION=	F4.0.4.27a
+PORTVERSION=	F4.0.4.28
 CATEGORIES=	net security
-MASTER_SITES=	ftp://ftp.shrubbery.net/pub/tac_plus/
-DISTNAME=	tacacs+-F4.0.4.27a
+MASTER_SITES=	ftp://ftp.shrubbery.net/pub/${PORTNAME}/
+DISTNAME=	tacacs-${PORTVERSION}
 
 MAINTAINER=	marcus@FreeBSD.org
-COMMENT=	The Cisco remote authentication/authorization/accounting server
+COMMENT=	Cisco remote authentication/authorization/accounting server
 
 GNU_CONFIGURE=	yes
 USES=		bison perl5 libtool
diff --git a/net/tac_plus4/distinfo b/net/tac_plus4/distinfo
index fb61523180e4..ed39fe2d002a 100644
--- a/net/tac_plus4/distinfo
+++ b/net/tac_plus4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tacacs+-F4.0.4.27a.tar.gz) = 512e1c30389b102d4af25d7e9bc3bdcd9d39d70e5e7d8a98c8f785733df8d9a1
-SIZE (tacacs+-F4.0.4.27a.tar.gz) = 504395
+SHA256 (tacacs-F4.0.4.28.tar.gz) = 147f2dc98d26d2f93f0aba76c988ced196ffe1c001dc2e91f788a1a2c747219e
+SIZE (tacacs-F4.0.4.28.tar.gz) = 530049
diff --git a/net/tac_plus4/files/patch-Makefile.in b/net/tac_plus4/files/patch-Makefile.in
index 8ba7d9586a19..289f2acd2786 100644
--- a/net/tac_plus4/files/patch-Makefile.in
+++ b/net/tac_plus4/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2012-04-17 02:56:54.000000000 +0400
-+++ Makefile.in	2013-04-13 13:43:18.000000000 +0400
-@@ -98,7 +98,7 @@
+--- Makefile.in.orig	2012-04-16 22:56:21 UTC
++++ Makefile.in
+@@ -162,7 +162,7 @@ am__tac_plus_SOURCES_DIST = acct.c authe
  	config.c default_fn.c default_v0_fn.c do_acct.c do_author.c \
  	dump.c enable.c encrypt.c expire.c hash.c maxsessint.c parse.c \
  	programs.c pw.c pwlib.c report.c sendauth.c sendpass.c \
@@ -9,7 +9,7 @@
  @TACSKEY_TRUE@am__objects_1 = skey_fn.$(OBJEXT)
  @TACACECLNT_TRUE@am__objects_2 = aceclnt_fn.$(OBJEXT)
  am_tac_plus_OBJECTS = acct.$(OBJEXT) authen.$(OBJEXT) author.$(OBJEXT) \
-@@ -109,7 +109,7 @@
+@@ -173,7 +173,7 @@ am_tac_plus_OBJECTS = acct.$(OBJEXT) aut
  	parse.$(OBJEXT) programs.$(OBJEXT) pw.$(OBJEXT) \
  	pwlib.$(OBJEXT) report.$(OBJEXT) sendauth.$(OBJEXT) \
  	sendpass.$(OBJEXT) tac_plus.$(OBJEXT) utils.$(OBJEXT) \
@@ -18,7 +18,7 @@
  tac_plus_OBJECTS = $(am_tac_plus_OBJECTS)
  am__DEPENDENCIES_1 =
  tac_plus_DEPENDENCIES = $(am__DEPENDENCIES_1)
-@@ -592,6 +592,7 @@
+@@ -770,6 +770,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendauth.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendpass.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skey_fn.Po@am__quote@
@@ -26,7 +26,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tac_plus.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tac_pwd.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
-@@ -1049,8 +1050,7 @@
+@@ -1256,8 +1257,7 @@ info: info-am
  
  info-am:
  
diff --git a/net/tac_plus4/files/patch-choose_authen.c b/net/tac_plus4/files/patch-choose_authen.c
index 08b1f1c37737..ccfe7badd3ab 100644
--- a/net/tac_plus4/files/patch-choose_authen.c
+++ b/net/tac_plus4/files/patch-choose_authen.c
@@ -1,6 +1,6 @@
---- choose_authen.c.orig	2012-04-17 01:42:55.000000000 +0400
-+++ choose_authen.c	2013-04-13 13:55:20.000000000 +0400
-@@ -130,12 +130,29 @@
+--- choose_authen.c.orig	2012-04-16 21:42:55 UTC
++++ choose_authen.c
+@@ -130,12 +130,29 @@ choose_login(struct authen_data *data, s
  #else /* SKEY */
  	    report(LOG_ERR,
  		   "%s %s: user %s s/key support has not been compiled in",
diff --git a/net/tac_plus4/files/patch-opie_fn.c b/net/tac_plus4/files/patch-opie_fn.c
index cf4356b6eee0..53af8860a4ab 100644
--- a/net/tac_plus4/files/patch-opie_fn.c
+++ b/net/tac_plus4/files/patch-opie_fn.c
@@ -1,5 +1,5 @@
---- opie_fn.c.orig	Sun Dec  8 15:26:20 2002
-+++ opie_fn.c	Sun Dec  8 15:27:01 2002
+--- opie_fn.c.orig	2002-12-08 11:26:20 UTC
++++ opie_fn.c
 @@ -0,0 +1,239 @@
 +/* 
 +   Copyright (c) 1995-2000 by Cisco systems, Inc.
diff --git a/net/tac_plus4/files/patch-parse.h b/net/tac_plus4/files/patch-parse.h
index 02f13231b600..37388fe0d413 100644
--- a/net/tac_plus4/files/patch-parse.h
+++ b/net/tac_plus4/files/patch-parse.h
@@ -1,5 +1,5 @@
---- parse.h.orig	2012-04-10 22:34:40.000000000 +0400
-+++ parse.h	2013-04-13 14:02:27.000000000 +0400
+--- parse.h.orig	2012-04-10 18:34:40 UTC
++++ parse.h
 @@ -74,6 +74,7 @@
  #ifdef MSCHAP
  #define S_mschap          42
diff --git a/net/tac_plus4/files/patch-skey_fn.c b/net/tac_plus4/files/patch-skey_fn.c
index 8b0ab1b742a3..3942befd4b41 100644
--- a/net/tac_plus4/files/patch-skey_fn.c
+++ b/net/tac_plus4/files/patch-skey_fn.c
@@ -1,6 +1,6 @@
---- skey_fn.c.orig	2012-06-06 22:34:55.000000000 +0400
-+++ skey_fn.c	2013-04-13 14:08:31.000000000 +0400
-@@ -164,7 +164,7 @@
+--- skey_fn.c.orig	2012-06-06 18:34:55 UTC
++++ skey_fn.c
+@@ -164,7 +164,7 @@ skey_fn(struct authen_data *data)
  		return(1);
  	    }
  
diff --git a/net/tac_plus4/files/patch-tac_plus.h b/net/tac_plus4/files/patch-tac_plus.h
index ca5c8eac3b67..49ef6087585e 100644
--- a/net/tac_plus4/files/patch-tac_plus.h
+++ b/net/tac_plus4/files/patch-tac_plus.h
@@ -1,6 +1,6 @@
---- tac_plus.h.orig	2013-04-13 13:45:20.000000000 +0400
-+++ tac_plus.h	2013-04-13 13:50:14.000000000 +0400
-@@ -452,6 +452,7 @@
+--- tac_plus.h.orig	2012-04-10 19:38:45 UTC
++++ tac_plus.h
+@@ -452,6 +452,7 @@ int enable_fn(struct authen_data *data);
  int sendauth_fn(struct authen_data *data);
  int sendpass_fn(struct authen_data *data);
  int skey_fn(struct authen_data *data);
diff --git a/net/tac_plus4/files/patch-users_guide.in b/net/tac_plus4/files/patch-users_guide.in
index c227654e50bf..8c839cf8669d 100644
--- a/net/tac_plus4/files/patch-users_guide.in
+++ b/net/tac_plus4/files/patch-users_guide.in
@@ -1,6 +1,6 @@
---- users_guide.in.orig	2011-05-28 02:11:57.000000000 +0400
-+++ users_guide.in	2013-04-13 14:16:37.000000000 +0400
-@@ -164,7 +164,10 @@
+--- users_guide.in.orig	2011-05-27 22:11:57 UTC
++++ users_guide.in
+@@ -164,7 +164,10 @@ for S/KEY in the Makefile.  I got my S/K
  crimelab.com but now it appears the only source is ftp.bellcore.com. I
  suggest you try a web search for s/key source code.
  
@@ -12,7 +12,7 @@
  
  Should you need them, there are routines for accessing password files
  (getpwnam,setpwent,endpwent,setpwfile) in pw.c.
-@@ -414,7 +417,16 @@
+@@ -414,7 +417,16 @@ be authenticated via s/key, as follows:
        login = skey
      }
  
diff --git a/net/tac_plus4/files/tac_plus.in b/net/tac_plus4/files/tac_plus.in
index 178792403918..f5a5b835784e 100644
--- a/net/tac_plus4/files/tac_plus.in
+++ b/net/tac_plus4/files/tac_plus.in
@@ -23,7 +23,7 @@
 name=tac_plus
 rcvar=tac_plus_enable
 
-command="%%PREFIX%%/bin/tac_plus"
+command="%%PREFIX%%/sbin/tac_plus"
 pidfile="/var/run/${name}.pid"
 tac_plus_enable=${tac_plus_enable:-"NO"}
 tac_plus_flags=${tac_plus_flags:-}
diff --git a/net/tac_plus4/pkg-descr b/net/tac_plus4/pkg-descr
index b41510f2250a..6967214a9d69 100644
--- a/net/tac_plus4/pkg-descr
+++ b/net/tac_plus4/pkg-descr
@@ -1,12 +1,16 @@
-TACACS+ program that allow authorization and authentication via net on
-remote access servers. Authenticate users, authorize commands and log
+A TACACS+ server that allows authorization and authentication via net
+on remote access servers: Authenticate users, authorize commands and log
 accounting information.
 
-This new version 4 has improved features and bugfixes over the older 2.x
-version, which is still available, since this source is still marked ALPHA.
+Version 4 has improved features and bugfixes over the older 2.x versions.
 
 Improved features among others and bugfixes: Microsoft CHAP support.
 To enable MSCHAP you need to optain a key from Microsoft, see the FAQ
 section in the users guide. Therefore this isn't enabled by default.
 
+Cisco, the original developers, have stopped tac_plus development around
+F4.0.4. There are different versions based on Cisco tac_plus, this is the
+version from Shrubbery Networks.
+
+WWW: http://www.shrubbery.net/tac_plus
 WWW: http://www.cisco.com/en/US/tech/tk59/technologies_tech_note09186a00800946a3.shtml
diff --git a/net/tac_plus4/pkg-plist b/net/tac_plus4/pkg-plist
index e6ab60dfa259..3d018ad530ed 100644
--- a/net/tac_plus4/pkg-plist
+++ b/net/tac_plus4/pkg-plist
@@ -1,6 +1,5 @@
-bin/tac_plus
 bin/tac_pwd
-etc/tac_plus.conf.example
+%%ETCDIR%%.conf.example
 include/tacacs.h
 lib/libtacacs.a
 lib/libtacacs.so
@@ -9,5 +8,6 @@ lib/libtacacs.so.1.0.0
 man/man5/tac_plus.conf.5.gz
 man/man8/tac_plus.8.gz
 man/man8/tac_pwd.8.gz
+sbin/tac_plus
 %%PORTDOCS%%%%DOCSDIR%%/tac_convert
 %%PORTDOCS%%%%DOCSDIR%%/users_guide