Attachment 66906 Details for Bug 98741 – net_dhcp6.diff

[patch] net_dhcp6.diff

net_dhcp6.diff (text/plain), 10.94 KB, created by Joerg Pulz on 2006-06-09 11:00:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joerg Pulz

Created: 2006-06-09 11:00:29 UTC

Size: 10.94 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/dhcp6/Makefile,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile
>--- Makefile	11 May 2006 22:49:05 -0000	1.7
>+++ Makefile	9 Jun 2006 08:46:38 -0000
>@@ -6,33 +6,24 @@
> #
> 
> PORTNAME=	dhcp6
>-PORTVERSION=	20060114
>-PORTREVISION=	0
>+PORTVERSION=	20060322
>+#PORTREVISION=	0
> CATEGORIES=	net ipv6
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	wide-dhcpv6
>-DISTNAME= wide-dhcpv6-${PORTVERSION}
>+DISTNAME=	wide-dhcpv6-${PORTVERSION}
> 
> MAINTAINER=	suz@FreeBSD.org
> COMMENT=	KAME DHCP6 client, server, and relay
> 
> WRKSRC=		${WRKDIR}/${DISTNAME}
>-USE_RC_SUBR=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=	--sysconfdir=${LOCALBASE}/etc --with-localdbdir=/var/db
> 
> MAN5=		dhcp6c.conf.5 dhcp6s.conf.5
> MAN8=		dhcp6c.8 dhcp6s.8 dhcp6relay.8 dhcp6ctl.8
> 
>-RC_SCRIPTS=	dhcp6c.sh dhcp6relay.sh dhcp6s.sh
>-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
>-		RC_SUBR=${RC_SUBR}
>-
>-post-patch:
>-.for f in ${RC_SCRIPTS}
>-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
>-		${FILESDIR}/${f} > ${WRKDIR}/${f}
>-.endfor
>+USE_RC_SUBR=	dhcp6c.sh dhcp6relay.sh dhcp6s.sh
> 
> post-install:
> .if !defined(NOPORTDOCS)
>@@ -41,8 +32,5 @@
> .endif
> 	${INSTALL_DATA} ${WRKSRC}/dhcp6c.conf.sample ${PREFIX}/etc
> 	${INSTALL_DATA} ${WRKSRC}/dhcp6s.conf.sample ${PREFIX}/etc
>-.for f in ${RC_SCRIPTS}
>-	@${INSTALL_SCRIPT} ${WRKDIR}/${f} ${PREFIX}/etc/rc.d/${f}
>-.endfor
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/net/dhcp6/distinfo,v
>retrieving revision 1.6
>diff -u -r1.6 distinfo
>--- distinfo	22 Jan 2006 21:23:00 -0000	1.6
>+++ distinfo	9 Jun 2006 08:46:38 -0000
>@@ -1,3 +1,3 @@
>-MD5 (wide-dhcpv6-20060114.tar.gz) = af600c0a0eb8e31a36e96c650d4f1945
>-SHA256 (wide-dhcpv6-20060114.tar.gz) = ce2eaef614ad615b215abfb95374f0c027920b60fa634623f780c78a0c97aae9
>-SIZE (wide-dhcpv6-20060114.tar.gz) = 177849
>+MD5 (wide-dhcpv6-20060322.tar.gz) = f6464d893b7b8fdeb7ea941ac8532ed9
>+SHA256 (wide-dhcpv6-20060322.tar.gz) = 2902335f71a3c782375064889c5d9154583a97453464eab6ca5d1eb99f24aed5
>+SIZE (wide-dhcpv6-20060322.tar.gz) = 161026
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/net/dhcp6/pkg-plist,v
>retrieving revision 1.3
>diff -u -r1.3 pkg-plist
>--- pkg-plist	25 Jul 2005 04:47:03 -0000	1.3
>+++ pkg-plist	9 Jun 2006 08:46:38 -0000
>@@ -1,8 +1,11 @@
>+@unexec %D/etc/rc.d/dhcp6s.sh forcestop 2>/dev/null || true
>+@unexec %D/etc/rc.d/dhcp6relay.sh forcestop 2>/dev/null || true
>+@unexec %D/etc/rc.d/dhcp6c.sh forcestop 2>/dev/null || true
>+@unexec %D/etc/rc.d/dhcp6s forcestop 2>/dev/null || true
>+@unexec %D/etc/rc.d/dhcp6relay  forcestop 2>/dev/null || true
>+@unexec %D/etc/rc.d/dhcp6c forcestop 2>/dev/null || true
> etc/dhcp6s.conf.sample
> etc/dhcp6c.conf.sample
>-etc/rc.d/dhcp6c.sh
>-etc/rc.d/dhcp6relay.sh
>-etc/rc.d/dhcp6s.sh
> sbin/dhcp6c
> sbin/dhcp6relay
> sbin/dhcp6s
>Index: files/dhcp6c.sh
>===================================================================
>RCS file: files/dhcp6c.sh
>diff -N files/dhcp6c.sh
>--- files/dhcp6c.sh	20 Feb 2006 20:47:22 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,36 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: ports/net/dhcp6/files/dhcp6c.sh,v 1.2 2006/02/20 20:47:22 dougb Exp $
>-#
>-
>-# PROVIDE: dhcp6c
>-# REQUIRE: DAEMON
>-# BEFORE: LOGIN
>-# KEYWORD: shutdown
>-#
>-# NOTE for FreeBSD 5.0+:
>-# If you want this script to start with the base rc scripts
>-# move dhcp6c.sh to /etc/rc.d/dhcp6c
>-
>-prefix=%%PREFIX%%
>-
>-# Define these dhcp6c_* variables in one of these files:
>-#	/etc/rc.conf
>-#	/etc/rc.conf.local
>-#	/etc/rc.conf.d/dhcp6c
>-#
>-# DO NOT CHANGE THESE DEFAULT VALUES HERE
>-#
>-dhcp6c_enable=${dhcp6c_enable:-"NO"}		# Enable dhcp6c
>-#dhcp6c_program="${prefix}/sbin/${name}"	# Location of dhcp6c
>-#dhcp6c_flags="fxp0"				# Flags to dhcp6c program
>-
>-. %%RC_SUBR%%
>-
>-name="dhcp6c"
>-rcvar=`set_rcvar`
>-command="${prefix}/sbin/${name}"
>-required_files="${prefix}/etc/${name}.conf"
>-
>-load_rc_config $name
>-run_rc_command "$1"
>Index: files/dhcp6c.sh.in
>===================================================================
>RCS file: files/dhcp6c.sh.in
>diff -N files/dhcp6c.sh.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/dhcp6c.sh.in	9 Jun 2006 08:46:38 -0000
>@@ -0,0 +1,53 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+
>+# PROVIDE: dhcp6c
>+# REQUIRE: DAEMON
>+# BEFORE: LOGIN
>+# KEYWORD: shutdown
>+
>+# Add the following lines to
>+# /etc/rc.conf.d/dhcp6c /etc/rc.conf.local or /etc/rc.conf
>+# to enable this service:
>+#
>+# dhcp6c_enable (bool):			Set to NO by default.
>+#		Set it to YES to enable dhcp6c.
>+# dhcp6c_config (path):			Set to %%PREFIX%%/etc/dhcp6c.conf
>+#		by default.
>+# dhcp6c_pidfile (path):		Set to /var/run/dhcp6c.pid
>+#		by default.
>+# dhcp6c_interfaces (NIC list):		Not defined by default.
>+#		Set it to the network interface(s) where dhcp6c should work on.
>+# dhcp6c_flags (additional arguments):	Not defined by default.
>+#
>+
>+. %%RC_SUBR%%
>+
>+name="dhcp6c"
>+rcvar=${name}_enable
>+
>+prefix="%%PREFIX%%"
>+command="${prefix}/sbin/${name}"
>+start_precmd="${name}_precmd"
>+
>+load_rc_config $name
>+
>+: ${dhcp6c_enable="NO"}
>+: ${dhcp6c_config="${prefix}/etc/${name}.conf"}
>+: ${dhcp6c_pidfile="/var/run/${name}.pid"}
>+
>+required_files="${dhcp6c_config}"
>+pidfile="${dhcp6c_pidfile}"
>+command_args="-c ${dhcp6c_config} -p ${dhcp6c_pidfile} ${dhcp6c_flags} ${dhcp6c_interfaces}"
>+
>+dhcp6c_precmd()
>+{
>+	if [ -z ${dhcp6c_interfaces} ]; then
>+		warn "dhcp6c_interfaces is not set."
>+		return 1
>+	fi
>+}
>+
>+run_rc_command "$1"
>Index: files/dhcp6relay.sh
>===================================================================
>RCS file: files/dhcp6relay.sh
>diff -N files/dhcp6relay.sh
>--- files/dhcp6relay.sh	20 Feb 2006 20:47:22 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,35 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: ports/net/dhcp6/files/dhcp6relay.sh,v 1.2 2006/02/20 20:47:22 dougb Exp $
>-#
>-
>-# PROVIDE: dhcp6relay
>-# REQUIRE: DAEMON
>-# BEFORE: LOGIN
>-# KEYWORD: shutdown
>-#
>-# NOTE for FreeBSD 5.0+:
>-# If you want this script to start with the base rc scripts
>-# move dhcp6relay.sh to /etc/rc.d/dhcp6relay
>-
>-prefix=%%PREFIX%%
>-
>-# Define these dhcp6relay_* variables in one of these files:
>-#	/etc/rc.conf
>-#	/etc/rc.conf.local
>-#	/etc/rc.conf.d/dhcp6relay
>-#
>-# DO NOT CHANGE THESE DEFAULT VALUES HERE
>-#
>-dhcp6relay_enable=${dhcp6relay_enable:-"NO"}	# Enable dhcp6relay
>-#dhcp6relay_program="${prefix}/sbin/${name}"	# Location of dhcp6relay
>-#dhcp6relay_flags="-r fxp1 fxp0"		# Flags to dhcp6relay program
>-
>-. %%RC_SUBR%%
>-
>-name="dhcp6relay"
>-rcvar=`set_rcvar`
>-command="${prefix}/sbin/${name}"
>-
>-load_rc_config $name
>-run_rc_command "$1"
>Index: files/dhcp6relay.sh.in
>===================================================================
>RCS file: files/dhcp6relay.sh.in
>diff -N files/dhcp6relay.sh.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/dhcp6relay.sh.in	9 Jun 2006 08:46:38 -0000
>@@ -0,0 +1,46 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+
>+# PROVIDE: dhcp6relay
>+# REQUIRE: DAEMON
>+# BEFORE: LOGIN
>+# KEYWORD: shutdown
>+
>+# Add the following lines to
>+# /etc/rc.conf.d/dhcp6relay /etc/rc.conf.local or /etc/rc.conf
>+# to enable this service:
>+#
>+# dhcp6relay_enable (bool):			Set to NO by default.
>+#		Set it to YES to enable dhcp6relay.
>+# dhcp6relay_interfaces (NIC list):		Not defined by default.
>+#		Set it to the network interface(s) where dhcp6relay should work
>+#		on.
>+# dhcp6relay_flags (additional arguments):	Not defined by default.
>+#
>+
>+. %%RC_SUBR%%
>+
>+name="dhcp6relay"
>+rcvar=${name}_enable
>+
>+prefix=%%PREFIX%%
>+command=${prefix}/sbin/${name}
>+start_precmd="${name}_precmd"
>+
>+load_rc_config $name
>+
>+: ${dhcp6relay_enable="NO"}
>+
>+command_args="${dhcp6relay_flags} ${dhcp6relay_interfaces}"
>+
>+dhcp6relay_precmd()
>+{
>+	if [ -z ${dhcp6relay_interfaces} ]; then
>+		warn "dhcp6relay_interfaces is not set."
>+		return 1
>+	fi
>+}
>+
>+run_rc_command "$1"
>Index: files/dhcp6s.sh
>===================================================================
>RCS file: files/dhcp6s.sh
>diff -N files/dhcp6s.sh
>--- files/dhcp6s.sh	20 Feb 2006 20:47:22 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,36 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: ports/net/dhcp6/files/dhcp6s.sh,v 1.2 2006/02/20 20:47:22 dougb Exp $
>-#
>-
>-# PROVIDE: dhcp6s
>-# REQUIRE: DAEMON
>-# BEFORE: LOGIN
>-# KEYWORD: shutdown
>-#
>-# NOTE for FreeBSD 5.0+:
>-# If you want this script to start with the base rc scripts
>-# move dhcp6s.sh to /etc/rc.d/dhcp6s
>-
>-prefix=%%PREFIX%%
>-
>-# Define these dhcp6s_* variables in one of these files:
>-#	/etc/rc.conf
>-#	/etc/rc.conf.local
>-#	/etc/rc.conf.d/dhcp6s
>-#
>-# DO NOT CHANGE THESE DEFAULT VALUES HERE
>-#
>-dhcp6s_enable=${dhcp6s_enable:-"NO"}		# Enable dhcp6s
>-#dhcp6s_program="${prefix}/sbin/${name}"	# Location of dhcp6s
>-#dhcp6s_flags="fxp0"				# Flags to dhcp6s program
>-
>-. %%RC_SUBR%%
>-
>-name="dhcp6s"
>-rcvar=`set_rcvar`
>-command="${prefix}/sbin/${name}"
>-required_files="${prefix}/etc/${name}.conf"
>-
>-load_rc_config $name
>-run_rc_command "$1"
>Index: files/dhcp6s.sh.in
>===================================================================
>RCS file: files/dhcp6s.sh.in
>diff -N files/dhcp6s.sh.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/dhcp6s.sh.in	9 Jun 2006 08:46:38 -0000
>@@ -0,0 +1,49 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+
>+# PROVIDE: dhcp6s
>+# REQUIRE: DAEMON
>+# BEFORE: LOGIN
>+# KEYWORD: shutdown
>+
>+# Add the following lines to
>+# /etc/rc.conf.d/dhcp6s /etc/rc.conf.local or /etc/rc.conf
>+# to enable this service:
>+#
>+# dhcp6s_enable (bool):			Set to NO by default.
>+#		Set it to YES to enable dhcp6s.
>+# dhcp6s_config (path):			Set to %%PREFIX%%/etc/dhcp6s.conf
>+#		by default.
>+# dhcp6s_interface (NIC):		Not defined by default.
>+#		Set it to the network interface where dhcp6s should work on.
>+# dhcp6s_flags (additional arguments):	Not defined by default.
>+#
>+
>+. %%RC_SUBR%%
>+
>+name="dhcp6s"
>+rcvar=${name}_enable
>+
>+prefix=%%PREFIX%%
>+command=${prefix}/sbin/${name}
>+start_precmd="${name}_precmd"
>+
>+load_rc_config $name
>+
>+: ${dhcp6s_enable="NO"}
>+: ${dhcp6s_config="${prefix}/etc/${name}.conf"}
>+
>+required_files=${dhcp6s_config}
>+command_args="-c ${dhcp6s_config} ${dhcp6s_flags} ${dhcp6s_interface}"
>+
>+dhcp6s_precmd()
>+{
>+	if [ -z ${dhcp6s_interface} ]; then
>+		warn "dhcp6s_interface is not set."
>+		return 1
>+	fi
>+}
>+
>+run_rc_command "$1"
>Index: files/patch-lease.c
>===================================================================
>RCS file: files/patch-lease.c
>diff -N files/patch-lease.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-lease.c	9 Jun 2006 08:46:38 -0000
>@@ -0,0 +1,28 @@
>+--- lease.c.orig	Thu Jan 26 07:48:28 2006
>++++ lease.c	Thu Jun  8 22:05:22 2006
>+@@ -33,6 +33,16 @@
>+ #include <string.h>
>+ #include <sys/socket.h>
>+ #include <sys/queue.h>
>++#if TIME_WITH_SYS_TIME
>++# include <sys/time.h>
>++# include <time.h>
>++#else
>++# if HAVE_SYS_TIME_H
>++#  include <sys/time.h>
>++# else
>++#  include <time.h>
>++# endif
>++#endif
>+ #include <netinet/in.h>
>+ #include "dhcp6.h"
>+ #include "config.h"
>+@@ -45,7 +55,7 @@
>+ 
>+ struct hash_entry {
>+ 	LIST_ENTRY(hash_entry) list;
>+-	char val[];
>++	char *val;
>+ };
>+ 
>+ LIST_HEAD(hash_head, hash_entry);

Actions: View | Diff

Attachments on bug 98741: 66906