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

Merge branch 'master' into iproute2_new

Browse Source
This commit is contained in:
Ertuğrul Erata
2018-07-10 07:01:01 +03:00
parent 28f4c46438 1526b44185
commit 845d5477f4
46 changed files with 163659 additions and 162162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/applications/kgpg/pspec.xml
+2 -2
View File
@@ -13,7 +13,7 @@
<License>GPL</License>
<Summary>A QtQuick plugin to render beautiful and interactive charts</Summary>
<Description>KGpg is a simple interface for GnuPG, a powerful encryption utility.</Description>
<Archive sha1sum="be665201a8f48693466ecff61ae10fc9eeca4398" type="tarxz">mirrors://kde/stable/applications/17.04.2/src/kgpg-17.04.2.tar.xz</Archive>
<Archive sha1sum="6b653c9517cc62072cdacea450e8946438b930fb" type="tarxz">mirrors://kde/stable/applications/18.04.1/src/kgpg-18.04.1.tar.xz</Archive>
<BuildDependencies>
<Dependency>akonadi-devel</Dependency>
<Dependency>boost-devel</Dependency>
@@ -90,7 +90,7 @@
<History>
<Update release="14">
<Date>2018-05-11</Date>
<Date>2018-06-09</Date>
<Version>18.04.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
find-packages-not-compiled-in-farm
+1 -1
View File
@@ -15,7 +15,7 @@ import lzma
import piksemel
pisirepouri = "http://ciftlik.pisilinux.org/2.0-Beta.1/pisi-index.xml.xz"
pisirepouri = "file:///home/ertugerata/Works/2.0-Beta.1/pisi-index.xml.xz"
svnrepouri = "https://github.com/ertugerata/main/raw/master/pisi-index.xml.xz"
def getIndex(uri):
hardware/virtualization/bubblewrap/pspec.xml
+8 -1
View File
@@ -11,7 +11,7 @@
<License>LGPLv2</License>
<Summary>Unprivileged sandboxing tool</Summary>
<Description>is a core execution engine for unprivileged containers that works as a setuid binary on kernels without user namespaces.</Description>
<Archive sha1sum="70890f2dac7c2b7ff39acb6b34dd23737e81ed79" type="targz">https://github.com/projectatomic/bubblewrap/archive/v0.2.0.tar.gz</Archive>
<Archive sha1sum="d194ab75170e2ea0817752e21db0de45031184b7" type="targz">https://github.com/projectatomic/bubblewrap/archive/v0.2.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>libcap-devel</Dependency>
<Dependency>bash-completion</Dependency>
@@ -34,6 +34,13 @@
</Package>
<History>
<Update release="2">
<Date>2018-05-29</Date>
<Version>0.2.1</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="1">
<Date>2018-02-03</Date>
<Version>0.2.0</Version>
hardware/virtualization/containerd/actions.py
+8 -5
View File
@@ -16,12 +16,15 @@ def build():
shelltools.cd("%s" % get.workDIR())
shelltools.move("containerd-*", "containerd")
shelltools.makedirs("src/github.com/docker")
shelltools.system("ln -rsf containerd* src/github.com/docker")
shelltools.cd("src/github.com/docker/containerd")
shelltools.cd("containerd")
shelltools.move("vendor", "src")
shelltools.system("LDFLAGS= make")
shelltools.makedirs("src/github.com/containerd")
shelltools.system("ln -rsf %s/containerd* src/github.com/containerd" % get.workDIR())
shelltools.cd("src/github.com/containerd/containerd")
shelltools.system("LDFLAGS= GOPATH=%s make GIT_COMMIT=209a7fc" % get.curDIR())
def install():
shelltools.cd("%s/containerd" % get.workDIR())
hardware/virtualization/containerd/pspec.xml
+12 -2
View File
@@ -11,10 +11,12 @@
<License>Apache-2.0</License>
<Summary>A daemon to control runC, built for performance and density.</Summary>
<Description>is a daemon with an API and a command line client, to manage containers on one machine. It uses runC to run containers according to the OCI specification.</Description>
<Archive sha1sum="db3ec28d045109952e0615f5a3bea39816dfac17" type="targz">https://github.com/docker/containerd/archive/v0.2.2.tar.gz</Archive>
<Archive sha1sum="4e976a4365c44a30f89aeae4d31b00eca914bfb5" type="targz">https://github.com/containerd/containerd/archive/v1.1.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>golang</Dependency>
<Dependency versionFrom="1.10.3">golang</Dependency>
<Dependency>git</Dependency>
<Dependency>libseccomp-devel</Dependency>
<Dependency>btrfs-progs-devel</Dependency>
</BuildDependencies>
</Source>
@@ -22,6 +24,7 @@
<Name>containerd</Name>
<RuntimeDependencies>
<Dependency>runc</Dependency>
<Dependency>libseccomp</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -30,6 +33,13 @@
</Package>
<History>
<Update release="3">
<Date>2018-06-17</Date>
<Version>1.1.0</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="2">
<Date>2017-03-20</Date>
<Version>0.2.2</Version>
hardware/virtualization/docker/actions.py
+26 -11
View File
@@ -10,30 +10,45 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get
shelltools.export("AUTO_GOPATH", "1")
shelltools.export("DOCKER_GITCOMMIT", "b9f10c9")
shelltools.export("DOCKER_GITCOMMIT","f150324")
shelltools.export("IAMSTATIC", "false")
shelltools.export("VERSION", "18.05.0")
shelltools.export("GOROOT","/usr/lib/go")
shelltools.export("GOPATH", "%s" % get.workDIR())
shelltools.export("GOPATH", "%s" % get.workDIR())
shelltools.export("CGO_CFLAGS", "-I/usr/include")
shelltools.export("CGO_LDFLAGS", "-L/usr/lib")
shelltools.export("DOCKER_BUILDTAGS","seccomp")
#shelltools.export("DOCKER_INITPATH", "/usr/lib/docker/dockerinit")
NoStrip=["/"]
def setup():
shelltools.makedirs("components/cli/src/github.com/docker")
shelltools.cd("components/cli/src/github.com/docker")
shelltools.system("ln -s ../../../../cli . ")
def build():
#shelltools.cd("docker")
shelltools.system("hack/make.sh dynbinary")
shelltools.cd("%s" % get.workDIR())
shelltools.cd("docker-ce-%s-ce/components/engine" % get.srcVERSION())
shelltools.system("hack/make.sh dynbinary-daemon")
# build cli
shelltools.cd("%s" % get.workDIR())
shelltools.cd("docker-ce-%s-ce/components/cli" % get.srcVERSION())
shelltools.system("LDFLAGS='' GOPATH=%s/docker-ce-%s-ce/components/cli ./scripts/build/dynbinary" % (get.workDIR(), get.srcVERSION()))
def install():
pisitools.dobin("bundles/1.11.2/dynbinary/docker")
pisitools.dobin("bundles/1.11.2/dynbinary/docker-1.11.2")
shelltools.cd("%s/docker-ce-%s-ce" % (get.workDIR(), get.srcVERSION()))
pisitools.dobin("components/cli/build/docker*")
pisitools.dobin("components/engine/bundles/dynbinary-daemon/*")
# insert udev rules
pisitools.insinto("/lib/udev/rules.d", "contrib/udev/*.rules")
pisitools.insinto("/lib/udev/rules.d", "components/engine/contrib/udev/*.rules")
#insert contrib in docs
pisitools.insinto("/usr/share/doc/docker", "contrib")
pisitools.dodoc("VERSION", "LICENSE", "README.md", "AUTHORS", "CONTRIBUTING.md", "CHANGELOG.md", "NOTICE")
pisitools.insinto("/usr/share/doc/docker", "components/cli/contrib")
pisitools.dobin("components/engine/contrib/check-config.sh")
pisitools.dodoc("VERSION", "README.md","CONTRIBUTING.md", "CHANGELOG.md")
hardware/virtualization/docker/comar/service.py
+2 -3
View File
@@ -14,15 +14,14 @@ def start():
os.environ["PATH"] = "/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/sbin:/usr/local/bin"
os.system("/sbin/modprobe -va bridge nf_nat br_netfilter")
startService(command="/usr/bin/docker",
args="daemon -p %s %s" % (pidfile, config.get("DOCKER_OPTS")),
startService(command="/usr/bin/dockerd",
detach=True,
pidfile=pidfile,
donotify=True)
@synchronized
def stop():
stopService(command="/usr/bin/docker",
stopService(command="/usr/bin/dockerd",
donotify=True)
def status():
hardware/virtualization/docker/files/docker.confd
+13 -3
View File
@@ -1,13 +1,23 @@
# /etc/conf.d/docker: config file for /etc/init.d/docker
# where the docker daemon output gets piped
DOCKER_LOGFILE="/var/log/docker.log"
# this contains both stdout and stderr. If you need to separate them,
# see the settings below
#DOCKER_LOGFILE="/var/log/docker.log"
# where the docker daemon stdout gets piped
# if this is not set, DOCKER_LOGFILE is used
#DOCKER_OUTFILE="/var/log/docker-out.log"
# where the docker daemon stderr gets piped
# if this is not set, DOCKER_LOGFILE is used
#DOCKER_ERRFILE="/var/log/docker-err.log"
# where docker's pid get stored
DOCKER_PIDFILE="/var/run/docker.pid"
#DOCKER_PIDFILE="/run/docker.pid"
# where the docker daemon itself is run from
DOCKER_BINARY="/usr/bin/docker"
#DOCKERD_BINARY="/usr/bin/dockerd"
# any other random options you want to pass to docker
DOCKER_OPTS=""
hardware/virtualization/docker/pspec.xml
+14 -4
View File
@@ -13,14 +13,15 @@
<Summary>Pack, ship and run any application as a lightweight container</Summary>
<Description>An open platform for distributed applications for developers and sysadmins</Description>
<!--fix sha1sum-->
<Archive sha1sum="3725a90651a4eabb4784fc252f3090af53a91339" type="targz">https://github.com/docker/docker/archive/v1.11.2.tar.gz</Archive>
<Archive sha1sum="089556da40a9438d963cca9bf8ddfc6800d5c619" type="targz">https://github.com/docker/docker-ce/archive/v18.05.0-ce.tar.gz</Archive>
<BuildDependencies>
<Dependency>git</Dependency>
<Dependency versionFrom="1.6.2">golang</Dependency>
<Dependency versionFrom="1.10.3">golang</Dependency>
<Dependency>btrfs-progs-devel</Dependency>
<Dependency>device-mapper-devel</Dependency>
<Dependency>sqlite-devel</Dependency>
<Dependency>libseccomp-devel</Dependency>
<Dependency>libtool-ltdl</Dependency>
<!--Dependency>runc</Dependency>
<Dependency>containerd</Dependency-->
</BuildDependencies>
@@ -39,8 +40,10 @@
<Dependency>iproute2</Dependency>
<Dependency>iptables</Dependency>
<Dependency>libseccomp</Dependency>
<Dependency>runc</Dependency>
<Dependency>containerd</Dependency>
<Dependency>libtool-ltdl</Dependency>
<Dependency versionFrom="1.0.0_rc5">runc</Dependency>
<Dependency versionFrom="1.1.0">containerd</Dependency>
<Dependency versionFrom="0.18.0">tini</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
@@ -61,6 +64,13 @@
</Package>
<History>
<Update release="7">
<Date>2018-06-10</Date>
<Version>18.05.0</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="6">
<Date>2017-03-20</Date>
<Version>1.11.2</Version>
hardware/virtualization/flatpak-builder/files/libglnx_submodule.patch
+1005 -595
View File
File diff suppressed because it is too large Load Diff
hardware/virtualization/flatpak-builder/pspec.xml
+14 -5
View File
@@ -12,10 +12,10 @@
<IsA>app:console</IsA>
<Summary>Tool to build flatpaks from sources</Summary>
<Description>Tool for building flatpaks from sources</Description>
<Archive sha1sum="3441a054003f560077d9ba77d103846480718711" type="targz">https://github.com/flatpak/flatpak-builder/archive/0.10.8.tar.gz</Archive>
<Archive sha1sum="340ec0981fc100c5b30eb919ae815665f23a78c2" type="targz">https://github.com/flatpak/flatpak-builder/archive/0.10.10.tar.gz</Archive>
<BuildDependencies>
<Dependency versionFrom="0.10.3">flatpak-devel</Dependency>
<Dependency versionFrom="2018.1">ostree-devel</Dependency>
<Dependency versionFrom="0.11.7">flatpak-devel</Dependency>
<Dependency versionFrom="2018.5">ostree-devel</Dependency>
<Dependency>util-linux</Dependency>
<Dependency>libxslt</Dependency>
<Dependency>xmlto</Dependency>
@@ -24,6 +24,7 @@
<Dependency>elfutils</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>libyaml-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">libglnx_submodule.patch</Patch>
@@ -33,13 +34,14 @@
<Package>
<Name>flatpak-builder</Name>
<RuntimeDependencies>
<Dependency versionFrom="0.10.3">flatpak</Dependency>
<Dependency versionFrom="2018.1">ostree</Dependency>
<Dependency versionFrom="0.11.7">flatpak</Dependency>
<Dependency versionFrom="2018.5">ostree</Dependency>
<Dependency>libsoup</Dependency>
<Dependency>elfutils</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>json-glib</Dependency>
<Dependency>libyaml</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -49,6 +51,13 @@
</Package>
<History>
<Update release="3">
<Date>2018-07-08</Date>
<Version>0.10.10</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="2">
<Date>2018-02-16</Date>
<Version>0.10.8</Version>
hardware/virtualization/flatpak/actions.py
+1
View File
@@ -18,6 +18,7 @@ def setup():
--enable-xauth \
--with-system-bubblewrap \
--enable-docbook-docs \
--disable-static \
--enable-sandboxed-triggers")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
hardware/virtualization/flatpak/files/bubblewrap_libglnx_submodule.patch
+451 -400
View File
File diff suppressed because it is too large Load Diff
hardware/virtualization/flatpak/pspec.xml
+9 -2
View File
@@ -11,7 +11,7 @@
<License>LGPLv2</License>
<Summary>Application distribution framework</Summary>
<Description>Linux application sandboxing and distribution framework, formerly xdg-app</Description>
<Archive sha1sum="03253865aa0d72d6e052d33998f6ebd07138cb8a" type="targz">https://github.com/flatpak/flatpak/archive/0.11.1.tar.gz</Archive>
<Archive sha1sum="6ae180dffc72b81081b1d1fbeacb69b2e3b9325d" type="targz">https://github.com/flatpak/flatpak/archive/0.11.7.tar.gz</Archive>
<BuildDependencies>
<Dependency>util-linux</Dependency>
<Dependency>gtk-doc</Dependency>
@@ -22,7 +22,7 @@
<Dependency>dbus-devel</Dependency>
<Dependency>json-glib-devel</Dependency>
<Dependency>appstream-glib-devel</Dependency>
<Dependency>ostree-devel</Dependency>
<Dependency versionFrom="2018.5">ostree-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">bubblewrap_libglnx_submodule.patch</Patch>
@@ -93,6 +93,13 @@
</Package>
<History>
<Update release="3">
<Date>2018-07-08</Date>
<Version>0.11.7</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="2">
<Date>2018-02-16</Date>
<Version>0.11.1</Version>
hardware/virtualization/libnetwork/actions.py
+37
View File
@@ -0,0 +1,37 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Copyright 2018 TUBITAK/UEKAE
# Licensed under the GNU General Public License, version 2.
# See the file http://www.gnu.org/copyleft/gpl.txt.
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
# WorkDir = ""
NoStrip = "/"
def setup():
shelltools.move("vendor", "src")
shelltools.makedirs("src/github.com/docker")
shelltools.cd("src/github.com/docker")
shelltools.system("ln -rsf %s/libnetwork ./libnetwork" % get.workDIR())
def build():
shelltools.cd("src/github.com/docker/libnetwork")
shelltools.system("GOPATH=%s/libnetwork make build-local" % get.workDIR())
def install():
pisitools.dobin("bin/dnet")
pisitools.dobin("bin/docker-proxy")
pisitools.dodoc("MAINTAINERS", "LICENSE", "README*", "ROADMAP.md")
shelltools.unlinkDir("docs/vagrant-systemd")
pisitools.insinto("/usr/share/doc/libnetwork", "docs/*")
hardware/virtualization/libnetwork/pspec.xml
+41
View File
@@ -0,0 +1,41 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pardus.org.tr/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libnetwork</Name>
<Homepage>https://github.com/docker/libnetwork</Homepage>
<Packager>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Packager>
<License>Apache-2.0</License>
<IsA>app:console</IsA>
<Summary>Docker Networking</Summary>
<Description>Libnetwork provides a native Go implementation for connecting containers The goal of libnetwork is to deliver a robust Container Network Model that provides a consistent programming interface and the required network abstractions for applications.</Description>
<Archive sha1sum="a15422974a5aceb4f41cd7ced4643975a2c1d549" type="targz">https://sourceforge.net/projects/pisilinux/files/source/libnetwork-0.8.0_dbc11cc.tar.gz</Archive>
<BuildDependencies>
<Dependency versionFrom="1.10.3">golang</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>libnetwork</Name>
<RuntimeDependencies>
<Dependency>docker</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2018-07-08</Date>
<Version>0.8.0_pre1</Version>
<Comment>First release</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
</History>
</PISI>
hardware/virtualization/ostree/actions.py
+1
View File
@@ -15,6 +15,7 @@ def setup():
shelltools.system("env NOCONFIGURE=1 ./autogen.sh")
autotools.configure("--enable-rust \
--enable-trivial-httpd-cmdline \
--with-openssl \
--disable-static \
--without-dracut \
hardware/virtualization/ostree/files/bsdiff_libglnx_submodule.patch
+164 -159
View File
@@ -1,6 +1,6 @@
diff -Nuar ostree-2018.1.orig/bsdiff/autogen.sh ostree-2018.1/bsdiff/autogen.sh
--- ostree-2018.1.orig/bsdiff/autogen.sh 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/autogen.sh 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/bsdiff/autogen.sh ostree-2018.5/bsdiff/autogen.sh
--- ostree-2018.5.orig/bsdiff/autogen.sh 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/autogen.sh 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,6 @@
+#!/bin/sh
+
@@ -8,9 +8,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/autogen.sh ostree-2018.1/bsdiff/autogen.sh
+cp LICENSE COPYING
+
+autoreconf -fis
diff -Nuar ostree-2018.1.orig/bsdiff/bsdiff.c ostree-2018.1/bsdiff/bsdiff.c
--- ostree-2018.1.orig/bsdiff/bsdiff.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/bsdiff.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/bsdiff/bsdiff.c ostree-2018.5/bsdiff/bsdiff.c
--- ostree-2018.5.orig/bsdiff/bsdiff.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/bsdiff.c 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,445 @@
+/*-
+ * Copyright 2003-2005 Colin Percival
@@ -457,9 +457,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/bsdiff.c ostree-2018.1/bsdiff/bsdiff.c
+}
+
+#endif
diff -Nuar ostree-2018.1.orig/bsdiff/bsdiff.h ostree-2018.1/bsdiff/bsdiff.h
--- ostree-2018.1.orig/bsdiff/bsdiff.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/bsdiff.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/bsdiff/bsdiff.h ostree-2018.5/bsdiff/bsdiff.h
--- ostree-2018.5.orig/bsdiff/bsdiff.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/bsdiff.h 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,45 @@
+/*-
+ * Copyright 2003-2005 Colin Percival
@@ -506,9 +506,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/bsdiff.h ostree-2018.1/bsdiff/bsdiff.h
+int bsdiff(const uint8_t* old, int64_t oldsize, const uint8_t* new, int64_t newsize, struct bsdiff_stream* stream);
+
+#endif
diff -Nuar ostree-2018.1.orig/bsdiff/bspatch.c ostree-2018.1/bsdiff/bspatch.c
--- ostree-2018.1.orig/bsdiff/bspatch.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/bspatch.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/bsdiff/bspatch.c ostree-2018.5/bsdiff/bspatch.c
--- ostree-2018.5.orig/bsdiff/bspatch.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/bspatch.c 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,187 @@
+/*-
+ * Copyright 2003-2005 Colin Percival
@@ -697,9 +697,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/bspatch.c ostree-2018.1/bsdiff/bspatch.c
+}
+
+#endif
diff -Nuar ostree-2018.1.orig/bsdiff/bspatch.h ostree-2018.1/bsdiff/bspatch.h
--- ostree-2018.1.orig/bsdiff/bspatch.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/bspatch.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/bsdiff/bspatch.h ostree-2018.5/bsdiff/bspatch.h
--- ostree-2018.5.orig/bsdiff/bspatch.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/bspatch.h 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,42 @@
+/*-
+ * Copyright 2003-2005 Colin Percival
@@ -743,9 +743,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/bspatch.h ostree-2018.1/bsdiff/bspatch.h
+
+#endif
+
diff -Nuar ostree-2018.1.orig/bsdiff/configure.ac ostree-2018.1/bsdiff/configure.ac
--- ostree-2018.1.orig/bsdiff/configure.ac 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/configure.ac 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/bsdiff/configure.ac ostree-2018.5/bsdiff/configure.ac
--- ostree-2018.5.orig/bsdiff/configure.ac 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/configure.ac 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,30 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
@@ -777,14 +777,14 @@ diff -Nuar ostree-2018.1.orig/bsdiff/configure.ac ostree-2018.1/bsdiff/configure
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -Nuar ostree-2018.1.orig/bsdiff/.git ostree-2018.1/bsdiff/.git
--- ostree-2018.1.orig/bsdiff/.git 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/.git 2018-02-02 23:13:23.000000000 +0300
diff -Nuar ostree-2018.5.orig/bsdiff/.git ostree-2018.5/bsdiff/.git
--- ostree-2018.5.orig/bsdiff/.git 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/.git 2018-05-26 00:37:14.345018427 +0300
@@ -0,0 +1 @@
+gitdir: ../.git/modules/bsdiff
diff -Nuar ostree-2018.1.orig/bsdiff/.gitignore ostree-2018.1/bsdiff/.gitignore
--- ostree-2018.1.orig/bsdiff/.gitignore 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/.gitignore 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/bsdiff/.gitignore ostree-2018.5/bsdiff/.gitignore
--- ostree-2018.5.orig/bsdiff/.gitignore 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/.gitignore 2018-05-26 00:37:31.984018846 +0300
@@ -0,0 +1,11 @@
+.deps/*
+.libs/*
@@ -797,9 +797,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/.gitignore ostree-2018.1/bsdiff/.gitignore
+README
+ChangeLog
+COPYING
diff -Nuar ostree-2018.1.orig/bsdiff/LICENSE ostree-2018.1/bsdiff/LICENSE
--- ostree-2018.1.orig/bsdiff/LICENSE 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/LICENSE 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/bsdiff/LICENSE ostree-2018.5/bsdiff/LICENSE
--- ostree-2018.5.orig/bsdiff/LICENSE 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/LICENSE 2018-05-26 00:37:31.984018846 +0300
@@ -0,0 +1,24 @@
+ Copyright 2003-2005 Colin Percival
+ Copyright 2012 Matthew Endsley
@@ -825,9 +825,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/LICENSE ostree-2018.1/bsdiff/LICENSE
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
diff -Nuar ostree-2018.1.orig/bsdiff/Makefile.am ostree-2018.1/bsdiff/Makefile.am
--- ostree-2018.1.orig/bsdiff/Makefile.am 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/Makefile.am 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/bsdiff/Makefile.am ostree-2018.5/bsdiff/Makefile.am
--- ostree-2018.5.orig/bsdiff/Makefile.am 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/Makefile.am 2018-05-26 00:37:31.984018846 +0300
@@ -0,0 +1,11 @@
+bin_PROGRAMS = bsdiff bspatch
+
@@ -840,9 +840,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/Makefile.am ostree-2018.1/bsdiff/Makefile.a
+
+EXTRA_DIST = bsdiff.h bspatch.h
+
diff -Nuar ostree-2018.1.orig/bsdiff/Makefile-bsdiff.am ostree-2018.1/bsdiff/Makefile-bsdiff.am
--- ostree-2018.1.orig/bsdiff/Makefile-bsdiff.am 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/Makefile-bsdiff.am 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/bsdiff/Makefile-bsdiff.am ostree-2018.5/bsdiff/Makefile-bsdiff.am
--- ostree-2018.5.orig/bsdiff/Makefile-bsdiff.am 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/Makefile-bsdiff.am 2018-05-26 00:37:31.984018846 +0300
@@ -0,0 +1,32 @@
+# Copyright (C) 2015 Giuseppe Scrivano <gscrivan@redhat.com>
+#
@@ -876,9 +876,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/Makefile-bsdiff.am ostree-2018.1/bsdiff/Mak
+ $(NULL)
+
+libbsdiff_la_CFLAGS = $(AM_CFLAGS)
diff -Nuar ostree-2018.1.orig/bsdiff/README.md ostree-2018.1/bsdiff/README.md
--- ostree-2018.1.orig/bsdiff/README.md 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/README.md 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/bsdiff/README.md ostree-2018.5/bsdiff/README.md
--- ostree-2018.5.orig/bsdiff/README.md 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/README.md 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,129 @@
+bsdiff/bspatch
+==============
@@ -1009,9 +1009,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/README.md ostree-2018.1/bsdiff/README.md
+
+`bspatch` returns `0` on success and `-1` on failure. On success, `new` contains
+the data for the patched file.
diff -Nuar ostree-2018.1.orig/libglnx/COPYING ostree-2018.1/libglnx/COPYING
--- ostree-2018.1.orig/libglnx/COPYING 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/COPYING 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/COPYING ostree-2018.5/libglnx/COPYING
--- ostree-2018.5.orig/libglnx/COPYING 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/COPYING 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,502 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
@@ -1515,14 +1515,14 @@ diff -Nuar ostree-2018.1.orig/libglnx/COPYING ostree-2018.1/libglnx/COPYING
+ Ty Coon, President of Vice
+
+That's all there is to it!
diff -Nuar ostree-2018.1.orig/libglnx/.git ostree-2018.1/libglnx/.git
--- ostree-2018.1.orig/libglnx/.git 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/.git 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/.git ostree-2018.5/libglnx/.git
--- ostree-2018.5.orig/libglnx/.git 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/.git 2018-05-26 00:37:31.964018845 +0300
@@ -0,0 +1 @@
+gitdir: ../.git/modules/libglnx
diff -Nuar ostree-2018.1.orig/libglnx/.gitignore ostree-2018.1/libglnx/.gitignore
--- ostree-2018.1.orig/libglnx/.gitignore 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/.gitignore 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/.gitignore ostree-2018.5/libglnx/.gitignore
--- ostree-2018.5.orig/libglnx/.gitignore 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/.gitignore 2018-05-26 00:37:32.005018846 +0300
@@ -0,0 +1,16 @@
+# A path ostree writes to work around automake bug with
+# subdir-objects
@@ -1540,9 +1540,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/.gitignore ostree-2018.1/libglnx/.gitignor
+*.stamp
+*~
+
diff -Nuar ostree-2018.1.orig/libglnx/glnx-backport-autocleanups.h ostree-2018.1/libglnx/glnx-backport-autocleanups.h
--- ostree-2018.1.orig/libglnx/glnx-backport-autocleanups.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-backport-autocleanups.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-backport-autocleanups.h ostree-2018.5/libglnx/glnx-backport-autocleanups.h
--- ostree-2018.5.orig/libglnx/glnx-backport-autocleanups.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-backport-autocleanups.h 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,124 @@
+/*
+ * Copyright © 2015 Canonical Limited
@@ -1668,9 +1668,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-backport-autocleanups.h ostree-2018.1
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GString, g_autoptr_cleanup_gstring_free)
+
+#endif
diff -Nuar ostree-2018.1.orig/libglnx/glnx-backport-autoptr.h ostree-2018.1/libglnx/glnx-backport-autoptr.h
--- ostree-2018.1.orig/libglnx/glnx-backport-autoptr.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-backport-autoptr.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-backport-autoptr.h ostree-2018.5/libglnx/glnx-backport-autoptr.h
--- ostree-2018.5.orig/libglnx/glnx-backport-autoptr.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-backport-autoptr.h 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,133 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -1805,9 +1805,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-backport-autoptr.h ostree-2018.1/libg
+#endif /* !GLIB_CHECK_VERSION(2, 43, 3) */
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-backports.c ostree-2018.1/libglnx/glnx-backports.c
--- ostree-2018.1.orig/libglnx/glnx-backports.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-backports.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-backports.c ostree-2018.5/libglnx/glnx-backports.c
--- ostree-2018.5.orig/libglnx/glnx-backports.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-backports.c 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,61 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -1870,9 +1870,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-backports.c ostree-2018.1/libglnx/gln
+ return TRUE;
+}
+#endif
diff -Nuar ostree-2018.1.orig/libglnx/glnx-backports.h ostree-2018.1/libglnx/glnx-backports.h
--- ostree-2018.1.orig/libglnx/glnx-backports.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-backports.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-backports.h ostree-2018.5/libglnx/glnx-backports.h
--- ostree-2018.5.orig/libglnx/glnx-backports.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-backports.h 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,46 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -1920,9 +1920,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-backports.h ostree-2018.1/libglnx/gln
+#endif /* !GLIB_CHECK_VERSION(2, 44, 0) */
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.c ostree-2018.1/libglnx/glnx-console.c
--- ostree-2018.1.orig/libglnx/glnx-console.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-console.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-console.c ostree-2018.5/libglnx/glnx-console.c
--- ostree-2018.5.orig/libglnx/glnx-console.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-console.c 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,359 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -1972,8 +1972,8 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.c ostree-2018.1/libglnx/glnx-
+static gboolean locked;
+static guint64 last_update_ms; /* monotonic time in millis we last updated */
+
+static gboolean
+stdout_is_tty (void)
+gboolean
+glnx_stdout_is_tty (void)
+{
+ static gsize initialized = 0;
+ static gboolean stdout_is_tty_v;
@@ -2082,7 +2082,7 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.c ostree-2018.1/libglnx/glnx-
+ g_return_if_fail (!locked);
+ g_return_if_fail (!console->locked);
+
+ console->is_tty = stdout_is_tty ();
+ console->is_tty = glnx_stdout_is_tty ();
+
+ locked = console->locked = TRUE;
+
@@ -2125,7 +2125,7 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.c ostree-2018.1/libglnx/glnx-
+ if (percentage != 100)
+ {
+ const guint64 diff_ms = current_ms - last_update_ms;
+ if (stdout_is_tty ())
+ if (glnx_stdout_is_tty ())
+ {
+ if (diff_ms < (1000/MAX_TTY_UPDATE_HZ))
+ return;
@@ -2150,7 +2150,7 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.c ostree-2018.1/libglnx/glnx-
+
+ const guint input_textlen = text ? strlen (text) : 0;
+
+ if (!stdout_is_tty ())
+ if (!glnx_stdout_is_tty ())
+ {
+ if (text)
+ fprintf (stdout, "%s", text);
@@ -2283,10 +2283,10 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.c ostree-2018.1/libglnx/glnx-
+
+ locked = console->locked = FALSE;
+}
diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.h ostree-2018.1/libglnx/glnx-console.h
--- ostree-2018.1.orig/libglnx/glnx-console.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-console.h 2018-02-02 23:13:30.000000000 +0300
@@ -0,0 +1,59 @@
diff -Nuar ostree-2018.5.orig/libglnx/glnx-console.h ostree-2018.5/libglnx/glnx-console.h
--- ostree-2018.5.orig/libglnx/glnx-console.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-console.h 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,61 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2013,2014,2015 Colin Walters <walters@verbum.org>
@@ -2320,6 +2320,8 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.h ostree-2018.1/libglnx/glnx-
+
+typedef struct GLnxConsoleRef GLnxConsoleRef;
+
+gboolean glnx_stdout_is_tty (void);
+
+void glnx_console_lock (GLnxConsoleRef *ref);
+
+void glnx_console_text (const char *text);
@@ -2346,9 +2348,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.h ostree-2018.1/libglnx/glnx-
+G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GLnxConsoleRef, glnx_console_ref_cleanup)
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-dirfd.c ostree-2018.1/libglnx/glnx-dirfd.c
--- ostree-2018.1.orig/libglnx/glnx-dirfd.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-dirfd.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-dirfd.c ostree-2018.5/libglnx/glnx-dirfd.c
--- ostree-2018.5.orig/libglnx/glnx-dirfd.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-dirfd.c 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,425 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -2775,9 +2777,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-dirfd.c ostree-2018.1/libglnx/glnx-di
+{
+ (void) _glnx_tmpdir_free (tmpf, FALSE, NULL, NULL);
+}
diff -Nuar ostree-2018.1.orig/libglnx/glnx-dirfd.h ostree-2018.1/libglnx/glnx-dirfd.h
--- ostree-2018.1.orig/libglnx/glnx-dirfd.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-dirfd.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-dirfd.h ostree-2018.5/libglnx/glnx-dirfd.h
--- ostree-2018.5.orig/libglnx/glnx-dirfd.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-dirfd.h 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,137 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -2916,9 +2918,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-dirfd.h ostree-2018.1/libglnx/glnx-di
+ GLnxTmpDir *out_tmpdir, GError **error);
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-errors.c ostree-2018.1/libglnx/glnx-errors.c
--- ostree-2018.1.orig/libglnx/glnx-errors.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-errors.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-errors.c ostree-2018.5/libglnx/glnx-errors.c
--- ostree-2018.5.orig/libglnx/glnx-errors.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-errors.c 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,131 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -3051,9 +3053,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-errors.c ostree-2018.1/libglnx/glnx-e
+ errno = errsv;
+ return FALSE;
+}
diff -Nuar ostree-2018.1.orig/libglnx/glnx-errors.h ostree-2018.1/libglnx/glnx-errors.h
--- ostree-2018.1.orig/libglnx/glnx-errors.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-errors.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-errors.h ostree-2018.5/libglnx/glnx-errors.h
--- ostree-2018.5.orig/libglnx/glnx-errors.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-errors.h 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,134 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -3189,9 +3191,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-errors.h ostree-2018.1/libglnx/glnx-e
+ } while (0);
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-fdio.c ostree-2018.1/libglnx/glnx-fdio.c
--- ostree-2018.1.orig/libglnx/glnx-fdio.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-fdio.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-fdio.c ostree-2018.5/libglnx/glnx-fdio.c
--- ostree-2018.5.orig/libglnx/glnx-fdio.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-fdio.c 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,1106 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -4299,9 +4301,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-fdio.c ostree-2018.1/libglnx/glnx-fdi
+
+ return TRUE;
+}
diff -Nuar ostree-2018.1.orig/libglnx/glnx-fdio.h ostree-2018.1/libglnx/glnx-fdio.h
--- ostree-2018.1.orig/libglnx/glnx-fdio.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-fdio.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-fdio.h ostree-2018.5/libglnx/glnx-fdio.h
--- ostree-2018.5.orig/libglnx/glnx-fdio.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-fdio.h 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,369 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -4672,9 +4674,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-fdio.h ostree-2018.1/libglnx/glnx-fdi
+}
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-local-alloc.c ostree-2018.1/libglnx/glnx-local-alloc.c
--- ostree-2018.1.orig/libglnx/glnx-local-alloc.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-local-alloc.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-local-alloc.c ostree-2018.5/libglnx/glnx-local-alloc.c
--- ostree-2018.5.orig/libglnx/glnx-local-alloc.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-local-alloc.c 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,72 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -4748,9 +4750,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-local-alloc.c ostree-2018.1/libglnx/g
+ * </example>
+ *
+ */
diff -Nuar ostree-2018.1.orig/libglnx/glnx-local-alloc.h ostree-2018.1/libglnx/glnx-local-alloc.h
--- ostree-2018.1.orig/libglnx/glnx-local-alloc.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-local-alloc.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-local-alloc.h ostree-2018.5/libglnx/glnx-local-alloc.h
--- ostree-2018.5.orig/libglnx/glnx-local-alloc.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-local-alloc.h 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,91 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -4843,9 +4845,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-local-alloc.h ostree-2018.1/libglnx/g
+#define glnx_autofd __attribute__((cleanup(glnx_close_fd)))
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-lockfile.c ostree-2018.1/libglnx/glnx-lockfile.c
--- ostree-2018.1.orig/libglnx/glnx-lockfile.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-lockfile.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-lockfile.c ostree-2018.5/libglnx/glnx-lockfile.c
--- ostree-2018.5.orig/libglnx/glnx-lockfile.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-lockfile.c 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,179 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
@@ -5026,9 +5028,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-lockfile.c ostree-2018.1/libglnx/glnx
+ f->operation = 0;
+ f->initialized = FALSE;
+}
diff -Nuar ostree-2018.1.orig/libglnx/glnx-lockfile.h ostree-2018.1/libglnx/glnx-lockfile.h
--- ostree-2018.1.orig/libglnx/glnx-lockfile.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-lockfile.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-lockfile.h ostree-2018.5/libglnx/glnx-lockfile.h
--- ostree-2018.5.orig/libglnx/glnx-lockfile.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-lockfile.h 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,40 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
@@ -5070,9 +5072,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-lockfile.h ostree-2018.1/libglnx/glnx
+void glnx_release_lock_file(GLnxLockFile *f);
+
+G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GLnxLockFile, glnx_release_lock_file)
diff -Nuar ostree-2018.1.orig/libglnx/glnx-macros.h ostree-2018.1/libglnx/glnx-macros.h
--- ostree-2018.1.orig/libglnx/glnx-macros.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-macros.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-macros.h ostree-2018.5/libglnx/glnx-macros.h
--- ostree-2018.5.orig/libglnx/glnx-macros.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-macros.h 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,189 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -5263,9 +5265,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-macros.h ostree-2018.1/libglnx/glnx-m
+#endif /* GI_SCANNER */
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-missing.h ostree-2018.1/libglnx/glnx-missing.h
--- ostree-2018.1.orig/libglnx/glnx-missing.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-missing.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-missing.h ostree-2018.5/libglnx/glnx-missing.h
--- ostree-2018.5.orig/libglnx/glnx-missing.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-missing.h 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,95 @@
+#pragma once
+
@@ -5362,10 +5364,10 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-missing.h ostree-2018.1/libglnx/glnx-
+#endif
+
+#include "glnx-missing-syscall.h"
diff -Nuar ostree-2018.1.orig/libglnx/glnx-missing-syscall.h ostree-2018.1/libglnx/glnx-missing-syscall.h
--- ostree-2018.1.orig/libglnx/glnx-missing-syscall.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-missing-syscall.h 2018-02-02 23:13:30.000000000 +0300
@@ -0,0 +1,154 @@
diff -Nuar ostree-2018.5.orig/libglnx/glnx-missing-syscall.h ostree-2018.5/libglnx/glnx-missing-syscall.h
--- ostree-2018.5.orig/libglnx/glnx-missing-syscall.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-missing-syscall.h 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,156 @@
+/***
+ This file was originally part of systemd.
+
@@ -5508,10 +5510,10 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-missing-syscall.h ostree-2018.1/libgl
+# endif
+# endif
+
+static inline ssize_t copy_file_range(int fd_in, loff_t *off_in,
+ int fd_out, loff_t *off_out,
+ size_t len,
+ unsigned int flags) {
+static inline ssize_t missing_copy_file_range(int fd_in, loff_t *off_in,
+ int fd_out, loff_t *off_out,
+ size_t len,
+ unsigned int flags) {
+# ifdef __NR_copy_file_range
+ return syscall(__NR_copy_file_range, fd_in, off_in, fd_out, off_out, len, flags);
+# else
@@ -5519,10 +5521,12 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-missing-syscall.h ostree-2018.1/libgl
+ return -1;
+# endif
+}
+
+# define copy_file_range missing_copy_file_range
+#endif
diff -Nuar ostree-2018.1.orig/libglnx/glnx-shutil.c ostree-2018.1/libglnx/glnx-shutil.c
--- ostree-2018.1.orig/libglnx/glnx-shutil.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-shutil.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-shutil.c ostree-2018.5/libglnx/glnx-shutil.c
--- ostree-2018.5.orig/libglnx/glnx-shutil.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-shutil.c 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,260 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -5784,9 +5788,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-shutil.c ostree-2018.1/libglnx/glnx-s
+
+ return glnx_opendirat (dfd, path, TRUE, out_dfd, error);
+}
diff -Nuar ostree-2018.1.orig/libglnx/glnx-shutil.h ostree-2018.1/libglnx/glnx-shutil.h
--- ostree-2018.1.orig/libglnx/glnx-shutil.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-shutil.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-shutil.h ostree-2018.5/libglnx/glnx-shutil.h
--- ostree-2018.5.orig/libglnx/glnx-shutil.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-shutil.h 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,48 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -5836,9 +5840,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-shutil.h ostree-2018.1/libglnx/glnx-s
+ GError **error);
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-xattrs.c ostree-2018.1/libglnx/glnx-xattrs.c
--- ostree-2018.1.orig/libglnx/glnx-xattrs.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-xattrs.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-xattrs.c ostree-2018.5/libglnx/glnx-xattrs.c
--- ostree-2018.5.orig/libglnx/glnx-xattrs.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-xattrs.c 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,444 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -6284,9 +6288,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-xattrs.c ostree-2018.1/libglnx/glnx-x
+ return TRUE;
+}
+
diff -Nuar ostree-2018.1.orig/libglnx/glnx-xattrs.h ostree-2018.1/libglnx/glnx-xattrs.h
--- ostree-2018.1.orig/libglnx/glnx-xattrs.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-xattrs.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/glnx-xattrs.h ostree-2018.5/libglnx/glnx-xattrs.h
--- ostree-2018.5.orig/libglnx/glnx-xattrs.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/glnx-xattrs.h 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,78 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -6366,9 +6370,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-xattrs.h ostree-2018.1/libglnx/glnx-x
+ GError **error);
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/libglnx.doap ostree-2018.1/libglnx/libglnx.doap
--- ostree-2018.1.orig/libglnx/libglnx.doap 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/libglnx.doap 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/libglnx.doap ostree-2018.5/libglnx/libglnx.doap
--- ostree-2018.5.orig/libglnx/libglnx.doap 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/libglnx.doap 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -6401,9 +6405,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/libglnx.doap ostree-2018.1/libglnx/libglnx
+ </maintainer>
+
+</Project>
diff -Nuar ostree-2018.1.orig/libglnx/libglnx.h ostree-2018.1/libglnx/libglnx.h
--- ostree-2018.1.orig/libglnx/libglnx.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/libglnx.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/libglnx.h ostree-2018.5/libglnx/libglnx.h
--- ostree-2018.5.orig/libglnx/libglnx.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/libglnx.h 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,40 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -6445,10 +6449,10 @@ diff -Nuar ostree-2018.1.orig/libglnx/libglnx.h ostree-2018.1/libglnx/libglnx.h
+#include <glnx-fdio.h>
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/libglnx.m4 ostree-2018.1/libglnx/libglnx.m4
--- ostree-2018.1.orig/libglnx/libglnx.m4 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/libglnx.m4 2018-02-02 23:13:30.000000000 +0300
@@ -0,0 +1,32 @@
diff -Nuar ostree-2018.5.orig/libglnx/libglnx.m4 ostree-2018.5/libglnx/libglnx.m4
--- ostree-2018.5.orig/libglnx/libglnx.m4 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/libglnx.m4 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,33 @@
+AC_DEFUN([LIBGLNX_CONFIGURE],
+[
+AC_CHECK_DECLS([
@@ -6463,6 +6467,7 @@ diff -Nuar ostree-2018.1.orig/libglnx/libglnx.m4 ostree-2018.1/libglnx/libglnx.m
+#include <sched.h>
+#include <linux/loop.h>
+#include <linux/random.h>
+#include <sys/mman.h>
+]])
+
+AC_ARG_ENABLE(otmpfile,
@@ -6481,9 +6486,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/libglnx.m4 ostree-2018.1/libglnx/libglnx.m
+
+dnl end LIBGLNX_CONFIGURE
+])
diff -Nuar ostree-2018.1.orig/libglnx/Makefile-libglnx.am ostree-2018.1/libglnx/Makefile-libglnx.am
--- ostree-2018.1.orig/libglnx/Makefile-libglnx.am 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/Makefile-libglnx.am 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/Makefile-libglnx.am ostree-2018.5/libglnx/Makefile-libglnx.am
--- ostree-2018.5.orig/libglnx/Makefile-libglnx.am 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/Makefile-libglnx.am 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,78 @@
+# Copyright (C) 2015 Colin Walters <walters@verbum.org>
+#
@@ -6563,9 +6568,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/Makefile-libglnx.am ostree-2018.1/libglnx/
+test_libglnx_shutil_SOURCES = $(libglnx_srcpath)/tests/test-libglnx-shutil.c
+test_libglnx_shutil_CFLAGS = $(AM_CFLAGS) $(libglnx_cflags)
+test_libglnx_shutil_LDADD = $(libglnx_libs) libglnx.la
diff -Nuar ostree-2018.1.orig/libglnx/README.md ostree-2018.1/libglnx/README.md
--- ostree-2018.1.orig/libglnx/README.md 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/README.md 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/README.md ostree-2018.5/libglnx/README.md
--- ostree-2018.5.orig/libglnx/README.md 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/README.md 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,52 @@
+libglnx is the successor to libgsystem: https://git.gnome.org/browse/libgsystem
+
@@ -6619,9 +6624,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/README.md ostree-2018.1/libglnx/README.md
+https://github.com/GNOME/libglnx/pulls
+
+Or alternatively, email one of the maintainers directly.
diff -Nuar ostree-2018.1.orig/libglnx/tests/libglnx-testlib.h ostree-2018.1/libglnx/tests/libglnx-testlib.h
--- ostree-2018.1.orig/libglnx/tests/libglnx-testlib.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/tests/libglnx-testlib.h 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/tests/libglnx-testlib.h ostree-2018.5/libglnx/tests/libglnx-testlib.h
--- ostree-2018.5.orig/libglnx/tests/libglnx-testlib.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/tests/libglnx-testlib.h 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,34 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -6657,9 +6662,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/tests/libglnx-testlib.h ostree-2018.1/libg
+#define _GLNX_TEST_DECLARE_ERROR(local_error, error) \
+ g_autoptr(_GLnxTestAutoError) local_error = NULL; \
+ GError **error = &local_error
diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-errors.c ostree-2018.1/libglnx/tests/test-libglnx-errors.c
--- ostree-2018.1.orig/libglnx/tests/test-libglnx-errors.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/tests/test-libglnx-errors.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-errors.c ostree-2018.5/libglnx/tests/test-libglnx-errors.c
--- ostree-2018.5.orig/libglnx/tests/test-libglnx-errors.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/tests/test-libglnx-errors.c 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,183 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -6844,9 +6849,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-errors.c ostree-2018.1/
+
+ return ret;
+}
diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-fdio.c ostree-2018.1/libglnx/tests/test-libglnx-fdio.c
--- ostree-2018.1.orig/libglnx/tests/test-libglnx-fdio.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/tests/test-libglnx-fdio.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-fdio.c ostree-2018.5/libglnx/tests/test-libglnx-fdio.c
--- ostree-2018.5.orig/libglnx/tests/test-libglnx-fdio.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/tests/test-libglnx-fdio.c 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,254 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -7102,9 +7107,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-fdio.c ostree-2018.1/li
+
+ return ret;
+}
diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-macros.c ostree-2018.1/libglnx/tests/test-libglnx-macros.c
--- ostree-2018.1.orig/libglnx/tests/test-libglnx-macros.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/tests/test-libglnx-macros.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-macros.c ostree-2018.5/libglnx/tests/test-libglnx-macros.c
--- ostree-2018.5.orig/libglnx/tests/test-libglnx-macros.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/tests/test-libglnx-macros.c 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,109 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -7215,9 +7220,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-macros.c ostree-2018.1/
+ g_test_add_func ("/hash_table_foreach", test_hash_table_foreach);
+ return g_test_run();
+}
diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-shutil.c ostree-2018.1/libglnx/tests/test-libglnx-shutil.c
--- ostree-2018.1.orig/libglnx/tests/test-libglnx-shutil.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/tests/test-libglnx-shutil.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-shutil.c ostree-2018.5/libglnx/tests/test-libglnx-shutil.c
--- ostree-2018.5.orig/libglnx/tests/test-libglnx-shutil.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/tests/test-libglnx-shutil.c 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,63 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -7282,9 +7287,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-shutil.c ostree-2018.1/
+
+ return ret;
+}
diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-xattrs.c ostree-2018.1/libglnx/tests/test-libglnx-xattrs.c
--- ostree-2018.1.orig/libglnx/tests/test-libglnx-xattrs.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/tests/test-libglnx-xattrs.c 2018-02-02 23:13:30.000000000 +0300
diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-xattrs.c ostree-2018.5/libglnx/tests/test-libglnx-xattrs.c
--- ostree-2018.5.orig/libglnx/tests/test-libglnx-xattrs.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/tests/test-libglnx-xattrs.c 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,283 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
hardware/virtualization/ostree/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>Operating system and container binary deployment and upgrades</Summary>
<Description>OSTree is a tool for managing bootable, immutable, versioned filesystem trees</Description>
<Archive sha1sum="2a68aafb690e1bcf1b8e144d8cfc3effa33a7d00" type="targz">https://github.com/ostreedev/ostree/archive/v2018.2.tar.gz</Archive>
<Archive sha1sum="f6f6f7bb2bf0bd0418bed81ad305dd318956a537" type="targz">https://github.com/ostreedev/ostree/archive/v2018.5.tar.gz</Archive>
<BuildDependencies>
<Dependency>gtk-doc</Dependency>
<Dependency>rust</Dependency>
@@ -85,6 +85,13 @@
</Package>
<History>
<Update release="3">
<Date>2018-05-24</Date>
<Version>2018.5</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="2">
<Date>2018-02-16</Date>
<Version>2018.2</Version>
hardware/virtualization/runc/actions.py
+19 -2
View File
@@ -10,12 +10,29 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
shelltools.export("GOPATH", "%s" % get.workDIR())
#shelltools.export("GOPATH", "%s" % get.curDIR())
shelltools.export("DOCKER_BUILDTAGS","seccomp")
shelltools.export("COMMIT","4fc53a8")
shelltools.export("BINDIR","/usr/bin")
def setup():
shelltools.cd("%s" % get.workDIR())
shelltools.move("runc-*", "runc")
shelltools.cd("runc")
shelltools.move("vendor", "src")
shelltools.makedirs("src/github.com/opencontainers")
shelltools.cd("src/github.com/opencontainers")
shelltools.system("ln -rsf %s/runc ./runc" % get.workDIR())
def build():
autotools.make()
shelltools.cd("%s/runc/src/github.com/opencontainers/runc" % get.workDIR())
build_runc = "GOPATH=%s/runc make COMMIT=4fc53a8" % get.workDIR()
shelltools.system(build_runc)
def install():
pisitools.dobin("runc")
hardware/virtualization/runc/pspec.xml
+9 -2
View File
@@ -11,9 +11,9 @@
<License>Apache-2.0</License>
<Summary>container cli tools</Summary>
<Description>CLI tool for managing OCI compliant containers</Description>
<Archive sha1sum="ca70c97c9211462f774e22f03fec2fe61f45f1ba" type="targz">https://github.com/opencontainers/runc/archive/v0.1.1.tar.gz</Archive>
<Archive sha1sum="dcc87b404034fff66f9d4c4e2983f3483157ad71" type="targz">https://github.com/opencontainers/runc/archive/v1.0.0-rc5.tar.gz</Archive>
<BuildDependencies>
<Dependency>golang</Dependency>
<Dependency versionFrom="1.10.3">golang</Dependency>
<Dependency>libseccomp-devel</Dependency>
</BuildDependencies>
</Source>
@@ -30,6 +30,13 @@
</Package>
<History>
<Update release="3">
<Date>2018-06-10</Date>
<Version>1.0.0_rc5</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="2">
<Date>2017-03-20</Date>
<Version>0.1.1</Version>
hardware/virtualization/tini/actions.py
+30
View File
@@ -0,0 +1,30 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Copyright 2018 TUBITAK/UEKAE
# Licensed under the GNU General Public License, version 2.
# See the file http://www.gnu.org/copyleft/gpl.txt.
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import cmaketools
from pisi.actionsapi import get
# WorkDir = ""
# NoStrip = "/"
def setup():
cmaketools.configure()
def build():
cmaketools.make()
def install():
pisitools.dobin("tini")
pisitools.dobin("tini-static")
# symlink docker-init (nice integration with docker)
pisitools.dosym("/usr/bin/tini-static", "/usr/bin/docker-init")
pisitools.dodoc("LICENSE", "README*", "VERSION")
hardware/virtualization/tini/files/tini-cmake-fixes.patch
+78
View File
@@ -0,0 +1,78 @@
From a8f82ea60cde15cbbd0ebcf729062de6bad9859c Mon Sep 17 00:00:00 2001
From: Thomas Orozco <thomas@orozco.fr>
Date: Tue, 28 Mar 2017 21:59:07 +0200
Subject: [PATCH] Allow setting VERSION_GIT
Fixes: #79
---
CMakeLists.txt | 48 +++++++++++++++++++++++++++++-------------------
1 file changed, 29 insertions(+), 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8936f18..06c180c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,34 +6,44 @@ set (tini_VERSION_MAJOR 0)
set (tini_VERSION_MINOR 14)
set (tini_VERSION_PATCH 0)
+set (GIT_PREFIX " - git.")
+
# Build options
option(MINIMAL "Disable argument parsing and verbose output" OFF)
+# Set VERSION_GIT to INTERNAL so it does not persist across runs of CMake, just
+# like the auto-discovery would.
+set(VERSION_GIT "" CACHE INTERNAL "Override the git revision")
+
if(MINIMAL)
add_definitions(-DTINI_MINIMAL=1)
endif()
# Extract git version and dirty-ness
-execute_process (
- COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" log -n 1 --date=local --pretty=format:%h
- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
- RESULT_VARIABLE git_version_check_ret
- OUTPUT_VARIABLE tini_VERSION_GIT
-)
-
-execute_process(
- COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" status --porcelain --untracked-files=no
- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
- OUTPUT_VARIABLE git_dirty_check_out
-)
-
-if("${git_version_check_ret}" EQUAL 0)
- set(tini_VERSION_GIT " - git.${tini_VERSION_GIT}")
- if(NOT "${git_dirty_check_out}" STREQUAL "")
- set(tini_VERSION_GIT "${tini_VERSION_GIT}-dirty")
- endif()
+if(VERSION_GIT)
+ set(tini_VERSION_GIT "${GIT_PREFIX}${VERSION_GIT}")
else()
- set(tini_VERSION_GIT "")
+ execute_process (
+ COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" log -n 1 --date=local --pretty=format:%h
+ WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
+ RESULT_VARIABLE git_version_check_ret
+ OUTPUT_VARIABLE tini_VERSION_GIT
+ )
+
+ execute_process(
+ COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" status --porcelain --untracked-files=no
+ WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
+ OUTPUT_VARIABLE git_dirty_check_out
+ )
+
+ if("${git_version_check_ret}" EQUAL 0)
+ set(tini_VERSION_GIT "${GIT_PREFIX}${tini_VERSION_GIT}")
+ if(NOT "${git_dirty_check_out}" STREQUAL "")
+ set(tini_VERSION_GIT "${tini_VERSION_GIT}-dirty")
+ endif()
+ else()
+ set(tini_VERSION_GIT "")
+ endif()
endif()
# Flags
hardware/virtualization/tini/pspec.xml
+42
View File
@@ -0,0 +1,42 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pardus.org.tr/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>tini</Name>
<Homepage>https://github.com/krallin/tini</Homepage>
<Packager>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Packager>
<License>GPLv2</License>
<IsA>app:console</IsA>
<Summary>A tiny but valid `init` for containers </Summary>
<Description>A tiny but valid `init` for containers </Description>
<Archive sha1sum="27b7529ae87ea688e21d0a061b6d9299ff9362f6" type="targz">https://github.com/krallin/tini/archive/v0.18.0.tar.gz</Archive>
<BuildDependencies>
<!--Dependency versionFrom="1.10.3">golang</Dependency-->
<Dependency>cmake</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">tini-cmake-fixes.patch</Patch>
</Patches>
</Source>
<Package>
<Name>tini</Name>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2018-07-08</Date>
<Version>0.18.0</Version>
<Comment>First release</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
</History>
</PISI>
multimedia/video/smplayer/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<IsA>app:gui</IsA>
<Summary>A complete front-end for MPlayer</Summary>
<Description>smplayer is Qt application which intends to be a complete front-end for MPlayer, from basic features like playing videos, DVDs, and VCDs to more advanced features like support for MPlayer filters and more.</Description>
<Archive sha1sum="04a8bbf6fe254491160df6623e6781e5ce91a256" type="tarbz2">https://sourceforge.net/projects/smplayer/files/SMPlayer/18.4.0/smplayer-18.4.0.tar.bz2</Archive>
<Archive sha1sum="192a7443ce6baa4a2d138fe698dbb7143afef613" type="tarbz2">https://sourceforge.net/projects/smplayer/files/SMPlayer/18.5.0/smplayer-18.5.0.tar.bz2</Archive>
<Archive sha1sum="164ef1bcd9cbb4e51736a08fd3c7270eaef8895b" type="tarbz2">https://sourceforge.net/projects/smplayer/files/SMPlayer-themes/17.3.0/smplayer-themes-17.3.0.tar.bz2</Archive>
<Archive sha1sum="ab30e705a54252088e28a5fb8d17fd8e6f495b41" type="tarbz2">http://sourceforge.net/projects/smplayer/files/SMPlayer-skins/15.2.0/smplayer-skins-15.2.0.tar.bz2</Archive>
<BuildDependencies>
@@ -47,6 +47,13 @@
</Package>
<History>
<Update release="10">
<Date>2018-05-27</Date>
<Version>18.5.0</Version>
<Comment>Version Bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="9">
<Date>2018-04-30</Date>
<Version>18.4.0</Version>
need_build
+11 -6
View File
@@ -1,14 +1,15 @@
* working on https://github.com/ertugerata/main/raw/master/pisi-index.xml.xz
* working on http://ciftlik.pisilinux.org/2.0-Beta.1/pisi-index.xml.xz
* working on file:///home/ertugerata/Works/2.0-Beta.1/pisi-index.xml.xz
* Packages missing in http://ciftlik.pisilinux.org/2.0-Beta.1/pisi-index.xml.xz
desktop/kde/applications/korganizer
* Packages missing in file:///home/ertugerata/Works/2.0-Beta.1/pisi-index.xml.xz
desktop/toolkit/qt5/qt5-quick1
kernel/drivers/module-fglrx
programming/language/python3/python3-kappa
* Packages that needs compiling
desktop/gnome/base/dconf (4 > 3)
desktop/kde/applications/blogilo (7 > 6)
desktop/kde/graphics/libkface (13 > 8)
desktop/kde/l10n/kde-l10n-ar (8 > 7)
desktop/kde/l10n/kde-l10n-bg (8 > 7)
@@ -63,12 +64,16 @@
desktop/kde/l10n/kde-l10n-wa (8 > 7)
desktop/kde/l10n/kde-l10n-zh_CN (8 > 7)
desktop/kde/l10n/kde-l10n-zh_TW (8 > 7)
desktop/toolkit/qt5/qt5-base (7 > 6)
desktop/toolkit/qt5/qt5-webkit (7 > 6)
desktop/toolkit/qtermwidget5 (5 > 4)
editor/bluefish (5 > 2)
kernel/tools/perf (11 > 10)
multimedia/nightingale (2 > 1)
multimedia/sound/audacity (2 > 1)
multimedia/sound/timidity-shompatches (3 > 1)
network/mail/thunderbird (5 > 4)
office/calligra/calligra (5 > 4)
programming/language/R-lang (4 > 5)
programming/language/python/notify-python (3 > 2)
programming/misc/qrencode (3 > 8)
util/crypt/nss (8 > 9)
x11/misc/colord (3 > 2)
network/mail/thunderbird/pspec.xml
+8 -1
View File
@@ -15,7 +15,7 @@
<IsA>app:gui</IsA>
<Summary>The Stand-Alone Mozilla Mail Component</Summary>
<Description>Thunderbird is a redesign of the Mozilla Mail Component. It is written using the XUL user interface language and designed to be cross-platform.</Description>
<Archive sha1sum="8965e9ece5feaa8370ebea047e1fcadd00f2cff7" type="tarxz">http://ftp.mozilla.org/pub/thunderbird/releases/52.6.0/source/thunderbird-52.6.0.source.tar.xz</Archive>
<Archive sha1sum="1480f20b91e52cbb27793ffcc9369f8670d4a2ee" type="tarxz">http://ftp.mozilla.org/pub/thunderbird/releases/52.9.0/source/thunderbird-52.9.0.source.tar.xz</Archive>
<AdditionalFiles>
<AdditionalFile target=".mozconfig">pisilinux/mozconfig</AdditionalFile>
</AdditionalFiles>
@@ -442,6 +442,13 @@
</Package>
<History>
<Update release="5">
<Date>2018-07-07</Date>
<Version>52.9.0</Version>
<Comment>Version Bump.</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2018-02-04</Date>
<Version>52.6.0</Version>
pisi-index.xml
+161348 -160941
View File
File diff suppressed because it is too large Load Diff
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
705942012f4e63a39db56bf1edbf531dcd178e80
9e30ffa0354f8a563d1714a1620c9e54636e52c7
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
63dd8b0bbe8da3942b8a147ac3ed01b135c0a7fa
e5a9bffd96bea5702a73b6739f888681fef2e2cf
programming/build/meson/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>High productivity build system</Summary>
<Description>Yüksek verimli üretme sistemi</Description>
<Archive sha1sum="964f175606846fb6229e645f5f6b756de21c1732" type="targz">https://github.com/mesonbuild/meson/releases/download/0.46.0/meson-0.46.0.tar.gz</Archive>
<Archive sha1sum="a83d0b1432302c4233cd0db39140e6a54c259931" type="targz">https://github.com/mesonbuild/meson/releases/download/0.47.0/meson-0.47.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>python3-devel</Dependency>
<Dependency>python3-setuptools</Dependency>
@@ -37,6 +37,13 @@
</Files>
</Package>
<History>
<Update release="5">
<Date>2018-07-07</Date>
<Version>0.47.0</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-05-13</Date>
<Version>0.46.0</Version>
programming/language/R-lang/pspec.xml
+9 -2
View File
@@ -13,7 +13,7 @@
<IsA>app:console</IsA>
<Summary>A free software environment for statistical computing and graphics</Summary>
<Description>This package includes the core R userspace and all R development components.</Description>
<Archive sha1sum="537d481888f20d385b3039f2f2b0c49b7b0fb5de" type="targz">http://cran.r-project.org/src/base/R-3/R-3.4.3.tar.gz</Archive>
<Archive sha1sum="9314d3d372b05546a33791fbc8dd579c92ebd16b" type="targz">http://cran.r-project.org/src/base/R-3/R-3.5.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>libXmu-devel</Dependency>
<Dependency>icu4c-devel</Dependency>
@@ -94,6 +94,7 @@
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="header">/usr/include/Rmath.h</Path>
<Path fileType="library">/usr/lib/pkgconfig/libRmath.pc</Path>
</Files>
</Package>
@@ -115,11 +116,17 @@
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig/libR.pc</Path>
<Path fileType="library">/usr/lib/pkgconfig/libRmath.pc</Path>
</Files>
</Package>
<History>
<Update release="5">
<Date>2018-07-08</Date>
<Version>3.5.1</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-02-01</Date>
<Version>3.4.3</Version>
programming/language/python3/python3/actions.py
+1 -1
View File
@@ -40,4 +40,4 @@ def build():
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.remove("/usr/bin/2to3")
pisitools.dodoc("LICENSE", "README")
pisitools.dodoc("LICENSE", "README.*")
programming/language/python3/python3/pspec.xml
+9 -2
View File
@@ -12,7 +12,7 @@
<PartOf>programming.language</PartOf>
<Summary>Next generation of the python high-level scripting language</Summary>
<Description>Next generation of the python high-level scripting language</Description>
<Archive sha1sum="18ebf7d726782967d967dc00e3aa08b334fbdd5c" type="tarxz">https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz</Archive>
<Archive sha1sum="5a7a833a36f1006257d298787f4c38493c5d1689" type="tarxz">https://www.python.org/ftp/python/3.6.5/Python-3.6.5.tar.xz</Archive>
<BuildDependencies>
<!-- <Dependency>valgrind</Dependency> -->
<Dependency>bzip2</Dependency>
@@ -161,6 +161,13 @@
</Package>
<History>
<Update release="5">
<Date>2018-05-09</Date>
<Version>3.6.5</Version>
<Comment>Version bump</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-01-31</Date>
<Version>3.6.0</Version>
@@ -190,4 +197,4 @@
<Email>marcin@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>
programming/language/ruby/ruby/pspec.xml
+7
View File
@@ -80,6 +80,13 @@
</Package>
<History>
<Update release="5">
<Date>2018-06-06</Date>
<Version>2.5.0</Version>
<Comment>Rebuild for gdbm.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-01-31</Date>
<Version>2.5.0</Version>
programming/language/rust/files/bootstrap-config.toml
Regular → Executable
+2 -2
View File
@@ -11,10 +11,10 @@ sanitizers = false
prefix = "/usr"
[rust]
codegen-units = 0
codegen-units = 1
debuginfo = true
# debuginfo-lines = true
debuginfo-lines = true
channel = "stable"
programming/language/rust/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app</IsA>
<Summary>Systems programming language focused on safety, speed and concurrency</Summary>
<Description>Systems programming language focused on safety, speed and concurrency</Description>
<Archive sha1sum="8a8d11a5b9f836025d0790f3d03606ad1e7acd3c" type="targz">https://static.rust-lang.org/dist/rustc-1.25.0-src.tar.gz</Archive>
<Archive sha1sum="54e4a19cd7eea451fea568644e4a3e264efcf36a" type="targz">https://static.rust-lang.org/dist/rustc-1.27.0-src.tar.gz</Archive>
<AdditionalFiles>
<AdditionalFile target="config.toml">bootstrap-config.toml</AdditionalFile>
</AdditionalFiles>
@@ -61,6 +61,13 @@
</Package>
<History>
<Update release="4">
<Date>2018-07-07</Date>
<Version>1.27.0</Version>
<Comment>Version Bump</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2018-04-17</Date>
<Version>1.25.0</Version>
programming/php/php/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>PHP7 is an HTML-embedded scripting language. The goal of the language is to allow web developers to write dynamically generated pages quickly</Summary>
<Description>PHP7 is an HTML-embedded scripting language. Much of its syntax is borrowed from C, Java and Perl with a couple of unique PHP-specific features thrown in. The goal of the language is to allow web developers to write dynamically generated pages quickly.</Description>
<Archive sha1sum="b15bd8fef8d5b99b993784e9c2254ab82f616c64" type="tarbz2">http://us2.php.net/distributions/php-7.2.0.tar.bz2</Archive>
<Archive sha1sum="5b32576ab1cedb65c4fc071ca186e3d95d607622" type="tarbz2">http://us2.php.net/distributions/php-7.2.6.tar.bz2</Archive>
<BuildDependencies>
<Dependency>gd-devel</Dependency>
<Dependency>re2c</Dependency>
@@ -209,6 +209,13 @@
<History>
<Update release="5">
<Date>2018-06-17</Date>
<Version>7.2.6</Version>
<Comment>Version Bump</Comment>
<Name>Erkan IŞIK</Name>
<Email>info@erkanisik.com</Email>
</Update>
<Update release="4">
<Date>2017-12-24</Date>
<Version>7.2.0</Version>
server/auth/cyrus-sasl/pspec.xml
+7
View File
@@ -92,6 +92,13 @@
</Package>
<History>
<Update release="4">
<Date>2018-05-09</Date>
<Version>2.1.26</Version>
<Comment>Version bump</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="3">
<Date>2017-02-19</Date>
<Version>2.1.26</Version>
util/admin/pgModeler/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA>
<Summary>PostgreSQL Database Modeler</Summary>
<Description>PostgreSQL Database Modeler: an open source CASE tool for modeling PostgreSQL databases</Description>
<Archive sha1sum="e4f2bd2ec4a4457997a7f752dd81279eedd89ce6" type="targz">https://github.com/pgmodeler/pgmodeler/archive/v0.9.0.tar.gz</Archive>
<Archive sha1sum="5d192b4075d65955c8a6ac21fe2e6ca563f1e77a" type="targz">https://github.com/pgmodeler/pgmodeler/archive/v0.9.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>libxml2-devel</Dependency>
<Dependency>mesa-devel</Dependency>
@@ -47,6 +47,13 @@
</Package>
<History>
<Update release="3">
<Date>2018-06-30</Date>
<Version>0.9.1</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="2">
<Date>2017-11-26</Date>
<Version>0.9.0</Version>
util/crypt/nss/pspec.xml
+8 -1
View File
@@ -15,7 +15,7 @@
<IsA>library</IsA>
<Summary>Network Security Services</Summary>
<Description>Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.</Description>
<Archive sha1sum="29268d7dadeaa41f2bee25607153574f44b4701e" type="targz">https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_37_RTM/src/nss-3.37.tar.gz</Archive>
<Archive sha1sum="1b77253126572b46a222bf3a85fe50e5246add0f" type="targz">https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_38_RTM/src/nss-3.38.tar.gz</Archive>
<AdditionalFiles>
<AdditionalFile target="dist/pkgconfig/nss.pc.in">nss.pc.in</AdditionalFile>
<AdditionalFile target="dist/pkgconfig/nss-config.in">nss-config.in</AdditionalFile>
@@ -75,6 +75,13 @@
</Package>
<History>
<Update release="9">
<Date>2018-07-08</Date>
<Version>3.38</Version>
<Comment>Version Bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="8">
<Date>2018-05-08</Date>
<Version>3.37</Version>
x11/misc/colord/pspec.xml
Executable → Regular
+1 -1
View File
@@ -108,7 +108,7 @@
<History>
<Update release="3">
<Date>2018-03-02</Date>
<Date>2018-07-09</Date>
<Version>1.4.1</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
x11/misc/mesa-demos/actions.py
+35
View File
@@ -0,0 +1,35 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import get
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
demos_dir = "/usr/lib/mesa/demos"
demos_dir_emul32 = "/usr/lib32/mesa/demos"
def setup():
autotools.autoreconf("-fvi")
options = "--disable-static \
--with-system-data-files \
--bindir=%s" % (demos_dir_emul32 if get.buildTYPE() == "emul32" else demos_dir)
autotools.configure(options)
pisitools.dosed("libtool","( -shared )", " -Wl,--as-needed\\1")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
if get.buildTYPE() == "emul32":
for util in ("glxgears", "glxinfo"):
pisitools.domove("%s/%s" % (demos_dir_emul32, util), "/usr/bin/", "%s32" % util)
return
for util in ("glxgears", "glxinfo"):
pisitools.domove("%s/%s" % (demos_dir, util), "/usr/bin/")
pisitools.dobin("src/egl/opengl/xeglgears")
x11/misc/mesa-demos/pspec.xml
+158
View File
@@ -0,0 +1,158 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>mesa-demos</Name>
<Homepage>http://www.mesa3d.org</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>app:console</IsA>
<Summary>Mesa demos</Summary>
<Description>Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics.</Description>
<Archive sha1sum="468a8f24938ab07e2e31828cf961515371d45b56" type="tarbz2">ftp://ftp.freedesktop.org/pub/mesa/demos/8.3.0/mesa-demos-8.3.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>glew-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>libXext-devel</Dependency>
<Dependency>mesa-glu-devel</Dependency>
<Dependency>freeglut-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>glibc-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>mesa-demos</Name>
<RuntimeDependencies>
<Dependency>glew</Dependency>
<Dependency>freeglut</Dependency>
<Dependency>libXext</Dependency>
<Dependency>mesa</Dependency>
<Dependency>mesa-glu</Dependency>
<Dependency>libX11</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/share/mesa-demos</Path>
<Path fileType="executable">/usr/lib/mesa/demos</Path>
</Files>
</Package>
<Package>
<Name>mesa-utils</Name>
<PartOf>x11.util</PartOf>
<Summary>Mesa utilities</Summary>
<RuntimeDependencies>
<Dependency>mesa</Dependency>
<Dependency>libX11</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
</Files>
</Package>
<Package>
<Name>mesa-demos-32bit</Name>
<PartOf>emul32</PartOf>
<Summary>32-bit shared libraries for mesa</Summary>
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>mesa-32bit</Dependency>
<Dependency>glew-32bit</Dependency>
<Dependency>freeglut-32bit</Dependency>
<Dependency>nettle-32bit</Dependency>
<Dependency>mesa-glu-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency>glew-32bit</Dependency>
<Dependency>mesa-32bit</Dependency>
<Dependency>libX11-32bit</Dependency>
<Dependency>libXext-32bit</Dependency>
<Dependency>freeglut-32bit</Dependency>
<Dependency>mesa-glu-32bit</Dependency>
<Dependency>libgcc</Dependency>
<Dependency release="current">mesa-demos</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32</Path>
<Path fileType="executable">/usr/bin/glxinfo32</Path>
<Path fileType="executable">/usr/bin/glxgears32</Path>
</Files>
</Package>
<History>
<Update release="10">
<Date>2016-03-01</Date>
<Version>8.3.0</Version>
<Comment>Release bump.</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="9">
<Date>2015-01-20</Date>
<Version>8.2.0</Version>
<Comment>Release bump.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="8">
<Date>2015-01-02</Date>
<Version>8.2.0</Version>
<Comment>Dep fixed.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="7">
<Date>2014-09-24</Date>
<Version>8.2.0</Version>
<Comment>Version bump.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2014-05-16</Date>
<Version>8.1.0</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2014-03-08</Date>
<Version>8.1.0</Version>
<Comment>Release bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2013-08-25</Date>
<Version>8.1.0</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-05-29</Date>
<Version>8.1.0</Version>
<Comment>Fixed configure settings.</Comment>
<Name>Ertan Güven</Name>
<Email>ertan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-02-27</Date>
<Version>8.1.0</Version>
<Comment>Version bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2013-02-09</Date>
<Version>8.0.1</Version>
<Comment>First release</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
</History>
</PISI>
x11/misc/mesa-demos/translations.xml
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>mesa-demos</Name>
<Summary xml:lang="tr">Mesa demoları</Summary>
<Description xml:lang="tr">Mesa, OpenGL belirtiminin (etkileşimli 3B grafiklerin gerçeklenmesi için bir sistem) açık kaynaklı bir uyarlamasıdır.</Description>
</Source>
<Package>
<Name>mesa-utils</Name>
<Summary xml:lang="tr">Mesa yardımcı uygulamaları</Summary>
</Package>
<Package>
<Name>mesa-demos-32bit</Name>
<Summary xml:lang="tr">mesa-demos için 32-bit paylaşımlı kitaplıklar</Summary>
</Package>
</PISI>