From: Steven Barth <cyrus@openwrt.org>
Date: Tue, 1 Apr 2014 18:52:09 +0000 (+0000)
Subject: odhcpd: add preliminary support for managed DHCPv6-PD and CER-ID
X-Git-Tag: reboot~7560
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e544c1607a0430b5168009421d61ec52094367fb;p=oweals%2Fopenwrt.git

odhcpd: add preliminary support for managed DHCPv6-PD and CER-ID

SVN-Revision: 40355
---

diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile
index 07218b6a4a..ac262bd5e4 100644
--- a/package/network/services/odhcpd/Makefile
+++ b/package/network/services/odhcpd/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=odhcpd
-PKG_VERSION:=2014-03-20.1
+PKG_VERSION:=2014-04-01
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=git://github.com/sbyx/odhcpd.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c7a8e2380a5299d48a851717e139c0876e85483e
+PKG_SOURCE_VERSION:=4264248aedd515a7c7cf5bcdf29c2ef2e76f938f
 
 PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
 
@@ -23,10 +23,16 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 CMAKE_OPTIONS += -DUBUS=1
+
 ifneq ($(CONFIG_PACKAGE_odhcpd_ext_prefix_class),0)
   CMAKE_OPTIONS += -DEXT_PREFIX_CLASS=$(CONFIG_PACKAGE_odhcpd_ext_prefix_class)
 endif
 
+ifneq ($(CONFIG_PACKAGE_odhcpd_ext_cer_id),0)
+  CMAKE_OPTIONS += -DEXT_CER_ID=$(CONFIG_PACKAGE_odhcpd_ext_cer_id)
+endif
+
+
 define Package/odhcpd
   SECTION:=net
   CATEGORY:=Network
@@ -39,6 +45,10 @@ define Package/odhcpd/config
     int "Prefix Class Extension ID (0 = disabled)"
     depends on PACKAGE_odhcpd
     default 0
+  config PACKAGE_odhcpd_ext_cer_id
+    int "CER-ID Extension ID (0 = disabled)"
+    depends on PACKAGE_odhcpd
+    default 0
 endef
 
 define Package/odhcpd/description