Date: Saturday, April 6, 2013 @ 23:12:45 Author: heftig Revision: 182097
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64 Added: networkmanager/repos/gnome-unstable-i686/ networkmanager/repos/gnome-unstable-i686/NetworkManager.conf (from rev 182096, networkmanager/trunk/NetworkManager.conf) networkmanager/repos/gnome-unstable-i686/PKGBUILD (from rev 182096, networkmanager/trunk/PKGBUILD) networkmanager/repos/gnome-unstable-i686/disable_set_hostname.patch (from rev 182096, networkmanager/trunk/disable_set_hostname.patch) networkmanager/repos/gnome-unstable-i686/dnsmasq-path.patch (from rev 182096, networkmanager/trunk/dnsmasq-path.patch) networkmanager/repos/gnome-unstable-i686/networkmanager.install (from rev 182096, networkmanager/trunk/networkmanager.install) networkmanager/repos/gnome-unstable-x86_64/ networkmanager/repos/gnome-unstable-x86_64/NetworkManager.conf (from rev 182096, networkmanager/trunk/NetworkManager.conf) networkmanager/repos/gnome-unstable-x86_64/PKGBUILD (from rev 182096, networkmanager/trunk/PKGBUILD) networkmanager/repos/gnome-unstable-x86_64/disable_set_hostname.patch (from rev 182096, networkmanager/trunk/disable_set_hostname.patch) networkmanager/repos/gnome-unstable-x86_64/dnsmasq-path.patch (from rev 182096, networkmanager/trunk/dnsmasq-path.patch) networkmanager/repos/gnome-unstable-x86_64/networkmanager.install (from rev 182096, networkmanager/trunk/networkmanager.install) --------------------------------------------------+ gnome-unstable-i686/NetworkManager.conf | 2 gnome-unstable-i686/PKGBUILD | 74 +++++++++++++++++++++ gnome-unstable-i686/disable_set_hostname.patch | 19 +++++ gnome-unstable-i686/dnsmasq-path.patch | 30 ++++++++ gnome-unstable-i686/networkmanager.install | 9 ++ gnome-unstable-x86_64/NetworkManager.conf | 2 gnome-unstable-x86_64/PKGBUILD | 74 +++++++++++++++++++++ gnome-unstable-x86_64/disable_set_hostname.patch | 19 +++++ gnome-unstable-x86_64/dnsmasq-path.patch | 30 ++++++++ gnome-unstable-x86_64/networkmanager.install | 9 ++ 10 files changed, 268 insertions(+) Copied: networkmanager/repos/gnome-unstable-i686/NetworkManager.conf (from rev 182096, networkmanager/trunk/NetworkManager.conf) =================================================================== --- gnome-unstable-i686/NetworkManager.conf (rev 0) +++ gnome-unstable-i686/NetworkManager.conf 2013-04-06 21:12:45 UTC (rev 182097) @@ -0,0 +1,2 @@ +[main] +plugins=keyfile Copied: networkmanager/repos/gnome-unstable-i686/PKGBUILD (from rev 182096, networkmanager/trunk/PKGBUILD) =================================================================== --- gnome-unstable-i686/PKGBUILD (rev 0) +++ gnome-unstable-i686/PKGBUILD 2013-04-06 21:12:45 UTC (rev 182097) @@ -0,0 +1,74 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Maintainer: Jan de Groot <j...@archlinxu.org> +# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org> +# Contributor: Tor Krill <t...@krill.nu> +# Contributor: Will Rea <sillywi...@gmail.com> +# Contributor: Valentine Sinitsyn <e_...@inbox.ru> + +pkgname=networkmanager +_pkgname=NetworkManager +pkgver=0.9.8.0 +pkgrel=3 +pkgdesc="Network Management daemon" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/$_pkgname/" +depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client + libsoup systemd modemmanager) +makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc) +optdepends=('dhclient: DHCPv6 support' + 'iptables: Connection sharing' + 'dnsmasq: Connection sharing' + 'bluez: Bluetooth support' + 'openresolv: resolvconf support' + 'ppp: Dialup connection support') +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) +sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b' + '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') + +build() { + cd $_pkgname-$pkgver + + patch -Np1 -i ../disable_set_hostname.patch + patch -Np1 -i ../dnsmasq-path.patch + #AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/networkmanager \ + --with-crypto=nss \ + --with-dhclient=/usr/sbin/dhclient \ + --with-dhcpcd=/usr/sbin/dhcpcd \ + --with-iptables=/usr/sbin/iptables \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-udev-dir=/usr/lib/udev \ + --with-resolvconf=/usr/sbin/resolvconf \ + --with-session-tracking=systemd \ + --with-modem-manager-1 \ + --disable-static \ + --enable-more-warnings=no \ + --disable-wimax \ + --enable-modify-system \ + --enable-doc + + make +} + +package() { + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install + + install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" + install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d" + + rm -r "$pkgdir/var/run" +} Copied: networkmanager/repos/gnome-unstable-i686/disable_set_hostname.patch (from rev 182096, networkmanager/trunk/disable_set_hostname.patch) =================================================================== --- gnome-unstable-i686/disable_set_hostname.patch (rev 0) +++ gnome-unstable-i686/disable_set_hostname.patch 2013-04-06 21:12:45 UTC (rev 182097) @@ -0,0 +1,19 @@ +diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c +--- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000 ++++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000 +@@ -302,6 +302,7 @@ + return; + } + ++#if 0 + /* Try automatically determined hostname from the best device's IP config */ + if (!best4) + best4 = get_best_ip4_device (policy->manager, &best_req4); +@@ -356,6 +357,7 @@ + } + } + ++#endif + /* If no automatically-configured hostname, try using the hostname from + * when NM started up. + */ Copied: networkmanager/repos/gnome-unstable-i686/dnsmasq-path.patch (from rev 182096, networkmanager/trunk/dnsmasq-path.patch) =================================================================== --- gnome-unstable-i686/dnsmasq-path.patch (rev 0) +++ gnome-unstable-i686/dnsmasq-path.patch 2013-04-06 21:12:45 UTC (rev 182097) @@ -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 + }; Copied: networkmanager/repos/gnome-unstable-i686/networkmanager.install (from rev 182096, networkmanager/trunk/networkmanager.install) =================================================================== --- gnome-unstable-i686/networkmanager.install (rev 0) +++ gnome-unstable-i686/networkmanager.install 2013-04-06 21:12:45 UTC (rev 182097) @@ -0,0 +1,9 @@ +post_upgrade() { + (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG +ATTENTION: + /etc/NetworkManager/nm-system-settings.conf has been replaced + by /etc/NetworkManager/NetworkManager.conf. Make sure you move + any custom settings to the new config file. +MSG + true +} Copied: networkmanager/repos/gnome-unstable-x86_64/NetworkManager.conf (from rev 182096, networkmanager/trunk/NetworkManager.conf) =================================================================== --- gnome-unstable-x86_64/NetworkManager.conf (rev 0) +++ gnome-unstable-x86_64/NetworkManager.conf 2013-04-06 21:12:45 UTC (rev 182097) @@ -0,0 +1,2 @@ +[main] +plugins=keyfile Copied: networkmanager/repos/gnome-unstable-x86_64/PKGBUILD (from rev 182096, networkmanager/trunk/PKGBUILD) =================================================================== --- gnome-unstable-x86_64/PKGBUILD (rev 0) +++ gnome-unstable-x86_64/PKGBUILD 2013-04-06 21:12:45 UTC (rev 182097) @@ -0,0 +1,74 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Maintainer: Jan de Groot <j...@archlinxu.org> +# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org> +# Contributor: Tor Krill <t...@krill.nu> +# Contributor: Will Rea <sillywi...@gmail.com> +# Contributor: Valentine Sinitsyn <e_...@inbox.ru> + +pkgname=networkmanager +_pkgname=NetworkManager +pkgver=0.9.8.0 +pkgrel=3 +pkgdesc="Network Management daemon" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/$_pkgname/" +depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client + libsoup systemd modemmanager) +makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc) +optdepends=('dhclient: DHCPv6 support' + 'iptables: Connection sharing' + 'dnsmasq: Connection sharing' + 'bluez: Bluetooth support' + 'openresolv: resolvconf support' + 'ppp: Dialup connection support') +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) +sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b' + '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') + +build() { + cd $_pkgname-$pkgver + + patch -Np1 -i ../disable_set_hostname.patch + patch -Np1 -i ../dnsmasq-path.patch + #AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/networkmanager \ + --with-crypto=nss \ + --with-dhclient=/usr/sbin/dhclient \ + --with-dhcpcd=/usr/sbin/dhcpcd \ + --with-iptables=/usr/sbin/iptables \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-udev-dir=/usr/lib/udev \ + --with-resolvconf=/usr/sbin/resolvconf \ + --with-session-tracking=systemd \ + --with-modem-manager-1 \ + --disable-static \ + --enable-more-warnings=no \ + --disable-wimax \ + --enable-modify-system \ + --enable-doc + + make +} + +package() { + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install + + install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" + install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d" + + rm -r "$pkgdir/var/run" +} Copied: networkmanager/repos/gnome-unstable-x86_64/disable_set_hostname.patch (from rev 182096, networkmanager/trunk/disable_set_hostname.patch) =================================================================== --- gnome-unstable-x86_64/disable_set_hostname.patch (rev 0) +++ gnome-unstable-x86_64/disable_set_hostname.patch 2013-04-06 21:12:45 UTC (rev 182097) @@ -0,0 +1,19 @@ +diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c +--- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000 ++++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000 +@@ -302,6 +302,7 @@ + return; + } + ++#if 0 + /* Try automatically determined hostname from the best device's IP config */ + if (!best4) + best4 = get_best_ip4_device (policy->manager, &best_req4); +@@ -356,6 +357,7 @@ + } + } + ++#endif + /* If no automatically-configured hostname, try using the hostname from + * when NM started up. + */ Copied: networkmanager/repos/gnome-unstable-x86_64/dnsmasq-path.patch (from rev 182096, networkmanager/trunk/dnsmasq-path.patch) =================================================================== --- gnome-unstable-x86_64/dnsmasq-path.patch (rev 0) +++ gnome-unstable-x86_64/dnsmasq-path.patch 2013-04-06 21:12:45 UTC (rev 182097) @@ -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 + }; Copied: networkmanager/repos/gnome-unstable-x86_64/networkmanager.install (from rev 182096, networkmanager/trunk/networkmanager.install) =================================================================== --- gnome-unstable-x86_64/networkmanager.install (rev 0) +++ gnome-unstable-x86_64/networkmanager.install 2013-04-06 21:12:45 UTC (rev 182097) @@ -0,0 +1,9 @@ +post_upgrade() { + (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG +ATTENTION: + /etc/NetworkManager/nm-system-settings.conf has been replaced + by /etc/NetworkManager/NetworkManager.conf. Make sure you move + any custom settings to the new config file. +MSG + true +}