From a9b28377b25ad055af0069d2d5e0569bcfc54f34 Mon Sep 17 00:00:00 2001 From: jvdias Date: Mon, 21 Feb 2005 23:38:26 +0000 Subject: [PATCH] Upgrade to upstream version 0.7.3 --- radvd.spec | 122 ++++++++++++++++++----------------------------------- 1 file changed, 41 insertions(+), 81 deletions(-) diff --git a/radvd.spec b/radvd.spec index 6cf79d9..72ea5be 100644 --- a/radvd.spec +++ b/radvd.spec @@ -1,17 +1,17 @@ %define initdir /etc/rc.d/init.d #%(if test -d /etc/init.d/. ; then echo /etc/init.d ; else echo /etc/rc.d/init.d ; fi) +%define RADVD_UID 75 + Summary: A Router Advertisement daemon Name: radvd -Version: 0.7.2 -Release: 10 -License: BSD +Version: 0.7.3 +Release: 1 +# The code includes the advertising clause, so it's GPL-incompatible +License: BSD-style Group: System Environment/Daemons -Source0: http://v6web.litech.org/radvd/radvd-%{version}.tar.gz -Source1: radvd.init -Source2: radvd.sysconfig -Patch: radvd-0.7.2-shutup-103543.patch -Patch1: radvd-0.7.2-srcmac-103469.patch +Packager: Pekka Savola +Source: http://www.litech.org/radvd/radvd-%{version}.tar.gz PreReq: chkconfig, /usr/sbin/useradd, /sbin/service, initscripts BuildRoot: %{_tmppath}/%{name}-root @@ -28,38 +28,33 @@ services. %prep %setup -%patch -p1 -%patch1 -p0 %build -CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %configure --with-pidfile=/var/run/radvd/radvd.pid +export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE" +export LDFLAGS='-Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen' +aclocal; autoconf; +%configure --with-pidfile=/var/run/radvd/radvd.pid make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT +[ $RPM_BUILD_ROOT != "/" ] && rm -rf $RPM_BUILD_ROOT + %makeinstall - -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} -install -m 644 $RPM_BUILD_DIR/radvd-%{version}/radvd.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/radvd.conf - +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig mkdir -p $RPM_BUILD_ROOT%{initdir} -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/radvd - mkdir -p $RPM_BUILD_ROOT/var/run/radvd -mkdir -p $RPM_BUILD_ROOT/etc/sysconfig -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/radvd +install -m 644 radvd.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/radvd.conf +install -m 755 redhat/radvd.init $RPM_BUILD_ROOT%{initdir}/radvd +install -m 644 redhat/radvd.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/radvd %clean -rm -rf $RPM_BUILD_ROOT +[ $RPM_BUILD_ROOT != "/" ] && rm -rf $RPM_BUILD_ROOT %postun if [ "$1" -ge "1" ]; then /sbin/service radvd condrestart >/dev/null 2>&1 fi -if [ $1 = 0 ]; then - /usr/sbin/userdel radvd > /dev/null 2>&1 || : -fi %post /sbin/chkconfig --add radvd @@ -71,7 +66,8 @@ if [ $1 = 0 ]; then fi %pre -/usr/sbin/useradd -c "radvd user" -r -s /sbin/nologin -u 75 -d / radvd 2>/dev/null || : + +/usr/sbin/useradd -c "radvd user" -r -M -s /sbin/nologin -u %{RADVD_UID} -d / radvd 2>/dev/null || : %files %defattr(-,root,root) @@ -85,69 +81,33 @@ fi %{_sbindir}/radvdump %changelog -* Mon Feb 21 2005 Jason Vas Dias -- rebuild for FC4 +* Mon Feb 21 2005 Jason Vas Dias 0.7.3-1 +- Upgrade to radvd-0.7.3 +- add execshield -fPIE / -pie compile / link options -* Thu Aug 26 2004 Jason Vas Dias -- rebuild for FC3 +* Mon Feb 21 2005 Pekka Savola 0.7.3-1 +- 0.7.3. -* Tue Jun 15 2004 Elliot Lee -- rebuilt +* Mon Oct 28 2002 Pekka Savola +- 0.7.2. -* Tue Feb 24 2004 Elliot Lee 0.7.2-7 -- Include COPYRIGHT to fix #115998 +* Tue May 7 2002 Pekka Savola +- remove '-g %%{RADVD_GID}' when creating the user, which may be problematic + if the user didn't exist before. -* Fri Feb 13 2004 Elliot Lee -- rebuilt +* Wed Jan 14 2002 Pekka Savola +- 0.7.1. -* Fri Sep 19 2003 Elliot Lee 0.7.2-5 -- Patch from #103469 +* Tue Jan 8 2002 Pekka Savola +- Change 'reload' to signal HUP to radvd instead or restarting. -* Fri Sep 05 2003 Elliot Lee 0.7.2-4 -- Patch from #103543 +* Fri Dec 28 2001 Pekka Savola +- License unfortunately is BSD *with* advertising clause, so to be pedantic, + change License: to 'BSD-style'. -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Mon Jan 13 2003 Elliot Lee 0.7.2-1 -- Fix #68372 for real -- Update to 0.7.2 - -* Wed Dec 11 2002 Tim Powers 0.7.1-4 -- rebuild on all arches - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Thu May 23 2002 Tim Powers -- automated rebuild - -* Fri Apr 12 2002 Bernhard Rosenkraenzer 0.7.1-1 -- 0.7.1 (bugfix release, #61023), fixes: - - Check that forwarding is enabled when starting radvd - (helps avoid odd problems) - - Check configuration file permissions (note: in setuid operation, must not - be writable by the user.group) - - Cleanups and enhancements for radvdump - - Ensure NULL-termination with strncpy even with overlong strings - (non-criticals, but better safe than sorry) - - Update config.{guess,sub} to cope with some newer architectures - - Minor fixes and cleanups - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Thu Nov 22 2001 Bernhard Rosenkraenzer -- 0.7.0 - -* Mon Jul 9 2001 Bernhard Rosenkraenzer -- initial Red Hat Linux build - -* Sun Jun 24 2001 Pekka Savola -- add a patch from USAGI for overflow, Copyright -> License. +* Wed Nov 14 2001 Pekka Savola +- spec file cleanups +- update to 0.7.0. * Wed Jun 20 2001 Pekka Savola - use /sbin/service.