Attachment 64236 Details for Bug 95581 – file.diff

[patch] file.diff

file.diff (text/plain), 4.45 KB, created by Andrey Simonenko on 2006-04-10 11:50:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Simonenko

Created: 2006-04-10 11:50:16 UTC

Size: 4.45 KB

patch

obsolete

>diff -ruN ipa.orig/Makefile ipa/Makefile
>--- ipa.orig/Makefile	Mon Apr 10 00:30:52 2006
>+++ ipa/Makefile	Mon Apr 10 01:02:08 2006
>@@ -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/ \
>@@ -53,8 +52,8 @@
> CONFIGURE_ARGS+=	--disable-thresholds
> .endif
> 
>-.ifdef WITHOUT_CTL_CREDS
>-CONFIGURE_ARGS+=	--disable-ctl-creds
>+.ifdef WITH_CTL_CREDS
>+CONFIGURE_ARGS+=	--enable-ctl-creds
> .endif
> 
> .ifdef WITH_MEMFUNC_DEBUG
>diff -ruN ipa.orig/distinfo ipa/distinfo
>--- ipa.orig/distinfo	Mon Apr 10 00:30:52 2006
>+++ ipa/distinfo	Mon Apr 10 01:14:05 2006
>@@ -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
>diff -ruN ipa.orig/files/ipa.sh ipa/files/ipa.sh
>--- ipa.orig/files/ipa.sh	Mon Apr 10 00:30:52 2006
>+++ ipa/files/ipa.sh	Mon Apr 10 01:23:38 2006
>@@ -4,11 +4,12 @@
> #
> 
> # 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.
>+# 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:
>+# REQUIRE: syslogd
> # BEFORE: LOGIN
> 
> # Following line can enable ipa (see rc.subr(8) for information
>@@ -21,12 +22,10 @@
> 
> name=ipa
> rcvar=`set_rcvar`
>-
> command="%%PREFIX%%/bin/ipa"
>-
>-load_rc_config $name
>+extra_commands="reload"
> 
> ipa_enable=${ipa_enable:-"NO"}
> 
>-extra_commands="reload"
>+load_rc_config $name
> run_rc_command "$1"
>diff -ruN ipa.orig/files/patch-memfunc.c ipa/files/patch-memfunc.c
>--- ipa.orig/files/patch-memfunc.c	Mon Apr 10 00:30:52 2006
>+++ ipa/files/patch-memfunc.c	Thu Jan  1 03:00:00 1970
>@@ -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;
>diff -ruN ipa.orig/files/patch-parser.c ipa/files/patch-parser.c
>--- ipa.orig/files/patch-parser.c	Mon Apr 10 00:30:52 2006
>+++ ipa/files/patch-parser.c	Thu Jan  1 03:00:00 1970
>@@ -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;
>-

Actions: View | Diff

Attachments on bug 95581: 64236