[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2020-02-22 Thread Christian Hesse via arch-commits
Date: Saturday, February 22, 2020 @ 19:40:09
  Author: eworm
Revision: 376054

upgpkg: dhcp 4.4.2-2

make dhclient depend on run-parts (FS#63753)

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-22 18:18:24 UTC (rev 376053)
+++ PKGBUILD2020-02-22 19:40:09 UTC (rev 376054)
@@ -6,7 +6,7 @@
 
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.4.2
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('custom:isc-dhcp')
 url='https://www.isc.org/dhcp/'
@@ -81,7 +81,7 @@
 
 package_dhclient(){
   pkgdesc="A standalone DHCP client from the dhcp package"
-  depends=('glibc' 'bash' 'iproute2')
+  depends=('glibc' 'bash' 'iproute2' 'run-parts')
   provides=('dhcp-client')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2020-01-23 Thread Christian Hesse via arch-commits
Date: Thursday, January 23, 2020 @ 10:36:29
  Author: eworm
Revision: 373823

upgpkg: dhcp 4.4.2-1

new upstream release

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-23 10:03:46 UTC (rev 373822)
+++ PKGBUILD2020-01-23 10:36:29 UTC (rev 373823)
@@ -5,14 +5,14 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.4.1
-pkgrel=5
+pkgver=4.4.2
+pkgrel=1
 arch=('x86_64')
 license=('custom:isc-dhcp')
 url='https://www.isc.org/dhcp/'
 makedepends=('bash' 'iproute2' 'openldap')
-validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57') # Internet Systems 
Consortium, Inc. (Signing key, 2017-2018) 
-source=("ftp://ftp.isc.org/isc/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz"{,.asc}
+validpgpkeys=('AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38') # Internet Systems 
Consortium, Inc. (Signing key, 2019-2020) 
+source=("https://downloads.isc.org/isc/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz"{,.asc}
 'dhcp-sysusers.conf'
 'dhcp-tmpfiles.conf'
 'dhcpd4.service'
@@ -19,7 +19,7 @@
 'dhcpd6.service'
 'dhclient@.service'
 '0002-iproute2.patch')
-sha256sums=('2a22508922ab367b4af4664a0472dc220cc9603482cf3c16d9aff14f3a76b608'
+sha256sums=('1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521'
 'SKIP'
 'b16083e6bb572ffacaa7cd97e7fde5fcfa1b6dbeb166f162e2ec6e8ec4b928d6'
 'abcd30e9e8428e34d22ab4d3074ef4bd84c2b11f5868597111b47d6f56d204da'


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2020-01-10 Thread Christian Hesse via arch-commits
Date: Friday, January 10, 2020 @ 22:20:32
  Author: eworm
Revision: 373149

update url

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-10 21:39:18 UTC (rev 373148)
+++ PKGBUILD2020-01-10 22:20:32 UTC (rev 373149)
@@ -9,7 +9,7 @@
 pkgrel=5
 arch=('x86_64')
 license=('custom:isc-dhcp')
-url="https://www.isc.org/software/dhcp;
+url='https://www.isc.org/dhcp/'
 makedepends=('bash' 'iproute2' 'openldap')
 validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57') # Internet Systems 
Consortium, Inc. (Signing key, 2017-2018) 
 
source=("ftp://ftp.isc.org/isc/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz"{,.asc}


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2020-01-10 Thread Christian Hesse via arch-commits
Date: Friday, January 10, 2020 @ 21:39:13
  Author: eworm
Revision: 373147

upgpkg: dhcp 4.4.1-5

rebuild old package

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-10 20:20:54 UTC (rev 373146)
+++ PKGBUILD2020-01-10 21:39:13 UTC (rev 373147)
@@ -6,7 +6,7 @@
 
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.4.1
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp;


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2018-03-09 Thread Christian Hesse via arch-commits
Date: Friday, March 9, 2018 @ 09:05:05
  Author: eworm
Revision: 318298

upgpkg: dhcp 4.4.1-3

enable ldap support (FS#47821)

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-09 08:45:30 UTC (rev 318297)
+++ PKGBUILD2018-03-09 09:05:05 UTC (rev 318298)
@@ -7,11 +7,11 @@
 
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.4.1
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp;
-makedepends=('bash' 'iproute2')
+makedepends=('bash' 'iproute2' 'openldap')
 validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57') # Internet Systems 
Consortium, Inc. (Signing key, 2017-2018) 
 
source=("ftp://ftp.isc.org/isc/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz"{,.asc}
 'dhcp-sysusers.conf'
@@ -36,16 +36,19 @@
 
 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 \
-  --enable-binary-leases
+  --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases
 
   make -j1
 }
@@ -52,11 +55,12 @@
 
 package_dhcp(){
   pkgdesc="A DHCP server, client, and relay agent"
-  depends=('glibc')
+  depends=('glibc' 'libldap')
   backup=('etc/dhcpd.conf' 'etc/dhcpd6.conf')
   install=dhcp.install
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
 
   install -d "${pkgdir}/var/lib/dhcp"
@@ -82,6 +86,7 @@
   provides=('dhcp-client')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
+
   make -C client DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/dhclient"


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2018-03-05 Thread Christian Hesse via arch-commits
Date: Tuesday, March 6, 2018 @ 06:53:02
  Author: eworm
Revision: 317860

upgpkg: dhcp 4.4.1-2

fix IPv6 configuration (FS#49578)

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-06 05:15:49 UTC (rev 317859)
+++ PKGBUILD2018-03-06 06:53:02 UTC (rev 317860)
@@ -7,7 +7,7 @@
 
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.4.1
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp;
@@ -65,9 +65,9 @@
   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.
+  # move and install config files in place
   mv "${pkgdir}/etc/dhcpd.conf.example" "${pkgdir}/etc/dhcpd.conf"
-  cp "${pkgdir}/etc/dhcpd.conf" "${pkgdir}/etc/dhcpd6.conf"
+  install -D -m644 doc/examples/dhcpd-dhcpv6.conf "${pkgdir}/etc/dhcpd6.conf"
 
   # Remove dhclient
   make -C client DESTDIR="${pkgdir}" uninstall


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2018-03-01 Thread Christian Hesse via arch-commits
Date: Thursday, March 1, 2018 @ 11:21:11
  Author: eworm
Revision: 317673

upgpkg: dhcp 4.4.1-1

new upstream release, fixing CVE-2018-5732 and CVE-2018-5733

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-01 09:15:48 UTC (rev 317672)
+++ PKGBUILD2018-03-01 11:21:11 UTC (rev 317673)
@@ -6,7 +6,7 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.4.0
+pkgver=4.4.1
 pkgrel=1
 arch=('x86_64')
 license=('custom:isc-dhcp')
@@ -19,7 +19,7 @@
 'dhcpd6.service'
 'dhclient@.service'
 '0002-iproute2.patch')
-sha256sums=('4a90be0f22ad81c987f5584661b60a594f1b21c581b82bfba3ae60f89ae44397'
+sha256sums=('2a22508922ab367b4af4664a0472dc220cc9603482cf3c16d9aff14f3a76b608'
 'SKIP'
 'b16083e6bb572ffacaa7cd97e7fde5fcfa1b6dbeb166f162e2ec6e8ec4b928d6'
 '537b52307e2196775d79b7e7087fa7499189e26bc9a1737c9b75acd45a720920'


[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcpd4.service dhcpd6.service)

2017-11-16 Thread Christian Hesse
Date: Thursday, November 16, 2017 @ 11:36:40
  Author: eworm
Revision: 310046

upgpkg: dhcp 4.3.6-3

try to work around racy issue with network setup

Modified:
  dhcp/trunk/PKGBUILD
  dhcp/trunk/dhcpd4.service
  dhcp/trunk/dhcpd6.service

+
 PKGBUILD   |   17 -
 dhcpd4.service |7 +++
 dhcpd6.service |7 +++
 3 files changed, 22 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-16 09:18:02 UTC (rev 310045)
+++ PKGBUILD2017-11-16 11:36:40 UTC (rev 310046)
@@ -7,14 +7,13 @@
 
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.3.6
-_pkgver=4.3.6
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp;
 makedepends=('bash' 'iproute2')
 validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57') # Internet Systems 
Consortium, Inc. (Signing key, 2017-2018) 
-source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
+source=(ftp://ftp.isc.org/isc/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz{,.asc}
 dhcp-sysusers.conf
 dhcpd4.service
 dhcpd6.service
@@ -23,13 +22,13 @@
 sha256sums=('a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b'
 'SKIP'
 'b16083e6bb572ffacaa7cd97e7fde5fcfa1b6dbeb166f162e2ec6e8ec4b928d6'
-'59164167861fe3eb5cef3582bc694e4b1e4d4ca96709103351b83e69ae05f8c8'
-'7a67175680ae509e5bae406f80b692a02aec3c647386a5519b1de00e7eea1218'
+'537b52307e2196775d79b7e7087fa7499189e26bc9a1737c9b75acd45a720920'
+'9a2a9bdf25871dfe875ed39d92a4d97852f9ad6c38fa74bd16cbc18e85986d3f'
 '259d004987b4759e0c9e1a8807a5baa3df74f1e0c57b058a9e1bc92ea41fcb6a'
 '97088096c5d880ecd889f4875ba89cf8eaf564bec772038e8976c22bd4896b18')
 
 prepare() {
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   # Sourced from Fedora - required for NM
   # https://bugzilla.gnome.org/show_bug.cgi?id=748268
@@ -37,7 +36,7 @@
 }
 
 build() {
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   ./configure \
   --prefix=/usr \
   --sbindir=/usr/bin \
@@ -58,7 +57,7 @@
   backup=('etc/dhcpd.conf' 'etc/dhcpd6.conf')
   install=dhcp.install
 
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -d "${pkgdir}/var/lib/dhcp"
@@ -83,7 +82,7 @@
   depends=('glibc' 'bash' 'iproute2')
   provides=('dhcp-client')
 
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C client DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/dhclient"

Modified: dhcpd4.service
===
--- dhcpd4.service  2017-11-16 09:18:02 UTC (rev 310045)
+++ dhcpd4.service  2017-11-16 11:36:40 UTC (rev 310046)
@@ -10,6 +10,13 @@
 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

Modified: dhcpd6.service
===
--- dhcpd6.service  2017-11-16 09:18:02 UTC (rev 310045)
+++ dhcpd6.service  2017-11-16 11:36:40 UTC (rev 310046)
@@ -10,6 +10,13 @@
 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


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2017-07-12 Thread Antonio Rojas
Date: Wednesday, July 12, 2017 @ 17:26:08
  Author: arojas
Revision: 300163

PIE rebuild

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-12 17:21:31 UTC (rev 300162)
+++ PKGBUILD2017-07-12 17:26:08 UTC (rev 300163)
@@ -8,7 +8,7 @@
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.3.5
 _pkgver=4.3.5
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp;


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2016-10-09 Thread Felix Yan
Date: Monday, October 10, 2016 @ 00:50:42
  Author: felixonmars
Revision: 278135

upgpkg: dhcp 4.3.5-1

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-09 21:52:28 UTC (rev 278134)
+++ PKGBUILD2016-10-10 00:50:42 UTC (rev 278135)
@@ -6,9 +6,9 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.3.4
-_pkgver=4.3.4
-pkgrel=2
+pkgver=4.3.5
+_pkgver=4.3.5
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp;
@@ -21,7 +21,7 @@
 dhcp-4.3.1-missing_ipv6-1.patch
 arch_patch_over_lfs.patch
 dhcp-honor-expired.patch)
-md5sums=('0138319fe2b788cf4bdf34fbeaf9ff54'
+md5sums=('2b5e5b2fa31c2e27e487039d86f83d3f'
  'SKIP'
  '33cceed7056fdceda845eef26934f30f'
  '4db26ed8335b908ef8cdee55172a84ed'


[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcp-honor-expired.patch)

2016-04-24 Thread Jan Steffens
Date: Sunday, April 24, 2016 @ 15:36:32
  Author: heftig
Revision: 266110

4.3.4-2

Added:
  dhcp/trunk/dhcp-honor-expired.patch
Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |   15 ++---
 dhcp-honor-expired.patch |   49 +
 2 files changed, 60 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-24 11:39:25 UTC (rev 266109)
+++ PKGBUILD2016-04-24 13:36:32 UTC (rev 266110)
@@ -8,7 +8,7 @@
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.3.4
 _pkgver=4.3.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp;
@@ -19,7 +19,8 @@
 dhclient@.service
 dhcp-4.3.1-client_script-1.patch
 dhcp-4.3.1-missing_ipv6-1.patch
-arch_patch_over_lfs.patch)
+arch_patch_over_lfs.patch
+dhcp-honor-expired.patch)
 md5sums=('0138319fe2b788cf4bdf34fbeaf9ff54'
  'SKIP'
  '33cceed7056fdceda845eef26934f30f'
@@ -27,7 +28,8 @@
  '06aa2ae46f05fdc784275e6ae54a8f7f'
  'c02bddb6c6c33c5885e3dd072ee2ee40'
  'da655f02f1cf4d95b4708e84e69edbc8'
- 'ea45057374098b8ff7e140ecedf7696a')
+ 'ea45057374098b8ff7e140ecedf7696a'
+ '10a2332307ad8ccc8993a18ffd7165cb')
 validpgpkeys=('ADBE9446286C794905F1E0756FA6EBC9911A4C02') # Internet Systems 
Consortium, Inc. 
 
 prepare() {
@@ -44,6 +46,10 @@
 
   # Apply Arch-specific patches over LSF changes
   patch -Np1 -i ../arch_patch_over_lfs.patch
+
+  # Sourced from Fedora - required for NM
+  # https://bugzilla.gnome.org/show_bug.cgi?id=748268
+  patch -Np1 -i ../dhcp-honor-expired.patch
 }
 
 build() {
@@ -52,7 +58,8 @@
   --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
+  --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases \
+  --enable-binary-leases
 
   make -j1
 }

Added: dhcp-honor-expired.patch
===
--- dhcp-honor-expired.patch(rev 0)
+++ dhcp-honor-expired.patch2016-04-24 13:36:32 UTC (rev 266110)
@@ -0,0 +1,49 @@
+diff -up dhcp-4.3.0a1/client/dhc6.c.honor-expired dhcp-4.3.0a1/client/dhc6.c
+--- dhcp-4.3.0a1/client/dhc6.c.honor-expired   2013-12-19 16:00:28.062183037 
+0100
 dhcp-4.3.0a1/client/dhc6.c 2013-12-19 16:00:28.076182842 +0100
+@@ -1351,6 +1351,32 @@ start_info_request6(struct client_state
+   go_daemon();
+ }
+ 
++/* Run through the addresses in lease and return true if there's any 
unexpired.
++ * Return false otherwise.
++ */
++isc_boolean_t
++unexpired_address_in_lease(struct dhc6_lease *lease)
++{
++  struct dhc6_ia *ia;
++  struct dhc6_addr *addr;
++
++  for (ia = lease->bindings ; ia != NULL ; ia = ia->next) {
++  for (addr = ia->addrs ; addr != NULL ; addr = addr->next) {
++  if (addr->flags & DHC6_ADDR_EXPIRED)
++  continue;
++
++  if (addr->starts + addr->max_life > cur_time) {
++  return ISC_TRUE;
++  }
++  }
++  }
++
++  log_info("PRC: Previous lease is devoid of active addresses."
++   "  Re-initializing.");
++
++  return ISC_FALSE;
++}
++
+ /*
+  * start_confirm6() kicks off an "init-reboot" version of the process, at
+  * startup to find out if old bindings are 'fair' and at runtime whenever
+@@ -1363,8 +1389,10 @@ start_confirm6(struct client_state *clie
+ 
+   /* If there is no active lease, there is nothing to check. */
+   if ((client->active_lease == NULL) ||
+-  !active_prefix(client) ||
+-  client->active_lease->released) {
++  !active_prefix(client) ||
++  client->active_lease->released ||
++  !unexpired_address_in_lease(client->active_lease)) {
++  dhc6_lease_destroy(>active_lease, MDL);
+   start_init6(client);
+   return;
+   }


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2016-03-30 Thread Felix Yan
Date: Wednesday, March 30, 2016 @ 18:14:43
  Author: fyan
Revision: 263343

upgpkg: dhcp 4.3.4-1

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-30 13:50:06 UTC (rev 263342)
+++ PKGBUILD2016-03-30 16:14:43 UTC (rev 263343)
@@ -6,8 +6,8 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.3.3.p1
-_pkgver=4.3.3-P1
+pkgver=4.3.4
+_pkgver=4.3.4
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
@@ -20,7 +20,7 @@
 dhcp-4.3.1-client_script-1.patch
 dhcp-4.3.1-missing_ipv6-1.patch
 arch_patch_over_lfs.patch)
-md5sums=('60f330a69566c52d841ddaab9d7a2662'
+md5sums=('0138319fe2b788cf4bdf34fbeaf9ff54'
  'SKIP'
  '33cceed7056fdceda845eef26934f30f'
  '4db26ed8335b908ef8cdee55172a84ed'


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2016-01-21 Thread Felix Yan
Date: Friday, January 22, 2016 @ 08:07:36
  Author: fyan
Revision: 258502

upgpkg: dhcp 4.3.3.p1-1

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-22 06:46:28 UTC (rev 258501)
+++ PKGBUILD2016-01-22 07:07:36 UTC (rev 258502)
@@ -6,9 +6,9 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.3.3
-_pkgver=4.3.3
-pkgrel=2
+pkgver=4.3.3.p1
+_pkgver=4.3.3-P1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp;
@@ -20,7 +20,7 @@
 dhcp-4.3.1-client_script-1.patch
 dhcp-4.3.1-missing_ipv6-1.patch
 arch_patch_over_lfs.patch)
-md5sums=('c5577b09c9017cdd319a11ff6364268e'
+md5sums=('60f330a69566c52d841ddaab9d7a2662'
  'SKIP'
  '33cceed7056fdceda845eef26934f30f'
  '4db26ed8335b908ef8cdee55172a84ed'


[arch-commits] Commit in dhcp/trunk (PKGBUILD dhclient@.service)

2015-09-11 Thread Felix Yan
Date: Friday, September 11, 2015 @ 08:52:08
  Author: fyan
Revision: 245761

upgpkg: dhcp 4.3.3-2

include a systemd unit for dhclient (FS#38420)

Added:
  dhcp/trunk/dhclient@.service
Modified:
  dhcp/trunk/PKGBUILD

---+
 PKGBUILD  |7 ++-
 dhclient@.service |   10 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-11 06:32:34 UTC (rev 245760)
+++ PKGBUILD2015-09-11 06:52:08 UTC (rev 245761)
@@ -8,7 +8,7 @@
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.3.3
 _pkgver=4.3.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp;
@@ -16,6 +16,7 @@
 
source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
 dhcpd4.service
 dhcpd6.service
+dhclient@.service
 dhcp-4.3.1-client_script-1.patch
 dhcp-4.3.1-missing_ipv6-1.patch
 arch_patch_over_lfs.patch)
@@ -23,6 +24,7 @@
  'SKIP'
  '33cceed7056fdceda845eef26934f30f'
  '4db26ed8335b908ef8cdee55172a84ed'
+ '06aa2ae46f05fdc784275e6ae54a8f7f'
  'c02bddb6c6c33c5885e3dd072ee2ee40'
  'da655f02f1cf4d95b4708e84e69edbc8'
  'ea45057374098b8ff7e140ecedf7696a')
@@ -98,4 +100,7 @@
 
   # install license
   install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhclient/LICENSE"
+
+  # install systemd service unit
+  install -m644 -D "$srcdir/dhclient@.service" 
"${pkgdir}/usr/lib/systemd/system/dhclient@.service"
 }

Added: dhclient@.service
===
--- dhclient@.service   (rev 0)
+++ dhclient@.service   2015-09-11 06:52:08 UTC (rev 245761)
@@ -0,0 +1,10 @@
+[Unit]
+Description=dhclient on %I
+Wants=network.target
+Before=network.target
+
+[Service]
+ExecStart=/usr/bin/dhclient -d %I
+
+[Install]
+WantedBy=multi-user.target


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2015-09-10 Thread Felix Yan
Date: Thursday, September 10, 2015 @ 09:07:18
  Author: fyan
Revision: 245695

upgpkg: dhcp 4.3.3-1

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-10 06:50:06 UTC (rev 245694)
+++ PKGBUILD2015-09-10 07:07:18 UTC (rev 245695)
@@ -1,13 +1,14 @@
 # $Id$
-# Maintainer: Daniel Isenmann 
+# Maintainer: Felix Yan 
+# Contributor: Daniel Isenmann 
 
 pkgbase=dhcp
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.3.2
-_pkgver=4.3.2
-pkgrel=2
+pkgver=4.3.3
+_pkgver=4.3.3
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp;
@@ -18,7 +19,7 @@
 dhcp-4.3.1-client_script-1.patch
 dhcp-4.3.1-missing_ipv6-1.patch
 arch_patch_over_lfs.patch)
-md5sums=('5a284875dd2c12ddd388416d69156a67'
+md5sums=('c5577b09c9017cdd319a11ff6364268e'
  '33cceed7056fdceda845eef26934f30f'
  '4db26ed8335b908ef8cdee55172a84ed'
  'c02bddb6c6c33c5885e3dd072ee2ee40'
@@ -49,7 +50,7 @@
   --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
   --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases
 
-  make
+  make -j1
 }
 
 package_dhcp(){


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2015-09-10 Thread Anatol Pomozov
Date: Thursday, September 10, 2015 @ 18:45:18
  Author: anatolik
Revision: 245744

Add gpg key validation back

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-10 16:05:05 UTC (rev 245743)
+++ PKGBUILD2015-09-10 16:45:18 UTC (rev 245744)
@@ -13,7 +13,7 @@
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp;
 makedepends=('bash' 'iproute2')
-source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz
+source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
 dhcpd4.service
 dhcpd6.service
 dhcp-4.3.1-client_script-1.patch
@@ -20,11 +20,13 @@
 dhcp-4.3.1-missing_ipv6-1.patch
 arch_patch_over_lfs.patch)
 md5sums=('c5577b09c9017cdd319a11ff6364268e'
+ 'SKIP'
  '33cceed7056fdceda845eef26934f30f'
  '4db26ed8335b908ef8cdee55172a84ed'
  'c02bddb6c6c33c5885e3dd072ee2ee40'
  'da655f02f1cf4d95b4708e84e69edbc8'
  'ea45057374098b8ff7e140ecedf7696a')
+validpgpkeys=('ADBE9446286C794905F1E0756FA6EBC9911A4C02') # Internet Systems 
Consortium, Inc. 
 
 prepare() {
   cd "${srcdir}/${pkgbase}-${_pkgver}"


[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcpd4.service dhcpd6.service)

2015-07-13 Thread Daniel Isenmann
Date: Monday, July 13, 2015 @ 23:15:26
  Author: daniel
Revision: 242178

upgpkg: dhcp 4.3.2-2

Fixed FS#23933 and FS#43405

Modified:
  dhcp/trunk/PKGBUILD
  dhcp/trunk/dhcpd4.service
  dhcp/trunk/dhcpd6.service

+
 PKGBUILD   |   13 ++---
 dhcpd4.service |2 +-
 dhcpd6.service |2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-13 20:24:23 UTC (rev 242177)
+++ PKGBUILD2015-07-13 21:15:26 UTC (rev 242178)
@@ -7,12 +7,12 @@
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.3.2
 _pkgver=4.3.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url=https://www.isc.org/software/dhcp;
 makedepends=('bash' 'iproute2')
-source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
+source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz
 dhcpd4.service
 dhcpd6.service
 dhcp-4.3.1-client_script-1.patch
@@ -19,13 +19,11 @@
 dhcp-4.3.1-missing_ipv6-1.patch
 arch_patch_over_lfs.patch)
 md5sums=('5a284875dd2c12ddd388416d69156a67'
- 'SKIP'
- '22579cc6ce2b71383f817b0564c44c4d'
- 'a03765a91fda3f139229dd82ea372f8f'
+ '33cceed7056fdceda845eef26934f30f'
+ '4db26ed8335b908ef8cdee55172a84ed'
  'c02bddb6c6c33c5885e3dd072ee2ee40'
  'da655f02f1cf4d95b4708e84e69edbc8'
  'ea45057374098b8ff7e140ecedf7696a')
-validpgpkeys=('ADBE9446286C794905F1E0756FA6EBC9911A4C02')
 
 prepare() {
   cd ${srcdir}/${pkgbase}-${_pkgver}
@@ -57,7 +55,7 @@
 package_dhcp(){
   pkgdesc=A DHCP server, client, and relay agent
   depends=('glibc')
-  backup=('etc/dhcpd.conf')
+  backup=('etc/dhcpd.conf' 'etc/dhcpd6.conf')
   install=dhcp.install
 
   cd ${srcdir}/${pkgbase}-${_pkgver}
@@ -70,6 +68,7 @@
 
   # 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
+  cp ${pkgdir}/etc/dhcpd.conf ${pkgdir}/etc/dhcpd6.conf
 
   # Remove dhclient
   make -C client DESTDIR=${pkgdir} uninstall

Modified: dhcpd4.service
===
--- dhcpd4.service  2015-07-13 20:24:23 UTC (rev 242177)
+++ dhcpd4.service  2015-07-13 21:15:26 UTC (rev 242178)
@@ -5,7 +5,7 @@
 [Service]
 Type=forking
 PIDFile=/run/dhcpd4.pid
-ExecStart=/usr/bin/dhcpd -4 -q -pf /run/dhcpd4.pid
+ExecStart=/usr/bin/dhcpd -4 -q -cf /etc/dhcpd.conf -pf /run/dhcpd4.pid
 KillSignal=SIGINT
 
 [Install]

Modified: dhcpd6.service
===
--- dhcpd6.service  2015-07-13 20:24:23 UTC (rev 242177)
+++ dhcpd6.service  2015-07-13 21:15:26 UTC (rev 242178)
@@ -5,7 +5,7 @@
 [Service]
 Type=forking
 PIDFile=/run/dhcpd6.pid
-ExecStart=/usr/bin/dhcpd -6 -q -pf /run/dhcpd6.pid
+ExecStart=/usr/bin/dhcpd -6 -q -cf /etc/dhcpd6.conf -pf /run/dhcpd6.pid
 KillSignal=SIGINT
 
 [Install]


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2015-03-23 Thread Anatol Pomozov
Date: Monday, March 23, 2015 @ 22:08:00
  Author: anatolik
Revision: 234587

upgpkg: dhcp 4.3.2-1

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-23 21:04:40 UTC (rev 234586)
+++ PKGBUILD2015-03-23 21:08:00 UTC (rev 234587)
@@ -5,8 +5,8 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.3.1
-_pkgver=4.3.1
+pkgver=4.3.2
+_pkgver=4.3.2
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
@@ -18,7 +18,7 @@
 dhcp-4.3.1-client_script-1.patch
 dhcp-4.3.1-missing_ipv6-1.patch
 arch_patch_over_lfs.patch)
-md5sums=('b3a42ece3c7f2cd2e74a3e12ca881d20'
+md5sums=('5a284875dd2c12ddd388416d69156a67'
  'SKIP'
  '22579cc6ce2b71383f817b0564c44c4d'
  'a03765a91fda3f139229dd82ea372f8f'
@@ -25,8 +25,8 @@
  'c02bddb6c6c33c5885e3dd072ee2ee40'
  'da655f02f1cf4d95b4708e84e69edbc8'
  'ea45057374098b8ff7e140ecedf7696a')
+validpgpkeys=('ADBE9446286C794905F1E0756FA6EBC9911A4C02')
 
-
 prepare() {
   cd ${srcdir}/${pkgbase}-${_pkgver}
 


[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2014-03-04 Thread Anatol Pomozov
Date: Tuesday, March 4, 2014 @ 21:53:49
  Author: anatolik
Revision: 206680

upgpkg: dhcp 4.3.0-1

dhcp: bump to 4.3.0

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-04 18:38:55 UTC (rev 206679)
+++ PKGBUILD2014-03-04 20:53:49 UTC (rev 206680)
@@ -5,19 +5,20 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.5.p1
-_pkgver=4.2.5-P1
-pkgrel=3
+pkgver=4.3.0
+_pkgver=4.3.0
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url=https://www.isc.org/software/dhcp;
 makedepends=('bash' 'iproute2')
+# The patches come from LFS
 
source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
 dhcpd4.service
 dhcpd6.service
 dhcp-4.2.5-client_script-1.patch
 dhcp-4.2.5-missing_ipv6-1.patch)
-md5sums=('f68e3c1f00a9af5742bc5e71d567cf93'
+md5sums=('1020d77e1a4c1f01b76279caff9beb80'
  'SKIP'
  '439ee2f145a1e86dd644cb94a854f8e7'
  '588aa85b6fe228c45623185a58d11992'
@@ -50,6 +51,7 @@
 
 package_dhcp(){
   pkgdesc=A DHCP server, client, and relay agent
+  depends=('glibc')
   backup=('etc/dhcpd.conf')
   install=dhcp.install
 
@@ -73,7 +75,7 @@
 
 package_dhclient(){
   pkgdesc=A standalone DHCP client from the dhcp package
-  depends=('bash' 'iproute2')
+  depends=('glibc' 'bash' 'iproute2')
   provides=('dhcp-client')
 
   cd ${srcdir}/${pkgbase}-${_pkgver}



[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcpd4.service dhcpd6.service)

2014-03-04 Thread Anatol Pomozov
Date: Tuesday, March 4, 2014 @ 22:05:32
  Author: anatolik
Revision: 206682

Use /usr/bin path instead of /usr/sbin/

Modified:
  dhcp/trunk/PKGBUILD
  dhcp/trunk/dhcpd4.service
  dhcp/trunk/dhcpd6.service

+
 PKGBUILD   |4 ++--
 dhcpd4.service |2 +-
 dhcpd6.service |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-04 20:54:54 UTC (rev 206681)
+++ PKGBUILD2014-03-04 21:05:32 UTC (rev 206682)
@@ -20,8 +20,8 @@
 dhcp-4.2.5-missing_ipv6-1.patch)
 md5sums=('1020d77e1a4c1f01b76279caff9beb80'
  'SKIP'
- '439ee2f145a1e86dd644cb94a854f8e7'
- '588aa85b6fe228c45623185a58d11992'
+ '22579cc6ce2b71383f817b0564c44c4d'
+ 'a03765a91fda3f139229dd82ea372f8f'
  '9e4dcf90beec15bfcb6631809cdcc780'
  'da655f02f1cf4d95b4708e84e69edbc8')
 

Modified: dhcpd4.service
===
--- dhcpd4.service  2014-03-04 20:54:54 UTC (rev 206681)
+++ dhcpd4.service  2014-03-04 21:05:32 UTC (rev 206682)
@@ -5,7 +5,7 @@
 [Service]
 Type=forking
 PIDFile=/run/dhcpd4.pid
-ExecStart=/usr/sbin/dhcpd -4 -q -pf /run/dhcpd4.pid
+ExecStart=/usr/bin/dhcpd -4 -q -pf /run/dhcpd4.pid
 KillSignal=SIGINT
 
 [Install]

Modified: dhcpd6.service
===
--- dhcpd6.service  2014-03-04 20:54:54 UTC (rev 206681)
+++ dhcpd6.service  2014-03-04 21:05:32 UTC (rev 206682)
@@ -5,7 +5,7 @@
 [Service]
 Type=forking
 PIDFile=/run/dhcpd6.pid
-ExecStart=/usr/sbin/dhcpd -6 -q -pf /run/dhcpd6.pid
+ExecStart=/usr/bin/dhcpd -6 -q -pf /run/dhcpd6.pid
 KillSignal=SIGINT
 
 [Install]



[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2014-01-03 Thread Bartłomiej Piotrowski
Date: Friday, January 3, 2014 @ 10:19:16
  Author: bpiotrowski
Revision: 203065

upgpkg: dhcp 4.2.5.p1-3

remove static libraries

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-03 09:18:41 UTC (rev 203064)
+++ PKGBUILD2014-01-03 09:19:16 UTC (rev 203065)
@@ -7,7 +7,7 @@
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.2.5.p1
 _pkgver=4.2.5-P1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url=https://www.isc.org/software/dhcp;



[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcp dhcp.conf.d dhcp4 dhcp6 dhcpd)

2013-05-31 Thread Evangelos Foutras
Date: Friday, May 31, 2013 @ 15:50:17
  Author: foutrelis
Revision: 186878

upgpkg: dhcp 4.2.5.p1-2

Drop rc.d scripts.

Modified:
  dhcp/trunk/PKGBUILD
Deleted:
  dhcp/trunk/dhcp
  dhcp/trunk/dhcp.conf.d
  dhcp/trunk/dhcp4
  dhcp/trunk/dhcp6
  dhcp/trunk/dhcpd

-+
 PKGBUILD|   19 +++
 dhcp|   10 --
 dhcp.conf.d |6 --
 dhcp4   |   57 -
 dhcp6   |   57 -
 dhcpd   |   40 
 6 files changed, 7 insertions(+), 182 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-31 13:31:02 UTC (rev 186877)
+++ PKGBUILD2013-05-31 13:50:17 UTC (rev 186878)
@@ -7,20 +7,18 @@
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.2.5.p1
 _pkgver=4.2.5-P1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url=https://www.isc.org/software/dhcp;
 makedepends=('bash' 'iproute2')
 
source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
-dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
+dhcpd4.service
+dhcpd6.service
 dhcp-4.2.5-client_script-1.patch
 dhcp-4.2.5-missing_ipv6-1.patch)
 md5sums=('f68e3c1f00a9af5742bc5e71d567cf93'
  'SKIP'
- 'c49b1497837ba56c54e401a66e1bab9b'
- '12c2f3ae47ed23eb698eb7f1bfd80f20'
- '8f357e46e1efcbb746f38737a3f977a2'
  '439ee2f145a1e86dd644cb94a854f8e7'
  '588aa85b6fe228c45623185a58d11992'
  '9e4dcf90beec15bfcb6631809cdcc780'
@@ -52,15 +50,12 @@
 
 package_dhcp(){
   pkgdesc=A DHCP server, client, and relay agent
-  backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
+  backup=('etc/dhcpd.conf')
   install=dhcp.install
-  
+
   cd ${srcdir}/${pkgbase}-${_pkgver}
   make DESTDIR=${pkgdir} install
 
-  install -D -m755 ${srcdir}/dhcp4 ${pkgdir}/etc/rc.d/dhcp4
-  install -D -m755 ${srcdir}/dhcp6 ${pkgdir}/etc/rc.d/dhcp6
-  install -D -m644 ${srcdir}/dhcp ${pkgdir}/etc/conf.d/${pkgbase}
   install -d ${pkgdir}/var/lib/dhcp
 
   install -D -m644 ${srcdir}/dhcpd4.service 
${pkgdir}/usr/lib/systemd/system/dhcpd4.service
@@ -71,7 +66,7 @@
 
   # Remove dhclient
   make -C client DESTDIR=${pkgdir} uninstall
-  
+
   # install license
   install -m644 -D LICENSE ${pkgdir}/usr/share/licenses/dhcp/LICENSE
 }
@@ -86,7 +81,7 @@
 
   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

Deleted: dhcp
===
--- dhcp2013-05-31 13:31:02 UTC (rev 186877)
+++ dhcp2013-05-31 13:50:17 UTC (rev 186878)
@@ -1,10 +0,0 @@
-#
-# Arguments to be passed to the DHCP server daemon
-#
-
-# ipv4 runtime parameters
-DHCP4_ARGS=-q
-
-# ipv6 runtime parameters
-DHCP6_ARGS=-q
-

Deleted: dhcp.conf.d
===
--- dhcp.conf.d 2013-05-31 13:31:02 UTC (rev 186877)
+++ dhcp.conf.d 2013-05-31 13:50:17 UTC (rev 186878)
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to the DHCP server daemon
-#
-
-DHCP_ARGS=-q
-

Deleted: dhcp4
===
--- dhcp4   2013-05-31 13:31:02 UTC (rev 186877)
+++ dhcp4   2013-05-31 13:50:17 UTC (rev 186878)
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE=/var/run/dhcpd.pid
-
-if [[ -f $PIDFILE ]]; then
-  read -r PID  $PIDFILE
-
-  # prevent stale pidfiles from hanging around
-  if [[ ! -d /proc/$PID ]]; then
-echo 'pid not found. deleteing stale pidfile'
-unset PID
-rm -f $PIDFILE
-  fi
-fi
-
-case $1 in
-  start)
-stat_busy Starting DHCPv4 Server
-if [[ $PID ]]; then
-  stat_fail
-  exit 1
-fi
-if /usr/sbin/dhcpd -4 -pf $PIDFILE $DHCP4_ARGS; then
-  add_daemon dhcp4
-  stat_done
-else
-  stat_fail
-  exit 1
-fi
-;;
-  stop)
-stat_busy Stopping DHCPv4 Server
-if [[ ! $PID ]]; then
-  stat_fail
-  exit 1
-fi
-if { kill $PID  rm -f $PIDFILE; } /dev/null; then
-  rm_daemon dhcp4
-  stat_done
-else
-  stat_fail
-  exit 1
-fi
-;;
-  restart)
-$0 stop
-sleep 1
-$0 start
-;;
-  *)
-echo usage: $0 {start|stop|restart}
-esac
-

Deleted: dhcp6
===
--- dhcp6   2013-05-31 13:31:02 UTC (rev 186877)
+++ dhcp6   2013-05-31 13:50:17 UTC (rev 186878)
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE=/var/run/dhcp6.pid
-
-if [[ -f $PIDFILE ]]; then
-  read -r PID  $PIDFILE
-
-  # prevent stale pidfiles from hanging around
-  if 

[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2013-05-30 Thread Allan McRae
Date: Friday, May 31, 2013 @ 05:28:04
  Author: allan
Revision: 186751

upgpkg: dhcp 4.2.5.p1-1

upstream update, /usr move

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |   18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-31 03:07:32 UTC (rev 186750)
+++ PKGBUILD2013-05-31 03:28:04 UTC (rev 186751)
@@ -5,8 +5,8 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.5
-_pkgver=4.2.5
+pkgver=4.2.5.p1
+_pkgver=4.2.5-P1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
@@ -16,8 +16,8 @@
 dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
 dhcp-4.2.5-client_script-1.patch
 dhcp-4.2.5-missing_ipv6-1.patch)
-md5sums=('6489e919ac093d17249270ee9be1020e'
- '022bc7038b3061cfb31da4736e7ab8a8'
+md5sums=('f68e3c1f00a9af5742bc5e71d567cf93'
+ 'SKIP'
  'c49b1497837ba56c54e401a66e1bab9b'
  '12c2f3ae47ed23eb698eb7f1bfd80f20'
  '8f357e46e1efcbb746f38737a3f977a2'
@@ -26,7 +26,8 @@
  '9e4dcf90beec15bfcb6631809cdcc780'
  'da655f02f1cf4d95b4708e84e69edbc8')
 
-build() {
+
+prepare() {
   cd ${srcdir}/${pkgbase}-${_pkgver}
 
   # Define _GNU_SOURCE to fix IPV6.
@@ -36,8 +37,11 @@
   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 \
+build() {
+  cd ${srcdir}/${pkgbase}-${_pkgver}
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
   --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 \
@@ -86,7 +90,7 @@
   install -d ${pkgdir}/var/lib/dhclient
 
   # install dhclient linux script
-  install -m755 -D client/scripts/linux ${pkgdir}/sbin/dhclient-script
+  install -m755 client/scripts/linux ${pkgdir}/usr/bin/dhclient-script
 
   # install license
   install -m644 -D LICENSE ${pkgdir}/usr/share/licenses/dhclient/LICENSE



[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcp.install)

2012-11-03 Thread Jan Steffens
Date: Saturday, November 3, 2012 @ 13:32:17
  Author: heftig
Revision: 170144

4.2.4.2, with /var/lib instead of /var/state

Modified:
  dhcp/trunk/PKGBUILD
  dhcp/trunk/dhcp.install

--+
 PKGBUILD |   24 +++-
 dhcp.install |   22 +-
 2 files changed, 20 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-03 17:26:58 UTC (rev 170143)
+++ PKGBUILD2012-11-03 17:32:17 UTC (rev 170144)
@@ -5,10 +5,10 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.4.1
-_pkgver=4.2.4-P1
+pkgver=4.2.4.2
+_pkgver=4.2.4-P2
 
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url=https://www.isc.org/software/dhcp;
@@ -17,8 +17,8 @@
 dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
 dhcp-4.1.1-missing-ipv6-not-fatal.patch
 dhclient-script-pathFixes.patch)
-md5sums=('0ca7181024651f6323951d5498c8020b'
- '0dfe000dd88555ea06b282ae5e574d5f'
+md5sums=('fe36056f2d274fa4b82a5422f192e65f'
+ '1f20126efd33c34d52a4148db780921f'
  'c49b1497837ba56c54e401a66e1bab9b'
  '12c2f3ae47ed23eb698eb7f1bfd80f20'
  '8f357e46e1efcbb746f38737a3f977a2'
@@ -37,10 +37,10 @@
   patch -Np0 -i ${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch
 
   ./configure --prefix=/usr --sysconfdir=/etc \
-  --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
-  --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \
-  --with-cli-lease-file=/var/state/dhclient/dhclient.leases \
-  --with-cli6-lease-file=/var/state/dhclient/dhclient6.leases
+  --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
 
@@ -59,12 +59,10 @@
   install -D -m755 ${srcdir}/dhcp4 ${pkgdir}/etc/rc.d/dhcp4
   install -D -m755 ${srcdir}/dhcp6 ${pkgdir}/etc/rc.d/dhcp6
   install -D -m644 ${srcdir}/dhcp ${pkgdir}/etc/conf.d/${pkgbase}
-  install -d ${pkgdir}/var/state/dhcp
+  install -d ${pkgdir}/var/lib/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
@@ -83,7 +81,7 @@
   # move dhclient.conf to dhclient.conf.example
   mv ${pkgdir}/etc/dhclient.conf{,.example}
   
-  install -d ${pkgdir}/var/state/dhclient
+  install -d ${pkgdir}/var/lib/dhclient
 
   # install dhclient linux script
   install -m755 -D client/scripts/linux ${pkgdir}/sbin/dhclient-script

Modified: dhcp.install
===
--- dhcp.install2012-11-03 17:26:58 UTC (rev 170143)
+++ dhcp.install2012-11-03 17:32:17 UTC (rev 170144)
@@ -1,18 +1,14 @@
-# arg 1:  the new package version
 post_install() {
-  [ -f var/state/dhcp/dhcpd.leases ] || : var/state/dhcp/dhcpd.leases
-  [ -f var/state/dhcp/dhcpd6.leases ] || : var/state/dhcp/dhcpd6.leases
-  #echo If dhcpd doesn't start, ensure the ipv6 kernel module is loaded.
-
-  echo
-  echo == The dhcp server has now two rc.d scripts.
-  echo == Use '/etc/rc.d/dhcp6' to use IPv6 dhcp server or
-  echo == '/etc/rc.d/dhcp4' to use IPv4 dhcp server.
-  echo == Make sure that you change your DAEMONS array in '/etc/rc.conf'!
+  [[ -f var/lib/dhcp/dhcpd.leases ]] || : var/lib/dhcp/dhcpd.leases
+  [[ -f var/lib/dhcp/dhcpd6.leases ]] || : var/lib/dhcp/dhcpd6.leases
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  post_install $1
+  if (( $(vercmp $2 4.2.4.2)  0 )); then
+echo  Lease directory moved from /var/state/dhcp
+echo to /var/lib/dhcp. Move your old lease files
+echo if you want to keep using them.
+  fi
+
+  post_install
 }



[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcpd4.service dhcpd6.service)

2012-10-13 Thread Thomas Bächler
Date: Saturday, October 13, 2012 @ 13:03:14
  Author: thomas
Revision: 168634

upgpkg: dhcp 4.2.4.1-3: Remove broken ExecReload= from units

Modified:
  dhcp/trunk/PKGBUILD
  dhcp/trunk/dhcpd4.service
  dhcp/trunk/dhcpd6.service

+
 PKGBUILD   |6 +++---
 dhcpd4.service |1 -
 dhcpd6.service |1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-13 16:48:28 UTC (rev 168633)
+++ PKGBUILD2012-10-13 17:03:14 UTC (rev 168634)
@@ -8,7 +8,7 @@
 pkgver=4.2.4.1
 _pkgver=4.2.4-P1
 
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url=https://www.isc.org/software/dhcp;
@@ -22,8 +22,8 @@
  'c49b1497837ba56c54e401a66e1bab9b'
  '12c2f3ae47ed23eb698eb7f1bfd80f20'
  '8f357e46e1efcbb746f38737a3f977a2'
- '1076444f22e13eb5f6bff7821fd0f446'
- '9310f2d8b1d7e97ace06d68cb41d9998'
+ '439ee2f145a1e86dd644cb94a854f8e7'
+ '588aa85b6fe228c45623185a58d11992'
  'fd64aeb4f399dcc41ea43089a3811094'
  '541b415a25a169eaf64b681405f79a80')
 

Modified: dhcpd4.service
===
--- dhcpd4.service  2012-10-13 16:48:28 UTC (rev 168633)
+++ dhcpd4.service  2012-10-13 17:03:14 UTC (rev 168634)
@@ -6,7 +6,6 @@
 Type=forking
 PIDFile=/run/dhcpd4.pid
 ExecStart=/usr/sbin/dhcpd -4 -q -pf /run/dhcpd4.pid
-ExecReload=/bin/kill -TERM $MAINPID
 KillSignal=SIGINT
 
 [Install]

Modified: dhcpd6.service
===
--- dhcpd6.service  2012-10-13 16:48:28 UTC (rev 168633)
+++ dhcpd6.service  2012-10-13 17:03:14 UTC (rev 168634)
@@ -6,7 +6,6 @@
 Type=forking
 PIDFile=/run/dhcpd6.pid
 ExecStart=/usr/sbin/dhcpd -6 -q -pf /run/dhcpd6.pid
-ExecReload=/bin/kill -TERM $MAINPID
 KillSignal=SIGINT
 
 [Install]



[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcpd4.service dhcpd6.service)

2012-08-17 Thread Jan Steffens
Date: Friday, August 17, 2012 @ 18:53:26
  Author: heftig
Revision: 165389

Add systemd services

Added:
  dhcp/trunk/dhcpd4.service
  dhcp/trunk/dhcpd6.service
Modified:
  dhcp/trunk/PKGBUILD

+
 PKGBUILD   |   11 +--
 dhcpd4.service |   13 +
 dhcpd6.service |   13 +
 3 files changed, 35 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-17 22:41:23 UTC (rev 165388)
+++ PKGBUILD2012-08-17 22:53:26 UTC (rev 165389)
@@ -8,13 +8,13 @@
 pkgver=4.2.4.1
 _pkgver=4.2.4-P1
 
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 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 @@
  'c49b1497837ba56c54e401a66e1bab9b'
  '12c2f3ae47ed23eb698eb7f1bfd80f20'
  '8f357e46e1efcbb746f38737a3f977a2'
+ '1076444f22e13eb5f6bff7821fd0f446'
+ '9310f2d8b1d7e97ace06d68cb41d9998'
  'fd64aeb4f399dcc41ea43089a3811094'
  '541b415a25a169eaf64b681405f79a80')
 
@@ -59,6 +61,11 @@
   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
   

Added: dhcpd4.service
===
--- dhcpd4.service  (rev 0)
+++ dhcpd4.service  2012-08-17 22:53:26 UTC (rev 165389)
@@ -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

Added: dhcpd6.service
===
--- dhcpd6.service  (rev 0)
+++ dhcpd6.service  2012-08-17 22:53:26 UTC (rev 165389)
@@ -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



[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2012-01-15 Thread Daniel Isenmann
Date: Sunday, January 15, 2012 @ 07:57:23
  Author: daniel
Revision: 146654

upgpkg: dhcp 4.2.3.2-2

New bugfix release. Only increment pkgrel, because set wrong pkgversion before, 
which now represent the correct pkgversion.

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-15 12:27:09 UTC (rev 146653)
+++ PKGBUILD2012-01-15 12:57:23 UTC (rev 146654)
@@ -6,9 +6,9 @@
 
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.2.3.2
-_pkgver=4.2.3-P1
+_pkgver=4.2.3-P2
 
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url=https://www.isc.org/software/dhcp;
@@ -16,7 +16,7 @@
 dhcp4 dhcp6 dhcp
 dhcp-4.1.1-missing-ipv6-not-fatal.patch
 dhclient-script-pathFixes.patch)
-md5sums=('04599f1557a5cafd10d7745267a68c8b'
+md5sums=('14f57fd580d01633d0fad4809007a801'
  'c49b1497837ba56c54e401a66e1bab9b'
  '12c2f3ae47ed23eb698eb7f1bfd80f20'
  '8f357e46e1efcbb746f38737a3f977a2'



[arch-commits] Commit in dhcp/trunk (PKGBUILD dhclient-script-pathFixes.patch)

2011-12-21 Thread Daniel Isenmann
Date: Wednesday, December 21, 2011 @ 13:55:59
  Author: daniel
Revision: 145312

upgpkg: dhcp 4.2.3.2-1

New upstream release

Modified:
  dhcp/trunk/PKGBUILD
  dhcp/trunk/dhclient-script-pathFixes.patch

-+
 PKGBUILD|   12 ++--
 dhclient-script-pathFixes.patch |   28 +++-
 2 files changed, 29 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-21 18:00:02 UTC (rev 145311)
+++ PKGBUILD2011-12-21 18:55:59 UTC (rev 145312)
@@ -5,23 +5,23 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.1.1
-_pkgver=4.2.1-P1
+pkgver=4.2.3.2
+_pkgver=4.2.3-P1
 
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url=https://www.isc.org/software/dhcp;
-source=(http://ftp.isc.org/isc/${pkgbase}/${pkgbase}-${_pkgver}.tar.gz
+source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz
 dhcp4 dhcp6 dhcp
 dhcp-4.1.1-missing-ipv6-not-fatal.patch
 dhclient-script-pathFixes.patch)
-md5sums=('22e6f1eff6d5cfe2621a06cc62ba5b70'
+md5sums=('04599f1557a5cafd10d7745267a68c8b'
  'c49b1497837ba56c54e401a66e1bab9b'
  '12c2f3ae47ed23eb698eb7f1bfd80f20'
  '8f357e46e1efcbb746f38737a3f977a2'
  'fd64aeb4f399dcc41ea43089a3811094'
- 'ddcc5cd576ec631ade6c4da21952b50b')
+ '541b415a25a169eaf64b681405f79a80')
 
 build() {
   cd ${srcdir}/${pkgbase}-${_pkgver}
@@ -66,7 +66,7 @@
 
 package_dhclient(){
   pkgdesc=dhclient is standalone client from the dhcp package
-  depends=('bash' 'iproute2')
+  depends=('bash' 'iproute2' 'net-tools')
 
   cd ${srcdir}/${pkgbase}-${_pkgver}
   make -C client DESTDIR=${pkgdir} install

Modified: dhclient-script-pathFixes.patch
===
--- dhclient-script-pathFixes.patch 2011-12-21 18:00:02 UTC (rev 145311)
+++ dhclient-script-pathFixes.patch 2011-12-21 18:55:59 UTC (rev 145312)
@@ -1,5 +1,5 @@
 linux  2009-04-21 16:21:09.0 +0200
-+++ linux_new  2010-06-30 19:06:20.0 +0200
+--- linux  2011-05-18 20:01:54.0 +
 linux_new  2011-12-21 18:45:41.487171012 +
 @@ -23,7 +23,7 @@
  # of the $1 in its args.
  
@@ -9,7 +9,7 @@
  
  make_resolv_conf() {
if [ x$new_domain_name_servers != x ]; then
-@@ -112,9 +112,9 @@
+@@ -122,9 +122,9 @@
  if [ x$reason = xPREINIT ]; then
if [ x$alias_ip_address != x ]; then
  # Bring down alias interface. Its routes will disappear too.
@@ -21,7 +21,7 @@
  
# We need to give the kernel some time to get the interface up.
sleep 1
-@@ -141,32 +141,32 @@
+@@ -151,25 +151,25 @@
if [ x$old_ip_address != x ]  [ x$alias_ip_address != x ]  \
[ x$alias_ip_address != x$old_ip_address ]; then
  # Possible new alias. Remove old alias.
@@ -50,6 +50,24 @@
 -  route add default gw $router $metric_arg dev $interface
 +  /sbin/route add default gw $router $metric_arg dev $interface
  done
+   else
+ # we haven't changed the address, have we changed other options   
+@@ -177,21 +177,21 @@
+ if [ x$new_routers != x ]  [ x$new_routers != x$old_routers ] ; then
+   # if we've changed routers delete the old and add the new.
+   for router in $old_routers; do
+-route del default gw $router
++/sbin/route del default gw $router
+   done
+   for router in $new_routers; do
+ if [ x$new_subnet_mask = x255.255.255.255 ] ; then
+-route add -host $router dev $interface
++/sbin/route add -host $router dev $interface
+   fi
+-  route add default gw $router $metric_arg dev $interface
++  /sbin/route add default gw $router $metric_arg dev $interface
+   done
+ fi
fi
if [ x$new_ip_address != x$alias_ip_address ]  [ x$alias_ip_address != x 
];
 then
@@ -62,7 +80,7 @@
fi
make_resolv_conf
exit_with_hooks 0
-@@ -176,42 +176,42 @@
+@@ -201,42 +201,42 @@
 || [ x$reason = xSTOP ]; then
if [ x$alias_ip_address != x ]; then
  # Turn off alias interface.



[arch-commits] Commit in dhcp/trunk (PKGBUILD dhcp dhcp.install dhcp4 dhcp6)

2011-04-14 Thread Daniel Isenmann
Date: Thursday, April 14, 2011 @ 06:22:18
  Author: daniel
Revision: 119729

upgpkg: dhcp 4.2.1.1-1
Fixed FS#23609, FS#23308, FS#22819

Added:
  dhcp/trunk/dhcp
  dhcp/trunk/dhcp4
  dhcp/trunk/dhcp6
Modified:
  dhcp/trunk/PKGBUILD
  dhcp/trunk/dhcp.install

--+
 PKGBUILD |   31 +--
 dhcp |   10 ++
 dhcp.install |7 +++
 dhcp4|   57 +
 dhcp6|   57 +
 5 files changed, 148 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-14 07:54:55 UTC (rev 119728)
+++ PKGBUILD2011-04-14 10:22:18 UTC (rev 119729)
@@ -5,20 +5,21 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.0.2
-_pkgver=4.2.0-P2
+pkgver=4.2.1.1
+_pkgver=4.2.1-P1
 
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url=https://www.isc.org/software/dhcp;
 source=(http://ftp.isc.org/isc/${pkgbase}/${pkgbase}-${_pkgver}.tar.gz
-dhcpd dhcp.conf.d
+dhcp4 dhcp6 dhcp
 dhcp-4.1.1-missing-ipv6-not-fatal.patch
 dhclient-script-pathFixes.patch)
-md5sums=('a98f4ce3ca651e7e28a5a1ae6398689e'
- 'df22cffa7d7415ece7bb025b7bf774dd'
- '49da3192e5c885e3c7d02f447c2dea5e'
+md5sums=('22e6f1eff6d5cfe2621a06cc62ba5b70'
+ 'c49b1497837ba56c54e401a66e1bab9b'
+ '12c2f3ae47ed23eb698eb7f1bfd80f20'
+ '8f357e46e1efcbb746f38737a3f977a2'
  'fd64aeb4f399dcc41ea43089a3811094'
  'ddcc5cd576ec631ade6c4da21952b50b')
 
@@ -33,11 +34,13 @@
 
   ./configure --prefix=/usr --sysconfdir=/etc \
   --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
-  --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases
+  --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \
+  --with-cli-lease-file=/var/state/dhclient/dhclient.leases \
+  --with-cli6-lease-file=/var/state/dhclient/dhclient6.leases
 
   make
 
-  patch -i ${srcdir}/dhclient-script-pathFixes.patch client/scripts/linux
+  patch -i ${srcdir}/dhclient-script-pathFixes.patch client/scripts/linux || 
return 1
 }
 
 package_dhcp(){
@@ -49,8 +52,9 @@
   cd ${srcdir}/${pkgbase}-${_pkgver}
   make DESTDIR=${pkgdir} install
 
-  install -D -m755 ${srcdir}/dhcpd ${pkgdir}/etc/rc.d/dhcpd
-  install -D -m644 ${srcdir}/dhcp.conf.d ${pkgdir}/etc/conf.d/${pkgbase}
+  install -D -m755 ${srcdir}/dhcp4 ${pkgdir}/etc/rc.d/dhcp4
+  install -D -m755 ${srcdir}/dhcp6 ${pkgdir}/etc/rc.d/dhcp6
+  install -D -m644 ${srcdir}/dhcp ${pkgdir}/etc/conf.d/${pkgbase}
   mkdir -p ${pkgdir}/var/state/dhcp
 
   # Remove dhclient
@@ -62,17 +66,16 @@
 
 package_dhclient(){
   pkgdesc=dhclient is standalone client from the dhcp package
-  depends=('bash')
+  depends=('bash' 'iproute2')
 
   cd ${srcdir}/${pkgbase}-${_pkgver}
   make -C client DESTDIR=${pkgdir} install
 
   # move dhclient.conf to dhclient.conf.example
   mv ${pkgdir}/etc/dhclient.conf{,.example}
+  
+  mkdir -p ${pkgdir}/var/state/dhclient
 
-  # directory needed for leasefiles
-  mkdir -p ${pkgdir}/var/lib/dhclient
-
   # install dhclient linux script
   install -m755 -D client/scripts/linux ${pkgdir}/sbin/dhclient-script
 

Added: dhcp
===
--- dhcp(rev 0)
+++ dhcp2011-04-14 10:22:18 UTC (rev 119729)
@@ -0,0 +1,10 @@
+#
+# Arguments to be passed to the DHCP server daemon
+#
+
+# ipv4 runtime parameters
+DHCP4_ARGS=-q
+
+# ipv6 runtime parameters
+DHCP6_ARGS=-q
+

Modified: dhcp.install
===
--- dhcp.install2011-04-14 07:54:55 UTC (rev 119728)
+++ dhcp.install2011-04-14 10:22:18 UTC (rev 119729)
@@ -1,7 +1,14 @@
 # arg 1:  the new package version
 post_install() {
   [ -f var/state/dhcp/dhcpd.leases ] || : var/state/dhcp/dhcpd.leases
+  [ -f var/state/dhcp/dhcpd6.leases ] || : var/state/dhcp/dhcpd6.leases
   #echo If dhcpd doesn't start, ensure the ipv6 kernel module is loaded.
+
+  echo
+  echo == The dhcp server has now two rc.d scripts.
+  echo == Use '/etc/rc.d/dhcp6' to use IPv6 dhcp server or
+  echo == '/etc/rc.d/dhcp4' to use IPv4 dhcp server.
+  echo == Make sure that you change your DAEMONS array in '/etc/rc.conf'!
 }
 
 # arg 1:  the new package version

Added: dhcp4
===
--- dhcp4   (rev 0)
+++ dhcp4   2011-04-14 10:22:18 UTC (rev 119729)
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/dhcp
+
+PIDFILE=/var/run/dhcpd.pid
+
+if [[ -f $PIDFILE ]]; then
+  read -r PID  $PIDFILE
+
+  # prevent stale pidfiles from hanging around
+  if [[ ! -d /proc/$PID ]]; then
+echo 'pid not found. deleteing stale pidfile'
+unset PID
+

[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2011-04-06 Thread Jan de Groot
Date: Wednesday, April 6, 2011 @ 03:14:19
  Author: jgc
Revision: 118234

Fix pkgname - pkgbase

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-06 06:30:24 UTC (rev 118233)
+++ PKGBUILD2011-04-06 07:14:19 UTC (rev 118234)
@@ -12,7 +12,7 @@
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url=https://www.isc.org/software/dhcp;
-source=(http://ftp.isc.org/isc/${pkgname}/${pkgname}-${_pkgver}.tar.gz
+source=(http://ftp.isc.org/isc/${pkgbase}/${pkgbase}-${_pkgver}.tar.gz
 dhcpd dhcp.conf.d
 dhcp-4.1.1-missing-ipv6-not-fatal.patch
 dhclient-script-pathFixes.patch)
@@ -23,7 +23,7 @@
  'ddcc5cd576ec631ade6c4da21952b50b')
 
 build() {
-  cd ${srcdir}/${pkgname}-${_pkgver}
+  cd ${srcdir}/${pkgbase}-${_pkgver}
 
   # Define _GNU_SOURCE to fix IPV6.
   sed '/^CFLAGS=$CFLAGS/ s/INGS/INGS -D_GNU_SOURCE/' -i configure
@@ -46,7 +46,7 @@
   backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
   install=dhcp.install
   
-  cd ${srcdir}/${pkgname}-${_pkgver}
+  cd ${srcdir}/${pkgbase}-${_pkgver}
   make DESTDIR=${pkgdir} install
 
   install -D -m755 ${srcdir}/dhcpd ${pkgdir}/etc/rc.d/dhcpd
@@ -64,7 +64,7 @@
   pkgdesc=dhclient is standalone client from the dhcp package
   depends=('bash')
 
-  cd ${srcdir}/${pkgname}-${_pkgver}
+  cd ${srcdir}/${pkgbase}-${_pkgver}
   make -C client DESTDIR=${pkgdir} install
 
   # move dhclient.conf to dhclient.conf.example



[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2011-01-04 Thread Daniel Isenmann
Date: Tuesday, January 4, 2011 @ 08:21:07
  Author: daniel
Revision: 104595

upgpkg: dhcp 4.2.0.2-1
Upstream security fix CVE-2010-3616

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-04 12:00:29 UTC (rev 104594)
+++ PKGBUILD2011-01-04 13:21:07 UTC (rev 104595)
@@ -1,12 +1,12 @@
 # $Id$
-# Maintainer: judd jvi...@zeroflux.org
+# Maintainer: Daniel Isenmann daniel @archlinux.org
 
 pkgbase=dhcp
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.0.1
-_pkgver=4.2.0-P1
+pkgver=4.2.0.2
+_pkgver=4.2.0-P2
 
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 dhcpd dhcp.conf.d
 dhcp-4.1.1-missing-ipv6-not-fatal.patch
 dhclient-script-pathFixes.patch)
-md5sums=('1c268a2368b2565252b5f9d7255d3c72'
+md5sums=('a98f4ce3ca651e7e28a5a1ae6398689e'
  'df22cffa7d7415ece7bb025b7bf774dd'
  '49da3192e5c885e3c7d02f447c2dea5e'
  'fd64aeb4f399dcc41ea43089a3811094'



[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2010-11-10 Thread Jan Steffens
Date: Wednesday, November 10, 2010 @ 21:25:41
  Author: heftig
Revision: 98541

Major cleanup. Bump to 4.2.0-P1. Fix FS#21649

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |   62 -
 1 file changed, 33 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-11 01:47:51 UTC (rev 98540)
+++ PKGBUILD2010-11-11 02:25:41 UTC (rev 98541)
@@ -1,18 +1,22 @@
 # $Id$
 # Maintainer: judd jvi...@zeroflux.org
+
 pkgbase=dhcp
-pkgname=('dhcp'
- 'dhclient')
+pkgname=('dhcp' 'dhclient')
+
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.0
-_pkgver=4.2.0
+pkgver=4.2.0.1
+_pkgver=4.2.0-P1
+
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url=https://www.isc.org/software/dhcp;
 source=(http://ftp.isc.org/isc/${pkgname}/${pkgname}-${_pkgver}.tar.gz
-dhcpd dhcp.conf.d dhcp-4.1.1-missing-ipv6-not-fatal.patch 
dhclient-script-pathFixes.patch)
-md5sums=('83abd7c4f9c24d8dd024ca5a71380c0a'
+dhcpd dhcp.conf.d
+dhcp-4.1.1-missing-ipv6-not-fatal.patch
+dhclient-script-pathFixes.patch)
+md5sums=('1c268a2368b2565252b5f9d7255d3c72'
  'df22cffa7d7415ece7bb025b7bf774dd'
  '49da3192e5c885e3c7d02f447c2dea5e'
  'fd64aeb4f399dcc41ea43089a3811094'
@@ -20,14 +24,20 @@
 
 build() {
   cd ${srcdir}/${pkgname}-${_pkgver}
+
   # Define _GNU_SOURCE to fix IPV6.
   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
+
   ./configure --prefix=/usr --sysconfdir=/etc \
   --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
   --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases
-  make || return 1
+
+  make
+
+  patch -i ${srcdir}/dhclient-script-pathFixes.patch client/scripts/linux
 }
 
 package_dhcp(){
@@ -38,40 +48,34 @@
   
   cd ${srcdir}/${pkgname}-${_pkgver}
   make DESTDIR=${pkgdir} install
+
   install -D -m755 ${srcdir}/dhcpd ${pkgdir}/etc/rc.d/dhcpd
   install -D -m644 ${srcdir}/dhcp.conf.d ${pkgdir}/etc/conf.d/${pkgbase}
   mkdir -p ${pkgdir}/var/state/dhcp
-  rm -f ${pkgdir}/etc/dhclient.conf
-  rm -f ${pkgdir}/usr/sbin/dhclient
-  rm -f ${pkgdir}/usr/share/man/man{5,8}/dhclient*
+
+  # Remove dhclient
+  make -C client DESTDIR=${pkgdir} uninstall
   
-  # install licenses
-  install -m644 -D ${srcdir}/${pkgbase}-${_pkgver}/LICENSE \
-   ${pkgdir}/usr/share/licenses/dhcp/LICENSE
+  # install license
+  install -m644 -D LICENSE ${pkgdir}/usr/share/licenses/dhcp/LICENSE
 }
 
 package_dhclient(){
-  
   pkgdesc=dhclient is standalone client from the dhcp package
   depends=('bash')
 
-  cd ${srcdir}/${pkgname}-${_pkgver}/client/scripts
-  patch -Np1 -i ${srcdir}/dhclient-script-pathFixes.patch linux || return 1
-  cd ${srcdir}/${pkgname}-${_pkgver}/client
-  make DESTDIR=${pkgdir} install
-  install -m755 -d ${startdir}/pkg/var/lib/dhclient
+  cd ${srcdir}/${pkgname}-${_pkgver}
+  make -C client DESTDIR=${pkgdir} install
 
-  #not needed after fresh install
-  rm -f ${pkgdir}/var/lib/dhclient/dhcpd.leases
+  # move dhclient.conf to dhclient.conf.example
+  mv ${pkgdir}/etc/dhclient.conf{,.example}
 
-  #move dhclient.conf to dhclient.conf.example
-  mv ${pkgdir}/etc/dhclient.conf ${pkgdir}/etc/dhclient.conf.example
+  # directory needed for leasefiles
+  mkdir -p ${pkgdir}/var/lib/dhclient
 
   # install dhclient linux script
-  mkdir ${pkgdir}/sbin
-  install -m755 -D ${srcdir}/${pkgname}-${_pkgver}/client/scripts/linux \
-   ${pkgdir}/sbin/dhclient-script
-  # install licenses
-  install -m644 -D ${srcdir}/${pkgname}-${_pkgver}/LICENSE \
-   ${pkgdir}/usr/share/licenses/dhclient/LICENSE
+  install -m755 -D client/scripts/linux ${pkgdir}/sbin/dhclient-script
+
+  # install license
+  install -m644 -D LICENSE ${pkgdir}/usr/share/licenses/dhclient/LICENSE
 }



[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2010-01-30 Thread Daniel Isenmann
Date: Saturday, January 30, 2010 @ 05:18:12
  Author: daniel
Revision: 65479

upgpkg: dhcp 4.1.0.p1-3
fix FS#17885 and FS#17904

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-30 02:36:49 UTC (rev 65478)
+++ PKGBUILD2010-01-30 10:18:12 UTC (rev 65479)
@@ -6,7 +6,7 @@
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.1.0.p1
 _pkgver=4.1.0p1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url=https://www.isc.org/software/dhcp;
@@ -64,9 +64,13 @@
   #not needed after fresh install
   rm -f ${pkgdir}/var/lib/dhclient/dhcpd.leases
 
+  #move dhclient.conf to dhclient.conf.example
+  mv ${pkgdir}/etc/dhclient.conf ${pkgdir}/etc/dhclient.conf.example
+
   # install dhclient linux script
+  mkdir ${pkgdir}/sbin
   install -m755 -D ${srcdir}/${pkgname}-${_pkgver}/client/scripts/linux \
-   ${pkgdir}/etc/dhclient-script
+   ${pkgdir}/sbin/dhclient-script
   # install licenses
   install -m644 -D ${srcdir}/${pkgname}-${_pkgver}/LICENSE \
${pkgdir}/usr/share/licenses/dhclient/LICENSE



[arch-commits] Commit in dhcp/trunk (PKGBUILD)

2010-01-17 Thread Daniel Isenmann
Date: Sunday, January 17, 2010 @ 09:53:08
  Author: daniel
Revision: 63447

upgpkg: dhcp 4.1.0.p1-2
Merged PKGBUILD from dhclient and dhcp. Push dchlient to newest version.

Modified:
  dhcp/trunk/PKGBUILD

--+
 PKGBUILD |   58 --
 1 file changed, 44 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-17 14:47:57 UTC (rev 63446)
+++ PKGBUILD2010-01-17 14:53:08 UTC (rev 63447)
@@ -1,21 +1,22 @@
 # $Id$
 # Maintainer: judd jvi...@zeroflux.org
-pkgname=dhcp
+pkgbase=dhcp
+pkgname=('dhcp'
+ 'dhclient')
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.1.0.p1
 _pkgver=4.1.0p1
-pkgrel=1
-pkgdesc=A DHCP server, client, and relay agent
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url=https://www.isc.org/software/dhcp;
-depends=('openssl=0.9.8a')
-backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
-install=dhcp.install
 source=(http://ftp.isc.org/isc/${pkgname}/${pkgname}-${_pkgver}.tar.gz
-dhcpd dhcp.conf.d dhcp-4.1.0-missing-ipv6-not-fatal.patch)
-md5sums=('325ff8338c5a21f89d5304ac13ffebdf' 'df22cffa7d7415ece7bb025b7bf774dd'
- '49da3192e5c885e3c7d02f447c2dea5e' '463fe58e8ba594b1946d77f685f9f5f5')
+dhcpd dhcp.conf.d dhcp-4.1.0-missing-ipv6-not-fatal.patch 
dhclient-script-pathFixes.patch)
+md5sums=('325ff8338c5a21f89d5304ac13ffebdf'
+ 'df22cffa7d7415ece7bb025b7bf774dd'
+ '49da3192e5c885e3c7d02f447c2dea5e'
+ 'edf327eabb82e54b1e9d80b2750134ed'
+ '4dbce386a6cb4fd7c8cebd4fb432b5db')
 
 build() {
   cd ${srcdir}/${pkgname}-${_pkgver}
@@ -27,17 +28,46 @@
   --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
   --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases
   make || return 1
+}
+
+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
+  
+  cd ${srcdir}/${pkgname}-${_pkgver}
   make DESTDIR=${pkgdir} install
-
   install -D -m755 ${srcdir}/dhcpd ${pkgdir}/etc/rc.d/dhcpd
-  install -D -m644 ${srcdir}/dhcp.conf.d ${pkgdir}/etc/conf.d/${pkgname}
+  install -D -m644 ${srcdir}/dhcp.conf.d ${pkgdir}/etc/conf.d/${pkgbase}
   mkdir -p ${pkgdir}/var/state/dhcp
   rm -f ${pkgdir}/etc/dhclient.conf
   rm -f ${pkgdir}/usr/sbin/dhclient
   rm -f ${pkgdir}/usr/share/man/man{5,8}/dhclient*
+  
   # install licenses
-  install -m644 -D ${srcdir}/${pkgname}-${_pkgver}/LICENSE \
+  install -m644 -D ${srcdir}/${pkgbase}-${_pkgver}/LICENSE \
${pkgdir}/usr/share/licenses/dhcp/LICENSE
 }
-md5sums=('325ff8338c5a21f89d5304ac13ffebdf' 'df22cffa7d7415ece7bb025b7bf774dd'
- '49da3192e5c885e3c7d02f447c2dea5e' 'edf327eabb82e54b1e9d80b2750134ed')
+
+package_dhclient(){
+  
+  pkgdesc=dhclient is standalone client from the dhcp package
+  depends=('bash')
+
+  cd ${srcdir}/${pkgname}-${_pkgver}/client/scripts
+  patch -Np1 -i ${srcdir}/dhclient-script-pathFixes.patch linux || return 1
+  cd ${srcdir}/${pkgname}-${_pkgver}/client
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${startdir}/pkg/var/lib/dhclient
+
+  #not needed after fresh install
+  rm -f ${pkgdir}/var/lib/dhclient/dhcpd.leases
+
+  # install dhclient linux script
+  install -m755 -D ${srcdir}/${pkgname}-${_pkgver}/client/scripts/linux \
+   ${pkgdir}/etc/dhclient-script
+  # install licenses
+  install -m644 -D ${srcdir}/${pkgname}-${_pkgver}/LICENSE \
+   ${pkgdir}/usr/share/licenses/dhclient/LICENSE
+}