Attachment #64236 for bug #95581

View | Details | Raw Unified | Return to bug 95581
Collapse All | Expand All




#

PORTNAME=	ipa
PORTVERSION=	2.0.1
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	http://ipa-system.sourceforge.net/ \
		http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/ \

CONFIGURE_ARGS+=	--disable-thresholds
.endif

.ifdef WITH_CTL_CREDS
CONFIGURE_ARGS+=	--enable-ctl-creds
.endif

.ifdef WITH_MEMFUNC_DEBUG

Lines 1-3 Link Here

(-)ipa/distinfo (-3 / +3 lines)
1	MD5 (ipa-2.0.tar.bz2) = 3031b5c837ad059c7401e5d18726c9d9	1	MD5 (ipa-2.0.1.tar.bz2) = 0a8abf40c001b040dd410015cfb2790a
2	SHA256 (ipa-2.0.tar.bz2) = 48b97af965b995f33fb9b331e4690ad02691ec458607c59bb7bfee689f2a0046	2	SHA256 (ipa-2.0.1.tar.bz2) = ff4d20082ba19c1828e7836f52a4fd1595d84ee3db153b93f47b81a4ea0a2242
3	SIZE (ipa-2.0.tar.bz2) = 281507	3	SIZE (ipa-2.0.1.tar.bz2) = 282407




#

# 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
# BEFORE: LOGIN

# Following line can enable ipa (see rc.subr(8) for information


name=ipa
rcvar=`set_rcvar`

command="%%PREFIX%%/bin/ipa"
extra_commands="reload"
load_rc_config $name

ipa_enable=${ipa_enable:-"NO"}

load_rc_config $name
run_rc_command "$1"




--- 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;

Lines 1-11 Link Here

