diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2010-07-14 15:39:29 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2010-07-14 15:39:29 +0000 |
| commit | 6e8020140bbfb5e42802eed7c1491e675924cc01 (patch) | |
| tree | cc54f3cce7238609561da3b2de59e2d3780c1085 /main/dhcp | |
| parent | 4ae2c3d81c309f93d2c41e22e71c5cf445123896 (diff) | |
| parent | daa6e0d05fff7a0d1216fd6719e32d5426b24e8b (diff) | |
| download | aports-6e8020140bbfb5e42802eed7c1491e675924cc01.tar.bz2 aports-6e8020140bbfb5e42802eed7c1491e675924cc01.tar.xz | |
Merge remote branch 'alpine/master'
Conflicts:
main/man-pages/APKBUILD
Diffstat (limited to 'main/dhcp')
| -rw-r--r-- | main/dhcp/APKBUILD | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD index 5b3c7d63d..caf32b768 100644 --- a/main/dhcp/APKBUILD +++ b/main/dhcp/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhcp -pkgver=4.1.0_p1 -_realver=4.1.0p1 -pkgrel=10 +pkgver=4.1.1_p1 +_realver=4.1.1-P1 +pkgrel=1 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)" url="https://www.isc.org/" license="GPL" @@ -21,7 +21,7 @@ source="http://ftp.isc.org/isc/dhcp/dhcp-4.1-history/$pkgname-$_realver.tar.gz prepare() { cd "$srcdir/$pkgname-$_realver" patch -p1 -i "$srcdir"/dhcp-3.0-fix-perms.patch || return 1 - patch -p1 -i ../linux_ipv6_discover.patch || return 1 + # patch -p1 -i ../linux_ipv6_discover.patch || return 1 } build() { @@ -74,7 +74,7 @@ dhcrelay() { "$subpkgdir"/etc/conf.d/dhcrelay } -md5sums="325ff8338c5a21f89d5304ac13ffebdf dhcp-4.1.0p1.tar.gz +md5sums="ee390a35687dd75dbfc32c856c0938d1 dhcp-4.1.1-P1.tar.gz 37abf1fb047a353e91b022fafdabf39a linux_ipv6_discover.patch a9eaf182dae3984670da52f20ae10fba dhcp-3.0-fix-perms.patch 1597c012bb1a2c0828254c87f0a904ad dhcrelay.initd |