From a35ebccb267c20ddb294070a45a846a7102df11b Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Fri, 30 Mar 2018 09:14:40 -0600 Subject: [PATCH 1/2] isc-dhcp: make files/ consistent by flattening Some /etc/config-destined files are in files/ and suffixed with .conf while others are in files/etc/config/ which isn't consistent. Put everything in files/ and call it good. Signed-off-by: Philip Prindeville --- net/isc-dhcp/Makefile | 2 +- net/isc-dhcp/files/{etc/config/dhcrelay => dhcrelay.conf} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename net/isc-dhcp/files/{etc/config/dhcrelay => dhcrelay.conf} (100%) diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile index a2b43530eb..0f8593177c 100644 --- a/net/isc-dhcp/Makefile +++ b/net/isc-dhcp/Makefile @@ -196,7 +196,7 @@ define Package/isc-dhcp-relay-$(BUILD_VARIANT)/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(1)/usr/sbin $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/etc/config/dhcrelay $(1)/etc/config + $(INSTALL_DATA) ./files/dhcrelay.conf $(1)/etc/config $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/dhcrelay4.init $(1)/etc/init.d/dhcrelay4 endef diff --git a/net/isc-dhcp/files/etc/config/dhcrelay b/net/isc-dhcp/files/dhcrelay.conf similarity index 100% rename from net/isc-dhcp/files/etc/config/dhcrelay rename to net/isc-dhcp/files/dhcrelay.conf From 6bfb46ebdbeae257f642668959c07717aac54b3c Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Sun, 8 Apr 2018 16:07:01 -0600 Subject: [PATCH 2/2] isc-dhcp: fix typeof regex for IP address pattern Missing backslash in "\d+" for last digit of dotted quad. Signed-off-by: Philip Prindeville --- net/isc-dhcp/Makefile | 2 +- net/isc-dhcp/files/dhcpd.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile index 0f8593177c..f22d743278 100644 --- a/net/isc-dhcp/Makefile +++ b/net/isc-dhcp/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=isc-dhcp UPSTREAM_NAME:=dhcp PKG_VERSION:=4.4.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/net/isc-dhcp/files/dhcpd.init b/net/isc-dhcp/files/dhcpd.init index fdcbe24909..8eb20d101d 100644 --- a/net/isc-dhcp/files/dhcpd.init +++ b/net/isc-dhcp/files/dhcpd.init @@ -122,7 +122,7 @@ static_hosts() { typeof() { echo "$1" | awk ' -/^\d+\.\d+\.\d+\.d+$/ { print "ip\n"; next; } +/^\d+\.\d+\.\d+\.\d+$/ { print "ip\n"; next; } /^(true|false)$/ { print "bool\n"; next; } /^\d+$/ { print "integer\n"; next; } /^"[^"]*"$/ { print "string\n"; next; }