Attachment 82125 Details for Bug 117515 – ndpmon-1.3a.patch

[patch] ndpmon-1.3a.patch

ndpmon-1.3a.patch (text/plain), 12.12 KB, created by Janos Mohacsi on 2007-10-25 23:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Janos Mohacsi

Created: 2007-10-25 23:40:00 UTC

Size: 12.12 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/Makefile /usr/ports/net-mgmt/ndpmon/Makefile
>--- /usr/ports/net-mgmt/ndpmon.orig/Makefile	2007-09-08 20:07:00.000000000 +0200
>+++ /usr/ports/net-mgmt/ndpmon/Makefile	2007-10-26 00:34:55.000000000 +0200
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	ndpmon
>-PORTVERSION=	1.2
>-PORTREVISION=	1
>+PORTVERSION=	1.3a
> CATEGORIES=	net-mgmt ipv6
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -19,21 +18,21 @@
> USE_GNOME=	libxml2
> USE_PERL5_RUN=	yes
> USE_RC_SUBR=	ndpmonitor
>-WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	OSTYPE=FreeBSD
>+CONFIGURE_ARGS=	--with-var-datadir=${PREFIX}/var
> 
> MAN8=		ndpmon.8
> PORTDOCS=	INSTALL README
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
>-		${WRKSRC}/ndpmon.c \
> 		${WRKSRC}/ndpmon.8 \
> 		${WRKSRC}/config_ndpmon.xml \
>-		${WRKSRC}/neighbor_list.xml \
>-		${WRKSRC}/demopipeprogram.pl
>+		${WRKSRC}/create_html_table.py \
>+		${WRKSRC}/demopipeprogram.pl.sample
>+	(cd ${WRKSRC}; ${MAKE} clean)
> 
> do-install:
> 	${INSTALL_MAN} ${WRKSRC}/ndpmon.8 ${PREFIX}/man/man8
>@@ -41,9 +40,12 @@
> 	${MKDIR} ${DATADIR}
> 	${INSTALL_DATA} ${WRKSRC}/*.dtd \
> 		${DATADIR}
>-	${INSTALL_SCRIPT} ${WRKSRC}/demopipeprogram.pl \
>+	${INSTALL_SCRIPT} ${WRKSRC}/demopipeprogram.pl.sample \
> 		${DATADIR}
>-	${INSTALL_DATA} ${WRKSRC}/config_ndpmon.xml ${PREFIX}/etc/config_ndpmon.xml-dist
>+	${INSTALL_SCRIPT} ${WRKSRC}/create_html_table.py \
>+		${DATADIR}
>+	${MKDIR} ${PREFIX}/etc/ndpmon
>+	${INSTALL_DATA} ${WRKSRC}/config_ndpmon.xml ${PREFIX}/etc/ndpmon/config_ndpmon.xml-dist
> 	${MKDIR} ${PREFIX}/var
> 	${INSTALL_DATA} ${WRKSRC}/neighbor_list.xml ${PREFIX}/var/ndpmon_neighbor_list.xml
> 
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/distinfo /usr/ports/net-mgmt/ndpmon/distinfo
>--- /usr/ports/net-mgmt/ndpmon.orig/distinfo	2007-08-06 12:35:39.000000000 +0200
>+++ /usr/ports/net-mgmt/ndpmon/distinfo	2007-10-25 23:36:44.000000000 +0200
>@@ -1,3 +1,3 @@
>-MD5 (ndpmon-1.2.tgz) = 4073e4b4d0a9031572a2988760622116
>-SHA256 (ndpmon-1.2.tgz) = 9e7239a59d33348bd7a69150bc34c7877916e9afecb58314c5e319d23447a2ef
>-SIZE (ndpmon-1.2.tgz) = 234792
>+MD5 (ndpmon-1.3a.tgz) = 3f0532fa61a0ac5bd5123eab2e95c9c2
>+SHA256 (ndpmon-1.3a.tgz) = 0425914ac03c9915ba8d3d54f2d93d6103f4d5346d9b544ce6fbe26203764675
>+SIZE (ndpmon-1.3a.tgz) = 298651
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/files/patch-config__ndpmon.xml /usr/ports/net-mgmt/ndpmon/files/patch-config__ndpmon.xml
>--- /usr/ports/net-mgmt/ndpmon.orig/files/patch-config__ndpmon.xml	2007-03-22 02:19:35.000000000 +0100
>+++ /usr/ports/net-mgmt/ndpmon/files/patch-config__ndpmon.xml	2007-10-25 23:52:16.000000000 +0200
>@@ -1,27 +1,28 @@
> 
>-$FreeBSD: ports/net-mgmt/ndpmon/files/patch-config__ndpmon.xml,v 1.2 2007/03/22 01:19:35 clsung Exp $
>+$FreeBSD$
> 
> --- config_ndpmon.xml.orig
> +++ config_ndpmon.xml
>-@@ -1,5 +1,5 @@
>+@@ -1,6 +1,6 @@
>  <?xml version="1.0" encoding="ISO-8859-1"?>
>--<!DOCTYPE config_ndpmon SYSTEM "config_ndpmon.dtd">
>+ <?xml-stylesheet type="text/xsl" href="config.xsl" ?>
>+-<!DOCTYPE config_ndpmon SYSTEM "/usr/local/etc/ndpmon/config_ndpmon.dtd">
> +<!DOCTYPE config_ndpmon SYSTEM "%%PREFIX%%/share/ndpmon/config_ndpmon.dtd">
>  <config_ndpmon>
>  	<ignor_autoconf>1</ignor_autoconf>
>  	<syslog_facility>LOG_LOCAL1</syslog_facility>
>-@@ -7,12 +7,12 @@
>+@@ -8,12 +8,12 @@
>          <actions_low_pri>
>          	<sendmail>1</sendmail>
>          	<syslog>1</syslog>
>--        	<exec_pipe_program>/usr/local/ndpmon/demopipeprogram.pl</exec_pipe_program>
>-+        	<exec_pipe_program>%%PREFIX%%/share/ndpmon/demopipeprogram.pl</exec_pipe_program>
>+-        	<exec_pipe_program>/usr/local/ndpmon/create_html_table.py</exec_pipe_program>
>++        	<exec_pipe_program>%%PREFIX%%/share/ndpmon/create_html_table.py</exec_pipe_program>
>          </actions_low_pri>
>          <actions_high_pri>
>          	<sendmail>1</sendmail>
>          	<syslog>1</syslog>
>--        	<exec_pipe_program>/usr/local/ndpmon/demopipeprogram.pl</exec_pipe_program>
>-+        	<exec_pipe_program>%%PREFIX%%/share/ndpmon/demopipeprogram.pl</exec_pipe_program>
>+-        	<exec_pipe_program>/usr/local/ndpmon/create_html_table.py</exec_pipe_program>
>++        	<exec_pipe_program>%%PREFIX%%/share/ndpmon/create_html_table.py</exec_pipe_program>
>          </actions_high_pri>
>          <use_reverse_hostlookups>1</use_reverse_hostlookups>
>          <routers>
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/files/patch-config__ndpmon.xml.in /usr/ports/net-mgmt/ndpmon/files/patch-config__ndpmon.xml.in
>--- /usr/ports/net-mgmt/ndpmon.orig/files/patch-config__ndpmon.xml.in	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/net-mgmt/ndpmon/files/patch-config__ndpmon.xml.in	2007-10-26 00:18:15.000000000 +0200
>@@ -0,0 +1,20 @@
>+
>+$FreeBSD$
>+
>+--- config_ndpmon.xml.in.orig
>++++ config_ndpmon.xml.in
>+@@ -8,12 +8,12 @@
>+         <actions_low_pri>
>+         	<sendmail>1</sendmail>
>+         	<syslog>1</syslog>
>+-        	<exec_pipe_program>/usr/local/ndpmon/create_html_table.py</exec_pipe_program>
>++        	<exec_pipe_program>@prefix@/share/ndpmon/create_html_table.py</exec_pipe_program>
>+         </actions_low_pri>
>+         <actions_high_pri>
>+         	<sendmail>1</sendmail>
>+         	<syslog>1</syslog>
>+-        	<exec_pipe_program>/usr/local/ndpmon/create_html_table.py</exec_pipe_program>
>++        	<exec_pipe_program>@prefix@/share/ndpmon/create_html_table.py</exec_pipe_program>
>+         </actions_high_pri>
>+         <use_reverse_hostlookups>1</use_reverse_hostlookups>
>+         <routers>
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/files/patch-create__html__table.py /usr/ports/net-mgmt/ndpmon/files/patch-create__html__table.py
>--- /usr/ports/net-mgmt/ndpmon.orig/files/patch-create__html__table.py	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/net-mgmt/ndpmon/files/patch-create__html__table.py	2007-10-26 00:09:29.000000000 +0200
>@@ -0,0 +1,14 @@
>+
>+$FreeBSD$
>+
>+--- create_html_table.py.orig
>++++ create_html_table.py
>+@@ -11,7 +11,7 @@
>+ from xml.dom import Node
>+ 
>+ # The file in which we will write the alerts 
>+-alerts = "/var/local/ndpmon/alerts.xml"
>++alerts = "%%PREFIX%%/var/ndpmon/alerts.xml"
>+ 
>+ # The alert itself piped from NDPmon to this script
>+ lines = sys.stdin.readlines()
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/files/patch-demopipeprogram.pl /usr/ports/net-mgmt/ndpmon/files/patch-demopipeprogram.pl
>--- /usr/ports/net-mgmt/ndpmon.orig/files/patch-demopipeprogram.pl	2007-03-22 02:19:35.000000000 +0100
>+++ /usr/ports/net-mgmt/ndpmon/files/patch-demopipeprogram.pl	1970-01-01 01:00:00.000000000 +0100
>@@ -1,21 +0,0 @@
>-
>-$FreeBSD: ports/net-mgmt/ndpmon/files/patch-demopipeprogram.pl,v 1.1 2007/03/22 01:19:35 clsung Exp $
>-
>---- demopipeprogram.pl.orig
>-+++ demopipeprogram.pl
>-@@ -1,7 +1,7 @@
>- #!/usr/bin/perl
>- 
>- my $i=0;
>--open DATA, ">>/usr/local/ndpmon/test.txt" or die "Cannot open /usr/local/ndpmon/test.txt for writing\n";
>-+open DATA, ">>%%PREFIX%%/var/ndpmon_test.txt" or die "Cannot open %%PREFIX%%/var/ndpmon_test.txt for writing\n";
>- 
>- print DATA "-----\n";
>- while (<STDIN>) {
>-@@ -14,4 +14,4 @@
>- }
>- print DATA "-----\n\n";
>- 
>--close DATA;
>-\ No newline at end of file
>-+close DATA;
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/files/patch-demopipeprogram.pl.sample /usr/ports/net-mgmt/ndpmon/files/patch-demopipeprogram.pl.sample
>--- /usr/ports/net-mgmt/ndpmon.orig/files/patch-demopipeprogram.pl.sample	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/net-mgmt/ndpmon/files/patch-demopipeprogram.pl.sample	2007-10-26 00:10:15.000000000 +0200
>@@ -0,0 +1,21 @@
>+
>+$FreeBSD$
>+
>+--- demopipeprogram.pl.sample.orig
>++++ demopipeprogram.pl.sample
>+@@ -1,7 +1,7 @@
>+ #!/usr/bin/perl
>+ 
>+ my $i=0;
>+-open DATA, ">>/usr/local/ndpmon/test.txt" or die "Cannot open /usr/local/ndpmon/test.txt for writing\n";
>++open DATA, ">>%%PREFIX%%/var/ndpmon/ndpmon_test.txt" or die "Cannot open %%PREFIX%%/var/ndpmon/ndpmon_test.txt for writing\n";
>+ 
>+ print DATA "-----\n";
>+ while (<STDIN>) {
>+@@ -14,4 +14,4 @@
>+ }
>+ print DATA "-----\n\n";
>+ 
>+-close DATA;
>+\ No newline at end of file
>++close DATA;
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/files/patch-ndpmon.8 /usr/ports/net-mgmt/ndpmon/files/patch-ndpmon.8
>--- /usr/ports/net-mgmt/ndpmon.orig/files/patch-ndpmon.8	2006-12-21 21:20:49.000000000 +0100
>+++ /usr/ports/net-mgmt/ndpmon/files/patch-ndpmon.8	2007-10-26 00:13:01.000000000 +0200
>@@ -1,5 +1,5 @@
> 
>-$FreeBSD: ports/net-mgmt/ndpmon/files/patch-ndpmon.8,v 1.1 2006/12/21 20:20:49 miwi Exp $
>+$FreeBSD$
> 
> --- ndpmon.8.orig
> +++ ndpmon.8
>@@ -29,7 +29,7 @@
>  .B -g
>  flag is used to change the path to the neighbor cache. The default is 
> -.I /usr/local/ndpmon/neighbor_list.xml
>-+.I %%PREFIX%%/var/ndpmon_neighbor_list.xml
>++.I %%PREFIX%%/var/ndpmon/ndpmon_neighbor_list.xml
>  .LP
>  Note that an empty
>  .I neighbor_cache.xml
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/files/patch-ndpmon.c /usr/ports/net-mgmt/ndpmon/files/patch-ndpmon.c
>--- /usr/ports/net-mgmt/ndpmon.orig/files/patch-ndpmon.c	2007-08-06 12:35:39.000000000 +0200
>+++ /usr/ports/net-mgmt/ndpmon/files/patch-ndpmon.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,20 +0,0 @@
>-
>-$FreeBSD: ports/net-mgmt/ndpmon/files/patch-ndpmon.c,v 1.2 2007/08/03 21:40:26 pav Exp $
>-
>---- ndpmon.c.orig
>-+++ ndpmon.c
>-@@ -43,10 +43,10 @@
>- char admin_mail[128] = "";
>- char syslog_facility[16] = "";
>- int ignor_autoconf = 0;
>--char config_path[128] = "/usr/local/ndpmon/config_ndpmon.xml";
>--char cache_path[128] = "/usr/local/ndpmon/neighbor_list.xml";
>--char dtd_path[128] = "/usr/local/ndpmon/neighbor_list.dtd";
>--char dtd_config_path[128] = "/usr/local/ndpmon/config_ndpmon.dtd";
>-+char config_path[128] = "%%PREFIX%%/etc/config_ndpmon.xml";
>-+char cache_path[128] = "%%PREFIX%%/var/ndpmon_neighbor_list.xml";
>-+char dtd_path[128] = "%%PREFIX%%/share/ndpmon/neighbor_list.dtd";
>-+char dtd_config_path[128] = "%%PREFIX%%/share/ndpmon/config_ndpmon.dtd";
>- 
>- struct action_selector action_low_pri, action_high_pri;
>- int use_reverse_hostlookups;
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/files/patch-ndpmon__defs.h.in /usr/ports/net-mgmt/ndpmon/files/patch-ndpmon__defs.h.in
>--- /usr/ports/net-mgmt/ndpmon.orig/files/patch-ndpmon__defs.h.in	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/net-mgmt/ndpmon/files/patch-ndpmon__defs.h.in	2007-10-26 00:07:31.000000000 +0200
>@@ -0,0 +1,17 @@
>+
>+$FreeBSD$
>+
>+--- ndpmon_defs.h.in.orig
>++++ ndpmon_defs.h.in
>+@@ -10,9 +10,9 @@
>+ #endif
>+ 
>+ #define _CONFIG_PATH_ "@prefix@/etc/ndpmon/config_ndpmon.xml"
>+-#define _CONFIG_DTD_PATH_ "@prefix@/etc/ndpmon/config_ndpmon.dtd"
>++#define _CONFIG_DTD_PATH_ "@prefix@/share/ndpmon/config_ndpmon.dtd"
>+ #define _CACHE_PATH_ "@VARDATADIR@/ndpmon/neighbor_list.xml"
>+-#define _CACHE_DTD_PATH_ "@VARDATADIR@/ndpmon/neighbor_list.dtd"
>++#define _CACHE_DTD_PATH_ "@prefix@/share/ndpmon/neighbor_list.dtd"
>+ #define _DISCOVERY_HISTORY_PATH_ "@VARDATADIR@/ndpmon/discovery_history.dat"
>+ 
>+ extern int DEBUG;
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/files/patch-neighbor__list.xml /usr/ports/net-mgmt/ndpmon/files/patch-neighbor__list.xml
>--- /usr/ports/net-mgmt/ndpmon.orig/files/patch-neighbor__list.xml	2006-12-21 21:20:49.000000000 +0100
>+++ /usr/ports/net-mgmt/ndpmon/files/patch-neighbor__list.xml	1970-01-01 01:00:00.000000000 +0100
>@@ -1,12 +0,0 @@
>-
>-$FreeBSD: ports/net-mgmt/ndpmon/files/patch-neighbor__list.xml,v 1.1 2006/12/21 20:20:49 miwi Exp $
>-
>---- neighbor_list.xml.orig
>-+++ neighbor_list.xml
>-@@ -1,5 +1,5 @@
>- <?xml version="1.0" encoding="ISO-8859-1"?>
>- <!DOCTYPE neighbor_list
>--SYSTEM "/usr/local/ndpmon/neighbor_list.dtd">
>-+SYSTEM "%%PREFIX%%/share/ndpmon/neighbor_list.dtd">
>- <neighbor_list>
>- </neighbor_list>
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/pkg-plist /usr/ports/net-mgmt/ndpmon/pkg-plist
>--- /usr/ports/net-mgmt/ndpmon.orig/pkg-plist	2007-03-22 02:19:34.000000000 +0100
>+++ /usr/ports/net-mgmt/ndpmon/pkg-plist	2007-10-26 00:33:32.000000000 +0200
>@@ -1,8 +1,10 @@
> sbin/ndpmon
> %%DATADIR%%/config_ndpmon.dtd
> %%DATADIR%%/neighbor_list.dtd
>-%%DATADIR%%/demopipeprogram.pl
>+%%DATADIR%%/demopipeprogram.pl.sample
>+%%DATADIR%%/create_html_table.py
> @dirrmtry %%DATADIR%%
> var/ndpmon_neighbor_list.xml
> @dirrmtry var
>-etc/config_ndpmon.xml-dist
>+etc/ndpmon/config_ndpmon.xml-dist
>+@dirrmtry etc/ndpmon

Actions: View | Diff

Attachments on bug 117515: 82125