diff --git a/network/connection/NetworkManager/actions.py b/network/connection/NetworkManager/actions.py
index ca5b3d1766..7e4f6572d9 100644
--- a/network/connection/NetworkManager/actions.py
+++ b/network/connection/NetworkManager/actions.py
@@ -11,29 +11,25 @@ from pisi.actionsapi import shelltools
def setup():
- autotools.autoreconf("-fiv")
+ # /var/run => /run
+ for f in ["configure.ac", "src/Makefile.am", "src/Makefile.in"]:
+ pisitools.dosed(f, "\$\(?localstatedir\)?(\/run\/(\$PACKAGE|NetworkManager))", "\\1")
+ pisitools.dosed("configure.ac", "\/var(\/run\/ConsoleKit)", "\\1")
+ pisitools.dosed("configure.ac", "^initscript", deleteLine=True)
+ autotools.autoreconf("-fi")
shelltools.system("intltoolize --force --copy --automake")
autotools.configure("--disable-static \
--disable-silent-rules \
--disable-wimax \
- --disable-ifcfg-rh \
- --disable-ifcfg-suse \
- --disable-ifnet \
- --disable-ifupdown \
--disable-lto \
+ --disable-config-plugin-ibft \
+ --disable-ifnet \
--disable-more-warnings \
- --enable-introspection \
- --enable-wifi \
--enable-modify-system \
--enable-ppp=yes \
- --enable-bluez5-dun \
+ --enable-bluez5=yes \
--enable-concheck \
- --enable-config-plugin-ibft \
- --enable-vala=yes \
- --enable-json-validation \
- --enable-polkit \
- --enable-polkit-agent \
--without-netconfig \
--with-modem-manager-1 \
--with-libsoup=yes \
@@ -41,31 +37,30 @@ def setup():
--with-suspend-resume=upower \
--with-system-ca-path=/etc/ssl/certs \
--with-crypto=nss \
- --with-config-dhcp-default=/usr/bin/dhcpcd \
+ --with-dhcpcd=/sbin/dhcpcd \
--with-pppd=/usr/sbin/pppd \
+ --with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 \
--with-dbus-sys-dir=/etc/dbus-1/system.d \
+ --with-dhclient=/usr/sbin/dhclient \
--with-kernel-firmware-dir=/lib/firmware \
--with-udev-dir=/lib/udev \
--with-resolvconf=/etc/resolv.default.conf \
--with-iptables=/usr/sbin/iptables \
+ --with-dnsmasq=/usr/sbin/dnsmasq \
--with-systemdsystemunitdir=no \
--with-nmtui \
- --with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 \
- --without-valgrind \
--localstatedir=/var \
--sysconfdir=/etc \
--libexecdir=/usr/lib/NetworkManager \
- --with-dhcpcd=/usr/bin/dhcpcd \
- --without-dhclient \
- " )
+ ")
- pisitools.dosed("libtool", "-shared", "-Wl, --as-needed -shared")
+ pisitools.dosed("libtool", " -shared ", " -Wl,--as-needed -shared ")
def build():
autotools.make()
#def check():
- #autotools.make("check")
+ #autotools.make("-k check")
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
diff --git a/network/connection/NetworkManager/comar/service.py b/network/connection/NetworkManager/comar/service.py
index 52f2d23b94..1b91c789c1 100644
--- a/network/connection/NetworkManager/comar/service.py
+++ b/network/connection/NetworkManager/comar/service.py
@@ -41,4 +41,4 @@ def ready():
start()
def status():
- return isServiceRunning(pidfile=PIDFILE)
\ No newline at end of file
+ return isServiceRunning(pidfile=PIDFILE)
diff --git a/network/connection/NetworkManager/files/NetworkManager.conf b/network/connection/NetworkManager/files/NetworkManager.conf
index 002534833b..ca4b5883f5 100644
--- a/network/connection/NetworkManager/files/NetworkManager.conf
+++ b/network/connection/NetworkManager/files/NetworkManager.conf
@@ -1,4 +1,5 @@
[main]
plugins=keyfile
dhcp=internal
-dns=default
\ No newline at end of file
+dns=default
+
diff --git a/network/connection/NetworkManager/files/gentoo/01-org.freedesktop.NetworkManager.settings.modify.system.pkla b/network/connection/NetworkManager/files/gentoo/01-org.freedesktop.NetworkManager.settings.modify.system.pkla
index 24f8d0bd17..9bc8e88a3b 100644
--- a/network/connection/NetworkManager/files/gentoo/01-org.freedesktop.NetworkManager.settings.modify.system.pkla
+++ b/network/connection/NetworkManager/files/gentoo/01-org.freedesktop.NetworkManager.settings.modify.system.pkla
@@ -3,4 +3,4 @@ Identity=unix-group:removable
Action=org.freedesktop.NetworkManager.settings.*
ResultAny=no
ResultInactive=no
-ResultActive=yes
\ No newline at end of file
+ResultActive=yes
diff --git a/network/connection/NetworkManager/pspec.xml b/network/connection/NetworkManager/pspec.xml
index dae05ec921..6530ed27b2 100644
--- a/network/connection/NetworkManager/pspec.xml
+++ b/network/connection/NetworkManager/pspec.xml
@@ -12,19 +12,14 @@
app:console
Network connection manager powered by D-Bus and UDEV
NetworkManager attempts to keep an active network connection available at all times.
- https://download.gnome.org/sources/NetworkManager/1.6/NetworkManager-1.6.2.tar.xz
+ https://download.gnome.org/sources/NetworkManager/1.0/NetworkManager-1.0.10.tar.xz
-
+ tr.po
intltool
- dhcpcd
- iproute2
ppp-devel
- vala-devel
- jansson-devel
- gettext-devel
nss-devel
newt-devel
nspr-devel
@@ -43,18 +38,12 @@
readline-devel
libgudev-devel
libutil-linux-devel
- ConsoleKit-devel
- gtk-doc
- gobject-introspection-devel
- python-pygobject3-devel
- upower-devel
- docbook-xsl
- libxslt-devel
+ ConsoleKit-devel
-
-
-
+
+ 0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch
+ disable_set_hostname.patch
@@ -62,7 +51,6 @@
NetworkManager
dbus
- dhcpcd
nspr
glib2
polkit
@@ -81,9 +69,8 @@
libmm-glib
ModemManager
wpa_supplicant
- jansson
libndp
- ConsoleKit
+ ConsoleKit
mobile-broadband-provider-info
@@ -105,7 +92,6 @@
/etc/NetworkManager/system-connections
/usr/lib/tmpfiles.d/NetworkManager.conf
/etc/polkit-1/localauthority/10-vendor.d
- /var/run
NetworkManager.confd
@@ -136,25 +122,15 @@
-
- 2017-02-24
- 1.6.2
- Version Bump.
+
+ 2017-03-15
+ 1.0.10
+ Revert version
systemRestart
Ayhan Yalçınsoy
- ayhanyalcinsoy@pisilinux.org
-
-
- 2017-02-21
- 1.4.4
- Version Bump.
-
- systemRestart
-
- Ertuğrul Erata
- ertugrulerata@gmail.com
+ ayhanyalcinsoy@pisilnux.org
2016-12-15