diff options
| author | Corentin Henry <corentinhenry@gmail.com> | 2016-04-20 15:31:42 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-04-28 13:48:15 +0000 |
| commit | 8db3f0e97ebb7e74b2403b346cbb4b04630dc24b (patch) | |
| tree | d83dec432fab7f7da64e039b863f2942f02db30e /main/dhcp | |
| parent | 4e82ca0a137b08a7a7bfdee098b474d9e9e6a861 (diff) | |
| download | aports-8db3f0e97ebb7e74b2403b346cbb4b04630dc24b.tar.bz2 aports-8db3f0e97ebb7e74b2403b346cbb4b04630dc24b.tar.xz | |
main/dhcp: add /sbin/dhclient-script
fix https://bugs.alpinelinux.org/issues/4855
Diffstat (limited to 'main/dhcp')
| -rw-r--r-- | main/dhcp/APKBUILD | 7 | ||||
| -rw-r--r-- | main/dhcp/dhclient-script.patch | 30 |
2 files changed, 37 insertions, 0 deletions
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD index cf9d96d43d..6394c086bc 100644 --- a/main/dhcp/APKBUILD +++ b/main/dhcp/APKBUILD @@ -15,6 +15,7 @@ install="dhcp.pre-install dhcp.pre-upgrade dhcp.post-upgrade" subpackages="$pkgname-doc $pkgname-dev $pkgname-dbg dhclient dhcrelay" source="http://ftp.isc.org/isc/dhcp/${_realver}/$pkgname-$_realver.tar.gz dhcp-3.0-fix-perms.patch + dhclient-script.patch dhcrelay.initd dhcrelay.confd dhcpd.confd @@ -58,6 +59,7 @@ package() { install -m755 -D "$srcdir"/dhcpd.initd "$pkgdir"/etc/init.d/dhcpd install -m644 -D "$srcdir"/dhcpd.confd "$pkgdir"/etc/conf.d/dhcpd + install -m751 -D "$_builddir"/client/scripts/linux "$pkgdir"/sbin/dhclient-script install -d "$pkgdir"/var/lib/dhcp install -d "$pkgdir"/var/run/dhcp } @@ -67,8 +69,10 @@ dhclient() { install -d -o dhcp -g dhcp "$subpkgdir"/var/lib/dhcp install -d -o dhcp -g dhcp "$subpkgdir"/var/run/dhcp install -d "$subpkgdir"/usr/sbin + install -d "$subpkgdir"/sbin install -d "$subpkgdir"/etc/dhcp mv "$pkgdir"/usr/sbin/dhclient "$subpkgdir"/usr/sbin/ + mv "$pkgdir"/sbin/dhclient-script "$subpkgdir"/sbin/ mv "$pkgdir"/etc/dhcp/dhclient.conf* "$subpkgdir"/etc/dhcp/ } @@ -86,18 +90,21 @@ dhcrelay() { md5sums="0138319fe2b788cf4bdf34fbeaf9ff54 dhcp-4.3.4.tar.gz a9eaf182dae3984670da52f20ae10fba dhcp-3.0-fix-perms.patch +80e08227ab118dc5997a97ef320ef976 dhclient-script.patch 7ee16a915141699d6ad72c0ef5fb9e3c dhcrelay.initd db84514fe15fd7d81136afbaae738f55 dhcrelay.confd 026570f93fe76d2cdb0bbe6782b3ea5a dhcpd.confd 7308aa60c4e3e92c4bd8165b50995114 dhcpd.initd" sha256sums="f5115aee3dd3e6925de4ba47b80ab732ba48b481c8364b6ebade2d43698d607e dhcp-4.3.4.tar.gz 7482f93ec9140aa86b20d3fcc8cf336f1f2babf6217a909522c30a7947b0327d dhcp-3.0-fix-perms.patch +f959b69eaa5d235b63f16fab60b063a61a304dd95e7e445d0655901fde035391 dhclient-script.patch e7e024344cf0459794f6454d4a3788c83b945b5b0c06c5c29439e19d358c100c dhcrelay.initd 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730 dhcrelay.confd e8a413e9102948b336f60041fc3cade33125faf56d8319ee65d9f3c63199a8e7 dhcpd.confd bf243bb24822306385df9f133ade625e145f3d7a6cfb190a7023392b2617f6e9 dhcpd.initd" sha512sums="411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706 dhcp-4.3.4.tar.gz d5697a56fbbff25199962608986e7ffb533ed4afd3e344e3c79d2010dda73cc0b088f06c454e9f0c69eb054e09a374455fa71d3f73306e0c98fa76df4dd321b7 dhcp-3.0-fix-perms.patch +a86fdbc73d3342be97261ac4ee13d4fc8cda812378cb370a856ad98a973adc7f4afad070cb3bde466881d8feade11a0c72389bf3338dc400e30bfa30f24cb073 dhclient-script.patch 0c3eee11ee9771a3bd7f8076827e57296136a36e6c00c3149e7274fb7a479feae4dc7d744f3c66ac78ffc96f036e14a7a5a0806095495441f98d76737a34faa6 dhcrelay.initd fd15dbaa4c61c3c26f407bf13dde859470a1adba134da064b653ccc152ce42635ee8de2fe113ae21ba8470e97e3caad8c1a47b69eb25e5e92b40e26790b96f6d dhcrelay.confd 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d dhcpd.confd diff --git a/main/dhcp/dhclient-script.patch b/main/dhcp/dhclient-script.patch new file mode 100644 index 0000000000..c799a94ac4 --- /dev/null +++ b/main/dhcp/dhclient-script.patch @@ -0,0 +1,30 @@ +--- a/client/scripts/linux ++++ b/client/scripts/linux +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # dhclient-script for Linux. Dan Halbert, March, 1997. + # Updated for Linux 2.[12] by Brian J. Murrell, January 1999. + # No guarantees about this. I'm a novice at the details of Linux +@@ -49,11 +49,11 @@ + if [ "x${new_dhcp6_domain_search}" != x ] ; then + echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 + fi +- shopt -s nocasematch + for nameserver in ${new_dhcp6_name_servers} ; do + # If the nameserver has a link-local address + # add a <zone_id> (interface name) to it. +- if [[ "$nameserver" =~ ^fe80:: ]] ++ echo $nameserver | tr '[:upper:]' '[:lower:]' | grep -E ^fe80:: > /dev/null ++ if [ $? -eq 0 ] + then + zone_id="%$interface" + else +@@ -61,7 +61,6 @@ + fi + echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 + done +- shopt -u nocasematch + + mv /etc/resolv.conf.dhclient6 /etc/resolv.conf + fi |