diff options
| -rw-r--r-- | pcr/networkmanager-consolekit/NetworkManager.conf | 7 | ||||
| -rw-r--r-- | pcr/networkmanager-consolekit/PKGBUILD | 93 | ||||
| -rw-r--r-- | pcr/networkmanager-consolekit/disable_set_hostname.patch | 19 | ||||
| -rw-r--r-- | pcr/networkmanager-consolekit/networkmanager.install | 9 |
4 files changed, 50 insertions, 78 deletions
diff --git a/pcr/networkmanager-consolekit/NetworkManager.conf b/pcr/networkmanager-consolekit/NetworkManager.conf index e01e3c52f..e1306035f 100644 --- a/pcr/networkmanager-consolekit/NetworkManager.conf +++ b/pcr/networkmanager-consolekit/NetworkManager.conf @@ -1,10 +1,9 @@ [main] plugins=keyfile - -## Set static hostname -#[keyfile] -#hostname=foobar +dhcp=internal +dns=default ## HTTP-based connectivity check #[connectivity] #uri=http://nmcheck.gnome.org/check_network_status.txt +#interval=100 diff --git a/pcr/networkmanager-consolekit/PKGBUILD b/pcr/networkmanager-consolekit/PKGBUILD index e24dba2c3..e8a0cb5d0 100644 --- a/pcr/networkmanager-consolekit/PKGBUILD +++ b/pcr/networkmanager-consolekit/PKGBUILD @@ -1,65 +1,57 @@ -# Maintainer (Manjaro): artoo <artoo@manjaro.org> -# Contributor (Manjaro): Alexey D. <lq07829icatm@rambler.ru> -# Contributor (Manjaro): DaZ <daz.root+arch@gmail.coM> -# Contributor (Manjaro): Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor (Manjaro): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor (Manjaro): Jan de Groot <jgc@archlinxu.org> +# $Id$ +# Maintainer (Manjaro): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Maintainer (Manjaro): Jan de Groot <jgc@archlinxu.org> # Contributor (Manjaro): Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor (Manjaro): Tor Krill <tor@krill.nu> # Contributor (Manjaro): Will Rea <sillywilly@gmail.com> # Contributor (Manjaro): Valentine Sinitsyn <e_val@inbox.ru> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +_pppver=2.4.7 + pkgname=networkmanager-consolekit -_pkgname=NetworkManager pkgver=1.2.2 -pkgrel=1 -_pppver=2.4.7 -pkgdesc="NetworkManager with ConsoleKit support for non-systemd systems" +pkgrel=2 +pkgdesc="Network Management daemon" arch=('i686' 'x86_64') -license=('GPL' 'LGPL2.1') -url="http://www.gnome.org/projects/$_pkgname/" -depends=('libnm-glib' 'iproute2' 'libnl' 'polkit-consolekit' 'wpa_supplicant' 'dhclient' 'libsoup' - 'libmm-glib' 'libnewt' 'libndp' 'libteam' 'libgudev' 'consolekit') -optdepends=('dnsmasq: connection sharing' - 'bluez: Bluetooth support' - 'openresolv: resolvconf support' - 'ppp: dialup connection support' - 'rp-pppoe: ADSL support' - 'modemmanager: cellular network support') -makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc' "ppp=$_pppver" - 'modemmanager' 'dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'wpa_supplicant' 'libsoup' - 'udev' 'libgudev' 'libmm-glib' 'rp-pppoe' 'libnewt' 'libndp' 'libteam' 'vala' 'perl-yaml' - 'python2-gobject') -provides=("networkmanager=$pkgver") +license=('GPL2' 'LGPL2.1') +url="http://www.gnome.org/projects/NetworkManager/" +provides=('networkmanager') conflicts=('networkmanager') +makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc' + "ppp=$_pppver" 'modemmanager' 'dbus-glib' 'iproute2' 'nss' 'polkit-consolekit' + 'wpa_supplicant' 'libsoup' 'systemd' 'libgudev' 'libmm-glib' 'rp-pppoe' + 'libnewt' 'libndp' 'libteam' 'vala' 'perl-yaml' 'python-gobject') +checkdepends=('libx11' 'python-dbus') +depends=('libnm-glib' 'iproute2' 'polkit-consolekit' 'wpa_supplicant' 'libsoup' 'libmm-glib' + 'libnewt' 'libndp' 'libteam' 'consolekit') +optdepends=('dnsmasq: connection sharing' + 'bluez: Bluetooth support' + 'openresolv: resolvconf support' + 'ppp: dialup connection support' + 'rp-pppoe: ADSL support' + 'dhclient: External DHCP client' + 'modemmanager: cellular network support') backup=('etc/NetworkManager/NetworkManager.conf') -install=networkmanager.install -source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz" - 'disable_set_hostname.patch' +source=("https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz" 'NetworkManager.conf' '01-org.freedesktop.NetworkManager.settings.modify.system.rules' '50-org.freedesktop.NetworkManager.rules') sha256sums=('41d8082e027f58bb5fa4181f93742606ab99c659794a18e2823eff22df0eecd9' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3' + '452e4f77c1de92b1e08f6f58674a6c52a2b2d65b7deb0ba436e9afa91ee15103' '4b815f43de58379e68653d890f529485aec4d2f83f11d050b08b31489d2267c2' '02d9f7d836d297d6ddf39482d86a8573b3e41735b408aa2cd6df22048ec5f6c4') prepare() { - mkdir path - ln -s /usr/bin/python2 path/python + cd NetworkManager-$pkgver - cd $_pkgname-$pkgver + 2to3 -w libnm src tools - patch -Np1 -i ../disable_set_hostname.patch NOCONFIGURE=1 ./autogen.sh } build() { - cd $_pkgname-$pkgver - - AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi + cd NetworkManager-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -86,30 +78,39 @@ build() { --enable-doc \ --enable-gtk-doc + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make +} +check() { + cd NetworkManager-$pkgver + make -k check } package() { - cd $_pkgname-$pkgver - make DESTDIR="${pkgdir}" install + 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 - install -m644 $srcdir/NetworkManager.conf "$pkgdir/etc/NetworkManager/" + # 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 -rf "$pkgdir/usr/include" - rm -rf "$pkgdir/usr/lib/pkgconfig" - rm -r "${pkgdir}/var/run" + rm -r "$pkgdir/var/run" + rmdir -p --ignore-fail-on-non-empty \ + "$pkgdir"/usr/{share/{vala/vapi,gir-1.0},lib/girepository-1.0} - install -dm 750 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d + install -dm 750 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d install -m 644 ${srcdir}/01-org.freedesktop.NetworkManager.settings.modify.system.rules $pkgdir/usr/share/polkit-1/rules.d/ install -m 644 ${srcdir}/50-org.freedesktop.NetworkManager.rules $pkgdir/usr/share/polkit-1/rules.d/ - #chown root:102 "$pkgdir"/{etc,usr/share}/polkit-1/rules.d - #chmod 750 "$pkgdir"/{etc,usr/share}/polkit-1/rules.d } diff --git a/pcr/networkmanager-consolekit/disable_set_hostname.patch b/pcr/networkmanager-consolekit/disable_set_hostname.patch deleted file mode 100644 index ee95dd0e1..000000000 --- a/pcr/networkmanager-consolekit/disable_set_hostname.patch +++ /dev/null @@ -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. - */ diff --git a/pcr/networkmanager-consolekit/networkmanager.install b/pcr/networkmanager-consolekit/networkmanager.install deleted file mode 100644 index de40c17ed..000000000 --- a/pcr/networkmanager-consolekit/networkmanager.install +++ /dev/null @@ -1,9 +0,0 @@ -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 -} |