Please update sysutils/ipa to 2.0.1 version. Changes in IPA: * Several bugs were corrected, see its HISTORY file. Changes in port: * Now IPA can be build on 64bits systems, so two patches were removed. * --disable-ctl-creds option was changed to --enable-ctl-creds. * ipa.sh script was updated: added syslogd to REQUIRE, several lines were reordered to follow common style.
Responsible Changed From-To: freebsd-ports-bugs->jmelo I'll take it.
Dear maintainer, I did a cleanup/organize your port, following the patch: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/ipa/Makefile,v retrieving revision 1.36 diff -u -r1.36 Makefile --- Makefile 3 Jan 2006 13:45:54 -0000 1.36 +++ Makefile 11 Apr 2006 15:04:57 -0000 @@ -6,8 +6,7 @@ # PORTNAME= ipa -PORTVERSION= 2.0 -PORTREVISION= 1 +PORTVERSION= 2.0.1 CATEGORIES= sysutils MASTER_SITES= http://ipa-system.sourceforge.net/ \ http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/ \ @@ -19,7 +18,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes -USE_RC_SUBR= yes +USE_RC_SUBR= ipa OPTIONS= AUTORULES "Enable dynamic rules support" on \ RULES "Enable static rules support" on \ @@ -33,35 +32,35 @@ .include <bsd.port.pre.mk> -.ifdef WITHOUT_AUTORULES +.if defined(WITHOUT_AUTORULES) CONFIGURE_ARGS+= --disable-autorules .endif -.ifdef WITHOUT_RULES +.if defined(WITHOUT_RULES) CONFIGURE_ARGS+= --disable-rules .endif -.ifdef WITHOUT_LIMITS +.if defined(WITHOUT_LIMITS) CONFIGURE_ARGS+= --disable-limits .endif -.ifdef WITHOUT_SUBLIMITS +.if defined(WITHOUT_SUBLIMITS) CONFIGURE_ARGS+= --disable-sublimits .endif -.ifdef WITHOUT_THRESHOLDS +.if defined(WITHOUT_THRESHOLDS) CONFIGURE_ARGS+= --disable-thresholds .endif -.ifdef WITHOUT_CTL_CREDS -CONFIGURE_ARGS+= --disable-ctl-creds +.if defined(WITH_CTL_CREDS) +CONFIGURE_ARGS+= --enable-ctl-creds .endif -.ifdef WITH_MEMFUNC_DEBUG +.if defined(WITH_MEMFUNC_DEBUG) CONFIGURE_ARGS+= --enable-memfunc-debug .endif -.ifdef WITH_DEBUG_INFO +.if defined(WITH_DEBUG_INFO) STRIP= # empty CFLAGS+= -g .endif @@ -70,22 +69,15 @@ MAN5= ipa.conf.5 ipastat.conf.5 MAN8= ipa.8 ipactl.8 ipastat.8 MANLANG= "" -.ifdef WITH_MAN_KOI8_R +.if defined(WITH_MAN_KOI8_R) MANLANG+= ru.KOI8-R .endif -RC_SCRIPT_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} - -post-build: - @${SED} ${RC_SCRIPT_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/ipa.sh > ${WRKSRC}/ipa.sh - do-install: - cd ${WRKSRC}/src && make install - cd ${WRKSRC}/man && make install-am - ${INSTALL_SCRIPT} ${WRKSRC}/ipa.sh ${PREFIX}/etc/rc.d -.ifdef WITH_MAN_KOI8_R - cd ${WRKSRC}/man/ru.KOI8-R && make install + cd ${WRKSRC}/src && ${MAKE} ${INSTALL} + cd ${WRKSRC}/man && ${MAKE} ${INSTALL}-am +.if defined(WITH_MAN_KOI8_R) + cd ${WRKSRC}/man/ru.KOI8-R && ${MAKE} ${INSTALL} .endif .include <bsd.port.post.mk> Index: distinfo =================================================================== RCS file: /home/pcvs/ports/sysutils/ipa/distinfo,v retrieving revision 1.29 diff -u -r1.29 distinfo --- distinfo 24 Dec 2005 14:02:14 -0000 1.29 +++ distinfo 11 Apr 2006 15:04:57 -0000 @@ -1,3 +1,3 @@ -MD5 (ipa-2.0.tar.bz2) = 3031b5c837ad059c7401e5d18726c9d9 -SHA256 (ipa-2.0.tar.bz2) = 48b97af965b995f33fb9b331e4690ad02691ec458607c59bb7bfee689f2a0046 -SIZE (ipa-2.0.tar.bz2) = 281507 +MD5 (ipa-2.0.1.tar.bz2) = 0a8abf40c001b040dd410015cfb2790a +SHA256 (ipa-2.0.1.tar.bz2) = ff4d20082ba19c1828e7836f52a4fd1595d84ee3db153b93f47b81a4ea0a2242 +SIZE (ipa-2.0.1.tar.bz2) = 282407 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/sysutils/ipa/pkg-plist,v retrieving revision 1.6 diff -u -r1.6 pkg-plist --- pkg-plist 24 Dec 2005 14:02:14 -0000 1.6 +++ pkg-plist 11 Apr 2006 15:04:57 -0000 @@ -1,5 +1,4 @@ bin/ipa bin/ipactl bin/ipastat -etc/rc.d/ipa.sh include/ipa_mod.h Index: files/ipa.in =================================================================== RCS file: files/ipa.in diff -N files/ipa.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/ipa.in 11 Apr 2006 15:04:57 -0000 @@ -0,0 +1,30 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# 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: syslogd + +# Following line can enable ipa (see rc.subr(8) for information +# where to write it): +# +# ipa_enable (boolean) Set to "YES" to enable ipa +# (default is "NO") + +. %%RC_SUBR%% + +name=ipa +rcvar=`set_rcvar` +command="%%PREFIX%%/bin/ipa" +extra_commands="reload" + +ipa_enable=${ipa_enable:-"NO"} + +load_rc_config $name +run_rc_command "$1" Index: files/ipa.sh =================================================================== RCS file: files/ipa.sh diff -N files/ipa.sh --- files/ipa.sh 24 Dec 2005 14:02:14 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/sysutils/ipa/files/ipa.sh,v 1.1 2005/12/24 14:02:14 ehaupt Exp $ -# - -# If some IPA module requires some services, then they should -# be specified after the REQUIRE, by default REQUIRE is empty, -# since ipa itself does not require anything for running. - -# PROVIDE: ipa -# REQUIRE: -# BEFORE: LOGIN - -# Following line can enable ipa (see rc.subr(8) for information -# where to write it): -# -# ipa_enable (boolean) Set to "YES" to enable ipa -# (default is "NO") - -. %%RC_SUBR%% - -name=ipa -rcvar=`set_rcvar` - -command="%%PREFIX%%/bin/ipa" - -load_rc_config $name - -ipa_enable=${ipa_enable:-"NO"} - -extra_commands="reload" -run_rc_command "$1" Index: files/patch-memfunc.c =================================================================== RCS file: files/patch-memfunc.c diff -N files/patch-memfunc.c --- files/patch-memfunc.c 3 Jan 2006 13:45:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,46 +0,0 @@ ---- src/memfunc.c.orig Sat Dec 3 11:28:00 2005 -+++ src/memfunc.c Tue Jan 3 13:44:56 2006 -@@ -575,8 +575,8 @@ - mem_type->name); - - if ( (mem = malloc(size + MEM_DESC_BUF_OFFSET + sizeof(gbytes))) == NULL) { -- logmsgx("mem_malloc(%lu + %u, %s) failed: malloc: %s", -- (u_long)size, MEM_DESC_BUF_OFFSET, mem_type->name, -+ logmsgx("mem_malloc(%lu + %lu, %s) failed: malloc: %s", -+ (u_long)size, (u_long)MEM_DESC_BUF_OFFSET, mem_type->name, - strerror(errno)); - return NULL; - } -@@ -614,8 +614,8 @@ - - size *= number; - if ( (mem = malloc(size + MEM_DESC_BUF_OFFSET + sizeof(gbytes))) == NULL) { -- logmsgx("mem_calloc(%lu + %u, %s) failed: %s", -- (u_long)size, MEM_DESC_BUF_OFFSET, mem_type->name, -+ logmsgx("mem_calloc(%lu + %lu, %s) failed: %s", -+ (u_long)size, (u_long)MEM_DESC_BUF_OFFSET, mem_type->name, - strerror(errno)); - return NULL; - } -@@ -714,8 +714,8 @@ - #ifdef WITH_MEMFUNC_DEBUG - /* malloc() --> memcpy() --> free() */ - if ( (mem2 = malloc(size2 + MEM_DESC_BUF_OFFSET + sizeof(gbytes))) == NULL) { -- logmsgx("mem_realloc(%s): malloc(%lu + %u) failed: %s", -- mem_type->name, (u_long)size2, MEM_DESC_BUF_OFFSET, -+ logmsgx("mem_realloc(%s): malloc(%lu + %lu) failed: %s", -+ mem_type->name, (u_long)size2, (u_long)MEM_DESC_BUF_OFFSET, - strerror(errno)); - return NULL; - } -@@ -733,8 +733,8 @@ - /* True realloc(). */ - mem1->signature = MEM_NOSIGNATURE; - if ( (mem2 = realloc(mem1, size2 + MEM_DESC_BUF_OFFSET + sizeof(gbytes))) == NULL) { -- logmsgx("mem_realloc(%lu + %u, %s) failed: %s", -- (u_long)size2, MEM_DESC_BUF_OFFSET, mem_type->name, -+ logmsgx("mem_realloc(%lu + %lu, %s) failed: %s", -+ (u_long)size2, (u_long)MEM_DESC_BUF_OFFSET, mem_type->name, - strerror(errno)); - mem1->signature = MEM_SIGNATURE & (int)size1; - return NULL; Index: files/patch-parser.c =================================================================== RCS file: files/patch-parser.c diff -N files/patch-parser.c --- files/patch-parser.c 3 Jan 2006 13:45:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- src/parser.c.orig Sat Dec 3 11:28:00 2005 -+++ src/parser.c Tue Jan 3 13:44:50 2006 -@@ -533,7 +533,7 @@ - * outside of this function. - */ - struct parser_pbuf * --parser_new_pbuf(u_int size) -+parser_new_pbuf(size_t size) - { - struct parser_pbuf *pbuf; - This patch can be downloaded here: http://main.bh.freebsdbrasil.com.br:81/~jmelo/ipa.diff Build logs: i386: http://main.bh.freebsdbrasil.com.br:9090/tb/logs/4.11-FreeBSD/ipa-2.0.1.log http://main.bh.freebsdbrasil.com.br:9090/tb/logs/5.5-FreeBSD/ipa-2.0.1.log http://main.bh.freebsdbrasil.com.br:9090/tb/logs/6.1-FreeBSD/ipa-2.0.1.log AMD64: http://main.bh.freebsdbrasil.com.br:8080/tb/logs/6.1-FreeBSD/ipa-2.0.1.log http://main.bh.freebsdbrasil.com.br:8080/tb/logs/5.5-FreeBSD/ipa-2.0.1.log Please, take a look and tell me if i can commit it. - Jean
Maintainer, Another thing, as WITH_CTL_CREDS options is ON by default you must use WITHOUT instead of WITH, such as: .if defined(WITHOUT_CTL_CREDS) CONFIGURE_ARGS+= --disable-ctl-creds .endif - Jean
State Changed From-To: open->closed Committed, with minor changes. Thanks!