(-)ipa/files/patch-parser.c (-11 lines)
1	--- src/parser.c.orig Sat Dec 3 11:28:00 2005
2	+++ src/parser.c Tue Jan 3 13:44:50 2006
3	@@ -533,7 +533,7 @@
4	* outside of this function.
5	*/
6	struct parser_pbuf *
7	-parser_new_pbuf(u_int size)
8	+parser_new_pbuf(size_t size)
9	{
10	struct parser_pbuf *pbuf;
11

Return to bug 95581

Lines 6-13 Link Here

(-)ipa/Makefile (-4 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= ipa	8	PORTNAME= ipa
9	PORTVERSION= 2.0	9	PORTVERSION= 2.0.1
10	PORTREVISION= 1
11	CATEGORIES= sysutils	10	CATEGORIES= sysutils
12	MASTER_SITES= http://ipa-system.sourceforge.net/ \	11	MASTER_SITES= http://ipa-system.sourceforge.net/ \
13	http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/ \	12	http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/ \
Lines 53-60 Link Here
53	CONFIGURE_ARGS+= --disable-thresholds	52	CONFIGURE_ARGS+= --disable-thresholds
54	.endif	53	.endif
55		54
56	.ifdef WITHOUT_CTL_CREDS	55	.ifdef WITH_CTL_CREDS
57	CONFIGURE_ARGS+= --disable-ctl-creds	56	CONFIGURE_ARGS+= --enable-ctl-creds
58	.endif	57	.endif
59		58
60	.ifdef WITH_MEMFUNC_DEBUG	59	.ifdef WITH_MEMFUNC_DEBUG

Lines 4-14 Link Here

(-)ipa/files/ipa.sh (-7 / +6 lines)
4	#	4	#
5		5
6	# If some IPA module requires some services, then they should	6	# If some IPA module requires some services, then they should
7	# be specified after the REQUIRE, by default REQUIRE is empty,	7	# be specified after REQUIRE, by default REQUIRE contains
8	# since ipa itself does not require anything for running.	8	# only syslogd, since ipa uses syslog for logging by default
		9	# and does not require anything more for running.
9		10
10	# PROVIDE: ipa	11	# PROVIDE: ipa
11	# REQUIRE:	12	# REQUIRE: syslogd
12	# BEFORE: LOGIN	13	# BEFORE: LOGIN
13		14
14	# Following line can enable ipa (see rc.subr(8) for information	15	# Following line can enable ipa (see rc.subr(8) for information
Lines 21-32 Link Here
21		22
22	name=ipa	23	name=ipa
23	rcvar=`set_rcvar`	24	rcvar=`set_rcvar`
24
25	command="%%PREFIX%%/bin/ipa"	25	command="%%PREFIX%%/bin/ipa"
26		26	extra_commands="reload"
27	load_rc_config $name
28		27
29	ipa_enable=${ipa_enable:-"NO"}	28	ipa_enable=${ipa_enable:-"NO"}
30		29
31	extra_commands="reload"	30	load_rc_config $name
32	run_rc_command "$1"	31	run_rc_command "$1"

Lines 1-46 Link Here

(-)ipa/files/patch-memfunc.c (-46 lines)
1	--- src/memfunc.c.orig Sat Dec 3 11:28:00 2005
2	+++ src/memfunc.c Tue Jan 3 13:44:56 2006
3	@@ -575,8 +575,8 @@
4	mem_type->name);
5
6	if ( (mem = malloc(size + MEM_DESC_BUF_OFFSET + sizeof(gbytes))) == NULL) {
7	- logmsgx("mem_malloc(%lu + %u, %s) failed: malloc: %s",
8	- (u_long)size, MEM_DESC_BUF_OFFSET, mem_type->name,
9	+ logmsgx("mem_malloc(%lu + %lu, %s) failed: malloc: %s",
10	+ (u_long)size, (u_long)MEM_DESC_BUF_OFFSET, mem_type->name,
11	strerror(errno));
12	return NULL;
13	}
14	@@ -614,8 +614,8 @@
15
16	size *= number;
17	if ( (mem = malloc(size + MEM_DESC_BUF_OFFSET + sizeof(gbytes))) == NULL) {
18	- logmsgx("mem_calloc(%lu + %u, %s) failed: %s",
19	- (u_long)size, MEM_DESC_BUF_OFFSET, mem_type->name,
20	+ logmsgx("mem_calloc(%lu + %lu, %s) failed: %s",
21	+ (u_long)size, (u_long)MEM_DESC_BUF_OFFSET, mem_type->name,
22	strerror(errno));
23	return NULL;
24	}
25	@@ -714,8 +714,8 @@
26	#ifdef WITH_MEMFUNC_DEBUG
27	/* malloc() --> memcpy() --> free() */
28	if ( (mem2 = malloc(size2 + MEM_DESC_BUF_OFFSET + sizeof(gbytes))) == NULL) {
29	- logmsgx("mem_realloc(%s): malloc(%lu + %u) failed: %s",
30	- mem_type->name, (u_long)size2, MEM_DESC_BUF_OFFSET,
31	+ logmsgx("mem_realloc(%s): malloc(%lu + %lu) failed: %s",
32	+ mem_type->name, (u_long)size2, (u_long)MEM_DESC_BUF_OFFSET,
33	strerror(errno));
34	return NULL;
35	}
36	@@ -733,8 +733,8 @@
37	/* True realloc(). */
38	mem1->signature = MEM_NOSIGNATURE;
39	if ( (mem2 = realloc(mem1, size2 + MEM_DESC_BUF_OFFSET + sizeof(gbytes))) == NULL) {
40	- logmsgx("mem_realloc(%lu + %u, %s) failed: %s",
41	- (u_long)size2, MEM_DESC_BUF_OFFSET, mem_type->name,
42	+ logmsgx("mem_realloc(%lu + %lu, %s) failed: %s",
43	+ (u_long)size2, (u_long)MEM_DESC_BUF_OFFSET, mem_type->name,
44	strerror(errno));
45	mem1->signature = MEM_SIGNATURE & (int)size1;
46	return NULL;