[arch-commits] Commit in dhcp/repos (9 files)
Christian Hesse
eworm at archlinux.org
Wed May 26 22:00:58 UTC 2021
Date: Wednesday, May 26, 2021 @ 22:00:58
Author: eworm
Revision: 416493
archrelease: copy trunk to testing-x86_64
Added:
dhcp/repos/testing-x86_64/
dhcp/repos/testing-x86_64/0002-iproute2.patch
(from rev 416492, dhcp/trunk/0002-iproute2.patch)
dhcp/repos/testing-x86_64/0003-117-fixed-gcc-10-compilation-issues.patch
(from rev 416492, dhcp/trunk/0003-117-fixed-gcc-10-compilation-issues.patch)
dhcp/repos/testing-x86_64/PKGBUILD
(from rev 416492, dhcp/trunk/PKGBUILD)
dhcp/repos/testing-x86_64/dhclient at .service
(from rev 416492, dhcp/trunk/dhclient at .service)
dhcp/repos/testing-x86_64/dhcp-sysusers.conf
(from rev 416492, dhcp/trunk/dhcp-sysusers.conf)
dhcp/repos/testing-x86_64/dhcp-tmpfiles.conf
(from rev 416492, dhcp/trunk/dhcp-tmpfiles.conf)
dhcp/repos/testing-x86_64/dhcpd4.service
(from rev 416492, dhcp/trunk/dhcpd4.service)
dhcp/repos/testing-x86_64/dhcpd6.service
(from rev 416492, dhcp/trunk/dhcpd6.service)
------------------------------------------------+
0002-iproute2.patch | 13 ++
0003-117-fixed-gcc-10-compilation-issues.patch | 117 +++++++++++++++++++++++
PKGBUILD | 110 +++++++++++++++++++++
dhclient at .service | 13 ++
dhcp-sysusers.conf | 1
dhcp-tmpfiles.conf | 3
dhcpd4.service | 25 ++++
dhcpd6.service | 25 ++++
8 files changed, 307 insertions(+)
Copied: dhcp/repos/testing-x86_64/0002-iproute2.patch (from rev 416492, dhcp/trunk/0002-iproute2.patch)
===================================================================
--- testing-x86_64/0002-iproute2.patch (rev 0)
+++ testing-x86_64/0002-iproute2.patch 2021-05-26 22:00:58 UTC (rev 416493)
@@ -0,0 +1,13 @@
+diff --git a/client/scripts/linux b/client/scripts/linux
+index 5fb16121..c4cef632 100755
+--- a/client/scripts/linux
++++ b/client/scripts/linux
+@@ -362,7 +362,7 @@ case "$reason" in
+ interface_up_wait_time=5
+ for i in $(seq 0 ${interface_up_wait_time})
+ do
+- ifconfig ${interface} | grep RUNNING >/dev/null 2>&1
++ ${ip} link show dev ${interface} | grep -q LOWER_UP 2>&1
+ if [ $? -eq 0 ]; then
+ break;
+ fi
Copied: dhcp/repos/testing-x86_64/0003-117-fixed-gcc-10-compilation-issues.patch (from rev 416492, dhcp/trunk/0003-117-fixed-gcc-10-compilation-issues.patch)
===================================================================
--- testing-x86_64/0003-117-fixed-gcc-10-compilation-issues.patch (rev 0)
+++ testing-x86_64/0003-117-fixed-gcc-10-compilation-issues.patch 2021-05-26 22:00:58 UTC (rev 416493)
@@ -0,0 +1,117 @@
+From 6c7e61578b1b449272dbb40dd8b98d03dad8a57a Mon Sep 17 00:00:00 2001
+From: Thomas Markwalder <tmark at isc.org>
+Date: Thu, 30 Jul 2020 10:01:36 -0400
+Subject: [PATCH] [#117] Fixed gcc 10 compilation issues
+
+client/dhclient.c
+relay/dhcrelay.c
+ extern'ed local_port,remote_port
+
+common/discover.c
+ init local_port,remote_port to 0
+
+server/mdb.c
+ extern'ed dhcp_type_host
+
+server/mdb6.c
+ create_prefix6() - eliminated memcpy string overflow error
+---
+ RELNOTES | 5 +++++
+ client/dhclient.c | 5 +++--
+ common/discover.c | 4 ++--
+ relay/dhcrelay.c | 4 ++--
+ server/mdb.c | 2 +-
+ server/mdb6.c | 2 +-
+ 6 files changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/RELNOTES b/RELNOTES
+index 9d0a0414..6919dba7 100644
+--- a/RELNOTES
++++ b/RELNOTES
+@@ -103,6 +103,11 @@ ISC DHCP is open source software maintained by Internet Systems
+ Consortium. This product includes cryptographic software written
+ by Eric Young (eay at cryptsoft.com).
+
++ Changes since 4.4.2 (Bug Fixes)
++
++- Minor corrections to allow compilation under gcc 10.
++ [Gitlab #117]
++
+ Changes since 4.4.2b1 (Bug Fixes)
+
+ - Added a clarification on DHCPINFORMs and server authority to
+diff --git a/client/dhclient.c b/client/dhclient.c
+index 189e5270..7a7837cb 100644
+--- a/client/dhclient.c
++++ b/client/dhclient.c
+@@ -83,8 +83,9 @@ static const char message [] = "Internet Systems Consortium DHCP Client";
+ static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/";
+ #endif /* UNIT_TEST */
+
+-u_int16_t local_port = 0;
+-u_int16_t remote_port = 0;
++extern u_int16_t local_port;
++extern u_int16_t remote_port;
++
+ #if defined(DHCPv6) && defined(DHCP4o6)
+ int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */
+ #endif
+diff --git a/common/discover.c b/common/discover.c
+index ca4f4d55..22f09767 100644
+--- a/common/discover.c
++++ b/common/discover.c
+@@ -45,8 +45,8 @@ struct interface_info *fallback_interface = 0;
+
+ int interfaces_invalidated;
+ int quiet_interface_discovery;
+-u_int16_t local_port;
+-u_int16_t remote_port;
++u_int16_t local_port = 0;
++u_int16_t remote_port = 0;
+ u_int16_t relay_port = 0;
+ int dhcpv4_over_dhcpv6 = 0;
+ int (*dhcp_interface_setup_hook) (struct interface_info *, struct iaddr *);
+diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
+index 883d5058..7211e3bb 100644
+--- a/relay/dhcrelay.c
++++ b/relay/dhcrelay.c
+@@ -95,8 +95,8 @@ enum { forward_and_append, /* Forward and append our own relay option. */
+ forward_untouched, /* Forward without changes. */
+ discard } agent_relay_mode = forward_and_replace;
+
+-u_int16_t local_port;
+-u_int16_t remote_port;
++extern u_int16_t local_port;
++extern u_int16_t remote_port;
+
+ /* Relay agent server list. */
+ struct server_list {
+diff --git a/server/mdb.c b/server/mdb.c
+index ff8a707f..8266d764 100644
+--- a/server/mdb.c
++++ b/server/mdb.c
+@@ -67,7 +67,7 @@ static host_id_info_t *host_id_info = NULL;
+
+ int numclasseswritten;
+
+-omapi_object_type_t *dhcp_type_host;
++extern omapi_object_type_t *dhcp_type_host;
+
+ isc_result_t enter_class(cd, dynamicp, commit)
+ struct class *cd;
+diff --git a/server/mdb6.c b/server/mdb6.c
+index da7baf6e..ebe01e56 100644
+--- a/server/mdb6.c
++++ b/server/mdb6.c
+@@ -1945,7 +1945,7 @@ create_prefix6(struct ipv6_pool *pool, struct iasubopt **pref,
+ }
+ new_ds.data = new_ds.buffer->data;
+ memcpy(new_ds.buffer->data, ds.data, ds.len);
+- memcpy(new_ds.buffer->data + ds.len, &tmp, sizeof(tmp));
++ memcpy(&new_ds.buffer->data[0] + ds.len, &tmp, sizeof(tmp));
+ data_string_forget(&ds, MDL);
+ data_string_copy(&ds, &new_ds, MDL);
+ data_string_forget(&new_ds, MDL);
+--
+GitLab
+
Copied: dhcp/repos/testing-x86_64/PKGBUILD (from rev 416492, dhcp/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2021-05-26 22:00:58 UTC (rev 416493)
@@ -0,0 +1,110 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Daniel Isenmann <daniel @archlinux.org>
+
+pkgbase=dhcp
+pkgname=('dhcp' 'dhclient')
+
+# separate patch levels with a period to maintain proper versioning.
+_realver=4.4.2-P1
+pkgver=${_realver/-/.}
+pkgrel=1
+arch=('x86_64')
+license=('custom:isc-dhcp')
+url='https://www.isc.org/dhcp/'
+makedepends=('bash' 'iproute2' 'openldap')
+validpgpkeys=('7E1C91AC8030A5A59D1EFAB9750F3C87723E4012') # Internet Systems Consortium, Inc. (Signing key, 2021-2022) <codesign at isc.org>
+source=("https://downloads.isc.org/isc/${pkgbase}/${_realver}/${pkgbase}-${_realver}.tar.gz"{,.asc}
+ '0002-iproute2.patch'
+ '0003-117-fixed-gcc-10-compilation-issues.patch'
+ 'dhcp-sysusers.conf'
+ 'dhcp-tmpfiles.conf'
+ 'dhcpd4.service'
+ 'dhcpd6.service'
+ 'dhclient at .service')
+sha256sums=('b05e04337539545a8faa0d6ac518defc61a07e5aec66a857f455e7f218c85a1a'
+ 'SKIP'
+ '837a64189b949afae951655546967cc8f17f2f2cf370faabff00575364f0fcf7'
+ 'ab652f408a0730caa996df11bea608f279c5547acc849d5562a592ea19f67727'
+ 'b16083e6bb572ffacaa7cd97e7fde5fcfa1b6dbeb166f162e2ec6e8ec4b928d6'
+ 'abcd30e9e8428e34d22ab4d3074ef4bd84c2b11f5868597111b47d6f56d204da'
+ '03fce30efab819b2d928085b0bab962a33ce56fc376acae98ad9b30aa278c9c8'
+ 'f98a4438f4f69cab7cc5cce6927df4790ee993ebc8f88a169e63043c53d25625'
+ '86cd0b1e0ea1d47ab096f6ee925eee60545116fb887a155761eda589b30e4f0e')
+
+prepare() {
+ cd "${srcdir}/${pkgbase}-${_realver}"
+
+ # no ifconfig, use ip from iproute2
+ patch -Np1 -i ../0002-iproute2.patch
+
+ # [#117] Fixed gcc 10 compilation issues
+ patch -Np1 -i ../0003-117-fixed-gcc-10-compilation-issues.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgbase}-${_realver}"
+
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --enable-binary-leases \
+ --enable-paranoia \
+ --with-ldap \
+ --with-ldapcrypto \
+ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
+ --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
+ --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
+ --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases
+
+ make -j1
+}
+
+package_dhcp(){
+ pkgdesc="A DHCP server, client, and relay agent"
+ depends=('glibc' 'libldap')
+ backup=('etc/dhcpd.conf' 'etc/dhcpd6.conf')
+
+ cd "${srcdir}/${pkgbase}-${_realver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m644 "${srcdir}/dhcp-sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/dhcp.conf"
+ install -D -m644 "${srcdir}/dhcp-tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/dhcp.conf"
+ install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service"
+ install -D -m644 "${srcdir}/dhcpd6.service" "${pkgdir}/usr/lib/systemd/system/dhcpd6.service"
+
+ # move and install config files in place
+ mv "${pkgdir}/etc/dhcpd.conf.example" "${pkgdir}/etc/dhcpd.conf"
+ install -D -m644 doc/examples/dhcpd-dhcpv6.conf "${pkgdir}/etc/dhcpd6.conf"
+
+ # Remove dhclient
+ make -C client DESTDIR="${pkgdir}" uninstall
+
+ # install license
+ install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhcp/LICENSE"
+}
+
+package_dhclient(){
+ pkgdesc="A standalone DHCP client from the dhcp package"
+ depends=('glibc' 'bash' 'iproute2' 'run-parts')
+ provides=('dhcp-client')
+
+ cd "${srcdir}/${pkgbase}-${_realver}"
+
+ make -C client DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/dhclient"
+ mv "${pkgdir}/etc/dhclient.conf.example" "${pkgdir}/usr/share/dhclient/"
+
+ install -d "${pkgdir}/var/lib/dhclient"
+
+ # install dhclient linux script
+ install -m755 client/scripts/linux "${pkgdir}/usr/bin/dhclient-script"
+
+ # install license
+ install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhclient/LICENSE"
+
+ # install systemd service unit
+ install -m644 -D "$srcdir/dhclient at .service" "${pkgdir}/usr/lib/systemd/system/dhclient at .service"
+}
Copied: dhcp/repos/testing-x86_64/dhclient at .service (from rev 416492, dhcp/trunk/dhclient at .service)
===================================================================
--- testing-x86_64/dhclient at .service (rev 0)
+++ testing-x86_64/dhclient at .service 2021-05-26 22:00:58 UTC (rev 416493)
@@ -0,0 +1,13 @@
+[Unit]
+Description=dhclient on %I
+Wants=network.target
+Before=network.target
+
+[Service]
+ExecStart=/usr/bin/dhclient -pf /run/dhclient@%i/dhclient.pid -d %I
+RuntimeDirectory=dhclient@%i
+ProtectSystem=on
+ProtectHome=on
+
+[Install]
+WantedBy=multi-user.target
Copied: dhcp/repos/testing-x86_64/dhcp-sysusers.conf (from rev 416492, dhcp/trunk/dhcp-sysusers.conf)
===================================================================
--- testing-x86_64/dhcp-sysusers.conf (rev 0)
+++ testing-x86_64/dhcp-sysusers.conf 2021-05-26 22:00:58 UTC (rev 416493)
@@ -0,0 +1 @@
+u dhcp - "DHCP daemon" /
Copied: dhcp/repos/testing-x86_64/dhcp-tmpfiles.conf (from rev 416492, dhcp/trunk/dhcp-tmpfiles.conf)
===================================================================
--- testing-x86_64/dhcp-tmpfiles.conf (rev 0)
+++ testing-x86_64/dhcp-tmpfiles.conf 2021-05-26 22:00:58 UTC (rev 416493)
@@ -0,0 +1,3 @@
+d /var/lib/dhcp 0750 dhcp dhcp -
+f /var/lib/dhcp/dhcpd.leases 0640 dhcp dhcp -
+f /var/lib/dhcp/dhcpd6.leases 0640 dhcp dhcp -
Copied: dhcp/repos/testing-x86_64/dhcpd4.service (from rev 416492, dhcp/trunk/dhcpd4.service)
===================================================================
--- testing-x86_64/dhcpd4.service (rev 0)
+++ testing-x86_64/dhcpd4.service 2021-05-26 22:00:58 UTC (rev 416493)
@@ -0,0 +1,25 @@
+[Unit]
+Description=IPv4 DHCP server
+After=network.target network-online.target
+Wants=network-online.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/dhcpd -4 -q -cf /etc/dhcpd.conf -pf /run/dhcpd4/dhcpd.pid
+RuntimeDirectory=dhcpd4
+PIDFile=/run/dhcpd4/dhcpd.pid
+User=dhcp
+AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_NET_RAW
+ProtectSystem=full
+ProtectHome=on
+KillSignal=SIGINT
+# We pull in network-online.target for a configured network connection.
+# However this is not guaranteed to be the network connection our
+# networks are configured for. So try to restart on failure with a delay
+# of two seconds. Rate limiting kicks in after 12 seconds.
+RestartSec=2s
+Restart=on-failure
+StartLimitInterval=12s
+
+[Install]
+WantedBy=multi-user.target
Copied: dhcp/repos/testing-x86_64/dhcpd6.service (from rev 416492, dhcp/trunk/dhcpd6.service)
===================================================================
--- testing-x86_64/dhcpd6.service (rev 0)
+++ testing-x86_64/dhcpd6.service 2021-05-26 22:00:58 UTC (rev 416493)
@@ -0,0 +1,25 @@
+[Unit]
+Description=IPv6 DHCP server
+After=network.target network-online.target
+Wants=network-online.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/dhcpd -6 -q -cf /etc/dhcpd6.conf -pf /run/dhcpd6/dhcpd.pid
+RuntimeDirectory=dhcpd6
+PIDFile=/run/dhcpd6/dhcpd.pid
+User=dhcp
+AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_NET_RAW
+ProtectSystem=full
+ProtectHome=on
+KillSignal=SIGINT
+# We pull in network-online.target for a configured network connection.
+# However this is not guaranteed to be the network connection our
+# networks are configured for. So try to restart on failure with a delay
+# of two seconds. Rate limiting kicks in after 12 seconds.
+RestartSec=2s
+Restart=on-failure
+StartLimitInterval=12s
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list