>Number:         14560
>Category:       pkg
>Synopsis:       Maintainer updates port net/ipa 1.1.6 -> 1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Nov 12 09:25:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Andrey Simonenko
>Release:        NetBSD 1.5.1
>Organization:
>Environment:
	NetBSD/i386 1.5.1

>Description:

	Please update port net/ipa from versinon 1.1.6 to 1.2:

	    - patches/patch-ab has been removed, because it was merged
	      to source

	    - patches/patch-aa became much more simple, I use some ${INSTALL_*}
	      variables in my Makefile. I didn't find any problems with them,
	      but let ports commiters check this.

	    - it is strage, but one @unexec desn't work propertly (I mean
	      @unexec which deletes ipa.sh.sample and ipa.sh). On FreeBSD
	      everything is Ok with this @unexec, on NetBSD etc/rc.d/ipa.sh
	      script always is not deleted.

	On following URL:

	    ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/net/ipa/README.html

	I found out that some binary packages of net/ipa have been built.
	I didn't find in Packages.txt how to stop building binary packages for
	some port. I used NO_BIN_ON_FTP and NO_BIN_ON_CDROM variables in
	the port's Makefile, but this doesn't help, as I see.

	There isn't *any* restriction about distributing binary packages of
	net/ipa, but IPA reads information about IP Filter tables from the
	kernel (that is by system calls, it doesn't parse output of some
	another program), that's why binary package of IPA will not work,
	it will not work with high probability.

	Please stop building binary net/ipa package, I repeate one more
	time: there isn't any restriction about binary distribution of
	IPA, but binary package will not work (probably it will work on some
	host, nevertheless it is not correct to install net/ipa from
	its binary package).

	Thanks for your time

>How-To-Repeat:
>Fix:
diff -ruN ipa.orig/Makefile ipa/Makefile
--- ipa.orig/Makefile	Sun Oct 21 22:50:01 2001
+++ ipa/Makefile	Mon Nov 12 18:02:06 2001
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1.1.1 2001/10/21 22:50:01 mjl Exp $

-DISTNAME=		ipa-1.1.6
+DISTNAME=		ipa-1.2
 CATEGORIES=		net sysutils
 MASTER_SITES=		http://www.simon.org.ua/ipa/

diff -ruN ipa.orig/distinfo ipa/distinfo
--- ipa.orig/distinfo	Sun Oct 21 22:50:01 2001
+++ ipa/distinfo	Mon Nov 12 18:09:19 2001
@@ -1,6 +1,5 @@
 $NetBSD: distinfo,v 1.1.1.1 2001/10/21 22:50:01 mjl Exp $

-SHA1 (ipa-1.1.6.tar.gz) = 4046dbbb38629cb5211ba55fecc263a37b0b18ef
-Size (ipa-1.1.6.tar.gz) = 122587 bytes
-SHA1 (patch-aa) = 26764c28ea43cf82fd71f64141d08f309b7902ec
-SHA1 (patch-ab) = 106201f2346edce3834539f7b7b2e39292aadb47
+SHA1 (ipa-1.2.tar.gz) = f084bfb8b1e3eefdf002ad069fefadc35817ce4e
+Size (ipa-1.2.tar.gz) = 128116 bytes
+SHA1 (patch-aa) = 69a787d21b640df9a0649196ca4293aba6c2e314
diff -ruN ipa.orig/patches/patch-aa ipa/patches/patch-aa
--- ipa.orig/patches/patch-aa	Sun Oct 21 22:50:01 2001
+++ ipa/patches/patch-aa	Mon Nov 12 18:08:51 2001
@@ -1,84 +1,30 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/21 22:50:01 mjl Exp $
-
---- Makefile.orig	Wed Oct  3 18:27:19 2001
-+++ Makefile	Wed Oct 10 20:09:57 2001
-@@ -38,32 +38,32 @@
- #	-Ox   - optimize (it seems that -O3 also help to find out some errors);
+--- Makefile.orig	Fri Nov  9 22:06:30 2001
++++ Makefile	Mon Nov 12 18:08:07 2001
+@@ -38,7 +38,7 @@
+ #	-Ox   - optimize;
  #	-g    - produce debugging information.
  #
--CFLAGS=		-Wall -O -g
-+#CFLAGS=		-Wall -O -g
+-CFLAGS=		-Wall -O1 -g
++#CFLAGS=		-Wall -O1 -g

  #
- # DSTBINDIR - where to install binaries
+ # PREFIX - prefix for all below listed paths
+@@ -97,12 +97,12 @@
  #
