diff options
| -rw-r--r-- | pcr/networkmanager-elogind/20-connectivity.conf | 2 | ||||
| -rw-r--r-- | pcr/networkmanager-elogind/NetworkManager.conf | 2 | ||||
| -rw-r--r-- | pcr/networkmanager-elogind/PKGBUILD | 160 |
3 files changed, 84 insertions, 80 deletions
diff --git a/pcr/networkmanager-elogind/20-connectivity.conf b/pcr/networkmanager-elogind/20-connectivity.conf deleted file mode 100644 index 9631eabdf..000000000 --- a/pcr/networkmanager-elogind/20-connectivity.conf +++ /dev/null @@ -1,2 +0,0 @@ -[connectivity] -uri=http://www.archlinux.org/check_network_status.txt diff --git a/pcr/networkmanager-elogind/NetworkManager.conf b/pcr/networkmanager-elogind/NetworkManager.conf deleted file mode 100644 index 8976130b9..000000000 --- a/pcr/networkmanager-elogind/NetworkManager.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Configuration file for NetworkManager. -# See "man 5 NetworkManager.conf" for details. diff --git a/pcr/networkmanager-elogind/PKGBUILD b/pcr/networkmanager-elogind/PKGBUILD index c3db539a4..f85f4fabd 100644 --- a/pcr/networkmanager-elogind/PKGBUILD +++ b/pcr/networkmanager-elogind/PKGBUILD @@ -10,20 +10,21 @@ _pppver=2.4.7 pkgname=networkmanager-elogind pkgver=1.10.6 -pkgrel=1.parabola1 +pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'armv7h') license=('GPL2' 'LGPL2.1') url="http://www.gnome.org/projects/NetworkManager/" provides=('networkmanager') conflicts=('networkmanager' 'networkmanager-consolekit') -# replaces=('networkmanager-consolekit') +replaces=('networkmanager-consolekit') makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager - dbus-glib iproute2 nss polkit wpa_supplicant libsoup elogind libgudev libmm-glib + dbus-glib iproute2 nss polkit-elogind wpa_supplicant curl elogind libmm-glib libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs - glib2-docs eudev-systemd) + glib2-docs dhcpcd eudev-systemd) # modemmanager and libmbim depend on 'systemd' checkdepends=('libx11' 'python-dbus') -depends=('libnm-glib' 'iproute2' 'polkit' 'wpa_supplicant' 'libsoup' 'libmm-glib' 'libnewt' 'libndp' 'libteam' 'elogind') +depends=(libnm-glib iproute2 polkit-elogind wpa_supplicant libmm-glib libnewt libndp libteam curl + bluez-libs elogind) optdepends=('dnsmasq: connection sharing' 'bluez: Bluetooth support' 'openresolv: resolvconf support' @@ -34,18 +35,14 @@ optdepends=('dnsmasq: connection sharing' 'networkmanager-openrc: networkmanager initscript') backup=('etc/NetworkManager/NetworkManager.conf') _commit=dd8cf21cea13fa1bbee11fd3e0e7519e4b4ba712 # tags/1.10.6^0 -source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit" - NetworkManager.conf - 20-connectivity.conf) -sha512sums=('SKIP' - '25866b000096003d4c90decb6e19a742cf62792ddd217616b12a6415cd05514a6023d9986743b548a99d0e1c70acd0a3849144807228a59361b3493c879ffa56' - 'da52ba9603c279c1c865cc3bf63606e1daeeb2a22c68e4b0077e15c312e251b494c4f0c94bcb27c9f6923f8b69cd7ab9062d9b7ce499222d3d2240864ed9345f') - +source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit") +sha512sums=('SKIP') prepare() { mkdir -p libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}} cd NetworkManager + git cherry-pick -n 4d1f090aedf05c0e2955d431638e311d1e18a52f NOCONFIGURE=1 ./autogen.sh } @@ -55,66 +52,69 @@ pkgver() { } build() { - cd NetworkManager #-$pkgver + cd NetworkManager ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - runstatedir=/run \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/NetworkManager \ - --disable-ifcfg-rh \ - --disable-ifcfg-suse \ - --disable-ifnet \ - --disable-ifupdown \ - --disable-lto \ - --disable-more-warnings \ - --disable-static \ - --enable-bluez5-dun \ - --enable-concheck \ - --enable-config-plugin-ibft \ - --enable-gtk-doc \ - --enable-introspection \ - --enable-json-validation \ - --enable-ld-gc \ - --enable-modify-system \ - --enable-polkit \ - --enable-polkit-agent \ - --enable-teamdctl \ - --enable-wifi \ - --with-config-dhcp-default=dhclient \ - --with-config-dns-rc-manager-default=resolvconf \ - --with-config-logging-backend-default=journal \ - --with-config-plugins-default=keyfile,ibft \ - --with-crypto=nss \ - --with-dbus-sys-dir=/usr/share/dbus-1/system.d \ - --with-dhclient=/usr/bin/dhclient \ - --with-dist-version="$pkgver-$pkgrel, Parabola GNU/Linux-libre" \ - --with-dnsmasq=/usr/bin/dnsmasq \ - --with-dnssec-trigger=/usr/lib/dnssec-trigger \ - --with-hostname-persist=default \ - --with-iptables=/usr/bin/iptables \ - --with-kernel-firmware-dir=/usr/lib/firmware \ - --with-libnm-glib \ - --with-libsoup \ - --with-modem-manager-1 \ - --with-nmcli \ - --with-nmtui \ - --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \ - --with-pppd=/usr/bin/pppd \ - --with-resolvconf=/usr/bin/resolvconf \ - --with-session-tracking=elogind \ - --with-suspend-resume=elogind \ - --with-system-ca-path=/etc/ssl/certs \ - --without-systemd-journal \ - --without-systemd-logind \ - --with-udev-dir=/usr/lib/udev \ - --with-wext \ - --without-consolekit \ - --without-dhcpcd \ - --without-libaudit \ - --without-netconfig \ - --without-ofono \ - --without-selinux + --sysconfdir=/etc \ + --localstatedir=/var \ + runstatedir=/run \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib \ + --disable-ifcfg-rh \ + --disable-ifcfg-suse \ + --disable-ifnet \ + --disable-ifupdown \ + --disable-lto \ + --disable-more-logging \ + --disable-more-warnings \ + --disable-static \ + --enable-bluez5-dun \ + --enable-concheck \ + --enable-config-plugin-ibft \ + --enable-gtk-doc \ + --enable-introspection \ + --enable-json-validation \ + --enable-ld-gc \ + --enable-modify-system \ + --enable-polkit \ + --enable-polkit-agent \ + --enable-teamdctl \ + --enable-wifi \ + --with-config-dhcp-default=internal \ + --with-config-dns-rc-manager-default=symlink \ + --with-config-logging-backend-default=journal \ + --with-config-plugins-default=keyfile,ibft \ + --with-crypto=nss \ + --with-dbus-sys-dir=/usr/share/dbus-1/system.d \ + --with-dhclient=/usr/bin/dhclient \ + --with-dhcpcd-supports-ipv6 \ + --with-dhcpcd=/usr/bin/dhcpcd \ + --with-dist-version="$pkgver-$pkgrel, Artix Linux" \ + --with-dnsmasq=/usr/bin/dnsmasq \ + --with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \ + --with-hostname-persist=default \ + --with-iptables=/usr/bin/iptables \ + --with-kernel-firmware-dir=/usr/lib/firmware \ + --with-libnm-glib \ + --with-modem-manager-1 \ + --with-nmcli \ + --with-nmtui \ + --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \ + --with-pppd=/usr/bin/pppd \ + --with-resolvconf=/usr/bin/resolvconf \ + --with-session-tracking=elogind \ + --with-suspend-resume=elogind \ + --with-system-ca-path=/etc/ssl/certs \ + --without-systemd-journal \ + --without-systemd-logind \ + --with-systemdsystemunitdir=no \ + --with-udev-dir=/usr/lib/udev \ + --with-wext \ + --without-consolekit \ + --without-libaudit \ + --without-more-asserts \ + --without-netconfig \ + --without-ofono \ + --without-selinux sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool @@ -123,18 +123,26 @@ build() { check() { cd NetworkManager - make -k check + make -k check || : } package() { cd NetworkManager make DESTDIR="$pkgdir" install - install -dm700 "$pkgdir/etc/NetworkManager/system-connections" + # packaged configuration + install -Dm644 /dev/stdin "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" <<END +[connectivity] +uri=http://www.archlinux.org/check_network_status.txt +END + + # /etc/NetworkManager install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d - install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" - install -Dm644 ../20-connectivity.conf \ - "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" + install -dm700 "$pkgdir/etc/NetworkManager/system-connections" + install -m644 /dev/stdin "$pkgdir/etc/NetworkManager/NetworkManager.conf" <<END +# Configuration file for NetworkManager. +# See "man 5 NetworkManager.conf" for details. +END ### rm libnm |