Date: Monday, November 23, 2015 @ 19:33:02 Author: heftig Revision: 251903
archrelease: copy trunk to extra-i686, extra-x86_64 Added: networkmanager/repos/extra-i686/NetworkManager.conf (from rev 251902, networkmanager/trunk/NetworkManager.conf) networkmanager/repos/extra-i686/PKGBUILD (from rev 251902, networkmanager/trunk/PKGBUILD) networkmanager/repos/extra-i686/disable_set_hostname.patch (from rev 251902, networkmanager/trunk/disable_set_hostname.patch) networkmanager/repos/extra-i686/networkmanager.install (from rev 251902, networkmanager/trunk/networkmanager.install) networkmanager/repos/extra-x86_64/NetworkManager.conf (from rev 251902, networkmanager/trunk/NetworkManager.conf) networkmanager/repos/extra-x86_64/PKGBUILD (from rev 251902, networkmanager/trunk/PKGBUILD) networkmanager/repos/extra-x86_64/disable_set_hostname.patch (from rev 251902, networkmanager/trunk/disable_set_hostname.patch) networkmanager/repos/extra-x86_64/networkmanager.install (from rev 251902, networkmanager/trunk/networkmanager.install) Deleted: networkmanager/repos/extra-i686/NetworkManager.conf networkmanager/repos/extra-i686/PKGBUILD networkmanager/repos/extra-i686/disable_set_hostname.patch networkmanager/repos/extra-i686/networkmanager.install networkmanager/repos/extra-x86_64/NetworkManager.conf networkmanager/repos/extra-x86_64/PKGBUILD networkmanager/repos/extra-x86_64/disable_set_hostname.patch networkmanager/repos/extra-x86_64/networkmanager.install -----------------------------------------+ /NetworkManager.conf | 26 +++ /PKGBUILD | 240 ++++++++++++++++++++++++++++++ /disable_set_hostname.patch | 38 ++++ /networkmanager.install | 18 ++ extra-i686/NetworkManager.conf | 13 - extra-i686/PKGBUILD | 120 --------------- extra-i686/disable_set_hostname.patch | 19 -- extra-i686/networkmanager.install | 9 - extra-x86_64/NetworkManager.conf | 13 - extra-x86_64/PKGBUILD | 120 --------------- extra-x86_64/disable_set_hostname.patch | 19 -- extra-x86_64/networkmanager.install | 9 - 12 files changed, 322 insertions(+), 322 deletions(-) Deleted: extra-i686/NetworkManager.conf =================================================================== --- extra-i686/NetworkManager.conf 2015-11-23 18:30:12 UTC (rev 251902) +++ extra-i686/NetworkManager.conf 2015-11-23 18:33:02 UTC (rev 251903) @@ -1,13 +0,0 @@ -[main] -plugins=keyfile -dhcp=dhclient -dns=default - -## Set static hostname -#[keyfile] -#hostname=foobar - -## HTTP-based connectivity check -#[connectivity] -#uri=http://nmcheck.gnome.org/check_network_status.txt -#interval=100 Copied: networkmanager/repos/extra-i686/NetworkManager.conf (from rev 251902, networkmanager/trunk/NetworkManager.conf) =================================================================== --- extra-i686/NetworkManager.conf (rev 0) +++ extra-i686/NetworkManager.conf 2015-11-23 18:33:02 UTC (rev 251903) @@ -0,0 +1,13 @@ +[main] +plugins=keyfile +dhcp=dhclient +dns=default + +## Set static hostname +#[keyfile] +#hostname=foobar + +## HTTP-based connectivity check +#[connectivity] +#uri=http://nmcheck.gnome.org/check_network_status.txt +#interval=100 Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-11-23 18:30:12 UTC (rev 251902) +++ extra-i686/PKGBUILD 2015-11-23 18:33:02 UTC (rev 251903) @@ -1,120 +0,0 @@ -# $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> - -pkgbase=networkmanager -pkgname=(networkmanager libnm-glib) -pkgver=1.0.7 -pkgrel=1 -pkgdesc="Network Management daemon" -arch=(i686 x86_64) -license=(GPL2 LGPL2.1) -url="http://www.gnome.org/projects/NetworkManager/" -_pppver=2.4.7 -makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" - modemmanager dbus-glib iproute2 libnl nss polkit wpa_supplicant libsoup - systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala perl-yaml - python2-gobject git) -checkdepends=(libx11 python2-dbus) -#source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz -_commit=ba46efd07777350be737dbdac9df9becb86e8f77 -source=("git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=$_commit" - NetworkManager.conf disable_set_hostname.patch) -sha256sums=('SKIP' - '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') - -prepare() { - mkdir path - ln -s /usr/bin/python2 path/python - - cd NetworkManager - patch -Np1 -i ../disable_set_hostname.patch - NOCONFIGURE=1 ./autogen.sh -} - -build() { - export PATH="$srcdir/path:$PATH" - cd NetworkManager - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/networkmanager \ - --with-crypto=nss \ - --with-dhclient=/usr/bin/dhclient \ - --without-dhcpcd \ - --with-dnsmasq=/usr/bin/dnsmasq \ - --with-iptables=/usr/bin/iptables \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --with-udev-dir=/usr/lib/udev \ - --with-resolvconf=/usr/bin/resolvconf \ - --with-pppd=/usr/bin/pppd \ - --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \ - --with-pppoe=/usr/bin/pppoe \ - --with-kernel-firmware-dir=/usr/lib/firmware \ - --with-session-tracking=systemd \ - --with-modem-manager-1 \ - --disable-static \ - --enable-more-warnings=no \ - --disable-wimax \ - --enable-modify-system \ - --enable-doc \ - --enable-gtk-doc - - make -} - -check() { - export PATH="$srcdir/path:$PATH" - cd NetworkManager - make -k check -} - -package_networkmanager() { - depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhclient libsoup - libmm-glib libnewt libndp libteam libgudev) - optdepends=('dnsmasq: connection sharing' - 'bluez: Bluetooth support' - 'openresolv: resolvconf support' - 'ppp: dialup connection support' - 'rp-pppoe: ADSL support' - 'modemmanager: cellular network support') - install=networkmanager.install - backup=('etc/NetworkManager/NetworkManager.conf') - - cd NetworkManager - make DESTDIR="$pkgdir" install - make DESTDIR="$pkgdir" -C libnm uninstall - make DESTDIR="$pkgdir" -C libnm-glib uninstall - make DESTDIR="$pkgdir" -C libnm-util uninstall - make DESTDIR="$pkgdir" -C vapi uninstall - - # Some stuff to move is left over - mv "$pkgdir/usr/include" .. - mv "$pkgdir/usr/lib/pkgconfig" .. - - install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" - install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d" - - rm -r "$pkgdir/var/run" -} - -package_libnm-glib() { - pkgdesc="NetworkManager library" - depends=(libgudev nss dbus-glib libutil-linux) - - install -d "$pkgdir/usr/lib" - mv include "$pkgdir/usr" - mv pkgconfig "$pkgdir/usr/lib" - - cd NetworkManager - make DESTDIR="$pkgdir" -C libnm install - make DESTDIR="$pkgdir" -C libnm-util install - make DESTDIR="$pkgdir" -C libnm-glib install - make DESTDIR="$pkgdir" -C vapi install -} Copied: networkmanager/repos/extra-i686/PKGBUILD (from rev 251902, networkmanager/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-11-23 18:33:02 UTC (rev 251903) @@ -0,0 +1,120 @@ +# $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> + +pkgbase=networkmanager +pkgname=(networkmanager libnm-glib) +pkgver=1.0.8 +pkgrel=1 +pkgdesc="Network Management daemon" +arch=(i686 x86_64) +license=(GPL2 LGPL2.1) +url="http://www.gnome.org/projects/NetworkManager/" +_pppver=2.4.7 +makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" + modemmanager dbus-glib iproute2 libnl nss polkit wpa_supplicant libsoup + systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala perl-yaml + python2-gobject) +checkdepends=(libx11 python2-dbus) +#_commit=ba46efd07777350be737dbdac9df9becb86e8f77 +#source=("git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=$_commit" +source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz + NetworkManager.conf disable_set_hostname.patch) +sha256sums=('8bb128950f8a79ff881afadb46dd55e16f952390cf7cb4e06063431e5144937f' + '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b' + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') + +prepare() { + mkdir path + ln -s /usr/bin/python2 path/python + + cd NetworkManager-$pkgver + patch -Np1 -i ../disable_set_hostname.patch + NOCONFIGURE=1 ./autogen.sh +} + +build() { + export PATH="$srcdir/path:$PATH" + cd NetworkManager-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/networkmanager \ + --with-crypto=nss \ + --with-dhclient=/usr/bin/dhclient \ + --without-dhcpcd \ + --with-dnsmasq=/usr/bin/dnsmasq \ + --with-iptables=/usr/bin/iptables \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-udev-dir=/usr/lib/udev \ + --with-resolvconf=/usr/bin/resolvconf \ + --with-pppd=/usr/bin/pppd \ + --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \ + --with-pppoe=/usr/bin/pppoe \ + --with-kernel-firmware-dir=/usr/lib/firmware \ + --with-session-tracking=systemd \ + --with-modem-manager-1 \ + --disable-static \ + --enable-more-warnings=no \ + --disable-wimax \ + --enable-modify-system \ + --enable-doc \ + --enable-gtk-doc + + make +} + +check() { + export PATH="$srcdir/path:$PATH" + cd NetworkManager-$pkgver + make -k check +} + +package_networkmanager() { + depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhclient libsoup + libmm-glib libnewt libndp libteam libgudev) + optdepends=('dnsmasq: connection sharing' + 'bluez: Bluetooth support' + 'openresolv: resolvconf support' + 'ppp: dialup connection support' + 'rp-pppoe: ADSL support' + 'modemmanager: cellular network support') + install=networkmanager.install + backup=('etc/NetworkManager/NetworkManager.conf') + + cd NetworkManager-$pkgver + make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C libnm uninstall + make DESTDIR="$pkgdir" -C libnm-glib uninstall + make DESTDIR="$pkgdir" -C libnm-util uninstall + make DESTDIR="$pkgdir" -C vapi uninstall + + # Some stuff to move is left over + mv "$pkgdir/usr/include" .. + mv "$pkgdir/usr/lib/pkgconfig" .. + + install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" + install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d" + + rm -r "$pkgdir/var/run" +} + +package_libnm-glib() { + pkgdesc="NetworkManager library" + depends=(libgudev nss dbus-glib libutil-linux) + + install -d "$pkgdir/usr/lib" + mv include "$pkgdir/usr" + mv pkgconfig "$pkgdir/usr/lib" + + cd NetworkManager-$pkgver + make DESTDIR="$pkgdir" -C libnm install + make DESTDIR="$pkgdir" -C libnm-util install + make DESTDIR="$pkgdir" -C libnm-glib install + make DESTDIR="$pkgdir" -C vapi install +} Deleted: extra-i686/disable_set_hostname.patch =================================================================== --- extra-i686/disable_set_hostname.patch 2015-11-23 18:30:12 UTC (rev 251902) +++ extra-i686/disable_set_hostname.patch 2015-11-23 18:33:02 UTC (rev 251903) @@ -1,19 +0,0 @@ -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/extra-i686/disable_set_hostname.patch (from rev 251902, networkmanager/trunk/disable_set_hostname.patch) =================================================================== --- extra-i686/disable_set_hostname.patch (rev 0) +++ extra-i686/disable_set_hostname.patch 2015-11-23 18:33:02 UTC (rev 251903) @@ -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. + */ Deleted: extra-i686/networkmanager.install =================================================================== --- extra-i686/networkmanager.install 2015-11-23 18:30:12 UTC (rev 251902) +++ extra-i686/networkmanager.install 2015-11-23 18:33:02 UTC (rev 251903) @@ -1,9 +0,0 @@ -post_upgrade() { - (( $(vercmp $2 0.8.3) < 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/extra-i686/networkmanager.install (from rev 251902, networkmanager/trunk/networkmanager.install) =================================================================== --- extra-i686/networkmanager.install (rev 0) +++ extra-i686/networkmanager.install 2015-11-23 18:33:02 UTC (rev 251903) @@ -0,0 +1,9 @@ +post_upgrade() { + (( $(vercmp $2 0.8.3) < 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 +} Deleted: extra-x86_64/NetworkManager.conf =================================================================== --- extra-x86_64/NetworkManager.conf 2015-11-23 18:30:12 UTC (rev 251902) +++ extra-x86_64/NetworkManager.conf 2015-11-23 18:33:02 UTC (rev 251903) @@ -1,13 +0,0 @@ -[main] -plugins=keyfile -dhcp=dhclient -dns=default - -## Set static hostname -#[keyfile] -#hostname=foobar - -## HTTP-based connectivity check -#[connectivity] -#uri=http://nmcheck.gnome.org/check_network_status.txt -#interval=100 Copied: networkmanager/repos/extra-x86_64/NetworkManager.conf (from rev 251902, networkmanager/trunk/NetworkManager.conf) =================================================================== --- extra-x86_64/NetworkManager.conf (rev 0) +++ extra-x86_64/NetworkManager.conf 2015-11-23 18:33:02 UTC (rev 251903) @@ -0,0 +1,13 @@ +[main] +plugins=keyfile +dhcp=dhclient +dns=default + +## Set static hostname +#[keyfile] +#hostname=foobar + +## HTTP-based connectivity check +#[connectivity] +#uri=http://nmcheck.gnome.org/check_network_status.txt +#interval=100 Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-11-23 18:30:12 UTC (rev 251902) +++ extra-x86_64/PKGBUILD 2015-11-23 18:33:02 UTC (rev 251903) @@ -1,120 +0,0 @@ -# $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> - -pkgbase=networkmanager -pkgname=(networkmanager libnm-glib) -pkgver=1.0.7 -pkgrel=1 -pkgdesc="Network Management daemon" -arch=(i686 x86_64) -license=(GPL2 LGPL2.1) -url="http://www.gnome.org/projects/NetworkManager/" -_pppver=2.4.7 -makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" - modemmanager dbus-glib iproute2 libnl nss polkit wpa_supplicant libsoup - systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala perl-yaml - python2-gobject git) -checkdepends=(libx11 python2-dbus) -#source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz -_commit=ba46efd07777350be737dbdac9df9becb86e8f77 -source=("git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=$_commit" - NetworkManager.conf disable_set_hostname.patch) -sha256sums=('SKIP' - '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') - -prepare() { - mkdir path - ln -s /usr/bin/python2 path/python - - cd NetworkManager - patch -Np1 -i ../disable_set_hostname.patch - NOCONFIGURE=1 ./autogen.sh -} - -build() { - export PATH="$srcdir/path:$PATH" - cd NetworkManager - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/networkmanager \ - --with-crypto=nss \ - --with-dhclient=/usr/bin/dhclient \ - --without-dhcpcd \ - --with-dnsmasq=/usr/bin/dnsmasq \ - --with-iptables=/usr/bin/iptables \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --with-udev-dir=/usr/lib/udev \ - --with-resolvconf=/usr/bin/resolvconf \ - --with-pppd=/usr/bin/pppd \ - --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \ - --with-pppoe=/usr/bin/pppoe \ - --with-kernel-firmware-dir=/usr/lib/firmware \ - --with-session-tracking=systemd \ - --with-modem-manager-1 \ - --disable-static \ - --enable-more-warnings=no \ - --disable-wimax \ - --enable-modify-system \ - --enable-doc \ - --enable-gtk-doc - - make -} - -check() { - export PATH="$srcdir/path:$PATH" - cd NetworkManager - make -k check -} - -package_networkmanager() { - depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhclient libsoup - libmm-glib libnewt libndp libteam libgudev) - optdepends=('dnsmasq: connection sharing' - 'bluez: Bluetooth support' - 'openresolv: resolvconf support' - 'ppp: dialup connection support' - 'rp-pppoe: ADSL support' - 'modemmanager: cellular network support') - install=networkmanager.install - backup=('etc/NetworkManager/NetworkManager.conf') - - cd NetworkManager - make DESTDIR="$pkgdir" install - make DESTDIR="$pkgdir" -C libnm uninstall - make DESTDIR="$pkgdir" -C libnm-glib uninstall - make DESTDIR="$pkgdir" -C libnm-util uninstall - make DESTDIR="$pkgdir" -C vapi uninstall - - # Some stuff to move is left over - mv "$pkgdir/usr/include" .. - mv "$pkgdir/usr/lib/pkgconfig" .. - - install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" - install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d" - - rm -r "$pkgdir/var/run" -} - -package_libnm-glib() { - pkgdesc="NetworkManager library" - depends=(libgudev nss dbus-glib libutil-linux) - - install -d "$pkgdir/usr/lib" - mv include "$pkgdir/usr" - mv pkgconfig "$pkgdir/usr/lib" - - cd NetworkManager - make DESTDIR="$pkgdir" -C libnm install - make DESTDIR="$pkgdir" -C libnm-util install - make DESTDIR="$pkgdir" -C libnm-glib install - make DESTDIR="$pkgdir" -C vapi install -} Copied: networkmanager/repos/extra-x86_64/PKGBUILD (from rev 251902, networkmanager/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-11-23 18:33:02 UTC (rev 251903) @@ -0,0 +1,120 @@ +# $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> + +pkgbase=networkmanager +pkgname=(networkmanager libnm-glib) +pkgver=1.0.8 +pkgrel=1 +pkgdesc="Network Management daemon" +arch=(i686 x86_64) +license=(GPL2 LGPL2.1) +url="http://www.gnome.org/projects/NetworkManager/" +_pppver=2.4.7 +makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" + modemmanager dbus-glib iproute2 libnl nss polkit wpa_supplicant libsoup + systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala perl-yaml + python2-gobject) +checkdepends=(libx11 python2-dbus) +#_commit=ba46efd07777350be737dbdac9df9becb86e8f77 +#source=("git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=$_commit" +source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz + NetworkManager.conf disable_set_hostname.patch) +sha256sums=('8bb128950f8a79ff881afadb46dd55e16f952390cf7cb4e06063431e5144937f' + '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b' + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') + +prepare() { + mkdir path + ln -s /usr/bin/python2 path/python + + cd NetworkManager-$pkgver + patch -Np1 -i ../disable_set_hostname.patch + NOCONFIGURE=1 ./autogen.sh +} + +build() { + export PATH="$srcdir/path:$PATH" + cd NetworkManager-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/networkmanager \ + --with-crypto=nss \ + --with-dhclient=/usr/bin/dhclient \ + --without-dhcpcd \ + --with-dnsmasq=/usr/bin/dnsmasq \ + --with-iptables=/usr/bin/iptables \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-udev-dir=/usr/lib/udev \ + --with-resolvconf=/usr/bin/resolvconf \ + --with-pppd=/usr/bin/pppd \ + --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \ + --with-pppoe=/usr/bin/pppoe \ + --with-kernel-firmware-dir=/usr/lib/firmware \ + --with-session-tracking=systemd \ + --with-modem-manager-1 \ + --disable-static \ + --enable-more-warnings=no \ + --disable-wimax \ + --enable-modify-system \ + --enable-doc \ + --enable-gtk-doc + + make +} + +check() { + export PATH="$srcdir/path:$PATH" + cd NetworkManager-$pkgver + make -k check +} + +package_networkmanager() { + depends=(libnm-glib iproute2 libnl polkit wpa_supplicant dhclient libsoup + libmm-glib libnewt libndp libteam libgudev) + optdepends=('dnsmasq: connection sharing' + 'bluez: Bluetooth support' + 'openresolv: resolvconf support' + 'ppp: dialup connection support' + 'rp-pppoe: ADSL support' + 'modemmanager: cellular network support') + install=networkmanager.install + backup=('etc/NetworkManager/NetworkManager.conf') + + cd NetworkManager-$pkgver + make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C libnm uninstall + make DESTDIR="$pkgdir" -C libnm-glib uninstall + make DESTDIR="$pkgdir" -C libnm-util uninstall + make DESTDIR="$pkgdir" -C vapi uninstall + + # Some stuff to move is left over + mv "$pkgdir/usr/include" .. + mv "$pkgdir/usr/lib/pkgconfig" .. + + install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" + install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d" + + rm -r "$pkgdir/var/run" +} + +package_libnm-glib() { + pkgdesc="NetworkManager library" + depends=(libgudev nss dbus-glib libutil-linux) + + install -d "$pkgdir/usr/lib" + mv include "$pkgdir/usr" + mv pkgconfig "$pkgdir/usr/lib" + + cd NetworkManager-$pkgver + make DESTDIR="$pkgdir" -C libnm install + make DESTDIR="$pkgdir" -C libnm-util install + make DESTDIR="$pkgdir" -C libnm-glib install + make DESTDIR="$pkgdir" -C vapi install +} Deleted: extra-x86_64/disable_set_hostname.patch =================================================================== --- extra-x86_64/disable_set_hostname.patch 2015-11-23 18:30:12 UTC (rev 251902) +++ extra-x86_64/disable_set_hostname.patch 2015-11-23 18:33:02 UTC (rev 251903) @@ -1,19 +0,0 @@ -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/extra-x86_64/disable_set_hostname.patch (from rev 251902, networkmanager/trunk/disable_set_hostname.patch) =================================================================== --- extra-x86_64/disable_set_hostname.patch (rev 0) +++ extra-x86_64/disable_set_hostname.patch 2015-11-23 18:33:02 UTC (rev 251903) @@ -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. + */ Deleted: extra-x86_64/networkmanager.install =================================================================== --- extra-x86_64/networkmanager.install 2015-11-23 18:30:12 UTC (rev 251902) +++ extra-x86_64/networkmanager.install 2015-11-23 18:33:02 UTC (rev 251903) @@ -1,9 +0,0 @@ -post_upgrade() { - (( $(vercmp $2 0.8.3) < 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/extra-x86_64/networkmanager.install (from rev 251902, networkmanager/trunk/networkmanager.install) =================================================================== --- extra-x86_64/networkmanager.install (rev 0) +++ extra-x86_64/networkmanager.install 2015-11-23 18:33:02 UTC (rev 251903) @@ -0,0 +1,9 @@ +post_upgrade() { + (( $(vercmp $2 0.8.3) < 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 +}