From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 17 Jul 2009 11:30:39 +0000 (+0000)
Subject: [package] update dhcp-forwarder to 0.8 (#5536)
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=25f813659fe0180cc2d281b1577c496927c22600;p=openwrt%2Fsvn-archive%2Farchive.git

[package] update dhcp-forwarder to 0.8 (#5536)

SVN-Revision: 16877
---

diff --git a/net/dhcp-forwarder/Makefile b/net/dhcp-forwarder/Makefile
index f94b1ce2a4..558e0fe39e 100644
--- a/net/dhcp-forwarder/Makefile
+++ b/net/dhcp-forwarder/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcp-forwarder
-PKG_VERSION:=0.7
-PKG_RELEASE:=4
+PKG_VERSION:=0.8
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://savannah.nongnu.org/download/dhcp-fwd
-PKG_MD5SUM:=e7f876e615ebc3f96418f6477b4451e2
+PKG_MD5SUM:=fb3670dee9f71af1e55ac5dcd64e213e
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -44,7 +44,7 @@ define Package/dhcp-forwarder/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/contrib/dhcp-fwd.conf $(1)/etc/
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/contrib/dhcp-fwd.conf $(1)/etc/
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/dhcp-fwd.init $(1)/etc/init.d/dhcp-fwd
 endef
diff --git a/net/dhcp-forwarder/patches/000-big_endian.patch b/net/dhcp-forwarder/patches/000-big_endian.patch
deleted file mode 100644
index add157d3f4..0000000000
--- a/net/dhcp-forwarder/patches/000-big_endian.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dhcp-forwarder-0.7/src/dhcp.h	2004-06-22 03:46:56.000000000 -0700
-+++ dhcp-forwarder-0.7-x/src/dhcp.h	2005-10-06 17:04:14.000000000 -0700
-@@ -89,7 +89,7 @@
-   optDHCP_COOKIE = 0x63538263u,
-   flgDHCP_BCAST	 = 0x0080u
- #else
--  DHCP_COOKIE  	 = 0x63825363u,
-+  optDHCP_COOKIE = 0x63825363u,
-   flgDHCP_BCAST	 = 0x8000u
- #endif
- };
diff --git a/net/dhcp-forwarder/patches/001-getpwnmam_getgrnam.patch b/net/dhcp-forwarder/patches/001-getpwnmam_getgrnam.patch
deleted file mode 100644
index ef84913302..0000000000
--- a/net/dhcp-forwarder/patches/001-getpwnmam_getgrnam.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -pur dhcp-forwarder-0.7-orig/src/wrappers.h dhcp-forwarder-0.7-patched/src/wrappers.h
---- dhcp-forwarder-0.7-orig/src/wrappers.h	2004-06-22 12:46:56.000000000 +0200
-+++ dhcp-forwarder-0.7-patched/src/wrappers.h	2005-12-27 12:28:10.464289435 +0100
-@@ -65,7 +65,14 @@ Egetgrnam(char const *name)
-    /*@*/
- {
-   /*@observer@*/struct group const	*res = getgrnam(name);
--  FatalErrnoError(res==0, 1, "getgrnam()");
-+
-+  FatalErrnoError((res == NULL) && (errno != 0), 1, "getgrnam()");
-+
-+  if (res == NULL)
-+  {
-+    fprintf (stderr, "No such group: `%s'\n", name);
-+    exit (1);
-+  }
- 
-     /*@-freshtrans@*/
-     /*@-mustfreefresh@*/
-@@ -80,7 +87,14 @@ Egetpwnam(char const *name)
-     /*@*/
- {
-   struct passwd const	*res = getpwnam(name);
--  FatalErrnoError(res==0, 1, "getpwnam()");
-+
-+  FatalErrnoError((res == NULL) && (errno != 0), 1, "getpwnam()");
-+
-+  if (res == NULL)
-+  {
-+    fprintf (stderr, "No such user: `%s'\n", name);
-+    exit (1);
-+  }
- 
-   return res;
- }