diff options
| author | Philip Prindeville <philipp@redfish-solutions.com> | 2023-04-07 12:38:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-07 12:38:30 -0600 |
| commit | c8e1dd7d6013700163b90896654d97d6d855a08b (patch) | |
| tree | 2b711b91c90b65764b71ccf687c401da26220369 | |
| parent | 5354fa5df9c142e0738cd3f9b47d01a45cd7ef3c (diff) | |
| parent | 98e34afbdacb821b099843eacaca9cd498de8364 (diff) | |
Merge pull request #20731 from pprindeville/isc-dhcp-update-4.4.3-P1
isc-dhcp: Update to 4.4.3-P1
| -rw-r--r-- | net/isc-dhcp/Makefile | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile index e13c8c8a0..b326d48a0 100644 --- a/net/isc-dhcp/Makefile +++ b/net/isc-dhcp/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=isc-dhcp UPSTREAM_NAME:=dhcp -PKG_VERSION:=4.4.3 -PKG_RELEASE:=7 +PKG_VERSION:=4.4.3-P1 +PKG_RELEASE:=1 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE @@ -21,7 +21,7 @@ PKG_SOURCE:=$(UPSTREAM_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.isc.org/isc/dhcp/$(PKG_VERSION) \ http://ftp.funet.fi/pub/mirrors/ftp.isc.org/isc/dhcp/$(PKG_VERSION) \ http://ftp.iij.ad.jp/pub/network/isc/dhcp/$(PKG_VERSION) -PKG_HASH:=0e3ec6b4c2a05ec0148874bcd999a66d05518378d77421f607fb0bc9d0135818 +PKG_HASH:=0ac416bb55997ca8632174fd10737fd61cdb8dba2752160a335775bc21dc73c7 PKG_FIXUP:=autoreconf PKG_BUILD_PARALLEL:=1 @@ -132,18 +132,10 @@ $(call Package/isc-dhcp-server/description) This package is compiled with IPv4 and IPv6 support. endef -define Package/isc-dhcp-dyndns-ipv4 +define Package/isc-dhcp-dyndns $(call Package/isc-dhcp/Default) TITLE+= server dynamic DNS dependencies (meta) - DEPENDS+=isc-dhcp-server-ipv4 +bind-server +bind-client - VARIANT:=ipv4 -endef - -define Package/isc-dhcp-dyndns-ipv6 - $(call Package/isc-dhcp/Default) - TITLE+= server dynamic DNS dependencies (meta) - DEPENDS+=isc-dhcp-server-ipv6 +bind-server +bind-client - VARIANT:=ipv6 + DEPENDS+=@(PACKAGE_isc-dhcp-server-ipv4||PACKAGE_isc-dhcp-server-ipv6) +bind-server +bind-client endef define Package/isc-dhcp-dyndns/description @@ -151,16 +143,6 @@ define Package/isc-dhcp-dyndns/description Bootstrap Protocol (BOOTP). endef -define Package/isc-dhcp-dyndns-ipv4/description -$(call Package/isc-dhcp-dyndns/description) - This package is compiled with IPv4 support only. -endef - -define Package/isc-dhcp-dyndns-ipv6/description -$(call Package/isc-dhcp-dyndns/description) - This package is compiled with IPv4 and IPv6 support. -endef - define Package/isc-dhcp-omshell-ipv4 $(call Package/isc-dhcp/Default) DEPENDS:= +isc-dhcp-server-ipv4 @@ -257,7 +239,7 @@ define Package/isc-dhcp-server-ipv6/conffiles /etc/dhcpd6.conf endef -define Package/isc-dhcp-dyndns-$(BUILD_VARIANT)/install +define Package/isc-dhcp-dyndns/install : endef @@ -285,11 +267,10 @@ endef $(eval $(call BuildPackage,isc-dhcp-relay-ipv4)) $(eval $(call BuildPackage,isc-dhcp-server-ipv4)) -$(eval $(call BuildPackage,isc-dhcp-dyndns-ipv4)) +$(eval $(call BuildPackage,isc-dhcp-dyndns)) $(eval $(call BuildPackage,isc-dhcp-client-ipv4)) $(eval $(call BuildPackage,isc-dhcp-omshell-ipv4)) $(eval $(call BuildPackage,isc-dhcp-relay-ipv6)) $(eval $(call BuildPackage,isc-dhcp-server-ipv6)) -$(eval $(call BuildPackage,isc-dhcp-dyndns-ipv6)) $(eval $(call BuildPackage,isc-dhcp-client-ipv6)) $(eval $(call BuildPackage,isc-dhcp-omshell-ipv6)) |