From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 3 Aug 2009 16:10:10 +0000 (+0000)
Subject: [package] update radvd to 1.4
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=658ebdc4cce1b23593d4dd9721ee5290c3c94ecc

[package] update radvd to 1.4

SVN-Revision: 17105
---

diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile
index e8f116e01b..12c5bbcf4e 100644
--- a/ipv6/radvd/Makefile
+++ b/ipv6/radvd/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=radvd
-PKG_VERSION:=1.2
-PKG_RELEASE:=2
+PKG_VERSION:=1.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://v6web.litech.org/radvd/dist \
 		http://download.sourcemage.org/mirror
-PKG_MD5SUM:=614876420d76cd2bb5bcb49760c8b9e3
+PKG_MD5SUM:=ad57121d57a716aa5db33668e4fb32c5
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/ipv6/radvd/patches/003-linux_old_compat.patch b/ipv6/radvd/patches/003-linux_old_compat.patch
deleted file mode 100644
index 2a7d80d936..0000000000
--- a/ipv6/radvd/patches/003-linux_old_compat.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- radvd-1.2/radvd.h	2008-01-24 12:10:18.000000000 +0200
-+++ radvd-1.2.mod/radvd.h	2009-01-17 22:10:52.000000000 +0200
-@@ -235,4 +235,34 @@
- int privsep_interface_reachtime(const char *iface, uint32_t rtime);
- int privsep_interface_retranstimer(const char *iface, uint32_t rettimer);
- 
-+/*
-+ * compat hacks in case libc and kernel get out of sync:
-+ *
-+ * glibc 2.4 and uClibc 0.9.29 introduce IPV6_RECVPKTINFO etc. and change IPV6_PKTINFO
-+ * This is only supported in Linux kernel >= 2.6.14
-+ *
-+ * This is only an approximation because the kernel version that libc was compiled against
-+ * could be older or newer than the one being run.  But this should not be a problem --
-+ * we just keep using the old kernel interface.
-+ * 
-+ * these are placed here because they're needed in all of socket.c, recv.c and send.c
-+ */
-+#ifdef __linux__
-+#  if defined IPV6_RECVHOPLIMIT || defined IPV6_RECVPKTINFO
-+#    include <linux/version.h>
-+#    if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
-+#      if defined IPV6_RECVHOPLIMIT && defined IPV6_2292HOPLIMIT
-+#        undef IPV6_RECVHOPLIMIT
-+#        define IPV6_RECVHOPLIMIT IPV6_2292HOPLIMIT
-+#      endif
-+#      if defined IPV6_RECVPKTINFO && defined IPV6_2292PKTINFO
-+#        undef IPV6_RECVPKTINFO
-+#        undef IPV6_PKTINFO
-+#        define IPV6_RECVPKTINFO IPV6_2292PKTINFO
-+#        define IPV6_PKTINFO IPV6_2292PKTINFO
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
- #endif