[arch-commits] Commit in dhcp/repos/extra-x86_64 (14 files)
Christian Hesse
eworm at archlinux.org
Sat Feb 22 19:40:22 UTC 2020
Date: Saturday, February 22, 2020 @ 19:40:21
Author: eworm
Revision: 376055
archrelease: copy trunk to extra-x86_64
Added:
dhcp/repos/extra-x86_64/0002-iproute2.patch
(from rev 376054, dhcp/trunk/0002-iproute2.patch)
dhcp/repos/extra-x86_64/PKGBUILD
(from rev 376054, dhcp/trunk/PKGBUILD)
dhcp/repos/extra-x86_64/dhclient at .service
(from rev 376054, dhcp/trunk/dhclient at .service)
dhcp/repos/extra-x86_64/dhcp-sysusers.conf
(from rev 376054, dhcp/trunk/dhcp-sysusers.conf)
dhcp/repos/extra-x86_64/dhcp-tmpfiles.conf
(from rev 376054, dhcp/trunk/dhcp-tmpfiles.conf)
dhcp/repos/extra-x86_64/dhcpd4.service
(from rev 376054, dhcp/trunk/dhcpd4.service)
dhcp/repos/extra-x86_64/dhcpd6.service
(from rev 376054, dhcp/trunk/dhcpd6.service)
Deleted:
dhcp/repos/extra-x86_64/0002-iproute2.patch
dhcp/repos/extra-x86_64/PKGBUILD
dhcp/repos/extra-x86_64/dhclient at .service
dhcp/repos/extra-x86_64/dhcp-sysusers.conf
dhcp/repos/extra-x86_64/dhcp-tmpfiles.conf
dhcp/repos/extra-x86_64/dhcpd4.service
dhcp/repos/extra-x86_64/dhcpd6.service
---------------------+
0002-iproute2.patch | 26 +++---
PKGBUILD | 208 +++++++++++++++++++++++++-------------------------
dhclient at .service | 26 +++---
dhcp-sysusers.conf | 2
dhcp-tmpfiles.conf | 6 -
dhcpd4.service | 50 ++++++------
dhcpd6.service | 50 ++++++------
7 files changed, 184 insertions(+), 184 deletions(-)
Deleted: 0002-iproute2.patch
===================================================================
--- 0002-iproute2.patch 2020-02-22 19:40:09 UTC (rev 376054)
+++ 0002-iproute2.patch 2020-02-22 19:40:21 UTC (rev 376055)
@@ -1,13 +0,0 @@
-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/extra-x86_64/0002-iproute2.patch (from rev 376054, dhcp/trunk/0002-iproute2.patch)
===================================================================
--- 0002-iproute2.patch (rev 0)
+++ 0002-iproute2.patch 2020-02-22 19:40:21 UTC (rev 376055)
@@ -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
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-22 19:40:09 UTC (rev 376054)
+++ PKGBUILD 2020-02-22 19:40:21 UTC (rev 376055)
@@ -1,104 +0,0 @@
-# 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.
-pkgver=4.4.2
-pkgrel=1
-arch=('x86_64')
-license=('custom:isc-dhcp')
-url='https://www.isc.org/dhcp/'
-makedepends=('bash' 'iproute2' 'openldap')
-validpgpkeys=('AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38') # Internet Systems Consortium, Inc. (Signing key, 2019-2020) <codesign at isc.org>
-source=("https://downloads.isc.org/isc/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz"{,.asc}
- 'dhcp-sysusers.conf'
- 'dhcp-tmpfiles.conf'
- 'dhcpd4.service'
- 'dhcpd6.service'
- 'dhclient at .service'
- '0002-iproute2.patch')
-sha256sums=('1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521'
- 'SKIP'
- 'b16083e6bb572ffacaa7cd97e7fde5fcfa1b6dbeb166f162e2ec6e8ec4b928d6'
- 'abcd30e9e8428e34d22ab4d3074ef4bd84c2b11f5868597111b47d6f56d204da'
- '03fce30efab819b2d928085b0bab962a33ce56fc376acae98ad9b30aa278c9c8'
- 'f98a4438f4f69cab7cc5cce6927df4790ee993ebc8f88a169e63043c53d25625'
- '86cd0b1e0ea1d47ab096f6ee925eee60545116fb887a155761eda589b30e4f0e'
- '837a64189b949afae951655546967cc8f17f2f2cf370faabff00575364f0fcf7')
-
-prepare() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- # no ifconfig, use ip from iproute2
- patch -Np1 -i ../0002-iproute2.patch
-}
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- ./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}-${pkgver}"
-
- 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')
- provides=('dhcp-client')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- 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/extra-x86_64/PKGBUILD (from rev 376054, dhcp/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-02-22 19:40:21 UTC (rev 376055)
@@ -0,0 +1,104 @@
+# 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.
+pkgver=4.4.2
+pkgrel=2
+arch=('x86_64')
+license=('custom:isc-dhcp')
+url='https://www.isc.org/dhcp/'
+makedepends=('bash' 'iproute2' 'openldap')
+validpgpkeys=('AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38') # Internet Systems Consortium, Inc. (Signing key, 2019-2020) <codesign at isc.org>
+source=("https://downloads.isc.org/isc/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz"{,.asc}
+ 'dhcp-sysusers.conf'
+ 'dhcp-tmpfiles.conf'
+ 'dhcpd4.service'
+ 'dhcpd6.service'
+ 'dhclient at .service'
+ '0002-iproute2.patch')
+sha256sums=('1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521'
+ 'SKIP'
+ 'b16083e6bb572ffacaa7cd97e7fde5fcfa1b6dbeb166f162e2ec6e8ec4b928d6'
+ 'abcd30e9e8428e34d22ab4d3074ef4bd84c2b11f5868597111b47d6f56d204da'
+ '03fce30efab819b2d928085b0bab962a33ce56fc376acae98ad9b30aa278c9c8'
+ 'f98a4438f4f69cab7cc5cce6927df4790ee993ebc8f88a169e63043c53d25625'
+ '86cd0b1e0ea1d47ab096f6ee925eee60545116fb887a155761eda589b30e4f0e'
+ '837a64189b949afae951655546967cc8f17f2f2cf370faabff00575364f0fcf7')
+
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ # no ifconfig, use ip from iproute2
+ patch -Np1 -i ../0002-iproute2.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ ./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}-${pkgver}"
+
+ 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}-${pkgver}"
+
+ 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"
+}
Deleted: dhclient at .service
===================================================================
--- dhclient at .service 2020-02-22 19:40:09 UTC (rev 376054)
+++ dhclient at .service 2020-02-22 19:40:21 UTC (rev 376055)
@@ -1,13 +0,0 @@
-[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/extra-x86_64/dhclient at .service (from rev 376054, dhcp/trunk/dhclient at .service)
===================================================================
--- dhclient at .service (rev 0)
+++ dhclient at .service 2020-02-22 19:40:21 UTC (rev 376055)
@@ -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
Deleted: dhcp-sysusers.conf
===================================================================
--- dhcp-sysusers.conf 2020-02-22 19:40:09 UTC (rev 376054)
+++ dhcp-sysusers.conf 2020-02-22 19:40:21 UTC (rev 376055)
@@ -1 +0,0 @@
-u dhcp - "DHCP daemon" /
Copied: dhcp/repos/extra-x86_64/dhcp-sysusers.conf (from rev 376054, dhcp/trunk/dhcp-sysusers.conf)
===================================================================
--- dhcp-sysusers.conf (rev 0)
+++ dhcp-sysusers.conf 2020-02-22 19:40:21 UTC (rev 376055)
@@ -0,0 +1 @@
+u dhcp - "DHCP daemon" /
Deleted: dhcp-tmpfiles.conf
===================================================================
--- dhcp-tmpfiles.conf 2020-02-22 19:40:09 UTC (rev 376054)
+++ dhcp-tmpfiles.conf 2020-02-22 19:40:21 UTC (rev 376055)
@@ -1,3 +0,0 @@
-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/extra-x86_64/dhcp-tmpfiles.conf (from rev 376054, dhcp/trunk/dhcp-tmpfiles.conf)
===================================================================
--- dhcp-tmpfiles.conf (rev 0)
+++ dhcp-tmpfiles.conf 2020-02-22 19:40:21 UTC (rev 376055)
@@ -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 -
Deleted: dhcpd4.service
===================================================================
--- dhcpd4.service 2020-02-22 19:40:09 UTC (rev 376054)
+++ dhcpd4.service 2020-02-22 19:40:21 UTC (rev 376055)
@@ -1,25 +0,0 @@
-[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/extra-x86_64/dhcpd4.service (from rev 376054, dhcp/trunk/dhcpd4.service)
===================================================================
--- dhcpd4.service (rev 0)
+++ dhcpd4.service 2020-02-22 19:40:21 UTC (rev 376055)
@@ -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
Deleted: dhcpd6.service
===================================================================
--- dhcpd6.service 2020-02-22 19:40:09 UTC (rev 376054)
+++ dhcpd6.service 2020-02-22 19:40:21 UTC (rev 376055)
@@ -1,25 +0,0 @@
-[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
Copied: dhcp/repos/extra-x86_64/dhcpd6.service (from rev 376054, dhcp/trunk/dhcpd6.service)
===================================================================
--- dhcpd6.service (rev 0)
+++ dhcpd6.service 2020-02-22 19:40:21 UTC (rev 376055)
@@ -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