kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- updated tacacs-shrubbery to F4.0.4.13

Browse source 
- restored compatibility to non-pkgsrc (i.e. native) skey implementation found
  e.g. with NetBSD
- made sure CFLAGS and CPPFLAGS are honored
- added libnbcompat for IRIX 5 which needs snprintf()
This commit is contained in:
Georg Schwarz 2006-09-16 19:04:11 +00:00 committed by Thomas Klausner
parent 9abcfff6e0
commit 1fe0750a50
6 changed files with 67 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tacacs-shrubbery/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.5 2006/08/21 19:49:30 gschwarz Exp $
# $NetBSD: Makefile,v 1.6 2006/09/16 19:04:11 gschwarz Exp $
#
DISTNAME= tacacs+-F4.0.4.12
DISTNAME= tacacs+-F4.0.4.13
PKGNAME= ${DISTNAME:S,tacacs+,tacacs,}
CATEGORIES= net security
MASTER_SITES= ftp://ftp.shrubbery.net/pub/tac_plus/
@ -18,12 +18,15 @@ USE_TOOLS+= perl
CONFIGURE_ARGS+= --with-acctfile=${VARBASE:Q}/log/tac_plus.acct
CONFIGURE_ARGS+= --with-logfile=${VARBASE:Q}/log/tac_plus.log
CONFIGURE_ARGS+= --with-pidfile=${VARBASE:Q}/run/tac_plus.pid
CONFIGURE_ENV+= PERLV_PATH=${PERL5:Q}
.include "../../mk/bsd.prefs.mk"
.if !empty(LOWER_OPSYS:Mirix5*)
CFLAGS+= -Duint16_t=u_int16_t -Duint32_t=u_int32_t \
CPPFLAGS+= -Duint16_t=u_int16_t -Duint32_t=u_int32_t \
-Dsocklen_t=int
# need snprintf()
. include "../../pkgtools/libnbcompat/buildlink3.mk"
.endif
INSTALLATION_DIRS= sbin ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 \
@ -32,6 +35,7 @@ INSTALLATION_DIRS= sbin ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 \
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tac_plus ${WRKSRC}/tac_pwd \
${PREFIX}/sbin
${INSTALL_SCRIPT} ${WRKSRC}/tac_convert ${PREFIX}/sbin
${INSTALL_MAN} ${WRKSRC}/regexp.3 ${PREFIX}/${PKGMANDIR}/man3
${INSTALL_MAN} ${WRKSRC}/tac_plus.conf.5 ${PREFIX}/${PKGMANDIR}/man5
${INSTALL_MAN} ${WRKSRC}/tac_plus.8 ${WRKSRC}/tac_pwd.8 \

3
tacacs-shrubbery/PLIST
View file

@ -1,8 +1,9 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/08 20:50:15 gschwarz Exp $
@comment $NetBSD: PLIST,v 1.2 2006/09/16 19:04:11 gschwarz Exp $
man/man3/regexp.3
man/man5/tac_plus.conf.5
man/man8/tac_plus.8
man/man8/tac_pwd.8
sbin/tac_convert
sbin/tac_plus
sbin/tac_pwd
share/doc/tacacs/users_guide

11
tacacs-shrubbery/distinfo
View file

@ -1,8 +1,9 @@
$NetBSD: distinfo,v 1.6 2006/08/21 19:49:30 gschwarz Exp $
$NetBSD: distinfo,v 1.7 2006/09/16 19:04:11 gschwarz Exp $
SHA1 (tacacs+-F4.0.4.12.tar.gz) = ee1bad7d1d9d990cd3d0e348cda422f68f5c6da9
RMD160 (tacacs+-F4.0.4.12.tar.gz) = 7118dea3d90e271d3080b02d81a6e874a04aa8c3
Size (tacacs+-F4.0.4.12.tar.gz) = 248145 bytes
SHA1 (patch-ag) = 91605b7878762e6bc41d2992a822540efec6e211
SHA1 (tacacs+-F4.0.4.13.tar.gz) = 62610acc5947f4775cb66a2d971f0ce1149b6524
RMD160 (tacacs+-F4.0.4.13.tar.gz) = b5b4ad0d8a573ac7b6afdb7b1db7d9f6a2a0fac9
Size (tacacs+-F4.0.4.13.tar.gz) = 249108 bytes
SHA1 (patch-ag) = a7cc9c584911b52b3793f666c228ce9fc0fe247c
SHA1 (patch-ah) = 7fd3bd94530002f5f2cbdaffc9673f3ac3a15b68
SHA1 (patch-aj) = 1595c787ea7c4106ce1b70a5743277902a71eb5e
SHA1 (patch-ak) = 7923ab92fb445c598ac6350da2f866f953be1bc9

