Modify patch

Author: yaqiangz

rules/isc-dhcp.mk

@@ -1,8 +1,10 @@
 # isc-dhcp packages
 
 ISC_DHCP_VERSION = 4.4.3
-ISC_DHCP_VERSION_FULL = ${ISC_DHCP_VERSION}-P1-4
+ISC_DHCP_VERSION_MID = ${ISC_DHCP_VERSION}-P1
+ISC_DHCP_VERSION_FULL = ${ISC_DHCP_VERSION_MID}-4
 
+export ISC_DHCP_VERSION_MID
 export ISC_DHCP_VERSION ISC_DHCP_VERSION_FULL
 
 ISC_DHCP_RELAY = isc-dhcp-relay_$(ISC_DHCP_VERSION_FULL)_$(CONFIGURED_ARCH).deb

src/isc-dhcp/Makefile

@@ -11,7 +11,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	# Get isc-dhcp release, debian files
 	dget -u http://deb.debian.org/debian/pool/main/i/isc-dhcp/isc-dhcp_$(ISC_DHCP_VERSION_FULL).dsc
-	pushd ./isc-dhcp-$(ISC_DHCP_VERSION)
+	pushd ./isc-dhcp-$(ISC_DHCP_VERSION_MID)
 
 	# Create a git repository here for stg to apply patches
 	git init

src/isc-dhcp/patch/0004-Support-for-loading-port-alias-map-file-to-replace-p.patch

@@ -95,7 +95,7 @@ index 0d9b2e7..b72b1bc 100644
 
  							strncpy(ifname, ip->name, IFNAMSIZ);
  						}
-+						
++
 +						// Attempt to translate SONiC interface name to vendor alias
 +						ret = get_interface_alias_by_name(ifname, ifalias);
 +						if (ret < 0) {

src/isc-dhcp/patch/0005-Add-enable-use-sockets-to-configure-flags-in-debian-.patch

@@ -9,18 +9,18 @@ Subject: [PATCH 1/3] Add --enable-use-sockets to configure flags in
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/debian/rules b/debian/rules
-index d3fcc1d..2a7219d 100755
+index dc2a9b1..3d12fb5 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -24,7 +24,7 @@ CFLAGS+=-D_PATH_DHCLIENT_CONF='\"/etc/dhcp/dhclient.conf\"'
+@@ -23,7 +23,7 @@ CFLAGS+=-D_PATH_DHCLIENT_CONF='\"/etc/dhcp/dhclient.conf\"'
  CFLAGS+=-D_PATH_DHCLIENT_DB='\"$(LEASE_PATH)/dhclient.leases\"'
  CFLAGS+=-D_PATH_DHCLIENT6_DB='\"$(LEASE_PATH)/dhclient6.leases\"'
 
--CONFFLAGS=--prefix=/usr --with-libbind=/usr --enable-log-pid --enable-paranoia
-+CONFFLAGS=--prefix=/usr --with-libbind=/usr --enable-log-pid --enable-paranoia --enable-use-sockets
+-CONFFLAGS+=--prefix=/usr --enable-log-pid --enable-paranoia
++CONFFLAGS+=--prefix=/usr --enable-log-pid --enable-paranoia --enable-use-sockets
 
+ include /usr/share/dpkg/buildtools.mk
  # cross-architecture building
- ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 -- 
-2.17.1
+2.25.1