[arch-commits] Commit in dhcp/trunk (0001-dhcp-honor-expired.patch PKGBUILD)

[Christian Hesse]

    Date: Wednesday, January 31, 2018 @ 20:02:02
  Author: eworm
Revision: 315701

upgpkg: dhcp 4.4.0-1

new upstream release

Modified:
  dhcp/trunk/PKGBUILD
Deleted:
  dhcp/trunk/0001-dhcp-honor-expired.patch

-------------------------------+
 0001-dhcp-honor-expired.patch |   49 ----------------------------------------
 PKGBUILD                      |   24 +++++++------------
 2 files changed, 9 insertions(+), 64 deletions(-)

Deleted: 0001-dhcp-honor-expired.patch
===================================================================
--- 0001-dhcp-honor-expired.patch	2018-01-31 19:39:04 UTC (rev 315700)
+++ 0001-dhcp-honor-expired.patch	2018-01-31 20:02:02 UTC (rev 315701)
@@ -1,49 +0,0 @@
-diff -up dhcp-4.3.0a1/client/dhc6.c.honor-expired dhcp-4.3.0a1/client/dhc6.c
---- dhcp-4.3.0a1/client/dhc6.c.honor-expired	2013-12-19 16:00:28.062183037 +0100
-+++ dhcp-4.3.0a1/client/dhc6.c	2013-12-19 16:00:28.076182842 +0100
-@@ -1351,6 +1351,32 @@ start_info_request6(struct client_state
- 		go_daemon();
- }
- 
-+/* Run through the addresses in lease and return true if there's any unexpired.
-+ * Return false otherwise.
-+ */
-+isc_boolean_t
-+unexpired_address_in_lease(struct dhc6_lease *lease)
-+{
-+	struct dhc6_ia *ia;
-+	struct dhc6_addr *addr;
-+
-+	for (ia = lease->bindings ; ia != NULL ; ia = ia->next) {
-+		for (addr = ia->addrs ; addr != NULL ; addr = addr->next) {
-+			if (addr->flags & DHC6_ADDR_EXPIRED)
-+				continue;
-+
-+			if (addr->starts + addr->max_life > cur_time) {
-+				return ISC_TRUE;
-+			}
-+		}
-+	}
-+
-+	log_info("PRC: Previous lease is devoid of active addresses."
-+		 "  Re-initializing.");
-+
-+	return ISC_FALSE;
-+}
-+
- /*
-  * start_confirm6() kicks off an "init-reboot" version of the process, at
-  * startup to find out if old bindings are 'fair' and at runtime whenever
-@@ -1363,8 +1389,10 @@ start_confirm6(struct client_state *clie
- 
- 	/* If there is no active lease, there is nothing to check. */
- 	if ((client->active_lease == NULL) ||
--	    !active_prefix(client) ||
--	    client->active_lease->released) {
-+		!active_prefix(client) ||
-+		client->active_lease->released ||
-+		!unexpired_address_in_lease(client->active_lease)) {
-+		dhc6_lease_destroy(&client->active_lease, MDL);
- 		start_init6(client);
- 		return;
- 	}

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-31 19:39:04 UTC (rev 315700)
+++ PKGBUILD	2018-01-31 20:02:02 UTC (rev 315701)
@@ -6,36 +6,30 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.3.6
-pkgrel=4
+pkgver=4.4.0
+pkgrel=1
 arch=('x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
 makedepends=('bash' 'iproute2')
 validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57') # Internet Systems Consortium, Inc. (Signing key, 2017-2018) <codesign at isc.org>
-source=(ftp://ftp.isc.org/isc/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz{,.asc}
-        dhcp-sysusers.conf
-        dhcpd4.service
-        dhcpd6.service
-        dhclient at .service
-        0001-dhcp-honor-expired.patch
-        0002-iproute2.patch)
-sha256sums=('a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b'
+source=("ftp://ftp.isc.org/isc/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz"{,.asc}
+        'dhcp-sysusers.conf'
+        'dhcpd4.service'
+        'dhcpd6.service'
+        'dhclient at .service'
+        '0002-iproute2.patch')
+sha256sums=('4a90be0f22ad81c987f5584661b60a594f1b21c581b82bfba3ae60f89ae44397'
             'SKIP'
             'b16083e6bb572ffacaa7cd97e7fde5fcfa1b6dbeb166f162e2ec6e8ec4b928d6'
             '537b52307e2196775d79b7e7087fa7499189e26bc9a1737c9b75acd45a720920'
             '9a2a9bdf25871dfe875ed39d92a4d97852f9ad6c38fa74bd16cbc18e85986d3f'
             '259d004987b4759e0c9e1a8807a5baa3df74f1e0c57b058a9e1bc92ea41fcb6a'
-            '97088096c5d880ecd889f4875ba89cf8eaf564bec772038e8976c22bd4896b18'
             '837a64189b949afae951655546967cc8f17f2f2cf370faabff00575364f0fcf7')
 
 prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  # Sourced from Fedora - required for NM
-  # https://bugzilla.gnome.org/show_bug.cgi?id=748268
-  patch -Np1 -i ../0001-dhcp-honor-expired.patch
-
   # no ifconfig, use ip from iproute2
   patch -Np1 -i ../0002-iproute2.patch
 }