--DSTBINDIR=	/usr/local/bin
-+DSTBINDIR=	${PREFIX}/bin
-
- #
- # DSTMANDIR - where to install manuals
+ # Some INSTALL_* variables
  #
--DSTMANDIR=	/usr/local/man
-+DSTMANDIR=	${PREFIX}/man
+-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_DIR=	${INSTALL} -d -m 0555 -g wheel -o root
+-INSTALL_DATA_DIR=	${INSTALL} -d -m 0555 -g wheel -o root
++INSTALL_MAN=		${BSD_INSTALL_MAN}
++INSTALL_DATA=		${BSD_INSTALL_DATA}
++INSTALL_PROGRAM=	${BSD_INSTALL_PROGRAM}
++INSTALL_SCRIPT=		${BSD_INSTALL_SCRIPT}
++INSTALL_MAN_DIR=	${BSD_INSTALL_MAN_DIR}
++INSTALL_DATA_DIR=	${BSD_INSTALL_DATA_DIR}

- #
- # DSTETCDIR - where to install template configuration
- #
--DSTETCDIR=	/usr/local/etc
-+DSTETCDIR=	${PREFIX}/etc
+ REQDIRMSG=	">> Run \"make dirs\" to create required (but not really needed) directories and try to install again"

- #
- # DSTRCDIR - where to install sample rc-script
- #
--DSTRCDIR=	/usr/local/etc/rc.d
-+DSTRCDIR=	${PREFIX}/etc/rc.d
-
- #
- # DSTSHAREDIR - where to install examples, etc.
- #
--DSTSHAREDIR=	/usr/local/share/ipa
-+DSTSHAREDIR=	${PREFIX}/share/examples/ipa
-
- #
- # IP6FW (FreeBSD only)
-@@ -204,10 +204,10 @@
- 	@${ECHO}
- .else
- 	@${ECHO} ">> Installing binaries, manual pages and miscellaneous files"
--	${INSTALL} -c -g wheel -o root -m 0555 ipa ipastat ${DSTBINDIR}
-+	${BSD_INSTALL_PROGRAM} ipa ipastat ${DSTBINDIR}
- 	${CHMOD} u+s ${DSTBINDIR}/ipastat
--	${INSTALL} -c -g wheel -o root -m 0444 man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
--	${INSTALL} -c -g wheel -o root -m 0444 man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8
-+	${BSD_INSTALL_MAN} man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
-+	${BSD_INSTALL_MAN} man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8
- .if !exists(${DSTMANDIR}/ru_SU.KOI8-R/man5)
- 	${INSTALL} -d -m 0555 ${DSTMANDIR}/ru_SU.KOI8-R/man5
- .endif
-@@ -217,12 +217,12 @@
- .if !exists(${DSTMANDIR}/ru_RU.KOI8-R)
- 	${LN} -s ${DSTMANDIR}/ru_SU.KOI8-R ${DSTMANDIR}/ru_RU.KOI8-R
- .endif
--	${INSTALL} -c -g wheel -o root -m 0444 man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_RU.KOI8-R/man5
--	${INSTALL} -c -g wheel -o root -m 0444 man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_RU.KOI8-R/man8
--	${INSTALL} -d -m 0555 ${DSTSHAREDIR}/examples
--	${INSTALL} -c -g wheel -o root -m 0444 examples/* ${DSTSHAREDIR}/examples
-+	${BSD_INSTALL_MAN} man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_RU.KOI8-R/man5
-+	${BSD_INSTALL_MAN} man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_RU.KOI8-R/man8
-+	${INSTALL} -d -m 0555 ${DSTSHAREDIR}
-+	${BSD_INSTALL_DATA} examples/* ${DSTSHAREDIR}
- .if exists(${DSTRCDIR})
--	${INSTALL} -c -g wheel -o root -m 0500 etc/ipa.sh.sample ${DSTRCDIR}
-+	${BSD_INSTALL_SCRIPT} etc/ipa.sh.sample ${DSTRCDIR}
- .else
- 	@${ECHO}
- 	@${ECHO} ">> Can't find directory ${DSTRCDIR}, skip installing of ipa.sh.sample"
-@@ -230,7 +230,7 @@
- 	@${ECHO}
- .endif
- .if exists(${DSTETCDIR})
--	${INSTALL} -c -g wheel -o root -m 0400 etc/ipa.conf.default ${DSTETCDIR}
-+	${BSD_INSTALL_DATA} etc/ipa.conf.default ${DSTETCDIR}
- .else
- 	@${ECHO}
- 	@${ECHO} ">> Can't find directory ${DSTETCDIR}, skip installing of ipa.conf.default"
diff -ruN ipa.orig/patches/patch-ab ipa/patches/patch-ab
--- ipa.orig/patches/patch-ab	Sun Oct 21 22:50:01 2001
+++ ipa/patches/patch-ab	Thu Jan  1 00:00:00 1970
@@ -1,72 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/10/21 22:50:01 mjl Exp $
-
---- gensysinfo.orig	Mon Jul 16 01:04:59 2001
-+++ gensysinfo	Mon Oct 22 00:41:55 2001
-@@ -2,5 +2,8 @@
- #
-+# Copyright (c) 2001 Andrey Simonenko
-+#
- # Generate information about system and generate IP Filter
- # version number by parsing /usr/include/netinet/ipl.h or
--# /usr/src/sys/netinet/ipl.h file.
-+# /usr/src/sys/netinet/ipl.h file, or output of
-+# the "/sbin/ipf -V" command.
- #
-@@ -14,2 +17,4 @@
-
-+IPF=/sbin/ipf
-+
- IPL_H=/usr/include/netinet/ipl.h
-@@ -17,10 +22,2 @@
-
--if [ ! -f ${IPL_H} -a ! -f ${IPL_H_SRC} ]; then
--	${ECHO}
--	${ECHO} ">> Can't find file ${IPL_H} or ${IPL_H_SRC}."
--	${ECHO} ">> Is IP Filter installed on this system?"
--	${ECHO}
--	exit 1
--fi
--
- if [ ! -f ${IPL_H} ]; then
-@@ -30,9 +27,26 @@
- ${ECHO} "** Generating information about system"
--SYSTEM="`${UNAME} -m`--`${UNAME} -s` `${UNAME} -r`"
-+SYSTEM="`${UNAME} -s`/`${UNAME} -m` `${UNAME} -r`"
- ${ECHO} "  -- Your system: ${SYSTEM}"
-
--${ECHO} "** Parsing file ${IPL_H}"
--IPF_VERSION_ORIG=`${SED} -n '/^#[ 	]*define[	 ][	 ]*IPL_VERSION[	 ][	 ]*.*\".*v\([[:digit:]][[:digit:]]*\(\.[[:digit:]][[:digit:]]*\)*\).*\".*$/s//\1/p' ${IPL_H}`
-+# if [ ! -f ${IPL_H} -a ! -f ${IPL_H_SRC} ]; then
-+# 	${ECHO}
-+# 	${ECHO} ">> Can't find ${IPL_H}"
-+# 	${ECHO} ">> and ${IPL_H_SRC} file."
-+# 	${ECHO}
-+if [ ! -f ${IPF} -o ! -x ${IPF} ]; then
-+	${ECHO} ">> Can't find ${IPF}, or it is not executable."
-+	${ECHO} ">> Is IP Filter installed on this system?"
-+	${ECHO}
-+	exit 1
-+fi
-+	${ECHO} "** Parsing output of \"${IPF} -V\" command"
-+IPF_VERSION_ORIG=`${IPF} -V 2>&1 | ${SED} -n -e 's/^.*IP[ 	]*Filter.*v\([[:digit:]][[:digit:]]*\(\.[[:digit:]][[:digit:]]*\)*\).*$/\1/p' | ${SED} -e '1q'`
-+# else
-+# ${ECHO} "** Parsing file ${IPL_H}"
-+# IPF_VERSION_ORIG=`${SED} -n -e 's/^#[ 	]*define[	 ][	 ]*IPL_VERSION[	 ][	 ]*.*\".*v\([[:digit:]][[:digit:]]*\(\.[[:digit:]][[:digit:]]*\)*\).*\".*$/\1/p' ${IPL_H}`
-+# fi
-+
- IPF_VERSION_GEN=`${ECHO} ${IPF_VERSION_ORIG} | ${AWK} '
--	BEGIN { FS="." }
-+	BEGIN { FS="."
-+		err = 0 }
- 	NF == 0 { err = 2 }
-@@ -48,3 +62,3 @@
- 	${ECHO}
--	${ECHO} ">> Don't know how to convert IP Filter version ${IPF_VERSION_ORIG} to single decimal number"
-+	${ECHO} ">> Don't know how to convert IP Filter version ${IPF_VERSION_ORIG} to single decimal number."
- 	${ECHO}
-@@ -54,3 +68,4 @@
- 	${ECHO}
--	${ECHO} ">> Can't find IP Filter version number in ${IPL_H}"
-+	${ECHO} ">> Found IP Filter version number \"${IPF_VERSION_ORIG}\" doesn't look like version number."
-+	${ECHO} ">> Can't determine IP Filter version number."
- 	${ECHO}

>Release-Note:
>Audit-Trail:
>Unformatted: