summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/cabal-install/PKGBUILD29
-rw-r--r--extra/feh/PKGBUILD11
-rw-r--r--extra/git/PKGBUILD8
-rw-r--r--extra/icedtea-web-java7/PKGBUILD10
-rw-r--r--extra/icedtea-web/PKGBUILD8
-rw-r--r--extra/indent/PKGBUILD39
-rw-r--r--extra/indent/indent-2.2.11-LC_ALL.patch17
-rw-r--r--extra/indent/indent-2.2.11-decimal_format.patch98
-rw-r--r--extra/java7-openjdk/PKGBUILD16
-rw-r--r--extra/kdepim/PKGBUILD4
-rw-r--r--extra/libxmu/PKGBUILD8
-rw-r--r--extra/networkmanager/PKGBUILD10
-rw-r--r--extra/networkmanager/dnsmasq-path.patch30
13 files changed, 229 insertions, 59 deletions
diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index 78c9c8902..9c4bfc17d 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -1,27 +1,34 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
pkgname=cabal-install
-pkgver=0.10.2
-pkgrel=1
+pkgver=0.10.4
+pkgrel=2
pkgdesc="The command-line interface for Cabal and Hackage."
url="http://hackage.haskell.org/package/cabal-install"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-makedepends=('ghc=7.0.2' 'haskell-http>=4000.1.1' 'haskell-zlib')
-depends=('gmp' zlib)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz)
+makedepends=('haskell-http=4000.2.2-1' 'haskell-zlib=0.5.3.3-3' 'haskell-mtl=2.0.1.0-4' 'haskell-network=2.3.0.11-1' 'haskell-random=1.0.1.1-1')
+depends=('ghc' 'gmp' 'zlib')
+#source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz)
+# switch back to regular cabal-install once it gets updated...
+source=("http://hackage.haskell.org/packages/archive/cabal-install-ghc74/${pkgver}/cabal-install-ghc74-${pkgver}.tar.gz")
+md5sums=('49b3301cc80775ebf19fe9d949f15df5')
build() {
- cd $srcdir/cabal-install-$pkgver
+ cd cabal-install-ghc74-${pkgver}
runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr
runhaskell Setup build
}
package() {
- cd $srcdir/cabal-install-$pkgver
+ cd cabal-install-ghc74-${pkgver}
runhaskell Setup copy --destdir=$pkgdir
- install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ #install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+
+ # add bash completion
+ install -d ${pkgdir}/etc/bash_completion.d
+ install -m644 bash-completion/cabal \
+ ${pkgdir}/etc/bash_completion.d
}
-
-md5sums=('bc906ef0bed79cbb33fdb36b73514281')
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index 229ab4761..8c68a8611 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 148712 2012-02-05 11:47:50Z ibiru $
+# $Id: PKGBUILD 152286 2012-03-06 13:19:14Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=feh
-pkgver=2.3
-pkgrel=2
+pkgver=2.4
+pkgrel=1
pkgdesc='Fast and light imlib2-based image viewer'
url='http://feh.finalrewind.org/'
license=('MIT')
arch=('i686' 'x86_64')
depends=('giblib' 'curl' 'libxinerama')
-optdepends=('perl: feh-cam, webcam wrapper for feh')
+optdepends=('perl: feh-cam, webcam wrapper for feh'
+ 'imagemagick: support more file formats')
makedepends=('libxt')
source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9f42ba920baeb405777f834546223a9ff9eb43e7')
+sha1sums=('1798186105da2dacebd49210d7f0bd78687922a5')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 9d7dc326b..224afafab 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 150817 2012-02-23 04:50:43Z dan $
+# $Id: PKGBUILD 152269 2012-03-06 12:08:41Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.7.9.2
+pkgver=1.7.9.3
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64)
@@ -92,7 +92,7 @@ package() {
install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
}
-sha1sums=('7aff1048480a8637de94e8d82744d312c0b5e060'
- 'd6992d899fb70e40983f94a2f96ad24b8ee93557'
+sha1sums=('6216153da1139c25cb96cfb4441eff327013ec4f'
+ '223daa871a64facc60bdf643c50c78eac21c88f4'
'f2b41828bd912b72e2cb3e14677739c4f370de66'
'149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
index 076ebcaab..31c0e9566 100644
--- a/extra/icedtea-web-java7/PKGBUILD
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -3,14 +3,14 @@
pkgbase=icedtea-web-java7
pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.1.4
-pkgrel=2
+pkgver=1.1.5
+pkgrel=1
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org/wiki/IcedTea-Web"
license=('GPL2')
-makedepends=('jdk7-openjdk' 'zip' 'gtk' 'npapi-sdk' 'rhino' 'junit')
+makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit')
source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
-md5sums=('1ed24b7e58da26471187dfae80b020b6')
+sha256sums=('ab5c34a9dc6bff48baf1f1d1a34bf54bfb954ad93ee9e7e44d642fa991bcc919')
_javaver=7
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
@@ -20,7 +20,7 @@ build() {
. /etc/profile.d/jre.sh
. /etc/profile.d/jdk.sh
-
+
./configure --prefix=${_jvmdir} \
--datarootdir=/usr/share \
--with-jdk-home=${_jvmdir}
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index e63f555f8..fed422199 100644
--- a/extra/icedtea-web/PKGBUILD
+++ b/extra/icedtea-web/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 145641 2011-12-25 14:34:47Z andyrtr $
+# $Id: PKGBUILD 152259 2012-03-06 05:29:22Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=icedtea-web
pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.1.4
-pkgrel=2
+pkgver=1.1.5
+pkgrel=1
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org/wiki/IcedTea-Web"
license=('GPL2')
makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit')
source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-md5sums=('1ed24b7e58da26471187dfae80b020b6')
+sha256sums=('ab5c34a9dc6bff48baf1f1d1a34bf54bfb954ad93ee9e7e44d642fa991bcc919')
_javaver=6
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
diff --git a/extra/indent/PKGBUILD b/extra/indent/PKGBUILD
index 8ac2de017..86e1d39d5 100644
--- a/extra/indent/PKGBUILD
+++ b/extra/indent/PKGBUILD
@@ -1,33 +1,44 @@
-# $Id: PKGBUILD 127328 2011-06-13 05:26:28Z eric $
+# $Id: PKGBUILD 152433 2012-03-06 21:03:48Z stephane $
# Maintainer: Aaron Griffin <aaron@archlinux.org>
# Contributor: aurelien <aurelien@archlinux.org>
# Contributor: Herb Rose (hrose56@yahoo.com)
pkgname=indent
pkgver=2.2.11
-pkgrel=1
-pkgdesc="A tool to change the appearance of a C program by inserting or deleting whitespace"
+pkgrel=2
+pkgdesc="C language source code formatting program"
arch=('i686' 'x86_64')
url="http://indent.isidore-it.eu/beautify.html"
depends=('glibc')
makedepends=('texi2html')
license=('GPL3')
install=indent.install
-source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz indent-2.2.11-segfault.patch)
-md5sums=('98beafca62472805a3739d3867d5d70f'
- 'e5ded8513547ff4555dec2bb805dd2ab')
+source=(http://indent.isidore-it.eu/${pkgname}-${pkgver}.tar.gz
+ indent-2.2.11-segfault.patch
+ indent-2.2.11-LC_ALL.patch
+ indent-2.2.11-decimal_format.patch)
sha1sums=('9b242528bbc4914464117c69ffae9df24d3fa4a7'
- '31a6dcd5edcac4decac81dbb52bc9415b8b148e4')
+ '31a6dcd5edcac4decac81dbb52bc9415b8b148e4'
+ '91b210b666de59ca44524288a4c1ebd213570daa'
+ '2b7d5a725fe307ce81565f920a0a66b319b50c91')
build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p1 -i ../indent-2.2.11-segfault.patch
- sed -i 's/-number/-number-sections/' doc/Makefile.in
- ./configure --prefix=/usr
- make
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -Np1 -i ../indent-2.2.11-segfault.patch
+
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=205692
+ patch -Np1 -i ../indent-2.2.11-LC_ALL.patch
+
+ # https://lists.gnu.org/archive/html/bug-indent/2011-08/msg00000.html
+ patch -Np1 -i ../indent-2.2.11-decimal_format.patch
+
+ sed -i 's/-number/-number-sections/' doc/Makefile.in
+ ./configure --prefix=/usr
+ make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" docdir=/usr/share/doc/indent install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" docdir=/usr/share/doc/indent install
}
diff --git a/extra/indent/indent-2.2.11-LC_ALL.patch b/extra/indent/indent-2.2.11-LC_ALL.patch
new file mode 100644
index 000000000..0ffe56d3c
--- /dev/null
+++ b/extra/indent/indent-2.2.11-LC_ALL.patch
@@ -0,0 +1,17 @@
+From: Santiago Vila <sanvila@debian.org>
+Subject: setlocale using LC_ALL, not LC_MESSAGES
+Bug-Debian: http://bugs.debian.org/205692
+
+--- a/src/indent.c
++++ b/src/indent.c
+@@ -1008,8 +1008,8 @@
+ BOOLEAN using_stdin = false;
+ exit_values_ty exit_status;
+
+-#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) && defined (HAVE_LCCTYPES)
+- setlocale(LC_MESSAGES, "");
++#if defined (HAVE_SETLOCALE)
++ setlocale(LC_ALL, "");
+ #endif
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
diff --git a/extra/indent/indent-2.2.11-decimal_format.patch b/extra/indent/indent-2.2.11-decimal_format.patch
new file mode 100644
index 000000000..ea34d0ea7
--- /dev/null
+++ b/extra/indent/indent-2.2.11-decimal_format.patch
@@ -0,0 +1,98 @@
+From ff47ab3b90333bdfaa40b86cb548e92a01787345 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Thu, 25 Aug 2011 11:26:24 +0200
+Subject: [PATCH] Do not split decimal float suffix from constant
+
+N1312 draft of ISO/IEC WDTR24732 defines additional floating types
+with given suffixes:
+
+_Decimal32 DF, df
+_Decimal64 DD, dd
+_Decimal128 DL, dl
+
+These suffixes must stick on numeric part of the constant as classic
+float or long float does.
+---
+ regression/TEST | 3 ++-
+ regression/input/float-constant-suffix.c | 13 +++++++++++++
+ regression/standard/float-constant-suffix.c | 13 +++++++++++++
+ src/lexi.c | 9 +++++++++
+ 4 files changed, 37 insertions(+), 1 deletions(-)
+ create mode 100644 regression/input/float-constant-suffix.c
+ create mode 100644 regression/standard/float-constant-suffix.c
+
+diff --git a/regression/TEST b/regression/TEST
+index c860ef2..1402ddf 100755
+--- a/regression/TEST
++++ b/regression/TEST
+@@ -35,7 +35,8 @@ EXAMPLES="do.c else.c for.c func-def.c lshift.c ncs.c \
+
+ BUGS="case-label.c one-line-1.c one-line-2.c one-line-3.c \
+ one-line-4.c struct-decl.c sizeof-in-while.c line-break-comment.c \
+- macro.c enum.c elif.c nested.c wrapped-string.c minus_predecrement.c"
++ macro.c enum.c elif.c nested.c wrapped-string.c minus_predecrement.c \
++ float-constant-suffix.c"
+
+ INDENTSRC="args.c backup.h backup.c dirent_def.h globs.c indent.h \
+ indent.c indent_globs.h io.c lexi.c memcpy.c parse.c pr_comment.c \
+diff --git a/regression/input/float-constant-suffix.c b/regression/input/float-constant-suffix.c
+new file mode 100644
+index 0000000..58f5310
+--- /dev/null
++++ b/regression/input/float-constant-suffix.c
+@@ -0,0 +1,13 @@
++float foo = 1.0F;
++float foo = 1.0f;
++double foo = 1.0;
++double foo = 1.0;
++long double foo = 1.0L;
++long double foo = 1.0l;
++
++_Decimal32 foo = 1.0DF;
++_Decimal32 foo = 1.0df;
++_Decimal64 foo = 1.0DD;
++_Decimal64 foo = 1.0dd;
++_Decimal128 foo = 1.0DL;
++_Decimal128 foo = 1.0dl;
+diff --git a/regression/standard/float-constant-suffix.c b/regression/standard/float-constant-suffix.c
+new file mode 100644
+index 0000000..58f5310
+--- /dev/null
++++ b/regression/standard/float-constant-suffix.c
+@@ -0,0 +1,13 @@
++float foo = 1.0F;
++float foo = 1.0f;
++double foo = 1.0;
++double foo = 1.0;
++long double foo = 1.0L;
++long double foo = 1.0l;
++
++_Decimal32 foo = 1.0DF;
++_Decimal32 foo = 1.0df;
++_Decimal64 foo = 1.0DD;
++_Decimal64 foo = 1.0dd;
++_Decimal128 foo = 1.0DL;
++_Decimal128 foo = 1.0dl;
+diff --git a/src/lexi.c b/src/lexi.c
+index abc2bfa..eafb65e 100644
+--- a/src/lexi.c
++++ b/src/lexi.c
+@@ -330,6 +330,15 @@ extern codes_ty lexi(void)
+ {
+ buf_ptr++;
+ }
++ else if (*buf_ptr == 'D' || *buf_ptr == 'd')
++ {
++ if (buf_ptr[1] == 'F' || buf_ptr[1] == 'f' ||
++ buf_ptr[1] == 'D' || buf_ptr[1] == 'd' ||
++ buf_ptr[1] == 'L' || buf_ptr[1] == 'l')
++ {
++ buf_ptr+=2;
++ }
++ }
+ else
+ {
+ while (*buf_ptr == 'U' || *buf_ptr == 'u' || *buf_ptr == 'L' || *buf_ptr == 'l')
+--
+1.7.6
+
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index e19cf6b53..b6577ff1d 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150234 2012-02-15 16:00:28Z andyrtr $
+# $Id: PKGBUILD 152428 2012-03-06 20:36:57Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
@@ -24,7 +24,7 @@ _OPENJDK_CHANGESET=22cc03983e20
_bootstrap=0 # 0/1 for quick build or full bootstrap
pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=1
+pkgrel=3
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org"
license=('custom')
@@ -93,6 +93,7 @@ build() {
[ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
unset MAKEFLAGS # parallel build is currently broken
+
export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
@@ -122,7 +123,8 @@ build() {
--with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
--enable-pulse-java \
--enable-nss \
- --with-rhino
+ --with-rhino \
+ --with-abs-install-dir=${_jvmdir}
#--help
# --enable-systemtap Enable inclusion of SystemTap trace support - needs systemtab from AUR + --with-abs-install-dir=/usr/lib/jvm/java-7-openjdk The absolute path where the j2sdk-image dir will be installed
@@ -141,8 +143,8 @@ package_jre7-openjdk-headless() {
'ca-certificates-java' 'rhino')
optdepends=('libcups: needed for Java Mauve support - libmawt.so'
'fontconfig: needed for Java Mauve support - libmawt.so')
- provides=('java-runtime=7')
- conflicts=('java-runtime' 'openjdk6')
+ provides=('java-runtime-headless=7')
+ conflicts=('openjdk6')
# replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
backup=(etc/profile.d/jre.sh
etc/profile.d/jre.csh
@@ -263,8 +265,10 @@ package_jre7-openjdk() {
'alsa-lib: for basic sound support'
'giflib: for gif format support'
'libpulse: for advanced sound support'
- 'gtk2: for the Gtk+ look and feel - desktop usage')
+ 'gtk2: for the Gtk+ look and feel - desktop usage'
+ 'libxtst: linked in xawt/libmawt.so - desktop usage')
install=jre7-openjdk.install
+ provides=('java-runtime=7')
conflicts=('openjdk6')
mv ${srcdir}/tmp-desktop-jre/* ${pkgdir}
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 8aca2344c..8845731b4 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152097 2012-03-04 14:58:51Z andrea $
+# $Id: PKGBUILD 152419 2012-03-06 18:57:11Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -27,7 +27,7 @@ license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdepim')
makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
'kde-agent')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz")
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
sha1sums=('61509f42a96193ae2a9b9f8560dccb73d739f356')
build() {
diff --git a/extra/libxmu/PKGBUILD b/extra/libxmu/PKGBUILD
index f37bb9799..6ff36c5b0 100644
--- a/extra/libxmu/PKGBUILD
+++ b/extra/libxmu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151426 2012-02-26 10:48:08Z pierre $
+# $Id: PKGBUILD 152301 2012-03-06 15:00:25Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libxmu
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
pkgdesc="X11 miscellaneous micro-utility library"
arch=('i686' 'x86_64')
url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ makedepends=('xorg-util-macros')
license=('custom')
options=('!libtool')
source=("${url}/releases/individual/lib/libXmu-${pkgver}.tar.bz2")
-sha1sums=('81876a0848070bfc4476a2538fc16898eb6d96cd')
+sha1sums=('3e280aa927d78c05f94db6c7ae606f7ad132b495')
build() {
cd "${srcdir}/libXmu-${pkgver}"
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 1b511a2cd..ae0fbd88d 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')
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
+ };
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-24 09:06:53 +0000