diff --git a/.gitignore b/.gitignore index 46dfee5..bd26b79 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ radvd-1.6.tar.gz /radvd-1.8.tar.gz /radvd-1.8.1.tar.gz /radvd-1.8.2.tar.gz +/radvd-1.8.3.tar.gz diff --git a/radvd-1.8.2-iface.patch b/radvd-1.8.2-iface.patch deleted file mode 100644 index c1ed9d3..0000000 --- a/radvd-1.8.2-iface.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up radvd-1.8.2/device-linux.c.iface radvd-1.8.2/device-linux.c ---- radvd-1.8.2/device-linux.c.iface 2011-10-10 10:26:47.089760082 +0200 -+++ radvd-1.8.2/device-linux.c 2011-10-10 10:27:12.149014098 +0200 -@@ -244,7 +244,7 @@ set_interface_var(const char *iface, - return -1; - - /* No path traversal */ -- if (strstr(name, "..") || strchr(name, '/')) -+ if (!iface[0] || !strcmp(iface, ".") || !strcmp(iface, "..") || strchr(iface, '/')) - return -1; - - if (access(spath, F_OK) != 0) diff --git a/radvd.spec b/radvd.spec index d87bbda..f8e4a1b 100644 --- a/radvd.spec +++ b/radvd.spec @@ -3,8 +3,8 @@ %define RADVD_UID 75 Summary: A Router Advertisement daemon Name: radvd -Version: 1.8.2 -Release: 2%{?dist} +Version: 1.8.3 +Release: 1%{?dist} # The code includes the advertising clause, so it's GPL-incompatible License: BSD with advertising Group: System Environment/Daemons @@ -20,8 +20,6 @@ Requires(pre): /usr/sbin/useradd BuildRequires: flex, flex-static, byacc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: radvd-1.8.2-iface.patch - %description radvd is the router advertisement daemon for IPv6. It listens to router solicitations and sends router advertisements as described in "Neighbor @@ -36,8 +34,6 @@ services. %prep %setup -q -%patch1 -p1 -b .iface - %build export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE" export LDFLAGS='-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen' @@ -113,6 +109,9 @@ exit 0 %{_sbindir}/radvdump %changelog +* Mon Oct 17 2011 Jiri Skala - 1.8.3-1 +- update to latest upstream version 1.8.3 + * Mon Oct 10 2011 Jiri Skala - 1.8.2-2 - fixes CVE-2011-3602 diff --git a/sources b/sources index 97242fa..7b79b9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac8a862d2b232d25ea2622274a2da8a4 radvd-1.8.2.tar.gz +73d533b7b20f5554c8d3e33643945442 radvd-1.8.3.tar.gz