Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2921 from ertugerata/master

Browse Source 
NM update
This commit is contained in:
Ertuğrul Erata
2017-02-19 16:30:12 +02:00
committed by GitHub
parent ccf1f67980 08ea4fd78f
commit 7fc5c433fc
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/connection/NetworkManager/actions.py
+8 -4
View File
@@ -12,10 +12,10 @@ from pisi.actionsapi import shelltools
def setup(): def setup():
# /var/run => /run # /var/run => /run
for f in ["configure.ac", "src/Makefile.am", "src/Makefile.in"]: # for f in ["configure.ac", "src/Makefile.am", "src/Makefile.in"]:
pisitools.dosed(f, "\$\(?localstatedir\)?(\/run\/(\$PACKAGE|NetworkManager))", "\\1") # pisitools.dosed(f, "\$\(?localstatedir\)?(\/run\/(\$PACKAGE|NetworkManager))", "\\1")
pisitools.dosed("configure.ac", "\/var(\/run\/ConsoleKit)", "\\1") # pisitools.dosed("configure.ac", "\/var(\/run\/ConsoleKit)", "\\1")
pisitools.dosed("configure.ac", "^initscript", deleteLine=True) # pisitools.dosed("configure.ac", "^initscript", deleteLine=True)
autotools.autoreconf("-fi") autotools.autoreconf("-fi")
shelltools.system("intltoolize --force --copy --automake") shelltools.system("intltoolize --force --copy --automake")
@@ -30,6 +30,8 @@ def setup():
--enable-ppp=yes \ --enable-ppp=yes \
--enable-bluez5=yes \ --enable-bluez5=yes \
--enable-concheck \ --enable-concheck \
--enable-vala=yes \
--enable-json-validation \
--without-netconfig \ --without-netconfig \
--with-modem-manager-1 \ --with-modem-manager-1 \
--with-libsoup=yes \ --with-libsoup=yes \
@@ -49,6 +51,8 @@ def setup():
--with-dnsmasq=/usr/sbin/dnsmasq \ --with-dnsmasq=/usr/sbin/dnsmasq \
--with-systemdsystemunitdir=no \ --with-systemdsystemunitdir=no \
--with-nmtui \ --with-nmtui \
--with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 \
--without-valgrind \
--localstatedir=/var \ --localstatedir=/var \
--sysconfdir=/etc \ --sysconfdir=/etc \
--libexecdir=/usr/lib/NetworkManager \ --libexecdir=/usr/lib/NetworkManager \
network/connection/NetworkManager/pspec.xml
+18 -3
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>Network connection manager powered by D-Bus and UDEV</Summary> <Summary>Network connection manager powered by D-Bus and UDEV</Summary>
<Description>NetworkManager attempts to keep an active network connection available at all times.</Description> <Description>NetworkManager attempts to keep an active network connection available at all times.</Description>
<Archive sha1sum="1c199fdfb9fff9e7f540d51952699ce815a12369" type="tarxz">https://download.gnome.org/sources/NetworkManager/1.0/NetworkManager-1.0.10.tar.xz</Archive> <Archive sha1sum="c27457c3ff3a91f7fa4b51f6b24372715fc54a40" type="tarxz">https://download.gnome.org/sources/NetworkManager/1.4/NetworkManager-1.4.4.tar.xz</Archive>
<AdditionalFiles> <AdditionalFiles>
<AdditionalFile target="po/tr.po">tr.po</AdditionalFile> <AdditionalFile target="po/tr.po">tr.po</AdditionalFile>
</AdditionalFiles> </AdditionalFiles>
@@ -20,6 +20,9 @@
<Dependency>intltool</Dependency> <Dependency>intltool</Dependency>
<!--Dependency>dhclient</Dependency--> <!--Dependency>dhclient</Dependency-->
<Dependency>ppp-devel</Dependency> <Dependency>ppp-devel</Dependency>
<Dependency>vala-devel</Dependency>
<Dependency>jansson-devel</Dependency>
<Dependency>gettext-devel</Dependency>
<Dependency>nss-devel</Dependency> <Dependency>nss-devel</Dependency>
<Dependency>newt-devel</Dependency> <Dependency>newt-devel</Dependency>
<Dependency>nspr-devel</Dependency> <Dependency>nspr-devel</Dependency>
@@ -39,10 +42,11 @@
<Dependency>libgudev-devel</Dependency> <Dependency>libgudev-devel</Dependency>
<Dependency>libutil-linux-devel</Dependency> <Dependency>libutil-linux-devel</Dependency>
<Dependency versionFrom="0.9.2">ConsoleKit-devel</Dependency> <Dependency versionFrom="0.9.2">ConsoleKit-devel</Dependency>
<Dependency>gtk-doc</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!--<Patch>0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch</Patch>--> <!--<Patch>0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch</Patch>-->
<Patch>0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch</Patch> <!--Patch>0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch</Patch-->
<Patch>disable_set_hostname.patch</Patch> <Patch>disable_set_hostname.patch</Patch>
</Patches> </Patches>
</Source> </Source>
@@ -69,6 +73,7 @@
<Dependency>libmm-glib</Dependency> <Dependency>libmm-glib</Dependency>
<Dependency>ModemManager</Dependency> <Dependency>ModemManager</Dependency>
<Dependency>wpa_supplicant</Dependency> <Dependency>wpa_supplicant</Dependency>
<Dependency>jansson</Dependency>
<Dependency>libndp</Dependency> <Dependency>libndp</Dependency>
<Dependency versionFrom="0.9.2">ConsoleKit</Dependency> <Dependency versionFrom="0.9.2">ConsoleKit</Dependency>
<Dependency>mobile-broadband-provider-info</Dependency> <Dependency>mobile-broadband-provider-info</Dependency>
@@ -123,6 +128,16 @@
</Package> </Package>
<History> <History>
<Update release="5">
<Date>2017-02-19</Date>
<Version>1.4.4</Version>
<Comment>Version bump.</Comment>
<Requires>
<Action package="NetworkManager">systemRestart</Action>
</Requires>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4"> <Update release="4">
<Date>2016-12-15</Date> <Date>2016-12-15</Date>
<Version>1.0.10</Version> <Version>1.0.10</Version>