rpms/dhcpv6/devel dhcpv6-0.10-redhat.patch, 1.3, 1.4 dhcpv6.spec, 1.46, 1.47
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Nov 27 19:57:02 UTC 2006
- Previous message (by thread): rpms/pcre/devel pcre-6.6-stack.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 pcre.spec, 1.19, 1.20 sources, 1.8, 1.9
- Next message (by thread): rpms/kernel/FC-5/configs config-generic,1.183,1.183.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dcantrel
Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27183
Modified Files:
dhcpv6-0.10-redhat.patch dhcpv6.spec
Log Message:
* Mon Nov 27 2006 David Cantrell <dcantrell at redhat.com> - 0.10-35
- server6_addr.conf is not required for dhcp6s
- Resolves: rhbz#217309
- Man page for dhcp6s.conf should reference server-preference
- Resolves: rhbz#217308
dhcpv6-0.10-redhat.patch:
Makefile.in | 65 +++-
ReadMe | 10
client6_addr.c | 54 ++-
client6_parse.y | 48 ++-
client6_token.l | 5
common.c | 89 ++++-
common.h | 3
config.c | 94 ++++--
config.h | 39 +-
configure.in | 8
dad_token.l | 7
dhcp6.h | 33 ++
dhcp6c.c | 47 ++-
dhcp6c.conf.5 | 420 ++++++++++++++--------------
dhcp6r.8 | 213 ++++++++++++++
dhcp6r.c | 354 +++++++++++++++++++++++
dhcp6r.h | 74 ++++
dhcp6r.sh | 80 +++++
dhcp6r.sysconfig | 3
dhcp6relay.c | 6
dhcp6s.c | 414 ++++++++++++++++++++++++++-
dhcp6s.conf.5 | 660 ++++++++++++++++++++++----------------------
dhcp6s.sh | 11
dhcp6s.sysconfig | 4
htonl.h | 47 +++
ifaddrs.c | 2
lease.c | 2
lease_token.l | 4
netlink.c | 24 +
ra_token.l | 6
radvd_token.l | 27 +
relay6_database.c | 574 ++++++++++++++++++++++++++++++++++++++
relay6_database.h | 98 ++++++
relay6_parser.c | 278 ++++++++++++++++++
relay6_parser.h | 62 ++++
relay6_socket.c | 802 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
relay6_socket.h | 74 ++++
resolv_token.l | 52 +++
server6_addr.c | 24 -
server6_conf.c | 4
server6_conf.h | 1
server6_parse.y | 18 +
server6_token.l | 3
timer.c | 2
44 files changed, 4123 insertions(+), 722 deletions(-)
Index: dhcpv6-0.10-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6-0.10-redhat.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dhcpv6-0.10-redhat.patch 31 Oct 2006 19:29:34 -0000 1.3
+++ dhcpv6-0.10-redhat.patch 27 Nov 2006 19:56:59 -0000 1.4
@@ -1,5 +1,5 @@
--- dhcp-0.10/Makefile.in.rh 2004-03-04 18:31:24.000000000 -0500
-+++ dhcp-0.10/Makefile.in 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/Makefile.in 2006-11-27 14:55:32.000000000 -0500
@@ -10,12 +10,14 @@
CC= @CC@
YACC= @YACC@
@@ -115,7 +115,7 @@
$(CHKCONFIG) --add dhcp6c
--- dhcp-0.10/ReadMe.rh 2003-05-28 17:18:22.000000000 -0400
-+++ dhcp-0.10/ReadMe 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/ReadMe 2006-11-27 14:55:32.000000000 -0500
@@ -18,7 +18,8 @@
This implementation supports IPv6 address assignment to the clients.
@@ -153,7 +153,7 @@
D. INSTALLATTION:
--- dhcp-0.10/client6_addr.c.rh 2003-07-01 22:21:25.000000000 -0400
-+++ dhcp-0.10/client6_addr.c 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/client6_addr.c 2006-11-27 14:55:32.000000000 -0500
@@ -47,8 +47,9 @@
#include <stdlib.h>
#include <unistd.h>
@@ -286,7 +286,7 @@
return num_device;
}
--- dhcp-0.10/client6_parse.y.rh 2004-02-04 19:13:05.000000000 -0500
-+++ dhcp-0.10/client6_parse.y 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/client6_parse.y 2006-11-27 14:55:32.000000000 -0500
@@ -38,7 +38,9 @@
#include <arpa/inet.h>
@@ -381,7 +381,7 @@
}
| addrparam
--- dhcp-0.10/client6_token.l.rh 2003-04-02 18:31:49.000000000 -0500
-+++ dhcp-0.10/client6_token.l 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/client6_token.l 2006-11-27 14:55:32.000000000 -0500
@@ -48,7 +48,8 @@
#include <varargs.h>
#endif
@@ -409,7 +409,7 @@
<S_CNF>infinity { DECHO; return (INFINITY); }
--- dhcp-0.10/common.c.rh 2004-02-04 18:30:17.000000000 -0500
-+++ dhcp-0.10/common.c 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/common.c 2006-11-27 14:55:32.000000000 -0500
@@ -64,6 +64,7 @@
#include <netdb.h>
#include <ifaddrs.h>
@@ -642,7 +642,7 @@
sprintf(genstr, "opt_%d", type);
return (genstr);
--- dhcp-0.10/common.h.rh 2003-04-30 15:04:07.000000000 -0400
-+++ dhcp-0.10/common.h 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/common.h 2006-11-27 14:55:32.000000000 -0500
@@ -67,7 +67,7 @@
extern long random_between __P((long, long));
extern int prefix6_mask __P((struct in6_addr *, int));
@@ -661,7 +661,7 @@
extern int configure_duid __P((const char *, struct duid *));
extern struct dhcp6_if *find_ifconfbyname __P((const char *));
--- dhcp-0.10/config.c.rh 2003-04-11 20:25:32.000000000 -0400
-+++ dhcp-0.10/config.c 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/config.c 2006-11-27 14:55:32.000000000 -0500
@@ -41,8 +41,8 @@
#include <stdio.h>
#include <string.h>
@@ -822,7 +822,7 @@
+ return 0L;
+}
--- dhcp-0.10/config.h.rh 2004-03-04 18:31:24.000000000 -0500
-+++ dhcp-0.10/config.h 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/config.h 2006-11-27 14:55:32.000000000 -0500
@@ -51,6 +51,15 @@
int flags;
};
@@ -916,7 +916,7 @@
+
+extern void *get_if_option( struct dhcp6_option_list *, int);
--- dhcp-0.10/configure.in.rh 2003-04-11 20:25:33.000000000 -0400
-+++ dhcp-0.10/configure.in 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/configure.in 2006-11-27 14:55:32.000000000 -0500
@@ -66,14 +66,8 @@
;;
*) ;;
@@ -934,7 +934,7 @@
AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h syslog.h unistd.h ifaddrs.h)
AC_MSG_CHECKING(for socklen_t)
--- dhcp-0.10/dad_token.l.rh 2003-05-29 18:23:28.000000000 -0400
-+++ dhcp-0.10/dad_token.l 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/dad_token.l 2006-11-27 14:55:32.000000000 -0500
@@ -34,14 +34,15 @@
#include <stdio.h>
#include <string.h>
@@ -961,7 +961,7 @@
+ return yylex();
}
--- dhcp-0.10/dhcp6.h.rh 2004-03-04 18:31:24.000000000 -0500
-+++ dhcp-0.10/dhcp6.h 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/dhcp6.h 2006-11-27 14:55:32.000000000 -0500
@@ -126,6 +126,11 @@
char *duid_id; /* variable length ID value (must be opaque) */
};
@@ -1031,7 +1031,7 @@
struct dhcp6opt {
u_int16_t dh6opt_type;
--- dhcp-0.10/dhcp6c.c.rh 2004-03-04 18:31:24.000000000 -0500
-+++ dhcp-0.10/dhcp6c.c 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/dhcp6c.c 2006-11-27 14:55:32.000000000 -0500
@@ -65,8 +65,9 @@
#include <string.h>
#include <err.h>
@@ -1216,7 +1216,7 @@
if (client6_iaidaddr.client6_info.type == IAPD)
goto end;
--- dhcp-0.10/dhcp6c.conf.5.rh 2003-03-28 15:16:36.000000000 -0500
-+++ dhcp-0.10/dhcp6c.conf.5 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/dhcp6c.conf.5 2006-11-27 14:55:32.000000000 -0500
@@ -1,202 +1,218 @@
-.\" $Id$
-.\"
@@ -1638,8 +1638,8 @@
+Kazuo Hiekata <hiekata at yamato.ibm.com>
+
+
---- /dev/null 2006-10-31 10:23:48.419497130 -0500
-+++ dhcp-0.10/dhcp6r.8 2006-10-31 14:23:01.000000000 -0500
+--- /dev/null 2006-11-25 13:38:58.174646239 -0500
++++ dhcp-0.10/dhcp6r.8 2006-11-27 14:55:32.000000000 -0500
@@ -0,0 +1,213 @@
+.\"
+.\" Copyright (C) NEC Europe Ltd., 2003
@@ -1854,8 +1854,8 @@
+Juergen Quittek,
+.br
+Martin Stiemerling
---- /dev/null 2006-10-31 10:23:48.419497130 -0500
-+++ dhcp-0.10/dhcp6r.c 2006-10-31 14:23:01.000000000 -0500
+--- /dev/null 2006-11-25 13:38:58.174646239 -0500
++++ dhcp-0.10/dhcp6r.c 2006-11-27 14:55:32.000000000 -0500
@@ -0,0 +1,354 @@
+/*
+ * Copyright (C) NEC Europe Ltd., 2003
@@ -2211,8 +2211,8 @@
+
+ exit(0);
+}
---- /dev/null 2006-10-31 10:23:48.419497130 -0500
-+++ dhcp-0.10/dhcp6r.h 2006-10-31 14:23:01.000000000 -0500
+--- /dev/null 2006-11-25 13:38:58.174646239 -0500
++++ dhcp-0.10/dhcp6r.h 2006-11-27 14:55:32.000000000 -0500
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) NEC Europe Ltd., 2003
@@ -2288,8 +2288,8 @@
+
+
+#endif /* __DHCP6R_H_DEFINED */
---- /dev/null 2006-10-31 10:23:48.419497130 -0500
-+++ dhcp-0.10/dhcp6r.sh 2006-10-31 14:23:01.000000000 -0500
+--- /dev/null 2006-11-25 13:38:58.174646239 -0500
++++ dhcp-0.10/dhcp6r.sh 2006-11-27 14:55:32.000000000 -0500
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
@@ -2371,14 +2371,14 @@
+
+exit $RETVAL
+
---- /dev/null 2006-10-31 10:23:48.419497130 -0500
-+++ dhcp-0.10/dhcp6r.sysconfig 2006-10-31 14:23:01.000000000 -0500
+--- /dev/null 2006-11-25 13:38:58.174646239 -0500
++++ dhcp-0.10/dhcp6r.sysconfig 2006-11-27 14:55:32.000000000 -0500
@@ -0,0 +1,3 @@
+# Configuration for the DHCPv6 relay agent, dhcp6r
+# Command line options here
+DHCP6RARGS=
--- dhcp-0.10/dhcp6relay.c.rh 2003-02-27 14:43:08.000000000 -0500
-+++ dhcp-0.10/dhcp6relay.c 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/dhcp6relay.c 2006-11-27 14:55:32.000000000 -0500
@@ -53,8 +53,8 @@
#include <errno.h>
#include <err.h>
@@ -2408,7 +2408,7 @@
}
--- dhcp-0.10/dhcp6s.c.rh 2004-03-15 17:03:21.000000000 -0500
-+++ dhcp-0.10/dhcp6s.c 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/dhcp6s.c 2006-11-27 14:55:32.000000000 -0500
@@ -67,8 +67,8 @@
#include <err.h>
#include <netdb.h>
@@ -2938,7 +2938,7 @@
+ }
+}
--- dhcp-0.10/dhcp6s.conf.5.rh 2003-05-28 18:56:23.000000000 -0400
-+++ dhcp-0.10/dhcp6s.conf.5 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/dhcp6s.conf.5 2006-11-27 14:56:03.000000000 -0500
@@ -1,322 +1,340 @@
-.\" $Id$
-.\"
@@ -3486,7 +3486,7 @@
+from DHCPv6 clients if they include a Server Unicast option.
+
+.nf
-+\fIsend\ server-preference\ <server\ preference\ value>;\fR
++\fIserver-preference\ <server\ preference\ value>;\fR
+.fi
+This declaration enables dhcp6s to include a Preference option for sending
+DHCPv6 messages. DHCPv6 clients will pick up the DHCPv6 server which has
@@ -3548,7 +3548,7 @@
+.B \t\tallow unicast;
+.B \t\tsend unicast;
+.B \t\tallow rapid-commit;
-+.B \t\tsend server-preference 5;
++.B \t\tserver-preference 5;
+.B \t\trenew-time 1000;
+.B \t\trebind-time 2400;
+.B \t\tprefer-life-time 2000;
@@ -3602,7 +3602,7 @@
+.LP
+Kazuo Hiekata <hiekata at yamato.ibm.com>
--- dhcp-0.10/dhcp6s.sh.rh 2003-02-18 06:31:49.000000000 -0500
-+++ dhcp-0.10/dhcp6s.sh 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/dhcp6s.sh 2006-11-27 14:55:32.000000000 -0500
@@ -5,11 +5,10 @@
# dhcp6s.
#
@@ -3616,21 +3616,21 @@
# config: /etc/sysconfig/dhcp6s
# Source function library.
-@@ -23,10 +22,11 @@
+@@ -23,10 +22,10 @@
[ ${NETWORKING} = "no" ] && exit 0
# Check that files exist
-[ -f /usr/local/sbin/dhcp6s ] || exit 0
+[ -x /usr/sbin/dhcp6s ] || exit 0
[ -f /etc/dhcp6s.conf ] || exit 0
- [ -f /etc/server6_addr.conf ] || exit 0
+-[ -f /etc/server6_addr.conf ] || exit 0
-[ ${DHCP6SIF} = "" ] && exit 0
+
+if [ "x$DHCP6SIF" = "x" ]; then logger -s -t "dhcp6s" -p "daemon.info" "Warning: dhcp6s listening on ALL interfaces - set DHCP6SIF in /etc/sysconfig/dhcp6s"; fi
RETVAL=0
prog="dhcp6s"
-@@ -34,7 +34,7 @@
+@@ -34,7 +33,7 @@
start() {
# Start daemons.
echo -n $"Starting $prog: "
@@ -3640,7 +3640,7 @@
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcp6s
--- dhcp-0.10/dhcp6s.sysconfig.rh 2003-02-18 06:31:49.000000000 -0500
-+++ dhcp-0.10/dhcp6s.sysconfig 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/dhcp6s.sysconfig 2006-11-27 14:55:32.000000000 -0500
@@ -1,4 +1,4 @@
# specify the interface for dhcp6s
-DHCP6SIF=eth0
@@ -3648,8 +3648,8 @@
# Command line options here
-DHCP6CARGS=
+DHCP6SARGS=
---- /dev/null 2006-10-31 10:23:48.419497130 -0500
-+++ dhcp-0.10/htonl.h 2006-10-31 14:23:01.000000000 -0500
+--- /dev/null 2006-11-25 13:38:58.174646239 -0500
++++ dhcp-0.10/htonl.h 2006-11-27 14:55:32.000000000 -0500
@@ -0,0 +1,47 @@
+#ifndef _HTONL_H
+#define HTONL_H
@@ -3699,7 +3699,7 @@
+
+#endif
--- dhcp-0.10/ifaddrs.c.rh 2003-04-22 14:05:33.000000000 -0400
-+++ dhcp-0.10/ifaddrs.c 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/ifaddrs.c 2006-11-27 14:55:32.000000000 -0500
@@ -45,6 +45,8 @@
#include "libc-compat.h"
#endif
@@ -3710,7 +3710,7 @@
struct nlmsg_list
{
--- dhcp-0.10/netlink.c.rh 2004-03-15 17:02:09.000000000 -0500
-+++ dhcp-0.10/netlink.c 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/netlink.c 2006-11-27 14:55:32.000000000 -0500
@@ -28,22 +28,25 @@
*/
@@ -3784,7 +3784,7 @@
if (nlm->nlmsg_pid != getpid() ||
nlm->nlmsg_seq != seq)
--- dhcp-0.10/ra_token.l.rh 2004-03-04 18:31:24.000000000 -0500
-+++ dhcp-0.10/ra_token.l 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/ra_token.l 2006-11-27 14:55:32.000000000 -0500
@@ -43,8 +43,8 @@
#include <errno.h>
#include <syslog.h>
@@ -3812,7 +3812,7 @@
+ return yylex();
}
--- dhcp-0.10/radvd_token.l.rh 2003-07-07 14:01:05.000000000 -0400
-+++ dhcp-0.10/radvd_token.l 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/radvd_token.l 2006-11-27 14:55:32.000000000 -0500
@@ -47,8 +47,8 @@
#include <errno.h>
#include <syslog.h>
@@ -3875,8 +3875,8 @@
close(oldfd);
+ return 1;
}
---- /dev/null 2006-10-31 10:23:48.419497130 -0500
-+++ dhcp-0.10/relay6_database.c 2006-10-31 14:23:01.000000000 -0500
+--- /dev/null 2006-11-25 13:38:58.174646239 -0500
++++ dhcp-0.10/relay6_database.c 2006-11-27 14:55:32.000000000 -0500
@@ -0,0 +1,574 @@
+/*
+ * Copyright (C) NEC Europe Ltd., 2003
@@ -4452,8 +4452,8 @@
+
+ return 1;
+}
---- /dev/null 2006-10-31 10:23:48.419497130 -0500
-+++ dhcp-0.10/relay6_database.h 2006-10-31 14:23:01.000000000 -0500
+--- /dev/null 2006-11-25 13:38:58.174646239 -0500
++++ dhcp-0.10/relay6_database.h 2006-11-27 14:55:32.000000000 -0500
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) NEC Europe Ltd., 2003
@@ -4553,8 +4553,8 @@
+void command_text __P((void));
+
+#endif /* __RELAY6_DATABASE_H_DEFINED */
---- /dev/null 2006-10-31 10:23:48.419497130 -0500
-+++ dhcp-0.10/relay6_parser.c 2006-10-31 14:23:01.000000000 -0500
+--- /dev/null 2006-11-25 13:38:58.174646239 -0500
++++ dhcp-0.10/relay6_parser.c 2006-11-27 14:55:32.000000000 -0500
@@ -0,0 +1,278 @@
+/*
+ * Copyright (C) NEC Europe Ltd., 2003
@@ -4834,8 +4834,8 @@
+
+ return 0;
+}
---- /dev/null 2006-10-31 10:23:48.419497130 -0500
-+++ dhcp-0.10/relay6_parser.h 2006-10-31 14:23:01.000000000 -0500
+--- /dev/null 2006-11-25 13:38:58.174646239 -0500
++++ dhcp-0.10/relay6_parser.h 2006-11-27 14:55:32.000000000 -0500
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) NEC Europe Ltd., 2003
@@ -4899,8 +4899,8 @@
+int check_buffer __P((int ref, struct msg_parser *mesg));
+
+#endif /* __RELAY6_PARSER_H_DEFINED */
---- /dev/null 2006-10-31 10:23:48.419497130 -0500
-+++ dhcp-0.10/relay6_socket.c 2006-10-31 14:23:01.000000000 -0500
+--- /dev/null 2006-11-25 13:38:58.174646239 -0500
++++ dhcp-0.10/relay6_socket.c 2006-11-27 14:55:32.000000000 -0500
@@ -0,0 +1,802 @@
+/*
+ * Copyright (C) NEC Europe Ltd., 2003
@@ -5704,8 +5704,8 @@
+ "FATAL ERROR--> NO MESSAGE TYPE TO BE SENT!\n");
+ exit(1);
+}
---- /dev/null 2006-10-31 10:23:48.419497130 -0500
-+++ dhcp-0.10/relay6_socket.h 2006-10-31 14:23:01.000000000 -0500
+--- /dev/null 2006-11-25 13:38:58.174646239 -0500
++++ dhcp-0.10/relay6_socket.h 2006-11-27 14:55:32.000000000 -0500
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) NEC Europe Ltd., 2003
@@ -5782,7 +5782,7 @@
+
+#endif /* __RELAY6_SOCKET_H_DEFINED */
--- dhcp-0.10/resolv_token.l.rh 2003-06-23 13:24:48.000000000 -0400
-+++ dhcp-0.10/resolv_token.l 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/resolv_token.l 2006-11-27 14:55:32.000000000 -0500
@@ -37,6 +37,7 @@
#include <sys/file.h>
#include <sys/stat.h>
@@ -5886,7 +5886,7 @@
+ return 1;
}
--- dhcp-0.10/server6_addr.c.rh 2004-03-15 17:02:55.000000000 -0500
-+++ dhcp-0.10/server6_addr.c 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/server6_addr.c 2006-11-27 14:55:32.000000000 -0500
@@ -40,17 +40,15 @@
#include <sys/time.h>
#include <sys/socket.h>
@@ -5961,7 +5961,7 @@
else
continue;
--- dhcp-0.10/server6_conf.c.rh 2004-03-15 17:03:52.000000000 -0500
-+++ dhcp-0.10/server6_conf.c 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/server6_conf.c 2006-11-27 14:55:32.000000000 -0500
@@ -40,8 +40,8 @@
#include <sys/socket.h>
#include <net/if.h>
@@ -5982,7 +5982,7 @@
}
--- dhcp-0.10/server6_conf.h.rh 2003-04-30 15:04:14.000000000 -0400
-+++ dhcp-0.10/server6_conf.h 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/server6_conf.h 2006-11-27 14:55:32.000000000 -0500
@@ -50,6 +50,7 @@
u_int8_t send_flags;
u_int8_t allow_flags;
@@ -5992,7 +5992,7 @@
struct scopelist {
--- dhcp-0.10/server6_parse.y.rh 2004-02-04 19:10:31.000000000 -0500
-+++ dhcp-0.10/server6_parse.y 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/server6_parse.y 2006-11-27 14:55:32.000000000 -0500
@@ -33,6 +33,7 @@
%{
@@ -6060,7 +6060,7 @@
number_or_infinity
--- dhcp-0.10/server6_token.l.rh 2003-07-16 15:09:53.000000000 -0400
-+++ dhcp-0.10/server6_token.l 2006-10-31 14:23:01.000000000 -0500
++++ dhcp-0.10/server6_token.l 2006-11-27 14:55:32.000000000 -0500
@@ -42,8 +42,8 @@
#include <sys/socket.h>
#include <arpa/inet.h>
@@ -6080,7 +6080,7 @@
to { return TO; }
infinity { return INFINITY; }
--- dhcp-0.10/timer.c.rh 2003-03-11 18:52:23.000000000 -0500
-+++ dhcp-0.10/timer.c 2006-10-31 14:23:24.000000000 -0500
++++ dhcp-0.10/timer.c 2006-11-27 14:55:32.000000000 -0500
@@ -42,8 +42,8 @@
#if defined(__NetBSD__) || defined(__OpenBSD__)
#include <search.h>
@@ -6092,7 +6092,7 @@
#include "config.h"
#include "common.h"
--- dhcp-0.10/lease.c.rh 2004-03-03 15:11:16.000000000 -0500
-+++ dhcp-0.10/lease.c 2006-10-31 14:23:42.000000000 -0500
++++ dhcp-0.10/lease.c 2006-11-27 14:55:32.000000000 -0500
@@ -47,8 +47,8 @@
#include <net/if.h>
#include <linux/sockios.h>
@@ -6104,7 +6104,7 @@
#include "hash.h"
#include "config.h"
--- dhcp-0.10/lease_token.l.rh 2004-02-04 18:29:24.000000000 -0500
-+++ dhcp-0.10/lease_token.l 2006-10-31 14:24:04.000000000 -0500
++++ dhcp-0.10/lease_token.l 2006-11-27 14:55:32.000000000 -0500
@@ -44,10 +44,10 @@
#include <errno.h>
#include <sys/socket.h>
Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- dhcpv6.spec 16 Nov 2006 20:35:25 -0000 1.46
+++ dhcpv6.spec 27 Nov 2006 19:57:00 -0000 1.47
@@ -1,7 +1,7 @@
Summary: DHCPv6 - DHCP server and client for IPv6
Name: dhcpv6
Version: 0.10
-Release: 34%{?dist}
+Release: 35%{?dist}
License: GPL
Group: System Environment/Daemons
URL: http://dhcpv6.sourceforge.net/
@@ -118,7 +118,7 @@
%{_mandir}/man8/dhcp6r.8.gz
%attr(750,root,root) %dir %{_localstatedir}/lib/dhcpv6
-%doc ReadMe docs/* dhcp6s.conf server6_addr.conf
+%doc ReadMe docs/* dhcp6s.conf
%files -n dhcpv6_client
%defattr(-,root,root,-)
@@ -141,6 +141,12 @@
%{_libdir}/libdhcp6client.a
%changelog
+* Mon Nov 27 2006 David Cantrell <dcantrell at redhat.com> - 0.10-35
+- server6_addr.conf is not required for dhcp6s
+- Resolves: rhbz#217309
+- Man page for dhcp6s.conf should reference server-preference
+- Resolves: rhbz#217308
+
* Thu Nov 16 2006 David Cantrell <dcantrell at redhat.com> - 0.10-34
- Set permission of libdhcp6client.so.1 to 0755 (#215911)
- Previous message (by thread): rpms/pcre/devel pcre-6.6-stack.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 pcre.spec, 1.19, 1.20 sources, 1.8, 1.9
- Next message (by thread): rpms/kernel/FC-5/configs config-generic,1.183,1.183.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list