From b7b817cf94ad6fd2279ae6cf67cffb67747fbc51 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 22 Sep 2017 15:48:24 +0100 Subject: [PATCH] Import ostree_2017.11-2.debian.tar.xz [dgit import tarball ostree 2017.11-2 ostree_2017.11-2.debian.tar.xz] --- .gitignore | 8 + changelog | 512 ++++++++++++++++++ compat | 1 + control | 167 ++++++ copyright | 185 +++++++ docs | 1 + gbp.conf | 7 + gir1.2-ostree-1.0.install | 1 + libostree-1-1.install | 1 + libostree-1-1.symbols | 342 ++++++++++++ libostree-dev.install | 4 + libostree-doc.install | 1 + ostree-boot.README.Debian | 10 + ostree-boot.control | 33 ++ ostree-boot.install | 10 + ostree-tests.install | 3 + ostree-tests.lintian-overrides | 10 + ostree.install | 8 + ostree.maintscript | 2 + ...les-fuse-also-pass-mode-for-O_RDONLY.patch | 70 +++ ...-unset-LANGUAGE-after-setting-LC_ALL.patch | 31 ++ ...Fix-JavaScript-tests-with-gjs-1.50.0.patch | 45 ++ ...o-022-while-creating-test-repository.patch | 75 +++ patches/series | 4 + rules | 88 +++ source/format | 1 + test.sh | 43 ++ tests/build | 22 + tests/control | 5 + tests/gnome-desktop-testing | 22 + tests/test-local-pull | 19 + watch | 2 + 32 files changed, 1733 insertions(+) create mode 100644 .gitignore create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 docs create mode 100644 gbp.conf create mode 100644 gir1.2-ostree-1.0.install create mode 100644 libostree-1-1.install create mode 100644 libostree-1-1.symbols create mode 100644 libostree-dev.install create mode 100644 libostree-doc.install create mode 100644 ostree-boot.README.Debian create mode 100644 ostree-boot.control create mode 100644 ostree-boot.install create mode 100644 ostree-tests.install create mode 100644 ostree-tests.lintian-overrides create mode 100755 ostree.install create mode 100644 ostree.maintscript create mode 100644 patches/2017.12/rofiles-fuse-also-pass-mode-for-O_RDONLY.patch create mode 100644 patches/2017.12/tests-Explicitly-unset-LANGUAGE-after-setting-LC_ALL.patch create mode 100644 patches/2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch create mode 100644 patches/2017.12/tests-Reset-umask-to-022-while-creating-test-repository.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100755 test.sh create mode 100755 tests/build create mode 100644 tests/control create mode 100755 tests/gnome-desktop-testing create mode 100755 tests/test-local-pull create mode 100644 watch diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..910c5bde --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +/*.debhelper +/*.substvars +/gir1.2-ostree-1.0/ +/libostree-1-1/ +/libostree-dev/ +/libostree-doc/ +/ostree-grub2/ +/ostree/ diff --git a/changelog b/changelog new file mode 100644 index 00000000..6885c81f --- /dev/null +++ b/changelog @@ -0,0 +1,512 @@ +ostree (2017.11-2) unstable; urgency=medium + + * Replace patch with the version applied upstream in 2017.12 + * Standards-Version: 4.1.0 (no changes) + * Add a patch to fix FTBFS in non-English locales + * Add a patch to fix FTBFS if building as root with umask != 022, + which for some reason debomatic does (Closes: #876138) + * Add a patch from upstream to fix undefined behaviour with + O_RDONLY|O_CREAT in rofiles-fuse + + -- Simon McVittie Fri, 22 Sep 2017 15:48:24 +0100 + +ostree (2017.11-1) unstable; urgency=medium + + * New upstream release + - Drop all current patches, applied upstream + - Update symbols file + * Adjust Description and Upstream-Name to emphasize libostree + * Classify new ostree-tmpfiles.conf as part of ostree-boot, and so + don't install it yet + * Stop copying an old ostree-trivial-httpd.xml from debian/dist/ + into source tree. Upstream distributes it again, and has since + 2017.8. + * Add a patch to fix JavaScript tests with gjs 1.50.0, which is + more strict about 'let' + * Stop providing "ostree trivial-httpd" CLI, following upstream + default behaviour. flatpak used to use it in its tests, but + the version in stable no longer does. + + -- Simon McVittie Fri, 15 Sep 2017 16:58:15 +0100 + +ostree (2017.10-1) unstable; urgency=medium + + * New upstream release + - Update symbols file + - Install new bash completions + * Use dh_missing --fail-missing instead of dh_install --fail-missing + * Only run tests when building architecture-dependent packages. + The tests aren't so interesting that we want to run them again + when splitting -arch/-indep builds. + * Add patches to make the tests pass again when /var/tmp is on tmpfs, + which does not support user xattrs + * Add patch to remove useless #! from bash completions + * Make build-time test failures fatal again, but only if they are + reproducible (at least 3 times out of 5) for now + + -- Simon McVittie Tue, 29 Aug 2017 18:18:49 +0100 + +ostree (2017.9-1) unstable; urgency=medium + + * New upstream release + - Drop backported patch + - Update symbols file + * debian/rules: Adjust a comment to avoid Lintian thinking this is a + dh_make template + + -- Simon McVittie Fri, 28 Jul 2017 14:43:30 +0100 + +ostree (2017.8-1) unstable; urgency=medium + + * New upstream release + - Update symbols file + - Remove patches that are no longer needed + - Add patch from upstream PR #1016 to fix a regression + * Add a Breaks on flatpak (<< 0.8.7-2~), which rely on libostree to + download the summary and its signature when mirroring. + libostree >= 2017.7 no longer does this. On affected flatpak versions, + this breaks installation of new apps and runtimes system-wide. + * Add Build-Depends-Indep: libglib2.0-doc so gtk-doc can set up + cross-references + + -- Simon McVittie Wed, 19 Jul 2017 22:18:20 +0100 + +ostree (2017.7-1) unstable; urgency=medium + + * New upstream release + - Update symbols file + - Add post-release patches so test-symbols.sh passes again + - debian/dist/: Add ostree-trivial-httpd.xml, which was incorrectly + excluded from the upstream release + * Standards-Version: 4.0.0 + - Use https URL for copyright-format + * Implement build profile + * Upload to unstable + + -- Simon McVittie Wed, 21 Jun 2017 13:06:54 +0100 + +ostree (2017.6-1) experimental; urgency=medium + + * New upstream release + - Update debian/copyright + - Update disabled ostree-boot packaging for new systemd generator + - Add new ABI to symbols file + * Skip build-time tests when nocheck is in DEB_BUILD_OPTIONS + (Closes: #862803). Thanks to Krzesimir Nowak + + -- Simon McVittie Thu, 25 May 2017 10:01:12 +0100 + +ostree (2017.5-1) experimental; urgency=high + + * New upstream release + - This release fixes a regression in 2017.4 that caused symlinks + in Flatpak apps and runtimes to be checked out as regular files. + Any apps or runtimes that were installed or updated with 2017.4 + will need to be removed and reinstalled. + + -- Simon McVittie Wed, 19 Apr 2017 14:18:16 +0100 + +ostree (2017.4-1) experimental; urgency=medium + + * New upstream release + - d/rules: Explicitly enable trivial-httpd: the tests still need it + - Update symbols file for new ABI + + -- Simon McVittie Mon, 17 Apr 2017 17:19:58 +0100 + +ostree (2017.3-2) experimental; urgency=medium + + * d/ostree.maintscript: Clean up obsolete conffiles from before we + started removing what will eventually become ostree-boot + (see #824650) + * libostree-dev: Add missing dependency on libostree-1-1 + (Closes: #860047) + + -- Simon McVittie Mon, 10 Apr 2017 18:52:26 +0100 + +ostree (2017.3-1) experimental; urgency=medium + + * d/watch, d/copyright: upstream project is now named libostree + * New upstream release + - d/copyright: update + - symbols file: update + - tests, ostree-tests.install: update for new location of tests + - d/control: ostree-tests now needs python-yaml + - build-depend on python, python-yaml for tests + + -- Simon McVittie Thu, 16 Mar 2017 06:58:46 +0000 + +ostree (2017.1-1) experimental; urgency=medium + + * Branch to experimental to avoid interfering with the Debian 9 freeze + * Remove an unintended line in the previous changelog + * New upstream release + - trivial-httpd is now a separate binary. Move it to ostree-tests, + so that it doesn't continue to pull in libsoup if the ostree + downloader is ported to libcurl. + - d/copyright: update + - d/patches: drop all patches, applied upstream + * Explicitly depend on autoconf, automake, libtool. This avoids + builds for experimental non-deterministically pulling in an older + version of automake, in my case automake1.11 which is far too old. + + -- Simon McVittie Fri, 27 Jan 2017 10:23:47 +0000 + +ostree (2016.15-3) unstable; urgency=medium + + * debian/control: Don't run gjs tests on sparc64. gjs doesn't seem + to work there at all (#827815) + - d/ostree-tests.lintian-overrides: silence + missing-dep-for-interpreter error on sparc64, where we install + the script but do not attempt to run it + * debian/tests/gnome-desktop-testing: Skip test-local-pull.sh.test + which suffers from a known bug (#842606) + - debian/tests/test-local-pull: Run the unreliable test separately, + repeated 3 times to assess how often it fails + * d/p/Sourced-test-snippets-remove-shebang-and-make-non-executa.patch, + d/p/Make-corrupt-repo-ref.js-executable.patch: + Fix permissions and #! lines for some tests in the upstream build + system + * d/rules: remove workarounds for script permissions. + The upstream build system now uses the intended permissions throughout. + - Retain explicit chmod for *.js, which dh_fixperms assumes should + not be executable. + * d/p/Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch: + Run an additional test, which was previously installed but not run + + -- Simon McVittie Thu, 19 Jan 2017 13:23:32 +0000 + +ostree (2016.15-2) unstable; urgency=medium + + * Make all test failures non-fatal at build time, so that intermittent + test failures do not interfere with possible security updates during + Debian stretch-as-stable. + + -- Simon McVittie Tue, 20 Dec 2016 11:28:41 +0000 + +ostree (2016.15-1) unstable; urgency=medium + + * New upstream release + - d/patches: drop all patches, applied upstream + + -- Simon McVittie Tue, 13 Dec 2016 13:13:44 +0000 + +ostree (2016.14-2) unstable; urgency=medium + + * Make build-time test failures non-fatal, as long as at least + 3 out of 5 attempts succeed. + + There are several upstream bugs that cause intermittent test + failures, and can intermittently be reproduced in real use. + However, these are not regressions, so we should not FTBFS just + because we happen to have been unlucky during build. + + * d/p/Terminate-individual-tests-after-10-minutes.patch: + replace d/p/debian/Terminate-individual-tests-after-half-an-hour.patch + with the version that I sent upstream, which uses SIGABRT and + terminates the tests sooner + * d/p/*.patch: import more memory leak fixes from upstream + + -- Simon McVittie Thu, 01 Dec 2016 12:38:54 +0000 + +ostree (2016.14-1) unstable; urgency=medium + + * Switch the build-dependency on libgpgme11-dev (which no longer exists + as a real package) to libgpgme-dev + * Drop the version from versioned build-dependencies where the required + version was already present in oldstable + * New upstream release + - update symbols file for new ABI + * Import various post-release fixes from upstream + + -- Simon McVittie Tue, 29 Nov 2016 11:05:44 +0000 + +ostree (2016.13-1) unstable; urgency=medium + + * New upstream release + - d/p/dist/Retrieve-some-missing-test-files-from-upstream-git.patch: + remove, 2016.13 was released with a fixed "make dist" + - d/p/Filter-bootloader-supplied-kernel-cmdline-options.patch: + remove, merged upstream + * d/copyright: drop copyright and license stanzas for files that are + in upstream git but not in tarballs + + -- Simon McVittie Sun, 20 Nov 2016 21:58:11 +0000 + +ostree (2016.12-2) unstable; urgency=medium + + * d/p/Filter-bootloader-supplied-kernel-cmdline-options.patch: + - Filter out kernel command line parameters set by the bootloading when + deriving the configuration from /proc/cmdline. + * Add myself to uploaders + + -- Sjoerd Simons Thu, 03 Nov 2016 15:48:01 -0600 + +ostree (2016.12-1) unstable; urgency=medium + + * Force LC_ALL=C.UTF-8 during build, so that builds in non-English + locales can pass their build-time tests + * New upstream release + * Build-depend on ca-certificates. glib-networking now generates + warnings if those are missing, causing the build-time tests to fail. + + -- Simon McVittie Wed, 26 Oct 2016 19:11:14 +0100 + +ostree (2016.11-1) unstable; urgency=medium + + * New upstream release + * Relicense debian/ from GPL-2+ to LGPL-2+, with permission from + David King + * Install GObject-Introspection typelibs to multiarch path, + and mark gir1.2-ostree-1.0 as Multi-Arch: same + * libostree-dev: stop depending on ostree. It isn't necessary to + use the library, and would break multiarch installability + * Move to debhelper compat level 10 + - stop using dh --parallel, it's the default now + - don't use autoreconf and systemd addons explicitly, they are + the default now + * d/p/dist/Retrieve-some-missing-test-files-from-upstream-git.patch: + fetch missing test files from upstream git + - debian/rules: make the missing scripts executable + + -- Simon McVittie Fri, 07 Oct 2016 23:39:06 +0100 + +ostree (2016.10-1) unstable; urgency=medium + + * New upstream release + * Make libostree-dev Multi-Arch: same + * Make libostree-doc Multi-Arch: foreign + + -- Simon McVittie Thu, 15 Sep 2016 08:26:51 +0100 + +ostree (2016.9-2) unstable; urgency=medium + + * debian/patches/Terminate-individual-tests-after-half-an-hour.patch: + terminate individual tests after 30 minutes, in an attempt to debug + what happened on the ppc64el buildd + + -- Simon McVittie Fri, 09 Sep 2016 08:23:44 +0100 + +ostree (2016.9-1) unstable; urgency=medium + + * New upstream version + - update symbols file for new ABI + - update copyright file + - update ostree-boot packaging: the utilities in /usr/sbin moved to + /usr/lib/ostree + - drop libgsystem build-dependency + - d/p/Makefile-tests.am-make-check-uses-the-built-binaries.patch: + drop, applied upstream + * Explicitly build-depend on xsltproc, which is directly used + + -- Simon McVittie Tue, 06 Sep 2016 09:59:00 +0100 + +ostree (2016.7-1) unstable; urgency=medium + + * New upstream version + - drop all patches, applied upstream + - build-depend on libsystemd (unconditionally, because this package is + Linux-specific already) + - update symbols file for new ABI + * d/p/Makefile-tests.am-make-check-uses-the-built-binaries.patch: + add patch from upstream to make sure we use the built binaries for + build-time testing + * d/control: mention Flatpak, not its former name xdg-app + + -- Simon McVittie Thu, 28 Jul 2016 07:40:27 +0100 + +ostree (2016.6-4) unstable; urgency=medium + + * Switch sense of check in debian/test.sh so we really ignore test + failures on mipsel, and not on !mipsel. + + -- Simon McVittie Wed, 06 Jul 2016 15:23:31 +0100 + +ostree (2016.6-3) unstable; urgency=medium + + * Ignore build-time test failures on mipsel. "ostree pull" + intermittently fails with a bus error on at least some mipsel CPUs, + and applying gdb to the resulting core dump does not produce any + useful information. Debugging help would be appreciated. + (Mitigates: #827473) + + -- Simon McVittie Wed, 06 Jul 2016 10:17:43 +0100 + +ostree (2016.6-2) unstable; urgency=medium + + * d/p/tests-Improve-check-for-proc-cmdline-kargs.patch: add patch from + upstream fixing FTBFS on host machines without root= in /proc/cmdline, + such as the reproducible builds armhf workers + * d/control, d/copyright: use the GitHub repository as the Homepage + and Source: the GNOME wiki page is less frequently updated + + -- Simon McVittie Tue, 28 Jun 2016 09:29:53 +0100 + +ostree (2016.6-1) unstable; urgency=medium + + [ Jeremy Bicha ] + * Fix debian/watch (Closes: #827440) + + [ Simon McVittie ] + * New upstream release + - drop all patches, included upstream + - update symbols file + - this version is more careful about thread-safety, which appears + to fix the test failures that caused FTBFS on mipsel + (Closes: #827473) + * d/watch: fetch releases from GitHub instead of GNOME + * d/gbp.conf: configure to use upstream/latest for upstream imports + * d/gbp.conf: configure to merge upstream tags into upstream/latest + (add https://github.com/ostreedev/ostree as a remote) + * d/p/libostree.sym-Fix-test-symbols.patch: apply patch from upstream + to fix a build-time test + * d/p/pull-Correctly-handle-repo-parent_repo-when-applying-stat.patch: + apply patch from upstream to fix a bug that flatpak currently works + around + * d/p/tests-fail-the-build-if-symlinking-tests-ostree-fails.patch, + d/p/tests-use-our-own-generated-libtool-not-the-one-in-PATH.patch: + add patches to ensure that the build-time tests act on the copy + of ostree that we just built + * d/p/entry_pathname_test_helper-these-tests-need-extended-attr.patch: + skip more tests if /var/tmp doesn't support extended attributes + * d/control: ostree no longer needs its Suggests on dracut. A stronger + dependency on dracut will be needed in the ostree-boot package when + the boot integration is reinstated (see #824650). + + -- Simon McVittie Sun, 26 Jun 2016 19:51:31 +0100 + +ostree (2016.5-4) unstable; urgency=medium + + * d/p/test-sysroot.js-set-strict-mode-when-sourcing-libtest.sh.patch, + d/p/tests-Use-strict-mode-by-default-for-C-tests.patch: add patches + to make sure the tests fail as soon as something goes wrong + * Build-depend on procps, used to check for leaked processes + * debian/test.sh: factor out our dh_auto_test wrapper, and clean + up any stray processes even if the test fails + * If build-time tests fail, try 4 more times to get an idea of + whether the failure is reproducible (hoping to diagnose #826858) + * Add a patch to link libreaddir-rand to libdl, which should fix + test failures on Ubuntu (Closes: #826857) + + -- Simon McVittie Tue, 14 Jun 2016 15:35:18 -0400 + +ostree (2016.5-3) unstable; urgency=medium + + * Remove ostree-grub2 and the boot-related parts of ostree, leaving + the library and the command-line tool, which are also used by + Flatpak. + When we have documentation for how to use and test OSTree + deployments with a Debian derivative (see #824649), they should be + reinstated in an ostree-boot package (see #824650). + * Upload to unstable. + + -- Simon McVittie Wed, 08 Jun 2016 11:58:01 +0100 + +ostree (2016.5-2) experimental; urgency=medium + + * Add a patch to skip the test-parent test if /var/tmp doesn't support + user xattrs, hopefully fixing FTBFS on x86-csail-02 buildd + + -- Simon McVittie Mon, 25 Apr 2016 12:51:33 +0100 + +ostree (2016.5-1) experimental; urgency=medium + + * New upstream release + - Remove all patches, applied upstream + - debian/libostree-1-1.symbols: update for new versioned symbols + - Build-depend on libmount-dev + - debian/copyright: update + - debian/rules, debian/ostree-tests.install: adjust for new installation + directory for installed-tests + - debian/rules: use Debian's grub2-mkconfig path + * debian/gbp.conf: use DEP-14 branch names; disable numbered patches + * Fix ITP bug number in changelog (was #813308, should have been #697477) + * debian/control: build-depend on attr, for the tests (only required if + /var/tmp supports extended attributes) + * debian/rules: clean up stale gpg-agent processes after testing + * debian/rules: warn if there are leftover daemon processes after testing + * debian/ostree-tests.lintian-overrides: override a couple of false + positives + * Run dh_auto_test with VERBOSE=1, to get logs with older debhelper + * Build-depend on elfutils, for test-abi.sh + * Work around #821235 to avoid undefined macro 'AQ' in some man pages + * Add a patch to put more information in the log if tests fail, + in an attempt to debug a failure in test/pull-resume.sh which + I can no longer reproduce + * Standards-version: 3.9.8 (no changes needed) + + -- Simon McVittie Mon, 25 Apr 2016 07:46:16 +0100 + +ostree (2016.3-1) experimental; urgency=medium + + * Prepare package for Debian (Closes: #697477) + * New upstream release + * Remove -dbg package, rely on automatic dbgsym packages instead + * Extend package descriptions a bit + * debian/.gitignore: add + * debian/copyright: fill in all copyright holders and licenses + * debian/control: set Maintainer to the pkg-utopia team, with packaging + in collab-maint git, and myself and Matthias Klumpp as uploaders + * Normalize packaging via `wrap-and-sort -abst` + * debian/control: move shared library to Section: libs + * debian/control: remove redundant Section + * debian/control: change Section to admin + * Remove unnecessary uses of dh-exec + * debian/patches: remove all patches, no longer needed or applied + * Use dh_install --fail-missing to catch mistakes + * Add a symbols file + * Add missing dependency on libglib2.0-dev + * Add an ostree-tests package, and use it for autopkgtest + * Enable systemd helpers, but do not start the early-boot systemd services + on installation + * Don't override dh_auto_clean to nothing + * ostree-grub2: recommend concrete GRUB packages instead of hard-depending + on a transitional package. This is only a Recommends because you + could be using some other architecture's grub packages. + * Redirect libexecdir to /usr/lib (not /usr/lib/${multiarch}) since we don't + need multiarch for anything that's installed there, fixing a broken + symlink in ostree-grub2 + * Document the limited situations in which ostree-grub2 will work in + practice + * Only build on Linux architectures; this package is specifically + not portable + * Add patch to fix underlinking of test-archive + * Add patch to skip one build-time test if /var/tmp cannot support xattrs, + for example if it is on tmpfs + * Stop dh_makeshlibs thinking that the LD_PRELOAD module libreaddir-rand.so + (part of the tests) is meant to be a shared library + * Add a missing #!/bin/sh to one test + + -- Simon McVittie Sat, 19 Mar 2016 17:56:21 +0000 + +ostree (2016.1-alexlarsson1~wily1) wily; urgency=medium + + * New upstream release + + -- Alexander Larsson Thu, 01 Oct 2015 11:28:39 +0200 + +ostree (2015.11-alexlarsson1~vivid1) vivid; urgency=medium + + * New upstream release + + -- Alexander Larsson Thu, 01 Oct 2015 11:28:39 +0200 + +ostree (2015.9-alexlarsson1) vivid; urgency=medium + + * New upstream release + + -- Alexander Larsson Thu, 01 Oct 2015 11:28:39 +0200 + +ostree (2015.4-0amigadave2) trusty; urgency=low + + [ David King ] + * Add build dependency on libattr1-dev. + + -- David King Wed, 08 Apr 2015 13:10:39 +0100 + +ostree (2015.4-0amigadave1) trusty; urgency=low + + [ David King ] + * Initial packaging. + + -- David King Thu, 02 Apr 2015 15:40:52 +0000 diff --git a/compat b/compat new file mode 100644 index 00000000..f599e28b --- /dev/null +++ b/compat @@ -0,0 +1 @@ +10 diff --git a/control b/control new file mode 100644 index 00000000..b75d4fab --- /dev/null +++ b/control @@ -0,0 +1,167 @@ +Source: ostree +Section: admin +Priority: optional +Maintainer: Utopia Maintenance Team +Uploaders: + Matthias Klumpp , + Simon McVittie , + Sjoerd Simons +Build-Depends: + attr, + autoconf, + automake, + bison, + ca-certificates, + cpio, + debhelper (>= 10~), + dh-exec, + docbook-xml , + docbook-xsl , + e2fslibs-dev, + elfutils, + fuse, + gjs [!sparc64], + gobject-introspection, + gtk-doc-tools , + libarchive-dev, + libattr1-dev, + libcap-dev, + libfuse-dev, + libgirepository1.0-dev, + libglib2.0-dev (>= 2.40.0), + libgpgme-dev, + liblzma-dev, + libmount-dev (>= 2.23), + libselinux1-dev, + libsoup2.4-dev (>= 2.39.1), + libsystemd-dev, + libtool, + procps, + python , + python-yaml , + xsltproc , + zlib1g-dev, +Build-Depends-Indep: + libglib2.0-doc, +Standards-Version: 4.1.0 +Homepage: https://github.com/ostreedev/ostree/ +Vcs-Git: https://anonscm.debian.org/git/collab-maint/ostree.git +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/ostree.git + +Package: gir1.2-ostree-1.0 +Architecture: linux-any +Multi-Arch: same +Section: introspection +Depends: + ${gir:Depends}, + ${misc:Depends}, +Description: content-addressed filesystem for operating system binaries (introspection) + libostree provides a library and tools for managing bootable, immutable, + versioned filesystem trees. See the ostree package's description for + more details. + . + This package contains GObject-Introspection metadata, which can be used + to generate dynamic bindings into languages such as Python and JavaScript. + +Package: libostree-1-1 +Architecture: linux-any +Section: libs +Depends: + ${misc:Depends}, + ${shlibs:Depends}, +Pre-Depends: + ${misc:Pre-Depends}, +Breaks: + flatpak (<< 0.8.7-2~), +Multi-arch: same +Description: content-addressed filesystem for operating system binaries (library) + libostree is a library for managing bootable, immutable, versioned + filesystem trees. It is like git in that it checksums individual files + and has a content-addressed object store; unlike git, it "checks out" + the files using hardlinks into an immutable directory tree. This + can be used to provide atomic upgrades with rollback, history and + parallel-installation, particularly useful on "fixed purpose" systems + such as embedded devices. It is also used by the Flatpak application + runtime system. + . + This package contains the shared library. + +Package: libostree-dev +Architecture: linux-any +Multi-Arch: same +Section: libdevel +Depends: + gir1.2-ostree-1.0 (= ${binary:Version}), + libglib2.0-dev, + libostree-1-1 (= ${binary:Version}), + pkg-config, + ${misc:Depends}, +Suggests: + libostree-doc, +Description: Development files for the libostree library + libostree is a library for managing bootable, immutable, versioned + filesystem trees. It is like git in that it checksums individual files + and has a content-addressed object store; unlike git, it "checks out" + the files using hardlinks into an immutable directory tree. This + can be used to provide atomic upgrades with rollback, history and + parallel-installation, particularly useful on "fixed purpose" systems + such as embedded devices. It is also used by the Flatpak application + runtime system. + . + This package contains development headers and the pkg-config file for + libostree. + +Package: libostree-doc +Build-Profiles: +Architecture: all +Multi-Arch: foreign +Section: doc +Depends: + ${misc:Depends}, +Suggests: + devhelp, +Description: Development documentation for the libostree library + libostree provides a library and tools for managing bootable, immutable, + versioned filesystem trees. See the ostree package's description for + more details. + . + This package contains development documentation for libostree. + +Package: ostree +Architecture: linux-any +Depends: + ${misc:Depends}, + ${shlibs:Depends}, +Description: content-addressed filesystem for operating system binaries + libostree provides a library and tools for managing bootable, immutable, + versioned filesystem trees. It is like git in that it checksums + individual files and has a content-addressed object store; unlike git, + it "checks out" the files using hardlinks into an immutable directory + tree. This can be used to provide atomic upgrades with rollback, history + and parallel-installation, particularly useful on "fixed purpose" + systems such as embedded devices. + . + This package contains the executables used to manage and create + filesystem trees. It does not affect the boot process for the system + on which it is installed. + +Package: ostree-tests +Architecture: linux-any +Depends: + attr, + ca-certificates, + cpio, + fuse, + gir1.2-ostree-1.0, + gjs [!sparc64], + ostree, + python, + python-yaml, + ${misc:Depends}, + ${shlibs:Depends}, +Description: content-addressed filesystem for operating system binaries - tests + libostree provides a library and tools for managing bootable, immutable, + versioned filesystem trees. See the ostree package's description for + more details. + . + This package contains automated tests. diff --git a/copyright b/copyright new file mode 100644 index 00000000..e7400336 --- /dev/null +++ b/copyright @@ -0,0 +1,185 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libostree +Source: https://github.com/ostreedev/ostree/ + +Files: + * +Copyright: + © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + © 1999-2000, 2002-2005 Free Software Foundation, Inc. + © 1999-2003 Ximian, Inc. + © 2008-2017 Red Hat, Inc + © 2011-2017 Colin Walters + © 2017 Georges Basile Stavracas Neto + © 2011 Avery Pennarun + © 2013 Collabora Ltd. + © 2013 Stef Walter + © 2013 Javier Martinez + © 2013 Jeremy Whiting + © 2013-2016 Sjoerd Simons + © 2014-2016 Alexander Larsson + © 2014 Owen Taylor + © 2015 Dan Nicholson + © 2015 Canonical Ltd. + © 2017 Endless Mobile, Inc. +License: LGPL-2+ + +Files: + libglnx/glnx-lockfile.* + libglnx/glnx-fdio.* + libglnx/glnx-missing-syscall.h + libglnx/glnx-missing.h +Copyright: + © 2010-2011 Lennart Poettering + © 2014-2015 Colin Walters + © 2016 Zbigniew Jędrzejewski-Szmek +License: LGPL-2.1+ + +Files: + src/libostree/ostree-varint.c +Copyright: + © 2008 Google Inc. + © 2013 Colin Walters +License: LGPL-2+ and BSD-3-clause + +Files: + buildutil/attributes.m4 +Copyright: + 2006-2008 Diego Pettenò + 2006-2008 xine project + 2012 Lucas De Marchi +License: GPL-2+ with Autoconf exception + +Files: + bsdiff/* +Copyright: + © 2003-2005 Colin Percival + © 2012 Matthew Endsley +License: BSD-2-clause + +Files: debian/* +Copyright: + © 2015 David King + © 2016 Collabora Ltd. + © 2017 Simon McVittie +License: LGPL-2+ + +License: GPL-2+ with Autoconf exception + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + . + As a special exception, the copyright owners of the + macro gives unlimited permission to copy, distribute and modify the + configure scripts that are the output of Autoconf when processing the + Macro. You need not follow the terms of the GNU General Public + License when using or distributing such scripts, even though portions + of the text of the Macro appear in them. The GNU General Public + License (GPL) does govern all other use of the material that + constitutes the Autoconf Macro. + . + This special exception to the GPL applies to versions of the + Autoconf Macro released by this project. When you make and + distribute a modified version of the Autoconf Macro, you may extend + this special exception to the GPL to apply to your modified version as + well. +Comment: + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + '/usr/share/common-licenses/GPL-2'. + +License: LGPL-2+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Library General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public License + along with this program. If not, see . +Comment: + On Debian systems, the full text of the GNU Library General Public + License version 2 can be found in the file + '/usr/share/common-licenses/LGPL-2'. + +License: LGPL-2.1+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . +Comment: + On Debian systems, the full text of the GNU Lesser General Public + License version 2.1 can be found in the file + '/usr/share/common-licenses/LGPL-2.1'. + +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted providing that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + 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. + +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, 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 --git a/docs b/docs new file mode 100644 index 00000000..b43bf86b --- /dev/null +++ b/docs @@ -0,0 +1 @@ +README.md diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 00000000..2bda9c8b --- /dev/null +++ b/gbp.conf @@ -0,0 +1,7 @@ +[DEFAULT] +pristine-tar = True +compression = xz +debian-branch = debian/master +upstream-branch = upstream/latest +patch-numbers = False +upstream-vcs-tag = v%(version)s diff --git a/gir1.2-ostree-1.0.install b/gir1.2-ostree-1.0.install new file mode 100644 index 00000000..49d71c96 --- /dev/null +++ b/gir1.2-ostree-1.0.install @@ -0,0 +1 @@ +usr/lib/*/girepository-1.0 diff --git a/libostree-1-1.install b/libostree-1-1.install new file mode 100644 index 00000000..989a3850 --- /dev/null +++ b/libostree-1-1.install @@ -0,0 +1 @@ +usr/lib/*/libostree-1.so.* diff --git a/libostree-1-1.symbols b/libostree-1-1.symbols new file mode 100644 index 00000000..22d46cfc --- /dev/null +++ b/libostree-1-1.symbols @@ -0,0 +1,342 @@ +libostree-1.so.1 libostree-1-1 #MINVER# +* Build-Depends-Package: libostree-dev + LIBOSTREE_2016.3@LIBOSTREE_2016.3 2016.4 + LIBOSTREE_2016.4@LIBOSTREE_2016.4 2016.4 + LIBOSTREE_2016.5@LIBOSTREE_2016.5 2016.5 + LIBOSTREE_2016.6@LIBOSTREE_2016.6 2016.6 + LIBOSTREE_2016.7@LIBOSTREE_2016.7 2016.7 + LIBOSTREE_2016.8@LIBOSTREE_2016.8 2016.8 + LIBOSTREE_2016.14@LIBOSTREE_2016.14 2016.14 + LIBOSTREE_2017.1@LIBOSTREE_2017.1 2017.1 + LIBOSTREE_2017.2@LIBOSTREE_2017.2 2017.2 + LIBOSTREE_2017.3@LIBOSTREE_2017.3 2017.3 + LIBOSTREE_2017.4@LIBOSTREE_2017.4 2017.4 + LIBOSTREE_2017.6@LIBOSTREE_2017.6 2017.6 + LIBOSTREE_2017.7@LIBOSTREE_2017.7 2017.7 + LIBOSTREE_2017.8@LIBOSTREE_2017.8 2017.8 + LIBOSTREE_2017.9@LIBOSTREE_2017.9 2017.9 + LIBOSTREE_2017.10@LIBOSTREE_2017.10 2017.10 + LIBOSTREE_2017.11@LIBOSTREE_2017.11 2017.11 + ostree_async_progress_finish@LIBOSTREE_2016.3 2016.4 + ostree_async_progress_get@LIBOSTREE_2017.6 2017.6 + ostree_async_progress_get_status@LIBOSTREE_2016.3 2016.4 + ostree_async_progress_get_type@LIBOSTREE_2016.3 2016.4 + ostree_async_progress_get_uint64@LIBOSTREE_2016.3 2016.4 + ostree_async_progress_get_uint@LIBOSTREE_2016.3 2016.4 + ostree_async_progress_get_variant@LIBOSTREE_2017.6 2017.6 + ostree_async_progress_new@LIBOSTREE_2016.3 2016.4 + ostree_async_progress_new_and_connect@LIBOSTREE_2016.3 2016.4 + ostree_async_progress_set@LIBOSTREE_2017.6 2017.6 + ostree_async_progress_set_status@LIBOSTREE_2016.3 2016.4 + ostree_async_progress_set_uint64@LIBOSTREE_2016.3 2016.4 + ostree_async_progress_set_uint@LIBOSTREE_2016.3 2016.4 + ostree_async_progress_set_variant@LIBOSTREE_2017.6 2017.6 + ostree_bootconfig_parser_clone@LIBOSTREE_2016.3 2016.4 + ostree_bootconfig_parser_get@LIBOSTREE_2016.3 2016.4 + ostree_bootconfig_parser_get_type@LIBOSTREE_2016.3 2016.4 + ostree_bootconfig_parser_new@LIBOSTREE_2016.3 2016.4 + ostree_bootconfig_parser_parse@LIBOSTREE_2016.3 2016.4 + ostree_bootconfig_parser_parse_at@LIBOSTREE_2016.3 2016.4 + ostree_bootconfig_parser_set@LIBOSTREE_2016.3 2016.4 + ostree_bootconfig_parser_write@LIBOSTREE_2016.3 2016.4 + ostree_bootconfig_parser_write_at@LIBOSTREE_2016.3 2016.4 + ostree_chain_input_stream_get_type@LIBOSTREE_2016.3 2016.4 + ostree_chain_input_stream_new@LIBOSTREE_2016.3 2016.4 + ostree_check_version@LIBOSTREE_2017.4 2017.4 + ostree_checksum_b64_from_bytes@LIBOSTREE_2016.8 2016.8 + ostree_checksum_b64_inplace_from_bytes@LIBOSTREE_2016.3 2016.4 + ostree_checksum_b64_inplace_to_bytes@LIBOSTREE_2016.3 2016.4 + ostree_checksum_b64_to_bytes@LIBOSTREE_2016.8 2016.8 + ostree_checksum_bytes_peek@LIBOSTREE_2016.3 2016.4 + ostree_checksum_bytes_peek_validate@LIBOSTREE_2016.3 2016.4 + ostree_checksum_file@LIBOSTREE_2016.3 2016.4 + ostree_checksum_file_async@LIBOSTREE_2016.3 2016.4 + ostree_checksum_file_async_finish@LIBOSTREE_2016.3 2016.4 + ostree_checksum_file_from_input@LIBOSTREE_2016.3 2016.4 + ostree_checksum_from_bytes@LIBOSTREE_2016.3 2016.4 + ostree_checksum_from_bytes_v@LIBOSTREE_2016.3 2016.4 + ostree_checksum_inplace_from_bytes@LIBOSTREE_2016.3 2016.4 + ostree_checksum_inplace_to_bytes@LIBOSTREE_2016.3 2016.4 + ostree_checksum_input_stream_get_type@LIBOSTREE_2016.3 2016.4 + ostree_checksum_input_stream_new@LIBOSTREE_2016.3 2016.4 + ostree_checksum_to_bytes@LIBOSTREE_2016.3 2016.4 + ostree_checksum_to_bytes_v@LIBOSTREE_2016.3 2016.4 + ostree_cmd__private__@LIBOSTREE_2016.3 2016.4 + ostree_cmp_checksum_bytes@LIBOSTREE_2016.3 2016.4 + ostree_commit_get_parent@LIBOSTREE_2016.3 2016.4 + ostree_commit_get_timestamp@LIBOSTREE_2016.3 2016.4 + ostree_content_file_parse@LIBOSTREE_2016.3 2016.4 + ostree_content_file_parse_at@LIBOSTREE_2016.3 2016.4 + ostree_content_stream_parse@LIBOSTREE_2016.3 2016.4 + ostree_create_directory_metadata@LIBOSTREE_2016.3 2016.4 + ostree_deployment_clone@LIBOSTREE_2016.3 2016.4 + ostree_deployment_equal@LIBOSTREE_2016.3 2016.4 + ostree_deployment_get_bootconfig@LIBOSTREE_2016.3 2016.4 + ostree_deployment_get_bootcsum@LIBOSTREE_2016.3 2016.4 + ostree_deployment_get_bootserial@LIBOSTREE_2016.3 2016.4 + ostree_deployment_get_csum@LIBOSTREE_2016.3 2016.4 + ostree_deployment_get_deployserial@LIBOSTREE_2016.3 2016.4 + ostree_deployment_get_index@LIBOSTREE_2016.3 2016.4 + ostree_deployment_get_origin@LIBOSTREE_2016.3 2016.4 + ostree_deployment_get_origin_relpath@LIBOSTREE_2016.3 2016.4 + ostree_deployment_get_osname@LIBOSTREE_2016.3 2016.4 + ostree_deployment_get_type@LIBOSTREE_2016.3 2016.4 + ostree_deployment_get_unlocked@LIBOSTREE_2016.4 2016.4 + ostree_deployment_hash@LIBOSTREE_2016.3 2016.4 + ostree_deployment_new@LIBOSTREE_2016.3 2016.4 + ostree_deployment_set_bootconfig@LIBOSTREE_2016.3 2016.4 + ostree_deployment_set_bootserial@LIBOSTREE_2016.3 2016.4 + ostree_deployment_set_index@LIBOSTREE_2016.3 2016.4 + ostree_deployment_set_origin@LIBOSTREE_2016.3 2016.4 + ostree_deployment_unlocked_state_to_string@LIBOSTREE_2016.4 2016.4 + ostree_diff_dirs@LIBOSTREE_2016.3 2016.4 + ostree_diff_dirs_with_options@LIBOSTREE_2017.4 2017.4 + ostree_diff_item_get_type@LIBOSTREE_2016.3 2016.4 + ostree_diff_item_ref@LIBOSTREE_2016.3 2016.4 + ostree_diff_item_unref@LIBOSTREE_2016.3 2016.4 + ostree_diff_print@LIBOSTREE_2016.3 2016.4 + ostree_fetcher_config_flags_get_type@LIBOSTREE_2016.3 2016.4 + ostree_gpg_error_quark@LIBOSTREE_2017.10 2017.10 + ostree_gpg_verify_result_count_all@LIBOSTREE_2016.3 2016.4 + ostree_gpg_verify_result_count_valid@LIBOSTREE_2016.3 2016.4 + ostree_gpg_verify_result_describe@LIBOSTREE_2016.3 2016.4 + ostree_gpg_verify_result_describe_variant@LIBOSTREE_2016.3 2016.4 + ostree_gpg_verify_result_get@LIBOSTREE_2016.3 2016.4 + ostree_gpg_verify_result_get_all@LIBOSTREE_2016.3 2016.4 + ostree_gpg_verify_result_get_type@LIBOSTREE_2016.3 2016.4 + ostree_gpg_verify_result_lookup@LIBOSTREE_2016.3 2016.4 + ostree_gpg_verify_result_require_valid_signature@LIBOSTREE_2016.6 2016.6 + ostree_hash_object_name@LIBOSTREE_2016.3 2016.4 + ostree_metadata_variant_type@LIBOSTREE_2016.3 2016.4 + ostree_mutable_tree_ensure_dir@LIBOSTREE_2016.3 2016.4 + ostree_mutable_tree_ensure_parent_dirs@LIBOSTREE_2016.3 2016.4 + ostree_mutable_tree_get_contents_checksum@LIBOSTREE_2016.3 2016.4 + ostree_mutable_tree_get_files@LIBOSTREE_2016.3 2016.4 + ostree_mutable_tree_get_metadata_checksum@LIBOSTREE_2016.3 2016.4 + ostree_mutable_tree_get_subdirs@LIBOSTREE_2016.3 2016.4 + ostree_mutable_tree_get_type@LIBOSTREE_2016.3 2016.4 + ostree_mutable_tree_lookup@LIBOSTREE_2016.3 2016.4 + ostree_mutable_tree_new@LIBOSTREE_2016.3 2016.4 + ostree_mutable_tree_replace_file@LIBOSTREE_2016.3 2016.4 + ostree_mutable_tree_set_contents_checksum@LIBOSTREE_2016.3 2016.4 + ostree_mutable_tree_set_metadata_checksum@LIBOSTREE_2016.3 2016.4 + ostree_mutable_tree_walk@LIBOSTREE_2016.3 2016.4 + ostree_object_from_string@LIBOSTREE_2016.3 2016.4 + ostree_object_name_deserialize@LIBOSTREE_2016.3 2016.4 + ostree_object_name_serialize@LIBOSTREE_2016.3 2016.4 + ostree_object_to_string@LIBOSTREE_2016.3 2016.4 + ostree_object_type_from_string@LIBOSTREE_2016.3 2016.4 + ostree_object_type_to_string@LIBOSTREE_2016.3 2016.4 + ostree_parse_refspec@LIBOSTREE_2016.3 2016.4 + ostree_raw_file_to_archive_z2_stream@LIBOSTREE_2016.6 2016.6 + ostree_raw_file_to_archive_z2_stream_with_options@LIBOSTREE_2017.3 2017.3 + ostree_raw_file_to_content_stream@LIBOSTREE_2016.3 2016.4 + ostree_repo_abort_transaction@LIBOSTREE_2016.3 2016.4 + ostree_repo_add_gpg_signature_summary@LIBOSTREE_2016.3 2016.4 + ostree_repo_append_gpg_signature@LIBOSTREE_2016.3 2016.4 + ostree_repo_checkout_at@LIBOSTREE_2016.8 2016.8 + ostree_repo_checkout_gc@LIBOSTREE_2016.3 2016.4 + ostree_repo_checkout_tree@LIBOSTREE_2016.3 2016.4 + ostree_repo_checkout_tree_at@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_modifier_get_type@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_modifier_new@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_modifier_ref@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_modifier_set_devino_cache@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_modifier_set_sepolicy@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_modifier_set_xattr_callback@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_modifier_unref@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_transaction@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_traverse_iter_cleanup@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_traverse_iter_clear@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_traverse_iter_get_dir@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_traverse_iter_get_file@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_traverse_iter_init_commit@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_traverse_iter_init_dirtree@LIBOSTREE_2016.3 2016.4 + ostree_repo_commit_traverse_iter_next@LIBOSTREE_2016.3 2016.4 + ostree_repo_copy_config@LIBOSTREE_2016.3 2016.4 + ostree_repo_create@LIBOSTREE_2016.3 2016.4 + ostree_repo_create_at@LIBOSTREE_2017.10 2017.10 + ostree_repo_delete_object@LIBOSTREE_2016.3 2016.4 + ostree_repo_devino_cache_get_type@LIBOSTREE_2016.3 2016.4 + ostree_repo_devino_cache_new@LIBOSTREE_2016.3 2016.4 + ostree_repo_devino_cache_ref@LIBOSTREE_2016.3 2016.4 + ostree_repo_devino_cache_unref@LIBOSTREE_2016.3 2016.4 + ostree_repo_export_tree_to_archive@LIBOSTREE_2016.3 2016.3 + ostree_repo_file_ensure_resolved@LIBOSTREE_2016.3 2016.4 + ostree_repo_file_get_checksum@LIBOSTREE_2016.3 2016.4 + ostree_repo_file_get_repo@LIBOSTREE_2016.3 2016.4 + ostree_repo_file_get_root@LIBOSTREE_2016.3 2016.4 + ostree_repo_file_get_type@LIBOSTREE_2016.3 2016.4 + ostree_repo_file_get_xattrs@LIBOSTREE_2016.3 2016.4 + ostree_repo_file_tree_find_child@LIBOSTREE_2016.3 2016.4 + ostree_repo_file_tree_get_contents@LIBOSTREE_2016.3 2016.4 + ostree_repo_file_tree_get_contents_checksum@LIBOSTREE_2016.3 2016.4 + ostree_repo_file_tree_get_metadata@LIBOSTREE_2016.3 2016.4 + ostree_repo_file_tree_get_metadata_checksum@LIBOSTREE_2016.3 2016.4 + ostree_repo_file_tree_query_child@LIBOSTREE_2016.3 2016.4 + ostree_repo_file_tree_set_metadata@LIBOSTREE_2016.3 2016.4 + ostree_repo_get_config@LIBOSTREE_2016.3 2016.4 + ostree_repo_get_dfd@LIBOSTREE_2016.4 2016.4 + ostree_repo_get_disable_fsync@LIBOSTREE_2016.3 2016.3 + ostree_repo_get_mode@LIBOSTREE_2016.3 2016.4 + ostree_repo_get_parent@LIBOSTREE_2016.3 2016.4 + ostree_repo_get_path@LIBOSTREE_2016.3 2016.4 + ostree_repo_get_remote_boolean_option@LIBOSTREE_2016.5 2016.5 + ostree_repo_get_remote_list_option@LIBOSTREE_2016.5 2016.5 + ostree_repo_get_remote_option@LIBOSTREE_2016.5 2016.5 + ostree_repo_get_type@LIBOSTREE_2016.3 2016.4 + ostree_repo_gpg_verify_data@LIBOSTREE_2016.6 2016.6 + ostree_repo_has_object@LIBOSTREE_2016.3 2016.4 + ostree_repo_import_archive_to_mtree@LIBOSTREE_2016.3 2016.3 + ostree_repo_import_object_from@LIBOSTREE_2016.3 2016.4 + ostree_repo_import_object_from_with_trust@LIBOSTREE_2016.5 2016.5 + ostree_repo_is_system@LIBOSTREE_2016.3 2016.4 + ostree_repo_is_writable@LIBOSTREE_2016.3 2016.4 + ostree_repo_list_commit_objects_starting_with@LIBOSTREE_2016.3 2016.4 + ostree_repo_list_objects@LIBOSTREE_2016.3 2016.4 + ostree_repo_list_refs@LIBOSTREE_2016.3 2016.4 + ostree_repo_list_refs_ext@LIBOSTREE_2016.4 2016.4 + ostree_repo_list_static_delta_names@LIBOSTREE_2016.3 2016.4 + ostree_repo_load_commit@LIBOSTREE_2016.3 2016.4 + ostree_repo_load_file@LIBOSTREE_2016.3 2016.4 + ostree_repo_load_object_stream@LIBOSTREE_2016.3 2016.4 + ostree_repo_load_variant@LIBOSTREE_2016.3 2016.4 + ostree_repo_load_variant_if_exists@LIBOSTREE_2016.3 2016.4 + ostree_repo_mode_from_string@LIBOSTREE_2016.3 2016.4 + ostree_repo_new@LIBOSTREE_2016.3 2016.4 + ostree_repo_new_default@LIBOSTREE_2016.3 2016.4 + ostree_repo_new_for_sysroot_path@LIBOSTREE_2016.3 2016.4 + ostree_repo_open@LIBOSTREE_2016.3 2016.4 + ostree_repo_open_at@LIBOSTREE_2017.10 2017.10 + ostree_repo_prepare_transaction@LIBOSTREE_2016.3 2016.4 + ostree_repo_prune@LIBOSTREE_2016.3 2016.4 + ostree_repo_prune_from_reachable@LIBOSTREE_2017.1 2017.1 + ostree_repo_prune_static_deltas@LIBOSTREE_2016.3 2016.4 + ostree_repo_pull@LIBOSTREE_2016.3 2016.4 + ostree_repo_pull_default_console_progress_changed@LIBOSTREE_2016.3 2016.4 + ostree_repo_pull_one_dir@LIBOSTREE_2016.3 2016.4 + ostree_repo_pull_with_options@LIBOSTREE_2016.3 2016.4 + ostree_repo_query_object_storage_size@LIBOSTREE_2016.3 2016.4 + ostree_repo_read_commit@LIBOSTREE_2016.3 2016.4 + ostree_repo_read_commit_detached_metadata@LIBOSTREE_2016.3 2016.4 + ostree_repo_regenerate_summary@LIBOSTREE_2016.3 2016.4 + ostree_repo_reload_config@LIBOSTREE_2017.2 2017.2 + ostree_repo_remote_add@LIBOSTREE_2016.3 2016.4 + ostree_repo_remote_change@LIBOSTREE_2016.3 2016.4 + ostree_repo_remote_delete@LIBOSTREE_2016.3 2016.4 + ostree_repo_remote_fetch_summary@LIBOSTREE_2016.3 2016.4 + ostree_repo_remote_fetch_summary_with_options@LIBOSTREE_2016.6 2016.6 + ostree_repo_remote_get_gpg_verify@LIBOSTREE_2016.3 2016.4 + ostree_repo_remote_get_gpg_verify_summary@LIBOSTREE_2016.3 2016.4 + ostree_repo_remote_get_url@LIBOSTREE_2016.3 2016.4 + ostree_repo_remote_gpg_import@LIBOSTREE_2016.3 2016.4 + ostree_repo_remote_list@LIBOSTREE_2016.3 2016.4 + ostree_repo_remote_list_refs@LIBOSTREE_2016.3 2016.4 + ostree_repo_resolve_rev@LIBOSTREE_2016.3 2016.4 + ostree_repo_resolve_rev_ext@LIBOSTREE_2016.7 2016.7 + ostree_repo_scan_hardlinks@LIBOSTREE_2016.3 2016.4 + ostree_repo_set_alias_ref_immediate@LIBOSTREE_2017.10 2017.10 + ostree_repo_set_cache_dir@LIBOSTREE_2016.5 2016.5 + ostree_repo_set_disable_fsync@LIBOSTREE_2016.3 2016.4 + ostree_repo_set_ref_immediate@LIBOSTREE_2016.3 2016.4 + ostree_repo_sign_commit@LIBOSTREE_2016.3 2016.4 + ostree_repo_sign_delta@LIBOSTREE_2016.3 2016.4 + ostree_repo_static_delta_execute_offline@LIBOSTREE_2016.3 2016.4 + ostree_repo_static_delta_generate@LIBOSTREE_2016.3 2016.4 + ostree_repo_transaction_set_ref@LIBOSTREE_2016.3 2016.4 + ostree_repo_transaction_set_refspec@LIBOSTREE_2016.3 2016.4 + ostree_repo_transaction_stats_get_type@LIBOSTREE_2016.3 2016.4 + ostree_repo_traverse_commit@LIBOSTREE_2016.3 2016.4 + ostree_repo_traverse_commit_union@LIBOSTREE_2016.3 2016.4 + ostree_repo_traverse_new_reachable@LIBOSTREE_2016.3 2016.4 + ostree_repo_verify_commit@LIBOSTREE_2016.3 2016.4 + ostree_repo_verify_commit_ext@LIBOSTREE_2016.3 2016.4 + ostree_repo_verify_commit_for_remote@LIBOSTREE_2016.14 2016.14 + ostree_repo_verify_summary@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_archive_to_mtree@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_commit@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_commit_detached_metadata@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_commit_with_time@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_config@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_content@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_content_async@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_content_finish@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_content_trusted@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_dfd_to_mtree@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_directory_to_mtree@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_metadata@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_metadata_async@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_metadata_finish@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_metadata_stream_trusted@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_metadata_trusted@LIBOSTREE_2016.3 2016.4 + ostree_repo_write_mtree@LIBOSTREE_2016.3 2016.4 + ostree_sepolicy_fscreatecon_cleanup@LIBOSTREE_2016.3 2016.4 + ostree_sepolicy_get_csum@LIBOSTREE_2016.5 2016.5 + ostree_sepolicy_get_label@LIBOSTREE_2016.3 2016.4 + ostree_sepolicy_get_name@LIBOSTREE_2016.3 2016.4 + ostree_sepolicy_get_path@LIBOSTREE_2016.3 2016.4 + ostree_sepolicy_get_type@LIBOSTREE_2016.3 2016.4 + ostree_sepolicy_new@LIBOSTREE_2016.3 2016.4 + ostree_sepolicy_new_at@LIBOSTREE_2017.4 2017.4 + ostree_sepolicy_restorecon@LIBOSTREE_2016.3 2016.4 + ostree_sepolicy_setfscreatecon@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_cleanup@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_deploy_tree@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_deployment_set_kargs@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_deployment_set_mutable@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_deployment_unlock@LIBOSTREE_2016.4 2016.4 + ostree_sysroot_ensure_initialized@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_get_booted_deployment@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_get_bootversion@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_get_deployment_directory@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_get_deployment_dirpath@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_get_deployment_origin_path@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_get_deployments@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_get_fd@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_get_merge_deployment@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_get_path@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_get_repo@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_get_subbootversion@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_get_type@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_init_osname@LIBOSTREE_2016.4 2016.4 + ostree_sysroot_load@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_load_if_changed@LIBOSTREE_2016.4 2016.4 + ostree_sysroot_lock@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_lock_async@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_lock_finish@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_new@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_new_default@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_origin_new_from_refspec@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_prepare_cleanup@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_query_deployments_for@LIBOSTREE_2017.7 2017.7 + ostree_sysroot_repo@LIBOSTREE_2017.7 2017.7 + ostree_sysroot_simple_write_deployment@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_try_lock@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_unload@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_unlock@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_upgrader_check_timestamps@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_upgrader_deploy@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_upgrader_dup_origin@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_upgrader_flags_get_type@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_upgrader_get_origin@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_upgrader_get_origin_description@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_upgrader_get_type@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_upgrader_new@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_upgrader_new_for_os@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_upgrader_new_for_os_with_flags@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_upgrader_pull@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_upgrader_pull_one_dir@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_upgrader_set_origin@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_write_deployments@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_write_deployments_with_options@LIBOSTREE_2017.4 2017.4 + ostree_sysroot_write_origin_file@LIBOSTREE_2016.3 2016.4 + ostree_validate_checksum_string@LIBOSTREE_2016.3 2016.4 + ostree_validate_remote_name@LIBOSTREE_2017.8 2017.8 + ostree_validate_rev@LIBOSTREE_2016.3 2016.4 + ostree_validate_structureof_checksum_string@LIBOSTREE_2016.3 2016.4 + ostree_validate_structureof_commit@LIBOSTREE_2016.3 2016.4 + ostree_validate_structureof_csum_v@LIBOSTREE_2016.3 2016.4 + ostree_validate_structureof_dirmeta@LIBOSTREE_2016.3 2016.4 + ostree_validate_structureof_dirtree@LIBOSTREE_2016.3 2016.4 + ostree_validate_structureof_file_mode@LIBOSTREE_2016.3 2016.4 + ostree_validate_structureof_objtype@LIBOSTREE_2016.3 2016.4 diff --git a/libostree-dev.install b/libostree-dev.install new file mode 100644 index 00000000..3700ef29 --- /dev/null +++ b/libostree-dev.install @@ -0,0 +1,4 @@ +usr/include/* +usr/lib/*/libostree-1.so +usr/lib/*/pkgconfig +usr/share/gir-1.0/OSTree-1.0.gir diff --git a/libostree-doc.install b/libostree-doc.install new file mode 100644 index 00000000..95af827a --- /dev/null +++ b/libostree-doc.install @@ -0,0 +1 @@ +usr/share/gtk-doc diff --git a/ostree-boot.README.Debian b/ostree-boot.README.Debian new file mode 100644 index 00000000..f156b6a7 --- /dev/null +++ b/ostree-boot.README.Debian @@ -0,0 +1,10 @@ +This package contains configuration snippets for using ostree with GRUB 2. +This integration currently has some limitations: + + - the initramfs must have been made using dracut + - the root filesystem must be one that dracut can mount without a root= + command-line argument (an EFI partition with the GUID defined in + the Discoverable Partitions specification[1]) + - /boot must be a separate partition + +[1] https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/ diff --git a/ostree-boot.control b/ostree-boot.control new file mode 100644 index 00000000..8d51a694 --- /dev/null +++ b/ostree-boot.control @@ -0,0 +1,33 @@ +Package: ostree-boot +Architecture: linux-any +Depends: + dracut, + ostree (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Recommends: + grub-efi-amd64 | grub-pc | extlinux | syslinux | u-boot, +Breaks: + ostree (<< ${binary:Version}), + ostree-grub2 (<< ${binary:Version}), +Replaces: + ostree (<< ${binary:Version}), + ostree-grub2 (<< ${binary:Version}), +Provides: + ostree-grub2 (= ${binary:Version}), +Description: libostree boot loader and initramfs integration + libostree provides a library and tools for managing bootable, immutable, + versioned filesystem trees. See the ostree package's description for + more details. + . + This package contains configuration snippets and executables needed to + boot a Debian derivative from a libostree filesystem deployment. This + integration currently has some limitations: + . + - the initramfs must have been made using dracut + - the root filesystem must be one that dracut can mount without a root= + command-line argument (an EFI partition with the GUID defined in + the Discoverable Partitions specification) + - /boot must be a separate partition + - the boot loader must be one that is supported by libostree, currently + GNU GRUB 2, syslinux/extlinux or Das U-Boot diff --git a/ostree-boot.install b/ostree-boot.install new file mode 100644 index 00000000..097a2627 --- /dev/null +++ b/ostree-boot.install @@ -0,0 +1,10 @@ +etc/dracut.conf.d/ostree.conf +etc/grub.d/15_ostree +lib/systemd/system-generators/ostree-system-generator +lib/systemd/system/ostree-prepare-root.service +lib/systemd/system/ostree-remount.service +usr/lib/dracut/modules.d/98ostree +usr/lib/libostree/grub2-15_ostree +usr/lib/ostree/ostree-prepare-root +usr/lib/ostree/ostree-remount +usr/lib/tmpfiles.d/ostree-tmpfiles.conf diff --git a/ostree-tests.install b/ostree-tests.install new file mode 100644 index 00000000..47ef1484 --- /dev/null +++ b/ostree-tests.install @@ -0,0 +1,3 @@ +usr/lib/installed-tests/libostree +usr/lib/libostree/ostree-trivial-httpd +usr/share/installed-tests/libostree diff --git a/ostree-tests.lintian-overrides b/ostree-tests.lintian-overrides new file mode 100644 index 00000000..2766ed7b --- /dev/null +++ b/ostree-tests.lintian-overrides @@ -0,0 +1,10 @@ +# This is deliberate: it's just some random signed file to be verified, and +# upstream happens to have used the text of the LGPL as the signed file +ostree-tests: extra-license-file usr/lib/installed-tests/libostree/gpg-verify-data/lgpl2 +ostree-tests: extra-license-file usr/lib/installed-tests/libostree/gpg-verify-data/lgpl2.sig + +# This is deliberate, working around the assumption of recursive make +ostree-tests: symlink-is-self-recursive usr/lib/installed-tests/libostree/tests . + +# We won't run this on sparc64 currently +[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/lib/installed-tests/libostree/corrupt-repo-ref.js) diff --git a/ostree.install b/ostree.install new file mode 100755 index 00000000..c686947f --- /dev/null +++ b/ostree.install @@ -0,0 +1,8 @@ +#!/usr/bin/dh-exec + +etc/ostree +usr/bin/ostree +usr/bin/rofiles-fuse +usr/share/bash-completion/completions/ostree +usr/share/man +usr/share/ostree/trusted.gpg.d diff --git a/ostree.maintscript b/ostree.maintscript new file mode 100644 index 00000000..5b1850ba --- /dev/null +++ b/ostree.maintscript @@ -0,0 +1,2 @@ +rm_conffile /etc/dracut.conf.d/ostree.conf 2017.3-2~ ostree +rm_conffile /etc/grub.d/15_ostree 2017.3-2~ ostree diff --git a/patches/2017.12/rofiles-fuse-also-pass-mode-for-O_RDONLY.patch b/patches/2017.12/rofiles-fuse-also-pass-mode-for-O_RDONLY.patch new file mode 100644 index 00000000..e12dd2b9 --- /dev/null +++ b/patches/2017.12/rofiles-fuse-also-pass-mode-for-O_RDONLY.patch @@ -0,0 +1,70 @@ +From: Jonathan Lebon +Date: Wed, 20 Sep 2017 18:38:16 +0000 +Subject: rofiles-fuse: also pass mode for O_RDONLY + +In the `O_RDONLY` case, we were calling `openat` without a mode +argument. However, it's perfectly legal (albeit unusual) to do +`open(O_RDONLY|O_CREAT)`. One such application that makes use of this is +`flock(1)`. + +This was actually caught by `_FORTIFY_SOURCE=2`, and once we run +`rofiles-fuse` with `-f`, the message is clear: + +``` +*** invalid openat64 call: O_CREAT or O_TMPFILE without mode ***: +rofiles-fuse terminated +======= Backtrace: ========= +/lib64/libc.so.6(+0x7c8dc)[0x7f36d9f188dc] +/lib64/libc.so.6(__fortify_fail+0x37)[0x7f36d9fbfaa7] +/lib64/libc.so.6(+0x10019a)[0x7f36d9f9c19a] +rofiles-fuse[0x401768] +... +``` + +Without `_FORTIFY_SOURCE`, the file gets created, but its mode is +completely random. + +I ran into this while investigating +https://github.com/projectatomic/rpm-ostree/pull/1003. + +Closes: #1200 +Approved by: cgwalters +Origin: upstream, 2017.12, commit:d4c7093e370843c57eab2f89f0c39ef449e6b32e +--- + src/rofiles-fuse/main.c | 2 +- + tests/test-rofiles-fuse.sh | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/rofiles-fuse/main.c b/src/rofiles-fuse/main.c +index 6deaa6d..f2b1b65 100644 +--- a/src/rofiles-fuse/main.c ++++ b/src/rofiles-fuse/main.c +@@ -313,7 +313,7 @@ do_open (const char *path, mode_t mode, struct fuse_file_info *finfo) + if ((finfo->flags & O_ACCMODE) == O_RDONLY) + { + /* Read */ +- fd = openat (basefd, path, finfo->flags); ++ fd = openat (basefd, path, finfo->flags, mode); + if (fd == -1) + return -errno; + } +diff --git a/tests/test-rofiles-fuse.sh b/tests/test-rofiles-fuse.sh +index d329d76..6222929 100755 +--- a/tests/test-rofiles-fuse.sh ++++ b/tests/test-rofiles-fuse.sh +@@ -26,7 +26,7 @@ skip_without_user_xattrs + + setup_test_repository "bare" + +-echo "1..7" ++echo "1..8" + + cd ${test_tmpdir} + mkdir mnt +@@ -114,3 +114,6 @@ fi + assert_file_has_content err.txt "Unable to do hardlink checkout across devices" + + echo "ok checkout copy fallback" ++ ++# check that O_RDONLY|O_CREAT is handled correctly; used by flock(1) at least ++flock mnt/nonexistent-file echo "ok create file in ro mode" diff --git a/patches/2017.12/tests-Explicitly-unset-LANGUAGE-after-setting-LC_ALL.patch b/patches/2017.12/tests-Explicitly-unset-LANGUAGE-after-setting-LC_ALL.patch new file mode 100644 index 00000000..f540eef2 --- /dev/null +++ b/patches/2017.12/tests-Explicitly-unset-LANGUAGE-after-setting-LC_ALL.patch @@ -0,0 +1,31 @@ +From: Simon McVittie +Date: Tue, 19 Sep 2017 14:41:18 +0100 +Subject: tests: Explicitly unset LANGUAGE after setting LC_ALL + +As a GNU extension, LANGUAGE takes precedence over LC_ALL for +gettext(3) whenever the locale is not C, causing tests that grep for +specific English strings to fail when run in non-English locales. +The upstream glibc proposal for C.UTF-8 would give C.UTF-8 the same +special case as C here, but the implementation in Debian does not +currently have this, so we have to unset LANGUAGE too. + +Signed-off-by: Simon McVittie +Forwarded: https://github.com/ostreedev/ostree/pull/1188 +Applied-upstream: 2017.12, commit:223c940b46a4bb335665df7436566b73cdf0effd +--- + tests/libtest-core.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh +index d0b7d37..ce0e4bb 100644 +--- a/tests/libtest-core.sh ++++ b/tests/libtest-core.sh +@@ -40,6 +40,8 @@ if locale -a | grep C.UTF-8 >/dev/null; then + else + export LC_ALL=C + fi ++# A GNU extension, used whenever LC_ALL is not C ++unset LANGUAGE + + # This should really be the default IMO + export G_DEBUG=fatal-warnings diff --git a/patches/2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch b/patches/2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch new file mode 100644 index 00000000..d909e61f --- /dev/null +++ b/patches/2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch @@ -0,0 +1,45 @@ +From: Simon McVittie +Date: Fri, 15 Sep 2017 15:32:55 +0100 +Subject: tests: Fix JavaScript tests with gjs 1.50.0 + +In recent gjs, you can't declare a variable with "let" multiple times. + +Signed-off-by: Simon McVittie +Closes: #1178 +Approved by: cgwalters +Forwarded: https://github.com/ostreedev/ostree/pull/1178 +Applied-upstream: 2017.12, commit:1b430a776486d68be2d16a0ec53ad5512c604988 +--- + tests/corrupt-repo-ref.js | 1 - + tests/test-sysroot.js | 6 +++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/tests/corrupt-repo-ref.js b/tests/corrupt-repo-ref.js +index c5f2806..bcde86b 100755 +--- a/tests/corrupt-repo-ref.js ++++ b/tests/corrupt-repo-ref.js +@@ -47,7 +47,6 @@ function listObjectChecksumsRecurse(dir, allObjects) { + e.close(null); + } + +-let [,commit] = repo.resolve_rev(refToCorrupt, false); + let [,root,commit] = repo.read_commit(refToCorrupt, null); + let allObjects = {}; + allObjects[commit + '.commit'] = true; +diff --git a/tests/test-sysroot.js b/tests/test-sysroot.js +index 40397fe..e7250a8 100755 +--- a/tests/test-sysroot.js ++++ b/tests/test-sysroot.js +@@ -97,9 +97,9 @@ assertEquals(deploymentPath.query_exists(null), false); + + //// Ok, redeploy, then add a new revision upstream and pull it + +-let [,deployment] = sysroot.deploy_tree('testos', rev, origin, +- mergeDeployment, null, +- null); ++[,deployment] = sysroot.deploy_tree('testos', rev, origin, ++ mergeDeployment, null, ++ null); + newDeployments = deployments; + deployments = null; + newDeployments.unshift(deployment); diff --git a/patches/2017.12/tests-Reset-umask-to-022-while-creating-test-repository.patch b/patches/2017.12/tests-Reset-umask-to-022-while-creating-test-repository.patch new file mode 100644 index 00000000..0415b111 --- /dev/null +++ b/patches/2017.12/tests-Reset-umask-to-022-while-creating-test-repository.patch @@ -0,0 +1,75 @@ +From: Simon McVittie +Date: Tue, 19 Sep 2017 18:37:58 +0100 +Subject: tests: Reset umask to 022 while creating test repository + +In test-basic-root.sh we make assertions about the permissions +of files like baz/cow, which were created without an explicit chmod. +We can't do that unless we control the permissions. + +For some reason the "debomatic" autobuilder used to do some Debian +archive rebuilds does the entire build including build-time tests +as uid 0 with umask 002, which broke those assertions. This seems +a weird thing to do, and I've opened a bug, but it also seems +reasonable to fix this test. + +This also lets us remove a couple of existing workarounds for the +same issue. + +Bug-Debian: https://bugs.debian.org/876138 +Signed-off-by: Simon McVittie +Closes: #1192 +Approved by: cgwalters +Forwarded: https://github.com/ostreedev/ostree/pull/1192 +Applied-upstream: 2017.12, commit:e3c3ec5dd91492e82c79223052443d038c60f41c +--- + tests/libtest.sh | 3 +++ + tests/test-basic-user.sh | 8 ++------ + 2 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/tests/libtest.sh b/tests/libtest.sh +index 73e8889..1ae04a7 100755 +--- a/tests/libtest.sh ++++ b/tests/libtest.sh +@@ -150,6 +150,8 @@ setup_test_repository () { + export OSTREE="${CMD_PREFIX} ostree ${ot_repo}" + + cd ${test_tmpdir} ++ local oldumask="$(umask)" ++ umask 022 + mkdir files + cd files + ot_files=`pwd` +@@ -172,6 +174,7 @@ setup_test_repository () { + ln -s nonexistent baz/alink + mkdir baz/another/ + echo x > baz/another/y ++ umask "${oldumask}" + + cd ${test_tmpdir}/files + $OSTREE commit ${COMMIT_ARGS} -b test2 -s "Test Commit 2" -m "Commit body second" +diff --git a/tests/test-basic-user.sh b/tests/test-basic-user.sh +index 9486655..291806c 100755 +--- a/tests/test-basic-user.sh ++++ b/tests/test-basic-user.sh +@@ -34,11 +34,7 @@ setup_test_repository "bare-user" + + cd ${test_tmpdir} + objpath_nonexec=$(ostree_file_path_to_object_path repo test2 baz/cow) +-# Sigh, umask +-touch testfile +-default_mode=$(stat -c '%a' testfile) +-rm testfile +-assert_file_has_mode ${objpath_nonexec} ${default_mode} ++assert_file_has_mode ${objpath_nonexec} 644 + objpath_ro=$(ostree_file_path_to_object_path repo test2 baz/cowro) + assert_file_has_mode ${objpath_ro} 600 + objpath_exec=$(ostree_file_path_to_object_path repo test2 baz/deeper/ohyeahx) +@@ -48,7 +44,7 @@ echo "ok bare-user committed modes" + rm test2-checkout -rf + $OSTREE checkout -U -H test2 test2-checkout + cd test2-checkout +-assert_file_has_mode baz/cow ${default_mode} ++assert_file_has_mode baz/cow 644 + assert_file_has_mode baz/cowro 600 + assert_file_has_mode baz/deeper/ohyeahx 755 + echo "ok bare-user checkout modes" diff --git a/patches/series b/patches/series new file mode 100644 index 00000000..109f6e8e --- /dev/null +++ b/patches/series @@ -0,0 +1,4 @@ +2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch +2017.12/tests-Explicitly-unset-LANGUAGE-after-setting-LC_ALL.patch +2017.12/tests-Reset-umask-to-022-while-creating-test-repository.patch +2017.12/rofiles-fuse-also-pass-mode-for-O_RDONLY.patch diff --git a/rules b/rules new file mode 100755 index 00000000..7c76a019 --- /dev/null +++ b/rules @@ -0,0 +1,88 @@ +#!/usr/bin/make -f + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +# Some tests assert that we will see English strings +export LC_ALL=C.UTF-8 + +%: + dh $@ --with=gir + +override_dh_autoreconf: + env NOCONFIGURE=1 dh_autoreconf ./autogen.sh + +configure_options = \ + --enable-installed-tests \ + --libexecdir='$${prefix}/lib' \ + --with-dracut \ + --with-grub2 \ + --with-grub2-mkconfig-path=/usr/sbin/grub-mkconfig \ + --with-systemdsystemgeneratordir=/lib/systemd/system-generators \ + --with-systemdsystemunitdir=/lib/systemd/system \ + $(NULL) + +ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES))) +configure_options += --enable-gtk-doc +configure_options += --enable-man +else +configure_options += --disable-gtk-doc +configure_options += --disable-man +endif + +override_dh_auto_configure: + dh_auto_configure -- $(configure_options) + +override_dh_auto_test-arch: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + debian/test.sh +endif + +override_dh_auto_test-indep: + : + +override_dh_auto_install: + dh_auto_install +ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES))) + # docbook-xsl capitalizes the whole heading, including the macro + # used to represent a single quote... https://bugs.debian.org/821235 + sed -i -e 's,\*(AQ,*(Aq,g' \ + debian/tmp/usr/share/man/man1/ostree-remote.1 \ + debian/tmp/usr/share/man/man1/ostree-static-delta.1 \ + $(NULL) +endif + +override_dh_install: + rm -f debian/tmp/usr/lib/*/*.la + rm -f debian/tmp/usr/lib/installed-tests/libostree/*.la + : + # TODO: when someone documents how to test these (#824649) they + # should be installed in a new ostree-boot package: see + # debian/ostree-boot.* and https://bugs.debian.org/824650 + rm -f debian/tmp/etc/dracut.conf.d/ostree.conf + rm -f debian/tmp/etc/grub.d/15_ostree + rm -f debian/tmp/lib/systemd/system-generators/ostree-system-generator + rm -f debian/tmp/lib/systemd/system/ostree-prepare-root.service + rm -f debian/tmp/lib/systemd/system/ostree-remount.service + rm -fr debian/tmp/usr/lib/dracut/modules.d/98ostree/ + rm -f debian/tmp/usr/lib/libostree/grub2-15_ostree + rm -f debian/tmp/usr/lib/ostree/ostree-prepare-root + rm -f debian/tmp/usr/lib/ostree/ostree-remount + rm -f debian/tmp/usr/lib/tmpfiles.d/ostree-tmpfiles.conf + : + dh_install + +override_dh_missing: + dh_missing --fail-missing + +override_dh_makeshlibs: + # this is an LD_PRELOAD, not a real shared library + dh_makeshlibs -Xinstalled-tests/ostree/libreaddir-rand.so + +override_dh_fixperms-arch: + # dh_fixperms assumes *.js are for browsers and makes them 0644. + dh_fixperms -X'*.js' + find debian/tmp -type f -name '*.js' -print0 | \ + xargs -0r chmod -v go=rX,u+rw,a-s + +override_dh_systemd_start: + dh_systemd_start --no-start diff --git a/source/format b/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/test.sh b/test.sh new file mode 100755 index 00000000..97c54646 --- /dev/null +++ b/test.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +set -e + +export VERBOSE=1 + +try_tests=5 + +failed=0 +make check || failed=1 + +if [ "$failed" -gt 0 ]; then + [ "$failed" -eq 0 ] || echo "Test failed! Checking how reproducible it is..." + for i in $(seq 1 "$(( $try_tests - 1 ))"); do + if ! make check; then + failed=$(( $failed + 1 )) + fi + done +fi + +pkill --full "gpg-agent --homedir /var/tmp/tap-test\\.[^/]+/.*" || : + +if pgrep lt-ostree || pgrep --full "gpg-agent --homedir /var/tmp/tap-test."; then \ + echo "WARNING: daemon processes were leaked" + pgrep gpg-agent | xargs --no-run-if-empty ps ww + pgrep lt-ostree | xargs --no-run-if-empty ps ww +fi + +# There are several race conditions that cause intermittent failures. +# They are not actually a regression - we've just been luckier in the +# past - so let newer versions build reliably. +if [ "$failed" -gt 2 ]; then + echo "Failed $failed out of $try_tests test runs; that seems bad" + exit 1 +elif [ "$failed" -gt 0 ]; then + echo "Failed $failed out of $try_tests test runs; continuing anyway" +else + echo "All tests passed" +fi + +exit 0 + +# vim:set et sw=4 sts=4: diff --git a/tests/build b/tests/build new file mode 100755 index 00000000..594e4f77 --- /dev/null +++ b/tests/build @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e +exec 2>&1 +set -x + +cd "$ADTTMP" + +cat > trivial.c < + +int main (void) +{ + g_object_unref (ostree_repo_new_default ()); + return 0; +} +EOF + +gcc -o trivial trivial.c $(pkg-config --cflags --libs ostree-1 gobject-2.0) +test -x trivial +./trivial +echo "ok 3 run it" diff --git a/tests/control b/tests/control new file mode 100644 index 00000000..5c627361 --- /dev/null +++ b/tests/control @@ -0,0 +1,5 @@ +Tests: gnome-desktop-testing, test-local-pull +Depends: gnome-desktop-testing, ostree-tests + +Tests: build +Depends: build-essential, libostree-dev, pkg-config diff --git a/tests/gnome-desktop-testing b/tests/gnome-desktop-testing new file mode 100755 index 00000000..b5d57a76 --- /dev/null +++ b/tests/gnome-desktop-testing @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e +exec 2>&1 + +e=0 + +tests="$(gnome-desktop-testing-runner -l libostree | while read t; do + t="${t%% *}" + + case "$t" in + (libostree/test-local-pull.sh.test) + # frequently times out, https://bugs.debian.org/842606 + # https://github.com/ostreedev/ostree/issues/605 + continue + ;; + esac + + echo "$t" +done)" + +gnome-desktop-testing-runner $tests diff --git a/tests/test-local-pull b/tests/test-local-pull new file mode 100755 index 00000000..ab4e5fe7 --- /dev/null +++ b/tests/test-local-pull @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e +exec 2>&1 + +N=3 +passed=0 + +for i in `seq 1 $N`; do + if gnome-desktop-testing-runner libostree/test-local-pull.sh.test; then + passed=$(( $passed + 1)) + fi +done + +echo "test-local-pull: passed $passed/$N attempts" + +if [ "$passed" -ne "$N" ]; then + exit 1 +fi diff --git a/watch b/watch new file mode 100644 index 00000000..048ca2ae --- /dev/null +++ b/watch @@ -0,0 +1,2 @@ +version=4 +https://github.com/ostreedev/ostree/releases .*/libostree-(\d\S*)\.tar\.xz -- 2.30.2