summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ipa/Makefile27
-rw-r--r--net/ipa/PLIST13
-rw-r--r--net/ipa/distinfo9
-rw-r--r--net/ipa/patches/patch-aa55
-rw-r--r--net/ipa/patches/patch-ab14
5 files changed, 94 insertions, 24 deletions
diff --git a/net/ipa/Makefile b/net/ipa/Makefile
index 1e9eb4fabe2..bcdfc47825a 100644
--- a/net/ipa/Makefile
+++ b/net/ipa/Makefile
@@ -1,18 +1,31 @@
-# $NetBSD: Makefile,v 1.2 2002/04/15 10:51:53 martti Exp $
+# $NetBSD: Makefile,v 1.3 2002/06/30 03:47:53 jlam Exp $
-DISTNAME= ipa-1.2.5
-CATEGORIES= net sysutils
-MASTER_SITES= http://www.simon.org.ua/ipa/
+DISTNAME= ipa-1.2.7
+CATEGORIES= net sysutils
+MASTER_SITES= http://www.simon.org.ua/ipa/ \
+ http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/
-MAINTAINER= simon@simon.org.ua
-HOMEPAGE= http://www.simon.org.ua/ipa/
-COMMENT= IP accounting software
+MAINTAINER= simon@simon.org.ua
+HOMEPAGE= http://www.simon.org.ua/ipa/
+COMMENT= IP accounting software
RESTRICTED= "Needs to be built uniquely for each host"
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_PACKAGE= ${RESTRICTED}
+USE_BUILDLINK_ONLY= # defined
ALL_TARGET= NetBSD
+CFLAGS+= -DCFGFILE=\\\"${PKG_SYSCONFDIR}/ipa.conf\\\"
+
+CONF_FILES_PERMS= ${PREFIX}/share/examples/ipa/ipa.conf.default \
+ ${PKG_SYSCONFDIR}/ipa.conf \
+ ${ROOT_USER} ${ROOT_GROUP} 0400
+RCD_SCRIPTS= ipa
+
+pre-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ipa
+
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ipa/PLIST b/net/ipa/PLIST
index 0b11ae75ebc..ddd0a90ce45 100644
--- a/net/ipa/PLIST
+++ b/net/ipa/PLIST
@@ -1,20 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:54 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/06/30 03:47:53 jlam Exp $
bin/ipa
bin/ipastat
-etc/ipa.conf.default
-etc/rc.d/ipa.sh.sample
+etc/rc.d/ipa
man/man5/ipa.5
man/man5/ipa.conf.5
man/man8/ipa.8
man/man8/ipastat.8
-man/ru_SU.KOI8-R/man5/ipa.5
-man/ru_SU.KOI8-R/man5/ipa.conf.5
-man/ru_SU.KOI8-R/man8/ipa.8
-man/ru_SU.KOI8-R/man8/ipastat.8
share/examples/ipa/README
share/examples/ipa/example-1
share/examples/ipa/example-2
+share/examples/ipa/ipa.conf.default
@dirrm share/examples/ipa
-@unexec if [ -f %D/etc/rc.d/ipa.sh ]; then cmp -s %D/etc/rc.d/ipa.sh.sample %D/etc/rc.d/ipa.sh && ${RM} -f %D/etc/rc.d/ipa.sh || echo "If you are permanently removing this pkg, you should do a ``rm ${PKG_PREFIX}/etc/rc.d/ipa.sh`` to remove startup files left." | fmt ; fi
-@unexec ${RMDIR} %D/man/ru_SU.KOI8-R/man8 %D/man/ru_SU.KOI8-R/man5 %D/man/ru_SU.KOI8-R 2>/dev/null || true
-@unexec if [ -L %D/man/ru_RU.KOI8-R ]; then ${RM} %D/man/ru_RU.KOI8-R 2>/dev/null || true; else ${RMDIR} %D/man/ru_RU.KOI8-R/man8 %D/man/ru_RU.KOI8-R/man5 %D/man/ru_RU.KOI8-R && ${RM} %D/man/ru_RU.KOI8-R 2>/dev/null || true ; fi
diff --git a/net/ipa/distinfo b/net/ipa/distinfo
index c90f1470286..84c4ea05c05 100644
--- a/net/ipa/distinfo
+++ b/net/ipa/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/04/16 08:44:04 martti Exp $
+$NetBSD: distinfo,v 1.4 2002/06/30 03:47:53 jlam Exp $
-SHA1 (ipa-1.2.5.tar.gz) = e2c203d3bb46aec3cd122f6ae26b471ca77b6cb7
-Size (ipa-1.2.5.tar.gz) = 137086 bytes
-SHA1 (patch-aa) = f8e877c8a071595d0a5b8679e1e0b134d75857c9
+SHA1 (ipa-1.2.7.tar.gz) = 73799bf16be637b4d683ec86b9943177856349dc
+Size (ipa-1.2.7.tar.gz) = 137825 bytes
+SHA1 (patch-aa) = 6b7a63768c673eebb76b2a9c4cfe2eaf40287c8f
+SHA1 (patch-ab) = edce3d9d03ee7456c440ce4179e1e8c39bb516f2
diff --git a/net/ipa/patches/patch-aa b/net/ipa/patches/patch-aa
index d85419fdd8a..de2b0e2e758 100644
--- a/net/ipa/patches/patch-aa
+++ b/net/ipa/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2002/04/16 08:44:05 martti Exp $
+$NetBSD: patch-aa,v 1.4 2002/06/30 03:47:54 jlam Exp $
---- Makefile.orig Tue Dec 25 04:52:48 2001
-+++ Makefile Fri Dec 28 23:10:11 2001
+--- Makefile.orig Sat Jun 29 21:14:15 2002
++++ Makefile
@@ -38,7 +38,7 @@
# -Ox - optimize;
# -g - produce debugging information.
@@ -11,6 +11,15 @@ $NetBSD: patch-aa,v 1.3 2002/04/16 08:44:05 martti Exp $
#
# PREFIX - prefix for all below listed paths
+@@ -58,7 +58,7 @@
+ #
+ # DSTETCDIR - where to install template configuration
+ #
+-DSTETCDIR= ${PREFIX}/etc
++DSTETCDIR= ${DSTEXAMPLEDIR}
+
+ #
+ # DSTRCDIR - where to install sample rc-script
@@ -97,10 +97,10 @@
#
# Some INSTALL_* variables
@@ -26,3 +35,43 @@ $NetBSD: patch-aa,v 1.3 2002/04/16 08:44:05 martti Exp $
INSTALL_MAN_DIR= ${INSTALL} -d -m 0555 -g wheel -o root
INSTALL_DATA_DIR= ${INSTALL} -d -m 0555 -g wheel -o root
+@@ -219,7 +219,7 @@
+ ${RM} -r ${DSTEXAMPLEDIR}
+ ${RM} ${DSTMANDIR}/man5/ipa.conf.5 ${DSTMANDIR}/man5/ipa.5 ${DSTMANDIR}/man8/ipa.8 ${DSTMANDIR}/man8/ipastat.8
+ ${RM} ${DSTMANDIR}/ru_SU.KOI8-R/man5/ipa.conf.5 ${DSTMANDIR}/ru_SU.KOI8-R/man5/ipa.5 ${DSTMANDIR}/ru_SU.KOI8-R/man8/ipa.8 ${DSTMANDIR}/ru_SU.KOI8-R/man8/ipastat.8
+- ${RM} ${DSTETCDIR}/ipa.conf.default ${DSTRCDIR}/ipa.sh.sample
++ ${RM} ${DSTETCDIR}/ipa.conf.default ${DSTRCDIR}/ipa
+
+ install:
+ .if !exists(./ipa) || !exists(./ipastat)
+@@ -231,21 +231,10 @@
+ ${INSTALL_PROGRAM} ipa ipastat ${DSTBINDIR}
+ ${INSTALL_MAN} man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
+ ${INSTALL_MAN} man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8
+-.if !exists(${DSTMANDIR}/ru_SU.KOI8-R/man5)
+- ${INSTALL_MAN_DIR} ${DSTMANDIR}/ru_SU.KOI8-R/man5
+-.endif
+-.if !exists(${DSTMANDIR}/ru_SU.KOI8-R/man8)
+- ${INSTALL_MAN_DIR} ${DSTMANDIR}/ru_SU.KOI8-R/man8
+-.endif
+-.if !exists(${DSTMANDIR}/ru_RU.KOI8-R)
+- ${LN} -s ${DSTMANDIR}/ru_SU.KOI8-R ${DSTMANDIR}/ru_RU.KOI8-R
+-.endif
+- ${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_SU.KOI8-R/man5
+- ${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_SU.KOI8-R/man8
+ ${INSTALL_DATA_DIR} ${DSTEXAMPLEDIR}
+ ${INSTALL_DATA} examples/* ${DSTEXAMPLEDIR}
+ .if exists(${DSTRCDIR})
+- ${INSTALL_SCRIPT} etc/ipa.sh.sample ${DSTRCDIR}
++ ${INSTALL_SCRIPT} etc/ipa.sh.sample ${DSTRCDIR}/ipa
+ .else
+ @${ECHO}
+ @${ECHO} ">> Can't find directory ${DSTRCDIR}, skip installing of ipa.sh.sample"
+@@ -254,7 +243,6 @@
+ .endif
+ .if exists(${DSTETCDIR})
+ ${INSTALL_DATA} etc/ipa.conf.default ${DSTETCDIR}
+- ${CHMOD} 0400 ${DSTETCDIR}/ipa.conf.default
+ .else
+ @${ECHO}
+ @${ECHO} ">> Can't find directory ${DSTETCDIR}, skip installing of ipa.conf.default"
diff --git a/net/ipa/patches/patch-ab b/net/ipa/patches/patch-ab
new file mode 100644
index 00000000000..0023983f20f
--- /dev/null
+++ b/net/ipa/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.3 2002/06/30 03:47:55 jlam Exp $
+
+--- path.h.orig Tue Oct 16 18:44:37 2001
++++ path.h
+@@ -29,7 +29,9 @@
+ #ifndef IPA_PATH_H
+ #define IPA_PATH_H
+
++#ifndef CFGFILE
+ #define CFGFILE "/usr/local/etc/ipa.conf"
++#endif
+ #define DBDIR "/var/ipa"
+ #define PIDFILE "/var/run/ipa.pid"
+