diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2009-07-17 08:26:50 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-07-17 08:26:50 +0000 |
commit | 7044886c8c029202054492c65a1a83b485a40223 (patch) | |
tree | aec19b011a17154444ec335ff4b33284c0d88aa6 | |
parent | 44ba9d1bbc586d511dcfcd8db16be43d464c66b2 (diff) | |
download | alpine_aports-7044886c8c029202054492c65a1a83b485a40223.tar.bz2 alpine_aports-7044886c8c029202054492c65a1a83b485a40223.tar.xz alpine_aports-7044886c8c029202054492c65a1a83b485a40223.zip |
extra/dhcp: upgrade to 4.1.0_p1. rename init.d script to dhcpd
partly fixes #64
-rw-r--r-- | extra/dhcp/APKBUILD | 33 | ||||
-rw-r--r-- | extra/dhcp/dhcp.post-upgrade | 18 | ||||
-rw-r--r-- | extra/dhcp/dhcp.pre-upgrade | 8 | ||||
-rw-r--r-- | extra/dhcp/dhcpd.confd (renamed from extra/dhcp/dhcp.confd) | 0 | ||||
-rw-r--r-- | extra/dhcp/dhcpd.initd (renamed from extra/dhcp/dhcp.initd) | 0 |
5 files changed, 44 insertions, 15 deletions
diff --git a/extra/dhcp/APKBUILD b/extra/dhcp/APKBUILD index f3d4ec271c..01bb25e91d 100644 --- a/extra/dhcp/APKBUILD +++ b/extra/dhcp/APKBUILD | |||
@@ -1,21 +1,22 @@ | |||
1 | # Contributor: | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | # Maintainer: | ||
3 | pkgname=dhcp | 2 | pkgname=dhcp |
4 | pkgver=4.1.0 | 3 | pkgver=4.1.0_p1 |
4 | _realver=4.1.0p1 | ||
5 | pkgrel=0 | 5 | pkgrel=0 |
6 | pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)" | 6 | pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)" |
7 | url="https://www.isc.org/" | 7 | url="https://www.isc.org/" |
8 | license="GPL" | 8 | license="GPL" |
9 | depends="uclibc" | 9 | depends= |
10 | makedepends="" | 10 | makedepends= |
11 | install= | 11 | install="dhcp.pre-upgrade dhcp.post-upgrade" |
12 | subpackages="$pkgname-doc $pkgname-dev" | 12 | subpackages="$pkgname-doc $pkgname-dev" |
13 | source="http://ftp.isc.org/isc/dhcp/$pkgname-$pkgver.tar.gz | 13 | source="http://ftp.isc.org/isc/dhcp/$pkgname-$_realver.tar.gz |
14 | dhcp.confd | 14 | $install |
15 | dhcp.initd" | 15 | dhcpd.confd |
16 | dhcpd.initd" | ||
16 | 17 | ||
17 | build() { | 18 | build() { |
18 | cd "$srcdir/$pkgname-$pkgver" | 19 | cd "$srcdir/$pkgname-$_realver" |
19 | 20 | ||
20 | ./configure --prefix=/usr \ | 21 | ./configure --prefix=/usr \ |
21 | --sysconfdir=/etc \ | 22 | --sysconfdir=/etc \ |
@@ -24,10 +25,12 @@ build() { | |||
24 | make || return 1 | 25 | make || return 1 |
25 | make DESTDIR="$pkgdir" install | 26 | make DESTDIR="$pkgdir" install |
26 | 27 | ||
27 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname | 28 | install -m755 -D "$srcdir"/dhcpd.initd "$pkgdir"/etc/init.d/dhcpd |
28 | install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname | 29 | install -m644 -D "$srcdir"/dhcpd.confd "$pkgdir"/etc/conf.d/dhcpd |
29 | } | 30 | } |
30 | 31 | ||
31 | md5sums="1fffed2e8c3d67b111316d6a9b33db7a dhcp-4.1.0.tar.gz | 32 | md5sums="325ff8338c5a21f89d5304ac13ffebdf dhcp-4.1.0p1.tar.gz |
32 | df32707f5bbe5363306420b5dc6e6b40 dhcp.confd | 33 | 6cc49497f3c30ccd37fc7c032f7810c6 dhcp.pre-upgrade |
33 | 5df9a87539bedc98a1cbc7e38b290928 dhcp.initd" | 34 | a7b81948ceab73dd10de275ebc00e7eb dhcp.post-upgrade |
35 | df32707f5bbe5363306420b5dc6e6b40 dhcpd.confd | ||
36 | 5df9a87539bedc98a1cbc7e38b290928 dhcpd.initd" | ||
diff --git a/extra/dhcp/dhcp.post-upgrade b/extra/dhcp/dhcp.post-upgrade new file mode 100644 index 0000000000..b16fea6b4a --- /dev/null +++ b/extra/dhcp/dhcp.post-upgrade | |||
@@ -0,0 +1,18 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # we have renamed dhcp to dhcpd. Try cleanup for users | ||
4 | |||
5 | moved= | ||
6 | for i in /etc/runlevel/*/dhcp; do | ||
7 | if [ -L "$i" ]; then | ||
8 | mv ${i} ${i}d | ||
9 | moved=1 | ||
10 | fi | ||
11 | done | ||
12 | |||
13 | if [ -n "$moved" ]; then | ||
14 | echo " *" | ||
15 | echo " * NOTICE: the /etc/init.d/dhcp script have been renamed to /etc/init.d/dhcpd" | ||
16 | echo " *" | ||
17 | fi | ||
18 | |||
diff --git a/extra/dhcp/dhcp.pre-upgrade b/extra/dhcp/dhcp.pre-upgrade new file mode 100644 index 0000000000..090f654b9a --- /dev/null +++ b/extra/dhcp/dhcp.pre-upgrade | |||
@@ -0,0 +1,8 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # script renamed. Try save users settings if needed | ||
4 | |||
5 | if [ -f /etc/conf.d/dhcp ] && [ ! -f /etc/conf.d/dhcpd ]; then | ||
6 | mv /etc/conf.d/dhcp /etc/conf.d/dhcpd | ||
7 | fi | ||
8 | |||
diff --git a/extra/dhcp/dhcp.confd b/extra/dhcp/dhcpd.confd index df09ec7082..df09ec7082 100644 --- a/extra/dhcp/dhcp.confd +++ b/extra/dhcp/dhcpd.confd | |||
diff --git a/extra/dhcp/dhcp.initd b/extra/dhcp/dhcpd.initd index cc9727fc7c..cc9727fc7c 100644 --- a/extra/dhcp/dhcp.initd +++ b/extra/dhcp/dhcpd.initd | |||