diff options
Diffstat (limited to 'extra/dhcp/PKGBUILD')
| -rw-r--r-- | extra/dhcp/PKGBUILD | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD index 849c303cb..13140a531 100644 --- a/extra/dhcp/PKGBUILD +++ b/extra/dhcp/PKGBUILD @@ -1,31 +1,30 @@ -# $Id: PKGBUILD 170145 2012-11-03 17:35:36Z heftig $ +# $Id: PKGBUILD 180410 2013-03-21 12:04:16Z jgc $ # Maintainer: Daniel Isenmann <daniel @archlinux.org> pkgbase=dhcp pkgname=('dhcp' 'dhclient') # separate patch levels with a period to maintain proper versioning. -pkgver=4.2.4.2 -_pkgver=4.2.4-P2 - +pkgver=4.2.5 +_pkgver=4.2.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom:isc-dhcp') url="https://www.isc.org/software/dhcp" -makedepends=('bash' 'iproute2' 'net-tools') +makedepends=('bash' 'iproute2') source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc} dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service - dhcp-4.1.1-missing-ipv6-not-fatal.patch - dhclient-script-pathFixes.patch) -md5sums=('fe36056f2d274fa4b82a5422f192e65f' - '1f20126efd33c34d52a4148db780921f' + dhcp-4.2.5-client_script-1.patch + dhcp-4.2.5-missing_ipv6-1.patch) +md5sums=('6489e919ac093d17249270ee9be1020e' + '022bc7038b3061cfb31da4736e7ab8a8' 'c49b1497837ba56c54e401a66e1bab9b' '12c2f3ae47ed23eb698eb7f1bfd80f20' '8f357e46e1efcbb746f38737a3f977a2' '439ee2f145a1e86dd644cb94a854f8e7' '588aa85b6fe228c45623185a58d11992' - 'fd64aeb4f399dcc41ea43089a3811094' - '541b415a25a169eaf64b681405f79a80') + '9e4dcf90beec15bfcb6631809cdcc780' + 'da655f02f1cf4d95b4708e84e69edbc8') build() { cd "${srcdir}/${pkgbase}-${_pkgver}" @@ -34,7 +33,9 @@ build() { sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure # Make not having ipv6 non-fatal. - patch -Np0 -i "${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch" + patch -Np1 -i ../dhcp-4.2.5-missing_ipv6-1.patch + # Make dhcp client script suck less. + patch -Np1 -i ../dhcp-4.2.5-client_script-1.patch ./configure --prefix=/usr --sysconfdir=/etc \ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ @@ -43,13 +44,10 @@ build() { --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases make - - patch -i "${srcdir}/dhclient-script-pathFixes.patch" client/scripts/linux } package_dhcp(){ pkgdesc="A DHCP server, client, and relay agent" - depends=('openssl>=0.9.8a') backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp') install=dhcp.install @@ -64,6 +62,9 @@ package_dhcp(){ 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 back to config. This file is in backup array, so pacman will not overwrite a changed config. + mv "${pkgdir}/etc/dhcpd.conf.example" "${pkgdir}/etc/dhcpd.conf" + # Remove dhclient make -C client DESTDIR="${pkgdir}" uninstall @@ -73,13 +74,14 @@ package_dhcp(){ package_dhclient(){ pkgdesc="A standalone DHCP client from the dhcp package" - depends=('bash' 'iproute2' 'net-tools') + depends=('bash' 'iproute2') + provides=('dhcp-client') cd "${srcdir}/${pkgbase}-${_pkgver}" make -C client DESTDIR="${pkgdir}" install - # move dhclient.conf to dhclient.conf.example - mv "${pkgdir}"/etc/dhclient.conf{,.example} + install -m755 -d "${pkgdir}/usr/share/dhclient" + mv "${pkgdir}/etc/dhclient.conf.example" "${pkgdir}/usr/share/dhclient/" install -d "${pkgdir}/var/lib/dhclient" |