diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-09 17:15:33 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-09 17:15:33 +0100 |
| commit | 81c145bbc94619d18db270991d31912a3d50c43b (patch) | |
| tree | d4019392a513b226493ade11b1486d73dbb1e68e /extra/networkmanager | |
| parent | 4290dec175736d43c7df289c599f553c469f3678 (diff) | |
| parent | 0a7c64736c0b026c3105928d89500a8af1ad5eac (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/recoll/PKGBUILD
core/dnsutils/PKGBUILD
core/tzdata/PKGBUILD
extra/cabal-install/PKGBUILD
extra/feh/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/indent/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk/PKGBUILD
extra/ktorrent/PKGBUILD
extra/libktorrent/PKGBUILD
libre/mplayer-libre/PKGBUILD
multilib/lib32-libxau/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/wine/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdepim/PKGBUILD
testing/bluez/PKGBUILD
testing/xf86-input-evdev/PKGBUILD
Diffstat (limited to 'extra/networkmanager')
| -rw-r--r-- | extra/networkmanager/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/networkmanager/dnsmasq-path.patch | 30 |
2 files changed, 36 insertions, 4 deletions
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index be6a2766d..0d362036d 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150904 2012-02-23 13:55:20Z allan $ +# $Id: PKGBUILD 152264 2012-03-06 08:15:52Z heftig $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -7,7 +7,7 @@ pkgname=networkmanager pkgver=0.9.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -24,15 +24,17 @@ options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz - NetworkManager.conf disable_set_hostname.patch) + NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch) sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') build() { cd "${srcdir}/NetworkManager-${pkgver}" patch -Np1 -i "${srcdir}/disable_set_hostname.patch" + patch -Np1 -i "${srcdir}/dnsmasq-path.patch" ./configure \ --prefix=/usr \ diff --git a/extra/networkmanager/dnsmasq-path.patch b/extra/networkmanager/dnsmasq-path.patch new file mode 100644 index 000000000..c0e713266 --- /dev/null +++ b/extra/networkmanager/dnsmasq-path.patch @@ -0,0 +1,30 @@ +diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c +--- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100 +@@ -52,8 +52,11 @@ + find_dnsmasq (void) + { + static const char *paths[] = { ++ "/usr/local/bin/dnsmasq", + "/usr/local/sbin/dnsmasq", ++ "/usr/bin/dnsmasq", + "/usr/sbin/dnsmasq", ++ "/bin/dnsmasq", + "/sbin/dnsmasq", + NULL + }; +diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c +--- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100 +@@ -170,8 +170,11 @@ + nm_find_dnsmasq (void) + { + static const char *dnsmasq_binary_paths[] = { ++ "/usr/local/bin/dnsmasq", + "/usr/local/sbin/dnsmasq", ++ "/usr/bin/dnsmasq", + "/usr/sbin/dnsmasq", ++ "/bin/dnsmasq", + "/sbin/dnsmasq", + NULL + }; |