pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/32398: Maintainer update: net/ipa 1.3.6 -> sysutils/ipa 2.0
On Sun, Oct 08, 2006 at 09:40:02AM +0000, OBATA Akio wrote:
> You are using WITH_XXX variables, please use options framework instead in
> pkgsrc.
> And already 2.0.1 out.
> Would you please regenerate diff?
Done.
>
> > * Please remove ipa from net category and move it to
> > sysutils, ipa-2.0 does not have anything common with
> > network.
>
> Is ipa-2.0 compatible with 1.x ?
I still ask to move net/ipa --> sysutils/ipa.
> > * When I run "make install" for port, "make install" runs
> > ${CC} to compile some of source files. This does not happen
> > if I run "./configure; make; make install" not from pkgsrc
> > (Also I do not have this problem in FreeBSD with sysutils/ipa
> > port).
This problem disappeared with the most recent pkgsrc, which can be run
on NetBSD 2.0.
> >
> > * New WITH_DEBUG_INFO variable does not work, "make install"
> > runs "install ... -s ..." and all debugging information is
> > removed.
I decided to not add this feature.
Please do not add patches for manual pages, there are still few places
with "/usr/local/..." in manual pages, but this directory is used only
in examples.
Everything described in my original PR corresponds to the following patch.
diff -ruN ipa.orig/DESCR ipa/DESCR
--- ipa.orig/DESCR Fri May 30 14:53:16 2003
+++ ipa/DESCR Wed Oct 18 01:10:32 2006
@@ -1,9 +1,11 @@
-ipa(8) allows to make IP accounting (network accounting) based on FreeBSD
-IPv4/v6 Firewall (including IPFW2), OpenBSD Packet Filter and IP Filter
-accounting rules on FreeBSD, NetBSD and OpenBSD.
+IPA -- Pluggable Accounting System
-It supports limits for accounting rules and limits events as "limit is
-reached", "reached limit is expired", etc. It understands time intervals
-like "end of day", "end of week", "end of month", etc.
+Main features:
-ipastat(8) is a viewer for IP accounting database made by ipa(8).
+- Flexible general purpose accounting system;
+- Supports static and dynamic rules;
+- Support limits, sublimits and thresholds;
+- Works with external accounting modules;
+- Works with external database modules;
+- Works with external statistics modules;
+- Accounting per specified period of a week.
diff -ruN ipa.orig/Makefile ipa/Makefile
--- ipa.orig/Makefile Tue Oct 17 23:50:20 2006
+++ ipa/Makefile Wed Oct 18 08:45:26 2006
@@ -1,55 +1,35 @@
# $NetBSD: Makefile,v 1.25 2006/06/04 22:21:27 joerg Exp $
#
-DISTNAME= ipa-1.3.6
-PKGREVISION= 1
-CATEGORIES= net sysutils
+DISTNAME= ipa-2.0.1
+CATEGORIES= sysutils
MASTER_SITES= http://ipa-system.sourceforge.net/ \
http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/ \
-
ftp://ftp.mirrors.wiretapped.net/pub/security/network-monitoring/ipa/ \
- http://ipa.it-ss.be/
+
ftp://ftp.mirrors.wiretapped.net/pub/security/network-monitoring/ipa/
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= simon%comsys.ntu-kpi.kiev.ua@localhost
HOMEPAGE= http://ipa-system.sourceforge.net/
-COMMENT= IP accounting software
+COMMENT= Pluggable accounting system
-ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-1*-* OpenBSD-*-* DragonFly-*-*
-
-RESTRICTED= Needs to be built uniquely for each host
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_PACKAGE= ${RESTRICTED}
-
-BUILD_TARGET= # empty
-
-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
-OWN_DIRS_PERMS= /var/ipa ${ROOT_USER} ${ROOT_GROUP} 0555
+GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
-RCD_SCRIPTS= ipa
+RCD_SCRIPTS= ipa
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
RCD_SCRIPT_SRC.ipa= ${FILESDIR}/ipa.sh
.else
-RCD_SCRIPT_SRC.ipa= ${FILESDIR}/ipa.generic
+RCD_SCRIPT_SRC.ipa= ${WRKSRC}/etc/ipa.sh.sample
.endif
-.if ${OPSYS} == "DragonFly"
-MAKE_ENV+= WITH_PF=1 WITHOUT_IP6FW=1 WITHOUT_IPFW=1
-.endif
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= man/ipa.5 man/ipa.8 man/ipa.conf.5 man/ipastat.8
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.paths= post-patch
+.include "options.mk"
-pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ipa
+do-install:
+ cd ${WRKSRC}/src && ${MAKE} install
+ cd ${WRKSRC}/man && ${MAKE} install-am
.include "../../mk/bsd.pkg.mk"
diff -ruN ipa.orig/PLIST ipa/PLIST
--- ipa.orig/PLIST Tue Oct 17 23:51:26 2006
+++ ipa/PLIST Wed Oct 18 08:09:19 2006
@@ -1,13 +1,11 @@
@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:34:02 reed Exp $
bin/ipa
+bin/ipactl
bin/ipastat
-man/man5/ipa.5
+include/ipa_mod.h
+man/man3/ipa_mod.3
man/man5/ipa.conf.5
+man/man5/ipastat.conf.5
man/man8/ipa.8
+man/man8/ipactl.8
man/man8/ipastat.8
-share/examples/ipa/README
-share/examples/ipa/example-1
-share/examples/ipa/example-2
-share/examples/ipa/ipa.conf.default
-share/examples/rc.d/ipa
-@dirrm share/examples/ipa
diff -ruN ipa.orig/distinfo ipa/distinfo
--- ipa.orig/distinfo Tue Oct 17 23:51:40 2006
+++ ipa/distinfo Wed Oct 18 08:09:33 2006
@@ -1,12 +1,5 @@
$NetBSD: distinfo,v 1.17 2006/06/04 22:21:27 joerg Exp $
-SHA1 (ipa-1.3.6.tar.gz) = dcf5ebbf14600da0afba6a735f16a8b8ac84185e
-RMD160 (ipa-1.3.6.tar.gz) = d122d2f8c1b8bbdabb89f1fd1ccf9aa7f2867133
-Size (ipa-1.3.6.tar.gz) = 137156 bytes
-SHA1 (patch-aa) = db61ec179fdeb8ce5ef9ca4f7d287acb24a7faf4
-SHA1 (patch-ab) = edce3d9d03ee7456c440ce4179e1e8c39bb516f2
-SHA1 (patch-ac) = 0baab6507d335479379e78582c727fad72259b61
-SHA1 (patch-ad) = fe03afb555f2a6817dfddd7ab4edb7e41f49c03a
-SHA1 (patch-ae) = 8ed23f771ba11ae357b141ac62c2d4db9c3957e9
-SHA1 (patch-af) = d604d1bab7d51feb7e5ebd75b816c691db229957
-SHA1 (patch-ag) = 886e3e3fe00f4b4b6cd6ad4ae5d9ac356fe3704c
+SHA1 (ipa-2.0.1.tar.bz2) = 94c05df1600e309caf033895b61f797218dcd564
+RMD160 (ipa-2.0.1.tar.bz2) = b8e972e65d6b55c50f2b0566cf63f5edf181446f
+Size (ipa-2.0.1.tar.bz2) = 282407 bytes
diff -ruN ipa.orig/files/ipa.generic ipa/files/ipa.generic
--- ipa.orig/files/ipa.generic Tue Oct 17 23:52:28 2006
+++ ipa/files/ipa.generic Thu Jan 1 03:00:00 1970
@@ -1,78 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: ipa.generic,v 1.1 2003/05/30 11:53:17 salo Exp $
-#
-
-name="ipa"
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-required_dirs="/var/ipa"
-pidfile="/var/run/${name}.pid"
-command="@PREFIX@/bin/ipa"
-
-ipa_start()
-{
- if [ ! -r $required_files ]; then
- echo "$0: WARNING: $required_files is not readable."
- exit 1
- fi
- if [ ! -d $required_dirs ]; then
- echo "$0: WARNING: $required_dirs is not a directory."
- exit 1
- fi
-
- echo "Starting ${name}."
- eval $command
- return_code=$?
- if [ $return_code != "0" ]; then
- exit 1
- fi
-}
-
-ipa_stop()
-{
- echo "Stopping ${name}."
-
- ${command} -k shutdown
-}
-
-ipa_reconfigure()
-{
- echo "Reloading ${name} configuration."
-
- ${command} -k reconfigure
-}
-
-ipa_dump()
-{
- echo "Dumping ${name} stats."
-
- ${command} -k dump
-}
-
-case $1 in
-
-'start')
- ipa_start
- ;;
-
-'stop')
- ipa_stop
- ;;
-
-'restart')
- ipa_stop
- ipa_start
- ;;
-
-'reconfigure')
- ipa_reconfigure
- ;;
-
-'dump')
- ipa_dump
- ;;
-
-*)
- echo "Usage: $0 (start|stop|restart|reconfigure|dump)"
- ;;
-esac
diff -ruN ipa.orig/files/ipa.sh ipa/files/ipa.sh
--- ipa.orig/files/ipa.sh Tue Oct 17 23:52:38 2006
+++ ipa/files/ipa.sh Wed Oct 18 01:30:34 2006
@@ -3,41 +3,21 @@
# $NetBSD: ipa.sh,v 1.1 2003/05/30 11:53:17 salo Exp $
#
+# If some IPA module requires some services, then they should
+# be specified after REQUIRE, by default REQUIRE contains
+# only syslogd, since ipa uses syslog for logging by default
+# and does not require anything more for running.
+
# PROVIDE: ipa
-# REQUIRE: ipfilter
+# REQUIRE: syslogd
+# BEFORE: LOGIN
. /etc/rc.subr
name="ipa"
rcvar=$name
command="@PREFIX@/bin/${name}"
-required_files="@PKG_SYSCONFDIR@/$name.conf"
-required_dir="/var/${name}"
-stop_cmd="ipa_stop"
-reconfigure_cmd="ipa_reconfigure"
-dump_cmd="ipa_dump"
-extra_commands="reconfigure dump"
-
-ipa_stop()
-{
- echo "Stopping ${name}."
-
- ${command} -k shutdown
-}
-
-ipa_reconfigure()
-{
- echo "Reloading ${name} configuration."
-
- ${command} -k reconfigure
-}
-
-ipa_dump()
-{
- echo "Dumping ${name} stats."
-
- ${command} -k dump
-}
+extra_commands="reload"
load_rc_config $name
run_rc_command "$1"
diff -ruN ipa.orig/options.mk ipa/options.mk
--- ipa.orig/options.mk Thu Jan 1 03:00:00 1970
+++ ipa/options.mk Tue Oct 17 23:17:25 2006
@@ -0,0 +1,49 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.ipa
+PKG_SUPPORTED_OPTIONS= memfunc_debug without_autorules without_limits \
+ without_rules without_sublimits without_thresholds
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Enable ipa_memfunc debugging
+###
+.if !empty(PKG_OPTIONS:Mmemfunc_debug)
+CONFIGURE_ARGS+= --enable-memfunc-debug
+.endif
+
+###
+### Disable dynamic rules support
+###
+.if !empty(PKG_OPTIONS:Mwithout_autorules)
+CONFIGURE_ARGS+= --disable-autorules
+.endif
+
+###
+### Disable limits support
+###
+.if !empty(PKG_OPTIONS:Mwithout_limits)
+CONFIGURE_ARGS+= --disable-limits
+.endif
+
+###
+### Disable static rules support
+###
+.if !empty(PKG_OPTIONS:Mwithout_rules)
+CONFIGURE_ARGS+= --disable-rules
+.endif
+
+###
+### Disable sublimits support
+###
+.if !empty(PKG_OPTIONS:Mwithout_sublimits)
+CONFIGURE_ARGS+= --disable-sublimits
+.endif
+
+###
+### Disable thresholds support
+###
+.if !empty(PKG_OPTIONS:Mwithout_thresholds)
+CONFIGURE_ARGS+= --disable-thresholds
+.endif
diff -ruN ipa.orig/patches/patch-aa ipa/patches/patch-aa
--- ipa.orig/patches/patch-aa Tue Oct 17 23:53:24 2006
+++ ipa/patches/patch-aa Thu Jan 1 03:00:00 1970
@@ -1,86 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2006/06/04 22:21:27 joerg Exp $
-
---- Makefile.orig 2003-11-11 10:24:34.000000000 +0000
-+++ Makefile
-@@ -38,7 +38,7 @@ CC?= /usr/bin/cc
- # -Ox - optimize;
- # -g - produce debugging information.
- #
--CFLAGS= -Wall -O1 -g
-+#CFLAGS= -Wall -O1 -g
-
- #
- # PREFIX - prefix for all below listed paths
-@@ -58,7 +58,7 @@ DST_MAN_DIR= ${PREFIX}/man
- #
- # DST_ETC_DIR - where to install template configuration
- #
--DST_ETC_DIR= ${PREFIX}/etc
-+DST_ETC_DIR= ${DST_EXAMPLE_DIR}
-
- #
- # DST_RC_DIR - where to install sample rc-script
-@@ -81,10 +81,10 @@ MKDIR?= /bin/mkdir
- #
- # INSTALL_* variables
- #
--INSTALL_MAN= ${INSTALL} -c -g wheel -o root -m 0444
--INSTALL_DATA= ${INSTALL} -c -g wheel -o root -m 0444
--INSTALL_PROGRAM= ${INSTALL} -c -g wheel -o root -m 0555
--INSTALL_SCRIPT= ${INSTALL} -c -g wheel -o root -m 0500
-+INSTALL_MAN= ${BSD_INSTALL_MAN}
-+INSTALL_DATA= ${BSD_INSTALL_DATA}
-+INSTALL_PROGRAM= ${BSD_INSTALL_PROGRAM}
-+INSTALL_SCRIPT= ${BSD_INSTALL_SCRIPT}
- INSTALL_MAN_DIR= ${INSTALL} -d -m 0555 -g wheel -o root
- INSTALL_DATA_DIR= ${INSTALL} -d -m 0555 -g wheel -o root
-
-@@ -98,7 +98,7 @@ IPASTAT= ipastat.o common.o
- .MAIN: checkos ${OS}
-
- checkos:
--.if ${OS} != "FreeBSD" && ${OS} != "NetBSD" && ${OS} != "OpenBSD"
-+.if ${OS} != "FreeBSD" && ${OS} != "NetBSD" && ${OS} != "OpenBSD" && ${OS} !=
"DragonFly"
- @${ECHO}
- @${ECHO} ">> IPA-`${CAT} Version` is designed for FreeBSD, NetBSD and
OpenBSD."
- @${ECHO} ">> Your operating system is ${OS}."
-@@ -139,7 +139,7 @@ CFLAGS+= -I${PF_INCLUDE_DIR}
- .endif
- .endif
-
--.ifmake FreeBSD
-+.if make(FreeBSD) || make(DragonFly)
- IPA+= kipfw.o kip6fw.o
- .endif
-
-@@ -147,7 +147,7 @@ IPA+= kipfw.o kip6fw.o
- IPA+= kpf.o
- .endif
-
--FreeBSD NetBSD OpenBSD: ipa ipastat
-+DragonFly FreeBSD NetBSD OpenBSD: ipa ipastat
-
- ipa: ${IPA}
- ${CC} -o ${.TARGET} ${IPA}
-@@ -214,21 +214,8 @@ install:
- ${INSTALL_PROGRAM} ipa ipastat ${DST_BIN_DIR}
- ${INSTALL_MAN} man/ipa.5 man/ipa.conf.5 ${DST_MAN_DIR}/man5
- ${INSTALL_MAN} man/ipa.8 man/ipastat.8 ${DST_MAN_DIR}/man8
--.if !exists(${DST_MAN_DIR}/ru_RU.KOI8-R/man5)
-- ${INSTALL_MAN_DIR} ${DST_MAN_DIR}/ru_RU.KOI8-R/man5
--.endif
--.if !exists(${DST_MAN_DIR}/ru_RU.KOI8-R/man8)
-- ${INSTALL_MAN_DIR} ${DST_MAN_DIR}/ru_RU.KOI8-R/man8
--.endif
--.if !exists(${DST_MAN_DIR}/ru_SU.KOI8-R)
-- ${LN} -s ${DST_MAN_DIR}/ru_RU.KOI8-R ${DST_MAN_DIR}/ru_SU.KOI8-R
--.endif
-- ${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5
${DST_MAN_DIR}/ru_RU.KOI8-R/man5
-- ${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8
${DST_MAN_DIR}/ru_RU.KOI8-R/man8
-- ${INSTALL_DATA_DIR} ${DST_EXAMPLE_DIR}
- ${INSTALL_DATA} examples/* ${DST_EXAMPLE_DIR}
- .if exists(${DST_RC_DIR})
-- ${INSTALL_SCRIPT} etc/ipa.sh.sample ${DST_RC_DIR}
- .else
- @${ECHO}
- @${ECHO} ">> Can't find directory ${DST_RC_DIR}, the ipa.sh.sample file
was not installed (not a problem)."
diff -ruN ipa.orig/patches/patch-ab ipa/patches/patch-ab
--- ipa.orig/patches/patch-ab Tue Oct 17 23:53:34 2006
+++ ipa/patches/patch-ab Thu Jan 1 03:00:00 1970
@@ -1,14 +0,0 @@
-$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"
-
diff -ruN ipa.orig/patches/patch-ac ipa/patches/patch-ac
--- ipa.orig/patches/patch-ac Tue Oct 17 23:53:48 2006
+++ ipa/patches/patch-ac Thu Jan 1 03:00:00 1970
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2003/05/30 11:53:17 salo Exp $
-
---- man/ipa.5.orig 2003-04-17 22:47:42.000000000 +0200
-+++ man/ipa.5 2003-05-30 12:49:59.000000000 +0200
-@@ -152,7 +152,7 @@
- .SH FILES
- /var/ipa/
- .br
--/usr/local/etc/ipa.conf
-+@PKG_SYSCONFDIR@/ipa.conf
- .SH SEE ALSO
- ipa(8), ipa.conf(5), ipastat(8)
- .SH AUTHOR
diff -ruN ipa.orig/patches/patch-ad ipa/patches/patch-ad
--- ipa.orig/patches/patch-ad Tue Oct 17 23:53:58 2006
+++ ipa/patches/patch-ad Thu Jan 1 03:00:00 1970
@@ -1,38 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/05/30 11:53:18 salo Exp $
-
---- man/ipa.8.orig 2003-02-20 07:26:57.000000000 +0100
-+++ man/ipa.8 2003-05-30 12:49:10.000000000 +0200
-@@ -47,7 +47,7 @@
- on FreeBSD, NetBSD and OpenBSD, stores all accounting information in the
database,
- supports database locking, allows to set up limits for each accounting rule,
- understands time intervals like "end of day", "end of week", etc. \fBipa\fP(8)
--reads its configuration from the file \fB/usr/local/etc/ipa.conf\fP or from
-+reads its configuration from the file \fB@PKG_SYSCONFDIR@/ipa.conf\fP or from
- other one given in the command line. Read manual page \fBipa.conf\fP(5) for
- detail description of \fBipa\fP(8) features.
- .PP
-@@ -81,7 +81,7 @@
- IPFW/IPF/PF accounting rules.
- .IP \fB-f\fP\ <config-file>
- Use given <config-file> instead of using default configuration file
--\fB/usr/local/etc/ipa.conf\fP. \fINOTE\fP: a configuration file should be
given
-+\fB@PKG_SYSCONFDIR@/ipa.conf\fP. \fINOTE\fP: a configuration file should be
given
- with absolute pathname (i.e. starts with the `/' character).
- .IP \fB-h\fP
- Print help message about available options and exit.
-@@ -214,13 +214,10 @@
- .br
- /var/ipa/
- .br
--/usr/local/etc/ipa.conf
-+@PKG_SYSCONFDIR@/ipa.conf
- .br
--${PREFIX}/etc/ipa.conf.default
-+@PREFIX@/share/examples/ipa/
- .br
--${PREFIX}/share/examples/ipa/
--.PP
--(by default ${PREFIX} is /usr/local)
- .SH SEE ALSO
- ipa(5), ipa.conf(5), ipastat(8), ipf(1), ipfw(8), ip6fw(8), pf(4), pf.conf(5),
- pfctl(8), syslogd(8)
diff -ruN ipa.orig/patches/patch-ae ipa/patches/patch-ae
--- ipa.orig/patches/patch-ae Tue Oct 17 23:54:06 2006
+++ ipa/patches/patch-ae Thu Jan 1 03:00:00 1970
@@ -1,68 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/05/30 11:53:18 salo Exp $
-
---- man/ipa.conf.5.orig 2003-05-27 20:57:17.000000000 +0200
-+++ man/ipa.conf.5 2003-05-30 12:53:00.000000000 +0200
-@@ -29,7 +29,7 @@
- ipa.conf \- ipa(8) configuration file
- .SH DESCRIPTION
- The \fBipa.conf\fP file is a configuration file for \fBipa\fP(8).
--The \fB/usr/local/etc/ipa.conf\fP file or any other one specified in
-+The \fB@PKG_SYSCONFDIR@/ipa.conf\fP file or any other one specified in
- the \fBipa\fP(8) command line (the \fB-f\fP option for \fBipa\fP(8)) is read
- when \fBipa\fP(8) starts working or receives signal HUP.
- The complete description of the file format and possible parameters
-@@ -996,28 +996,28 @@
- .PP
- include {
- .br
-- file = /usr/local/etc/ipa/myaccout
-+ file = @PKG_SYSCONFDIR@/ipa/myaccout
- .br
-- file(?) = /usr/local/etc/ipa/mytestaccount
-+ file(?) = @PKG_SYSCONFDIR@/ipa//mytestaccount
- .br
-- files(/usr/local/etc/ipa/192.168.0) = .
-+ files(@PKG_SYSCONFDIR@/ipa/192.168.0) = .
- .br
-- files(/usr/local/etc/ipa/10.1) = ^(2|11)\\.*
-+ files(@PKG_SYSCONFDIR@/ipa/10.1) = ^(2|11)\\.*
- .br
-- files(?)(/usr/local/etc/ipa/testconfig) = \\.conf$
-+ files(?)(@PKG_SYSCONFDIR@/ipa/testconfig) = \\.conf$
- .br
- }
- .PP
- The first \fBfile\fP parameter tells \fBipa\fP(8) to include one file named
--/usr/local/etc/ipa/myaccout. The second \fBfile\fP parameter also tells to
--include one file, but if the /usr/local/etc/ipa/mytestaccount file is not
-+@PKG_SYSCONFDIR@/ipa/myaccout. The second \fBfile\fP parameter also tells to
-+include one file, but if the @PKG_SYSCONFDIR@/ipa/mytestaccount file is not
- present in the file system, then \fBipa\fP(8) will ignore it.
- .PP
- The first \fBfiles\fP parameter "includes" all files from the
--/usr/local/etc/ipa/192.168.0 directory. The second \fBfiles\fP parameter
-+@PKG_SYSCONFDIR@/ipa/192.168.0 directory. The second \fBfiles\fP parameter
- "includes" all files matched given POSIX regular expression from the
--/usr/local/etc/ipa/10.1 directory. And the last \fBfiles\fP parameter
"includes"
--all files with ".conf" suffix from the /usr/local/etc/ipa/testconfig
directory,
-+@PKG_SYSCONFDIR@/ipa/10.1 directory. And the last \fBfiles\fP parameter
"includes"
-+all files with ".conf" suffix from the @PKG_SYSCONFDIR@/ipa/testconfig
directory,
- but if this directory is not present in the file system, then \fBipa\fP(8)
- will ignore it and continue to work.
- .PP
-@@ -1286,13 +1286,10 @@
- .br
- # ... other "rule" sections.
- .SH FILES
--/usr/local/etc/ipa.conf
-+@PKG_SYSCONFDIR@/ipa.conf
- .br
--${PREFIX}/etc/ipa.conf.default
--.br
--${PREFIX}/share/examples/ipa/
-+@PREFIX@/share/examples/ipa/
- .PP
--(by default ${PREFIX} is /usr/local)
- .SH SEE ALSO
- ipa(8), ipa(5), ipastat(8), ipf(1), ipf(5), ipfstat(8), ipfw(8), ip6fw(8),
- pf.conf(5), pfctl(8)
diff -ruN ipa.orig/patches/patch-af ipa/patches/patch-af
--- ipa.orig/patches/patch-af Tue Oct 17 23:54:18 2006
+++ ipa/patches/patch-af Thu Jan 1 03:00:00 1970
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/05/30 11:53:18 salo Exp $
-
---- man/ipastat.8.orig 2003-02-19 23:04:34.000000000 +0100
-+++ man/ipastat.8 2003-05-30 12:53:56.000000000 +0200
-@@ -307,7 +307,7 @@
- .SH FILES
- /var/ipa/
- .br
--/usr/local/etc/ipa.conf
-+@PKG_SYSCONFDIR@/ipa.conf
- .SH SEE ALSO
- ipa.conf(5), ipa(8)
- .SH AUTHOR
diff -ruN ipa.orig/patches/patch-ag ipa/patches/patch-ag
--- ipa.orig/patches/patch-ag Tue Oct 17 23:54:26 2006
+++ ipa/patches/patch-ag Thu Jan 1 03:00:00 1970
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/06/04 22:21:27 joerg Exp $
-
---- kpf.c.orig 2006-06-04 22:08:28.000000000 +0000
-+++ kpf.c
-@@ -46,7 +46,11 @@ static const char rcsid[] =
- #include <sys/socket.h>
- #include <net/if.h>
- #include <netinet/in.h>
-+#if defined(__DragonFly__)
-+#include <net/pf/pfvar.h>
-+#else
- #include <net/pfvar.h>
-+#endif
-
- #include "debug.h"
-
Home |
Main Index |
Thread Index |
Old Index