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

Merge branch 'master' of github.com:pisilinux/main

Browse Source
This commit is contained in:
Ertuğrul Erata
2017-03-15 18:41:39 +03:00
parent 63a9dbdc28 cfec1d7e2c
commit 6028a58a11
6 changed files with 33 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/connection/NetworkManager/actions.py
+16 -21
View File
@@ -11,29 +11,25 @@ from pisi.actionsapi import shelltools
def setup(): 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") shelltools.system("intltoolize --force --copy --automake")
autotools.configure("--disable-static \ autotools.configure("--disable-static \
--disable-silent-rules \ --disable-silent-rules \
--disable-wimax \ --disable-wimax \
--disable-ifcfg-rh \
--disable-ifcfg-suse \
--disable-ifnet \
--disable-ifupdown \
--disable-lto \ --disable-lto \
--disable-config-plugin-ibft \
--disable-ifnet \
--disable-more-warnings \ --disable-more-warnings \
--enable-introspection \
--enable-wifi \
--enable-modify-system \ --enable-modify-system \
--enable-ppp=yes \ --enable-ppp=yes \
--enable-bluez5-dun \ --enable-bluez5=yes \
--enable-concheck \ --enable-concheck \
--enable-config-plugin-ibft \
--enable-vala=yes \
--enable-json-validation \
--enable-polkit \
--enable-polkit-agent \
--without-netconfig \ --without-netconfig \
--with-modem-manager-1 \ --with-modem-manager-1 \
--with-libsoup=yes \ --with-libsoup=yes \
@@ -41,31 +37,30 @@ def setup():
--with-suspend-resume=upower \ --with-suspend-resume=upower \
--with-system-ca-path=/etc/ssl/certs \ --with-system-ca-path=/etc/ssl/certs \
--with-crypto=nss \ --with-crypto=nss \
--with-config-dhcp-default=/usr/bin/dhcpcd \ --with-dhcpcd=/sbin/dhcpcd \
--with-pppd=/usr/sbin/pppd \ --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-dbus-sys-dir=/etc/dbus-1/system.d \
--with-dhclient=/usr/sbin/dhclient \
--with-kernel-firmware-dir=/lib/firmware \ --with-kernel-firmware-dir=/lib/firmware \
--with-udev-dir=/lib/udev \ --with-udev-dir=/lib/udev \
--with-resolvconf=/etc/resolv.default.conf \ --with-resolvconf=/etc/resolv.default.conf \
--with-iptables=/usr/sbin/iptables \ --with-iptables=/usr/sbin/iptables \
--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 \
--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(): def build():
autotools.make() autotools.make()
#def check(): #def check():
#autotools.make("check") #autotools.make("-k check")
def install(): def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR()) autotools.rawInstall("DESTDIR=%s" % get.installDIR())
network/connection/NetworkManager/comar/service.py
+1 -1
View File
@@ -41,4 +41,4 @@ def ready():
start() start()
def status(): def status():
return isServiceRunning(pidfile=PIDFILE) return isServiceRunning(pidfile=PIDFILE)
network/connection/NetworkManager/files/NetworkManager.conf
+2 -1
View File
@@ -1,4 +1,5 @@
[main] [main]
plugins=keyfile plugins=keyfile
dhcp=internal dhcp=internal
dns=default dns=default
network/connection/NetworkManager/files/gentoo/01-org.freedesktop.NetworkManager.settings.modify.system.pkla
+1 -1
View File
@@ -3,4 +3,4 @@ Identity=unix-group:removable
Action=org.freedesktop.NetworkManager.settings.* Action=org.freedesktop.NetworkManager.settings.*
ResultAny=no ResultAny=no
ResultInactive=no ResultInactive=no
ResultActive=yes ResultActive=yes
network/connection/NetworkManager/pspec.xml
+12 -36
View File
@@ -12,19 +12,14 @@
<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="fee830aee4b8d719046add91efa13ac08648b017" type="tarxz">https://download.gnome.org/sources/NetworkManager/1.6/NetworkManager-1.6.2.tar.xz</Archive> <Archive sha1sum="1c199fdfb9fff9e7f540d51952699ce815a12369" type="tarxz">https://download.gnome.org/sources/NetworkManager/1.0/NetworkManager-1.0.10.tar.xz</Archive>
<AdditionalFiles> <AdditionalFiles>
<!-- <AdditionalFile target="po/tr.po">tr.po</AdditionalFile> --> <AdditionalFile target="po/tr.po">tr.po</AdditionalFile>
</AdditionalFiles> </AdditionalFiles>
<BuildDependencies> <BuildDependencies>
<Dependency>intltool</Dependency> <Dependency>intltool</Dependency>
<Dependency>dhcpcd</Dependency>
<Dependency>iproute2</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>
@@ -43,18 +38,12 @@
<Dependency>readline-devel</Dependency> <Dependency>readline-devel</Dependency>
<Dependency>libgudev-devel</Dependency> <Dependency>libgudev-devel</Dependency>
<Dependency>libutil-linux-devel</Dependency> <Dependency>libutil-linux-devel</Dependency>
<Dependency versionFrom="1.0.2">ConsoleKit-devel</Dependency> <Dependency versionFrom="0.9.2">ConsoleKit-devel</Dependency>
<Dependency>gtk-doc</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
<Dependency>python-pygobject3-devel</Dependency>
<Dependency>upower-devel</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>libxslt-devel</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>
@@ -62,7 +51,6 @@
<Name>NetworkManager</Name> <Name>NetworkManager</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>dbus</Dependency> <Dependency>dbus</Dependency>
<Dependency>dhcpcd</Dependency>
<Dependency>nspr</Dependency> <Dependency>nspr</Dependency>
<Dependency>glib2</Dependency> <Dependency>glib2</Dependency>
<Dependency>polkit</Dependency> <Dependency>polkit</Dependency>
@@ -81,9 +69,8 @@
<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="1.0.2">ConsoleKit</Dependency> <Dependency versionFrom="0.9.2">ConsoleKit</Dependency>
<Dependency>mobile-broadband-provider-info</Dependency> <Dependency>mobile-broadband-provider-info</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -105,7 +92,6 @@
<Path fileType="data">/etc/NetworkManager/system-connections</Path> <Path fileType="data">/etc/NetworkManager/system-connections</Path>
<Path fileType="config">/usr/lib/tmpfiles.d/NetworkManager.conf</Path> <Path fileType="config">/usr/lib/tmpfiles.d/NetworkManager.conf</Path>
<Path fileType="config">/etc/polkit-1/localauthority/10-vendor.d</Path> <Path fileType="config">/etc/polkit-1/localauthority/10-vendor.d</Path>
<Path fileType="data">/var/run</Path>
</Files> </Files>
<AdditionalFiles> <AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/etc/conf.d/NetworkManager">NetworkManager.confd</AdditionalFile> <AdditionalFile owner="root" permission="0644" target="/etc/conf.d/NetworkManager">NetworkManager.confd</AdditionalFile>
@@ -136,25 +122,15 @@
</Package> </Package>
<History> <History>
<Update release="6"> <Update release="5">
<Date>2017-02-24</Date> <Date>2017-03-15</Date>
<Version>1.6.2</Version> <Version>1.0.10</Version>
<Comment>Version Bump.</Comment> <Comment>Revert version</Comment>
<Requires> <Requires>
<Action package="NetworkManager">systemRestart</Action> <Action package="NetworkManager">systemRestart</Action>
</Requires> </Requires>
<Name>Ayhan Yalçınsoy</Name> <Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email> <Email>ayhanyalcinsoy@pisilnux.org</Email>
</Update>
<Update release="5">
<Date>2017-02-21</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>
<Update release="4"> <Update release="4">
<Date>2016-12-15</Date> <Date>2016-12-15</Date>
x11/util/alternatives/pspec.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>Alternative management system</Summary> <Summary>Alternative management system</Summary>
<Description>alternatives creates, removes, maintains and displays information about the symbolic links comprising the alternatives system. Alternatives system determines the defaults when several programs fulfilling the same or similar functions to be installed on a single system at the same time.</Description> <Description>alternatives creates, removes, maintains and displays information about the symbolic links comprising the alternatives system. Alternatives system determines the defaults when several programs fulfilling the same or similar functions to be installed on a single system at the same time.</Description>
<Archive sha1sum="f4ad69599202834acb331e96df27d303ee383e67" type="tarxz">https://git.fedorahosted.org/cgit/chkconfig.git/snapshot/chkconfig-1.3.63.tar.xz</Archive> <Archive sha1sum="d2111640833792e96859559113c89467ea0f9a80" type="targz">https://github.com/fedora-sysv/chkconfig/archive/chkconfig-1.3.63.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>popt-devel</Dependency> <Dependency>popt-devel</Dependency>
<Dependency>newt-devel</Dependency> <Dependency>newt-devel</Dependency>