diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 20:05:58 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 20:05:58 -0300 |
commit | 1872d2123d241e0a3ef01a50fcdc4596b056bcf4 (patch) | |
tree | a9ba894779ea4dc5df5f6d5a9bceae99f4c44e06 /extra/networkmanager/PKGBUILD | |
parent | 5a05be089c68617c86c9c555e63f2b0314451ebf (diff) | |
parent | 005a14f92ef5d35e4c47d970cb7e69367a835958 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/balsa/PKGBUILD
community/bitcoin/PKGBUILD
community/jack2/PKGBUILD
community/kadu/PKGBUILD
community/oss/PKGBUILD
core/sudo/PKGBUILD
extra/djvulibre/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
multilib/jack2-multilib/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-sdl/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/dnsutils/PKGBUILD
testing/man-db/PKGBUILD
testing/postgresql/PKGBUILD
testing/postgresql/postgresql.install
testing/postgresql/postgresql.service
testing/procps-ng/PKGBUILD
testing/procps-ng/sysctl.conf
testing/sudo/PKGBUILD
testing/xf86-video-nouveau/PKGBUILD
testing/xf86-video-nouveau/xf86-video-nouveau.install
Diffstat (limited to 'extra/networkmanager/PKGBUILD')
-rw-r--r-- | extra/networkmanager/PKGBUILD | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 9c3b8ed62..3fea039bb 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166518 2012-09-09 15:40:49Z heftig $ +# $Id: PKGBUILD 166778 2012-09-19 08:12:49Z heftig $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -8,7 +8,7 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -26,17 +26,22 @@ options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz - NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch) + NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch + nm-polkit-permissive.patch repair-signals.patch) sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb' + 'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06' + 'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6') build() { cd $_pkgname-$pkgver patch -Np1 -i ../disable_set_hostname.patch patch -Np1 -i ../dnsmasq-path.patch + patch -Np1 -i ../nm-polkit-permissive.patch + patch -Np1 -i ../repair-signals.patch # FS#31115 ./configure \ --prefix=/usr \ @@ -46,7 +51,7 @@ build() { --with-crypto=nss \ --with-distro=arch \ --with-dhclient=/usr/sbin/dhclient \ - --with-dhcpcd=/sbin/dhcpcd \ + --with-dhcpcd=/usr/sbin/dhcpcd \ --with-iptables=/usr/sbin/iptables \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-udev-dir=/usr/lib/udev \ |