diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-29 11:24:07 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-29 11:24:07 -0300 |
| commit | 38bae167f23bd509b81394975c012b8abb1693d7 (patch) | |
| tree | 3b926bce43f03c0366d78ad6253cbdf9520235d4 /extra/dhcp | |
| parent | 2bcb8acb8b02bde03c5d285baafe754760788265 (diff) | |
| parent | 498a4346616c33beac56d48a246cf27fe3812341 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/espeak/PKGBUILD
community/gmic/PKGBUILD
extra/dhcp/PKGBUILD
extra/hspell/PKGBUILD
extra/libatasmart/PKGBUILD
extra/udisks/PKGBUILD
extra/xorg-server/PKGBUILD
testing/libdrm/PKGBUILD
testing/libdrm/no-pthread-stubs.patch
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/dhcp')
| -rw-r--r-- | extra/dhcp/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/dhcp/dhcpd4.service | 13 | ||||
| -rw-r--r-- | extra/dhcp/dhcpd6.service | 13 |
3 files changed, 36 insertions, 3 deletions
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD index fd75d1ea0..7ab36a123 100644 --- a/extra/dhcp/PKGBUILD +++ b/extra/dhcp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164333 2012-07-30 21:34:04Z eric $ +# $Id: PKGBUILD 165619 2012-08-27 12:24:33Z heftig $ # Maintainer: Daniel Isenmann <daniel @archlinux.org> pkgbase=dhcp @@ -8,13 +8,13 @@ pkgname=('dhcp' 'dhclient') pkgver=4.2.4.1 _pkgver=4.2.4-P1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom:isc-dhcp') url="https://www.isc.org/software/dhcp" makedepends=('bash' 'iproute2' 'net-tools') source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc} - dhcp4 dhcp6 dhcp + dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service dhcp-4.1.1-missing-ipv6-not-fatal.patch dhclient-script-pathFixes.patch) md5sums=('0ca7181024651f6323951d5498c8020b' @@ -22,6 +22,8 @@ md5sums=('0ca7181024651f6323951d5498c8020b' 'c49b1497837ba56c54e401a66e1bab9b' '12c2f3ae47ed23eb698eb7f1bfd80f20' '8f357e46e1efcbb746f38737a3f977a2' + '1076444f22e13eb5f6bff7821fd0f446' + '9310f2d8b1d7e97ace06d68cb41d9998' 'fd64aeb4f399dcc41ea43089a3811094' '541b415a25a169eaf64b681405f79a80') @@ -59,6 +61,11 @@ package_dhcp(){ install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}" install -d "${pkgdir}/var/state/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" + ln -s dhcpd4.service "${pkgdir}/usr/lib/systemd/system/dhcp4.service" + ln -s dhcpd6.service "${pkgdir}/usr/lib/systemd/system/dhcp6.service" + # Remove dhclient make -C client DESTDIR="${pkgdir}" uninstall diff --git a/extra/dhcp/dhcpd4.service b/extra/dhcp/dhcpd4.service new file mode 100644 index 000000000..2ef4a9f26 --- /dev/null +++ b/extra/dhcp/dhcpd4.service @@ -0,0 +1,13 @@ +[Unit] +Description=IPv4 DHCP server +After=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpd4.pid +ExecStart=/usr/sbin/dhcpd -4 -q -pf /run/dhcpd4.pid +ExecReload=/bin/kill -TERM $MAINPID +KillSignal=SIGINT + +[Install] +WantedBy=multi-user.target diff --git a/extra/dhcp/dhcpd6.service b/extra/dhcp/dhcpd6.service new file mode 100644 index 000000000..eb3b337c6 --- /dev/null +++ b/extra/dhcp/dhcpd6.service @@ -0,0 +1,13 @@ +[Unit] +Description=IPv6 DHCP server +After=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpd6.pid +ExecStart=/usr/sbin/dhcpd -6 -q -pf /run/dhcpd6.pid +ExecReload=/bin/kill -TERM $MAINPID +KillSignal=SIGINT + +[Install] +WantedBy=multi-user.target |