7
tacacs-shrubbery/options.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.2 2006/08/05 18:43:02 gschwarz Exp $
# $NetBSD: options.mk,v 1.3 2006/09/16 19:04:11 gschwarz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.tacacs-shrubbery
PKG_SUPPORTED_OPTIONS= acls-support drop-root-privileges tcpwrappers skey
@ -37,6 +37,11 @@ CONFIGURE_ARGS+= --without-libwrap
.if !empty(PKG_OPTIONS:Mskey)
CONFIGURE_ARGS+= --with-skey=${BUILDLINK_PREFIX.skey}
. include "../../security/skey/buildlink3.mk"
. include "../../security/skey/builtin.mk"
. if ${IS_BUILTIN.skey} == no
# pkgsrc's version uses three arguments only
CPPFLAGS+= -DOLDSKEY
. endif
.else
CONFIGURE_ARGS+= --without-skey
.endif

14
tacacs-shrubbery/patches/patch-ag
View file

@ -1,13 +1,17 @@
$NetBSD: patch-ag,v 1.1.1.1 2006/07/08 20:50:15 gschwarz Exp $
$NetBSD: patch-ag,v 1.2 2006/09/16 19:04:11 gschwarz Exp $
--- skey_fn.c.orig 2006-07-08 21:39:40.000000000 +0200
+++ skey_fn.c 2006-07-08 21:39:55.000000000 +0200
@@ -168,7 +168,7 @@
--- skey_fn.c.orig 2006-09-16 16:30:40.000000000 +0200
+++ skey_fn.c 2006-09-16 16:32:53.000000000 +0200
@@ -168,7 +168,11 @@
return(1);
}
- if (skeychallenge(&p->skey, name, skeyprompt, 80) == 0) {
+ if (skeychallenge(&p->skey, name, skeyprompt) == 0) {
+ if (skeychallenge(&p->skey, name, skeyprompt
+#ifndef OLDSKEY
+ , 80
+#endif
+ ) == 0) {
char buf[256];
sprintf(buf, "%s\nS/Key challenge: ", skeyprompt);
data->server_msg = tac_strdup(buf);

37
tacacs-shrubbery/patches/patch-ak Normal file
View file

@ -0,0 +1,37 @@
$NetBSD: patch-ak,v 1.3 2006/09/16 19:04:11 gschwarz Exp $
--- configure.orig 2006-09-16 16:09:39.000000000 +0200
+++ configure 2006-09-16 16:11:29.000000000 +0200
@@ -1910,8 +1910,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
- CPPFLAGS="$CFLAGS -I/usr/local/include"; export CPPFLAGS
- LDFLAGS="$LDFLAGS -L/usr/local/lib"; export LDFLAGS
+ # CPPFLAGS="$CFLAGS -I/usr/local/include"; export CPPFLAGS
+ # LDFLAGS="$LDFLAGS -L/usr/local/lib"; export LDFLAGS
LIBS="-lnsl -lcrypt"; export LIBS
cat >>confdefs.h <<\_ACEOF
#define LINUX 1
@@ -1921,8 +1921,8 @@
# XXX: does linux need glibc: -DGLIBC
;;
*mips* )
- CPPFLAGS="$CFLAGS -I/usr/local/include"; export CPPFLAGS
- LDFLAGS="$LDFLAGS -L/usr/local/lib"; export LDFLAGS
+ # CPPFLAGS="$CFLAGS -I/usr/local/include"; export CPPFLAGS
+ # LDFLAGS="$LDFLAGS -L/usr/local/lib"; export LDFLAGS
LIBS="-lcrypt"; export LIBS
cat >>confdefs.h <<\_ACEOF
#define MIPS 1
@@ -1930,8 +1930,8 @@
;;
* )
- CPPFLAGS="$CFLAGS -I/usr/local/include"; export CPPFLAGS
- LDFLAGS="$LDFLAGS -L/usr/local/lib"; export LDFLAGS
+ # CPPFLAGS="$CFLAGS -I/usr/local/include"; export CPPFLAGS
+ # LDFLAGS="$LDFLAGS -L/usr/local/lib"; export LDFLAGS
;;
esac