diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-31 12:17:44 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-31 12:17:44 +0200 |
| commit | 22a099ec0cc8532196da82ff11d6fb2b3b34fea8 (patch) | |
| tree | 1ef727a0b8dc9350430882f3086d4c17d01ce970 /core/dhcpcd | |
| parent | eaaf1e91b1d47d25856928ed24efcb6e99faae8e (diff) | |
| parent | 977b78df305a06797773799a7295f2a5f3f013cf (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/libzip/PKGBUILD
extra/qt/PKGBUILD
gnome-unstable/dconf/PKGBUILD
gnome-unstable/gnome-color-manager/PKGBUILD
gnome-unstable/gnome-disk-utility/PKGBUILD
gnome-unstable/gnome-documents/PKGBUILD
gnome-unstable/gnome-font-viewer/PKGBUILD
gnome-unstable/gnome-power-manager/PKGBUILD
gnome-unstable/gnome-system-log/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/gvfs/PKGBUILD
gnome-unstable/libimobiledevice/PKGBUILD
gnome-unstable/libplist/PKGBUILD
libre/grub2/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib-testing/lib32-glibc/glibc-__i686.patch
multilib/lib32-qt/PKGBUILD
testing/dhcpcd/PKGBUILD
testing/glibc/PKGBUILD
testing/glibc/glibc-__i686.patch
Diffstat (limited to 'core/dhcpcd')
| -rw-r--r-- | core/dhcpcd/PKGBUILD | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index 817f7c7d7..b4a3c295d 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150154 2012-02-13 15:50:03Z ronald $ +# $Id: PKGBUILD 154510 2012-03-29 17:58:41Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=5.5.4 +pkgver=5.5.5 pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/dhcpcd/" @@ -15,19 +15,16 @@ depends=('glibc' 'sh') backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ - 'dhcpcd.conf.d' '0001-Set-hostname-via-proc-if-file-is-available.patch' \ - '0001-set-MTU-via-sysfs-if-file-is-available.patch') -sha1sums=('8aa42abd28d49cce5b179998490c36f6c490e338' - 'b67b9ce6a2faaca75fea356966a16be2283b7db0' - 'ee85adac972a8172a9d9b3a1bdd46e0430301582' - 'afbed18dc5544f7d0b81e2266b322ca12becf9a4') + 'dhcpcd.conf.d') +sha1sums=('1856ad1535f2c7551cefcb492af24d345c6a1b50' + 'b67b9ce6a2faaca75fea356966a16be2283b7db0') build() { cd ${srcdir}/${pkgname}-${pkgver} - # remove net-tools dep - patch -Np1 -i ${srcdir}/0001-Set-hostname-via-proc-if-file-is-available.patch - patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch + # remove net-tools dep (upstream now) +# patch -Np1 -i ${srcdir}/0001-Set-hostname-via-proc-if-file-is-available.patch +# patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch # configure variables ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \ |