Date: Thursday, May 4, 2023 @ 19:27:56 Author: dvzrv Revision: 476746
upgpkg: dhcpcd 10.0.1-1: Upgrade to 10.0.1. Remove unnecessary quotes and curly braces. Switch to upstream description. Remove unnecessary .install file (use tmpfiles.d instead). Run dhcpcd on all interfaces in the foreground. Set noipv4ll in /etc/dhcpcd.conf in prepare() instead of package(). Switch to github provided source tarballs and add back openpgp verification. Modified: dhcpcd/trunk/PKGBUILD dhcpcd/trunk/dhcpcd.service dhcpcd/trunk/dhcpcd.tmpfiles dhcpcd/trunk/dhcpcd_.service Deleted: dhcpcd/trunk/dhcpcd.install -----------------+ PKGBUILD | 117 +++++++++++++++++++++++++++--------------------------- dhcpcd.install | 7 --- dhcpcd.service | 7 --- dhcpcd.tmpfiles | 1 dhcpcd_.service | 2 5 files changed, 64 insertions(+), 70 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-05-04 19:18:41 UTC (rev 476745) +++ PKGBUILD 2023-05-04 19:27:56 UTC (rev 476746) @@ -1,77 +1,80 @@ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Maintainer: Giancarlo Razzolini <[email protected]> +# Maintainer: David Runge <[email protected]> +# Contributor: Giancarlo Razzolini <[email protected]> +# Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=9.4.1 +pkgver=10.0.1 pkgrel=1 -pkgdesc="RFC2131 compliant DHCP client daemon" +pkgdesc="DHCP/ IPv4LL/ IPv6RA/ DHCPv6 client" url="https://roy.marples.name/projects/dhcpcd/"; -arch=('x86_64') -license=('BSD') -depends=('glibc' 'sh' 'udev' 'systemd-libs') +arch=(x86_64) +license=(BSD) +depends=( + glibc + sh + systemd-libs +) optdepends=('openresolv: resolvconf support') -provides=('dhcp-client') -backup=('etc/dhcpcd.conf') -install='dhcpcd.install' -options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory -source=("https://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.xz"; - dhcpcd.install - dhcpcd_.service - dhcpcd.service - dhcpcd.sysusers - dhcpcd.tmpfiles) +provides=(dhcp-client) +backup=(etc/$pkgname.conf) +# we need /var/lib/dhcpcd +options=(emptydirs) +source=( + https://github.com/NetworkConfiguration/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc} + ${pkgname}_.service + $pkgname.service + $pkgname.sysusers + $pkgname.tmpfiles +) +sha256sums=('6e9f6a5c47fcd8a763cfa26f1ca6eedf1e534992224a01d6c1ab8abb154af972' + 'SKIP' + 'a2495b4a4632f9ee6d5d40877eb9667aaa3f64e035dbd8ccfc029a3a2339f069' + '843913ee4cd77ca51ab1f1d21eb13650df3791db2b8526a9b0c9acf2d6b9c63f' + '06788ad9f5f7ccb5d2a2da6f0322ff5771f8de82cfbe8b9ad954f2c38265e21b' + '1ca593a91d537766d073e71cfab87881e6f6a2ccb5236a45531d5520b3af7a31') +b2sums=('f1e93285d040b98bede86bb2e87e372afc0d1d124e7a6580c23d8d228a34ee17001fc3c2d9091b16fb082fe2f2ad7ba50c0dd7b0db2b2237ab1cff9ca152100a' + 'SKIP' + '7589109b275c823b80002cbb273113d0e1b5635fc79859bbfc55c287d3d1ce9a539116e33f60d118f6251d7301b6376c40ff9346d5947b02f75cb9261c6488ef' + 'ceb051db7d43464992ffd804f95fb6c96ba6f450a0ec7a97d595f0700299916d1ebb049a1b97671e4b58f8829510bc44af2a36bfdccb79f9c34330162e6fdedb' + '1f4ad7d27a33ea9d317b95817898bc853bda8ef6bf1b09d86b7a5b25a0dae89c246fdb919c62b677d25148c8b4cf8c02e99cf3fa583c3a63bd04d1817bf47872' + 'fab9f56a694b2bcaa26ebd4040984778ea4a3cccd57f17a0eb724a9fc4750157d97d9d0db747932c3b386938fe2bf1d6a4ba609cc5cc3a6b0e1ae39404ba21be') validpgpkeys=('A785ED2755955D9E93EA59F6597F97EA9AD45549') # Roy Marples (NetBSD) <[email protected]> -sha256sums=('819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c' - 'd40d51367fcf7e9596e42cd2bab59404633bedbab4d0a3183e7246b4677937b7' - '37acd53a589711f5e1db2fcaebb4ccf1c90dc4bcd309626bde25beb7b630a545' - '20bccbf8a05b1bc2be365c8b4b526c38c752f48229ba53c3be113ac5b634f210' - '06788ad9f5f7ccb5d2a2da6f0322ff5771f8de82cfbe8b9ad954f2c38265e21b' - '55d57b958f6b7e4d4a538ee88b0fcc1a522050c2d38efb5d680139f618234b35') -# prepare () { -# cd ${pkgname}-${pkgver} -# } +prepare() { + printf "# Don't attempt to obtain an IPv4LL address if we failed to get one via DHCP. See RFC 3927.\nnoipv4ll\n" >> $pkgname-$pkgver/src/$pkgname.conf +} + build() { - cd ${pkgname}-${pkgver} + local configure_options=( + --dbdir=/var/lib/$pkgname + --libexecdir=/usr/lib/$pkgname + --prefix=/usr + --privsepuser=$pkgname + --runstatedir=/run + --sbindir=/usr/bin + --sysconfdir=/etc + ) - # configure variables - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/dhcpcd \ - --dbdir=/var/lib/dhcpcd \ - --runstatedir=/run \ - --privsepuser=dhcpcd - - # Build + cd $pkgname-$pkgver + ./configure "${configure_options[@]}" make } - check() { - cd ${pkgname}-${pkgver} - - make test + make test -C $pkgname-$pkgver } - package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install -C $pkgname-$pkgver + install -vDm 644 $pkgname-$pkgver/LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/" + install -Dm644 $pkgname.service -t "$pkgdir/usr/lib/systemd/system/" + install -Dm644 ${pkgname}_.service "$pkgdir/usr/lib/systemd/system/[email protected]" + install -Dm644 $pkgname.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" + install -Dm644 $pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" - # Install License - install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # Set Options in /etc/dhcpcd.conf - echo noipv4ll >> "${pkgdir}/etc/dhcpcd.conf" # Disable ip4vall - - # install systemd files - install -Dm644 "${srcdir}/dhcpcd_.service" "${pkgdir}/usr/lib/systemd/system/[email protected]" - install -Dm644 "${srcdir}/dhcpcd.service" "${pkgdir}/usr/lib/systemd/system/dhcpcd.service" # FS#31543 - install -Dm644 "${srcdir}/dhcpcd.sysusers" "${pkgdir}/usr/lib/sysusers.d/dhcpcd.conf" - install -Dm644 "${srcdir}/dhcpcd.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/dhcpcd.conf" + # strip files that somehow won't get stripped automatically + strip "$pkgdir/usr/bin/$pkgname" + strip "$pkgdir/usr/lib/$pkgname/dev/udev.so" } Deleted: dhcpcd.install =================================================================== --- dhcpcd.install 2023-05-04 19:18:41 UTC (rev 476745) +++ dhcpcd.install 2023-05-04 19:27:56 UTC (rev 476746) @@ -1,7 +0,0 @@ -pre_upgrade() { - if [ -d /var/lib/dhcpcd ]; then - # match permissions with upstream - chown root:root /var/lib/dhcpcd - chmod 0750 /var/lib/dhcpcd - fi -} Modified: dhcpcd.service =================================================================== --- dhcpcd.service 2023-05-04 19:18:41 UTC (rev 476745) +++ dhcpcd.service 2023-05-04 19:27:56 UTC (rev 476746) @@ -1,13 +1,10 @@ [Unit] -Description=dhcpcd on all interfaces +Description=DHCP/ IPv4LL/ IPv6RA/ DHCPv6 client on all interfaces Wants=network.target Before=network.target [Service] -Type=forking -PIDFile=/run/dhcpcd/pid -ExecStart=/usr/bin/dhcpcd -q -b -ExecStop=/usr/bin/dhcpcd -x +ExecStart=/usr/bin/dhcpcd -q -B [Install] WantedBy=multi-user.target Modified: dhcpcd.tmpfiles =================================================================== --- dhcpcd.tmpfiles 2023-05-04 19:18:41 UTC (rev 476745) +++ dhcpcd.tmpfiles 2023-05-04 19:27:56 UTC (rev 476746) @@ -1 +1,2 @@ d /run/dhcpcd 0755 root root - +z /var/lib/dhcpcd 0750 root root - Modified: dhcpcd_.service =================================================================== --- dhcpcd_.service 2023-05-04 19:18:41 UTC (rev 476745) +++ dhcpcd_.service 2023-05-04 19:27:56 UTC (rev 476746) @@ -1,5 +1,5 @@ [Unit] -Description=dhcpcd on %I +Description=DHCP/ IPv4LL/ IPv6RA/ DHCPv6 client on %I Wants=network.target Before=network.target BindsTo=sys-subsystem-net-devices-%i.device
