diff --git a/SOURCES/radvd-1.9.2-cli-man-help.patch b/SOURCES/radvd-1.9.2-cli-man-help.patch new file mode 100644 index 0000000..3f16c24 --- /dev/null +++ b/SOURCES/radvd-1.9.2-cli-man-help.patch @@ -0,0 +1,35 @@ +diff --git a/radvd.8.man b/radvd.8.man +index 0310150..c31d626 100644 +--- a/radvd.8.man ++++ b/radvd.8.man +@@ -71,6 +71,9 @@ This option disables privilege separation, and as a result, + the non-privileged radvd process does not have permissions to + change interface configuration. + .TP ++.BR "\-n" , " \-\-nodaemon" ++Prevent the daemonizing. ++.TP + .BR "\-c" , " \-\-configtest" + Test configuration and do startup tests and then exit. + .TP +diff --git a/radvd.c b/radvd.c +index 7cadf16..a241779 100644 +--- a/radvd.c ++++ b/radvd.c +@@ -42,6 +42,7 @@ char usage_str[] = { + " -p, --pidfile=PATH Sets the pid file.\n" + " -t, --chrootdir=PATH Chroot to the specified path.\n" + " -u, --username=USER Switch to the specified user.\n" ++" -s, --singleprocess Disable privilege separation.\n" + " -n, --nodaemon Prevent the daemonizing.\n" + #ifdef HAVE_NETLINK + " -L, --disablenetlink Disable netlink feature\n" +@@ -137,7 +138,7 @@ main(int argc, char *argv[]) + pidfile = PATH_RADVD_PID; + + /* parse args */ +-#define OPTIONS_STR "d:C:l:m:p:t:u:vhcsn" ++#define OPTIONS_STR "d:C:l:m:f:p:t:u:vhcsn" + #ifdef HAVE_GETOPT_LONG + while ((c = getopt_long(argc, argv, OPTIONS_STR, prog_opt, &opt_idx)) > 0) + #else diff --git a/SPECS/radvd.spec b/SPECS/radvd.spec index d84ad87..dff866f 100644 --- a/SPECS/radvd.spec +++ b/SPECS/radvd.spec @@ -1,7 +1,7 @@ Summary: A Router Advertisement daemon Name: radvd Version: 1.9.2 -Release: 3%{?dist} +Release: 7%{?dist} # The code includes the advertising clause, so it's GPL-incompatible License: BSD with advertising Group: System Environment/Daemons @@ -9,6 +9,7 @@ URL: http://www.litech.org/radvd/ Source0: %{url}dist/%{name}-%{version}.tar.gz Source1: radvd-tmpfs.conf Source2: radvd.service +Patch0: radvd-1.9.2-cli-man-help.patch BuildRequires: byacc BuildRequires: flex BuildRequires: flex-static @@ -33,6 +34,8 @@ services. %prep %setup -q +%patch0 -p1 -F2 -b .cli-man-help + for F in CHANGES; do iconv -f iso-8859-1 -t utf-8 < "$F" > "${F}.new" touch -r "$F" "${F}.new" @@ -40,7 +43,7 @@ for F in CHANGES; do done %build -export CFLAGS="$RPM_OPT_FLAGS -fPIE" +export CFLAGS="$RPM_OPT_FLAGS -fPIE -fno-strict-aliasing" export LDFLAGS='-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen' %configure --with-pidfile=%{_localstatedir}/run/radvd/radvd.pid make %{?_smp_mflags} @@ -88,6 +91,18 @@ exit 0 %{_sbindir}/radvdump %changelog +* Fri Jan 24 2014 Daniel Mach - 1.9.2-7 +- Mass rebuild 2014-01-24 + +* Thu Jan 02 2014 Pavel Šimerda - 1.9.2-6 +- Resolves: #1045179 - use -fno-strict-aliasing for radvd + +* Fri Dec 27 2013 Daniel Mach - 1.9.2-5 +- Mass rebuild 2013-12-27 + +* Tue Dec 10 2013 Pavel Šimerda - 1.9.2-4 +- Resolves: #948863 - man page scan results for radvd + * Thu Feb 14 2013 Fedora Release Engineering - 1.9.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild