Hello community,
here is the log from the commit of package dhcp6
checked in at Sun Jan 13 10:48:17 CET 2008.
--------
--- dhcp6/dhcp6.changes 2007-03-29 10:21:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/dhcp6/dhcp6.changes 2008-01-11 18:10:57.055800000 +0100
@@ -1,0 +2,5 @@
+Fri Jan 11 17:32:51 CET 2008 - kkeil@suse.de
+
+- update to version 1.0.4 (Fate 303301)
+
+-------------------------------------------------------------------
Old:
----
dhcp6-0.10.dif
dhcp6-0.10-fix.patch
dhcp6-0.10-iana.patch
dhcp6-0.10.tar.bz2
dhcp6-makefile.patch
LICENSE
New:
----
dhcp6c_update.sh
dhcpv6-1.0.4-cmd.patch
dhcpv6-1.0.4-destdir.patch
dhcpv6-1.0.4-fixes.patch
dhcpv6-1.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dhcp6.spec ++++++
--- /var/tmp/diff_new_pack.t17790/_old 2008-01-13 10:47:35.000000000 +0100
+++ /var/tmp/diff_new_pack.t17790/_new 2008-01-13 10:47:35.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package dhcp6 (Version 0.10)
+# spec file for package dhcp6 (Version 1.0.4)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,20 +11,20 @@
# norootforbuild
Name: dhcp6
-BuildRequires: bison flex openssl-devel
-URL: http://dhcpv6.sourceforge.net/
+BuildRequires: bison flex linux-kernel-headers openssl-devel
+Url: http://dcantrel.fedorapeople.org/dhcpv6/
%define prefix /usr
-License: BSD License and BSD-like
+%define _name dhcpv6
+License: BSD 3-Clause
Group: Productivity/Networking/System
Summary: DHCP Client and Server for IPv6
-Version: 0.10
-Release: 70
-Source0: %{name}-%{version}.tar.bz2
-Source1: LICENSE
-Patch0: %{name}-%{version}.dif
-Patch1: %{name}-%{version}-fix.patch
-Patch2: dhcp6-0.10-iana.patch
-Patch3: %{name}-makefile.patch
+Version: 1.0.4
+Release: 1
+Source0: %{_name}-%{version}.tar.bz2
+Source1: dhcp6c_update.sh
+Patch0: %{_name}-%{version}-fixes.patch
+Patch1: %{_name}-%{version}-destdir.patch
+Patch2: %{_name}-%{version}-cmd.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -37,35 +37,125 @@
--------
Shirley Ma, xma@us.ibm.com
Elizabeth Kon, beth@us.ibm.com
+ David Cantrell
+ Kazuo Hiekata
+ Mitsuru Chinen
+ Cristian Cadar
+ and more
+
+%package -n libdhcp6client-devel
+Requires: %{name} = %{version} glibc-devel
+Summary: Development files for libdhcp6client
+Group: Development/Libraries/C and C++
+
+%description -n libdhcp6client-devel
+This are the header files and the static library for libdhcp6client.
+The libdhcp6client library allows to include DHCPv6 client support into
+network control applications.
+
+
+
+Authors:
+--------
+ Shirley Ma, xma@us.ibm.com
+ Elizabeth Kon, beth@us.ibm.com
+ David Cantrell
+ Kazuo Hiekata
+ Mitsuru Chinen
+ Cristian Cadar
+ and more
+
+%package -n libdhcp6client-1_0-2
+Summary: DHCP Client library for IPv6
+Group: Productivity/Networking/System
+
+%description -n libdhcp6client-1_0-2
+A library which allows to include DHCPv6 client support into network
+control applications.
+
+
+
+Authors:
+--------
+ Shirley Ma, xma@us.ibm.com
+ Elizabeth Kon, beth@us.ibm.com
+ David Cantrell
+ Kazuo Hiekata
+ Mitsuru Chinen
+ Cristian Cadar
+ and more
%prep
-%setup -q -n dhcp-%version
+%setup -q -n %{_name}-%{version}
%patch0 -p1
-%patch1 -p1
+%patch1 -p0
%patch2 -p1
-%patch3
%build
+touch NEWS
+rm -f missing
+aclocal -I m4
+libtoolize --copy --force
+autoconf
+autoheader
+automake --foreign --add-missing --copy
autoconf
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
- ./configure --prefix=/usr --mandir=%{_mandir}
+ ./configure --prefix=/usr \
+ --libdir=%{_libdir} \
+ --mandir=%{_mandir} \
+ --sysconfdir=/etc \
+ --enable-libdhcp=no
+make clean
make
%install
mkdir -p $RPM_BUILD_ROOT/usr/sbin
+install -m 754 %{S:1} $RPM_BUILD_ROOT//usr/sbin/dhcp6c_update.sh
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{8,5}
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/var/lib/dhcpv6/
-cp %{SOURCE1} .
+
+%preun
+%{stop_on_removal dhcp6r}
+%{stop_on_removal dhcp6s}
+
+%postun
+%{insserv_cleanup dhcp6r}
+%{insserv_cleanup dhcp6s}
+
+%post -n libdhcp6client-1_0-2
+%run_ldconfig
+
+%postun -n libdhcp6client-1_0-2
+%run_ldconfig
%files
%defattr(-,root,root)
-%doc ReadMe docs/draft*.txt LICENSE
+%doc README ChangeLog AUTHORS LICENSE
/usr/sbin/*
%{_mandir}/man?/*
%dir /var/lib/dhcpv6
+%config /etc/sysconfig/network/*
+%config /etc/dhcp6c.conf
+%config /etc/dhcp6s.conf
+/etc/init.d/*
+
+%files -n libdhcp6client-devel
+%defattr(-,root,root)
+%{_libdir}/pkgconfig/libdhcp6client.pc
+/usr/include/*
+%{_libdir}/libdhcp6client.a
+%{_libdir}/libdhcp6client.la
+%{_libdir}/libdhcp6client.so
+
+%files -n libdhcp6client-1_0-2
+%defattr(-,root,root)
+%{_libdir}/libdhcp6client-1.0.so.*
%changelog
+* Fri Jan 11 2008 - kkeil@suse.de
+- update to version 1.0.4 (Fate 303301)
* Thu Mar 29 2007 - meissner@suse.de
- buildrequires flex,bison
* Wed Jan 25 2006 - mls@suse.de
++++++ dhcpv6-1.0.4-cmd.patch ++++++
Index: dhcpv6-1.0.4/src/resolv_token.l
===================================================================
--- dhcpv6-1.0.4.orig/src/resolv_token.l
+++ dhcpv6-1.0.4/src/resolv_token.l
@@ -138,6 +138,9 @@ nl \n
. {fprintf(dhcp6_resolv_file, yytext);}
%%
+
+#define UPDATE_RESOLV_CONF_CMD "/usr/sbin/dhcp6c_update.sh"
+
int change_resolv_conf
( char *new_rscf
)
@@ -153,10 +156,9 @@ int change_resolv_conf
if( getuid() != 0 )
return 1;
- l = strlen(new_rscf) + 73;
+ l = strlen(new_rscf) + strlen(UPDATE_RESOLV_CONF_CMD) + 2;
cmd = (char*)malloc(l);
- strcpy(cmd, ". /etc/sysconfig/network-scripts/network-functions; change_resolv_conf ");
- strcpy(cmd+71, new_rscf);
+ sprintf(cmd, "%s %s", UPDATE_RESOLV_CONF_CMD, new_rscf);
argv[2] = cmd;
if( (pid = fork()) < 0 )
++++++ dhcpv6-1.0.4-destdir.patch ++++++
Index: etc/init.d/dhcp6r.sh
===================================================================
--- etc/init.d/dhcp6r.sh.orig
+++ etc/init.d/dhcp6r.sh
@@ -18,7 +18,7 @@
# description: dhcp6r acts as a DHCPv6 relay agent forwarding DHCPv6 messages \
# from clients to servers and vice versa.
# processname: dhcp6r
-# config: /etc/sysconfig/dhcp6r
+# config: /etc/sysconfig/network/dhcp6r
. /etc/init.d/functions
@@ -28,18 +28,13 @@ prog=dhcp6r
dhcp6r=/usr/sbin/dhcp6r
lockfile=/var/lock/subsys/dhcp6r
-# Check that networking is up.
-# networking is not up, return 1 for generic error
-. /etc/sysconfig/network
-[ $NETWORKING = "no" ] && exit 1
-
start() {
# return 5 if program is not installed
[ -x $dhcp6r ] || exit 5
# return 6 if program is not configured
- [ -f /etc/sysconfig/dhcp6r ] || exit 6
- . /etc/sysconfig/dhcp6r
+ [ -f /etc/sysconfig/network/dhcp6r ] || exit 6
+ . /etc/sysconfig/network/dhcp6r
echo -n $"Starting $prog: "
daemon $dhcp6r $DHCP6RARGS
Index: etc/init.d/dhcp6s.sh
===================================================================
--- etc/init.d/dhcp6s.sh.orig
+++ etc/init.d/dhcp6s.sh
@@ -25,7 +25,7 @@
# addresses, or ntp server addresses.
# processname: dhcp6s
# config: /etc/dhcp6s.conf
-# config: /etc/sysconfig/dhcp6s
+# config: /etc/sysconfig/network/dhcp6s
. /etc/init.d/functions
@@ -35,19 +35,14 @@ prog=dhcp6s
dhcp6s=/usr/sbin/dhcp6s
lockfile=/var/lock/subsys/dhcp6s
-# Check that networking is up.
-# networking is not up, return 1 for generic error
-. /etc/sysconfig/network
-[ $NETWORKING = "no" ] && exit 1
-
start() {
# return 5 if program is not installed
[ -x $dhcp6s ] || exit 5
# return 6 if program is not configured
[ -f /etc/dhcp6s.conf ] || exit 6
- [ -f /etc/sysconfig/dhcp6s ] || exit 6
- . /etc/sysconfig/dhcp6s
+ [ -f /etc/sysconfig/network/dhcp6s ] || exit 6
+ . /etc/sysconfig/network/dhcp6s
if [ -z "$DHCP6SIF" ]; then
logger -s -t "$prog" -p "daemon.info" "Warning: $prog listening on ALL interfaces"
Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -13,7 +13,7 @@ MAINTAINERCLEANFILES = Makefile.in confi
depcomp install-sh ltmain.sh missing ABOUT-NLS \
INSTALL aclocal.m4 configure ylwrap $(DIST_ARCHIVES)
-CLEANFILES = *~ ChangeLog libdhcp6client.pc
+CLEANFILES = *~ libdhcp6client.pc
MOSTLYCLEANDIRS = m4
Index: etc/sysconfig/Makefile.am
===================================================================
--- etc/sysconfig/Makefile.am.orig
+++ etc/sysconfig/Makefile.am
@@ -8,6 +8,6 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = dhcp6s.sysconfig dhcp6r.sysconfig
install-data-local:
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
- $(install_sh_DATA) dhcp6s.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/dhcp6s
- $(install_sh_DATA) dhcp6r.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/dhcp6r
+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig/network
+ $(install_sh_DATA) dhcp6s.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/network/dhcp6s
+ $(install_sh_DATA) dhcp6r.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/network/dhcp6r
Index: etc/init.d/Makefile.am
===================================================================
--- etc/init.d/Makefile.am.orig
+++ etc/init.d/Makefile.am
@@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = dhcp6r.sh dhcp6s.sh
-rc_d_dir = $(DESTDIR)$(sysconfdir)/rc.d/init.d
+rc_d_dir = $(DESTDIR)$(sysconfdir)/init.d
install-data-local:
$(MKDIR_P) $(rc_d_dir)
++++++ dhcpv6-1.0.4-fixes.patch ++++++
Index: dhcpv6-1.0.4/src/lease_token.l
===================================================================
--- dhcpv6-1.0.4.orig/src/lease_token.l
+++ dhcpv6-1.0.4/src/lease_token.l
@@ -239,7 +239,7 @@ lease_parse(file)
fseek(file, 0, 0);
yyin = file;
- yy_init = 0;
+ yy_init = 1;
yy_start = 0;
yylex();
return;
Index: dhcpv6-1.0.4/etc/init.d/dhcp6r.sh
===================================================================
--- dhcpv6-1.0.4.orig/etc/init.d/dhcp6r.sh
+++ dhcpv6-1.0.4/etc/init.d/dhcp6r.sh
@@ -5,7 +5,7 @@
# Default-Start:
# Default-Stop:
# Should-Start:
-# Required-Start: $network
+# Required-Start: $network $remote_fs
# Required-Stop:
# Short-Description: Start and stop the DHCPv6 relay agent
# Description: dhcp6r acts as a DHCPv6 relay agent forwarding DHCPv6 messages
Index: dhcpv6-1.0.4/etc/init.d/dhcp6s.sh
===================================================================
--- dhcpv6-1.0.4.orig/etc/init.d/dhcp6s.sh
+++ dhcpv6-1.0.4/etc/init.d/dhcp6s.sh
@@ -5,7 +5,7 @@
# Default-Start:
# Default-Stop:
# Should-Start:
-# Required-Start: $network
+# Required-Start: $network $remote_fs
# Required-Stop:
# Short-Description: Start and stop the DHCPv6 server agent
# Description: dhcp6s provides IPv6 addresses and prefix assignment
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
