commit d91a88e95dfb2527b4edb7e193d917fd23da2f3c Author: Dylan Araps <dylan.araps@gmail.com> Date: Thu, 23 Apr 2020 13:12:00 +0300 initial commit Diffstat:
37 files changed, 246 insertions(+), 0 deletions(-)
diff --git a/LICENSE.md b/LICENSE.md @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2016-2019 Dylan Araps + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md diff --git a/flatpak/appstream-glib/build b/flatpak/appstream-glib/build @@ -0,0 +1,20 @@ +#!/bin/sh -e + +export DESTDIR="$1" + +# Don't build tests. +sed -i "/subdir('tests')/d" meson.build + +meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + -Ddocs=false \ + -Ddep11=false \ + -Dstemmer=false \ + -Dintrospection=false \ + -Drpm=false \ + . output + +ninja -C output +ninja -C output install diff --git a/flatpak/appstream-glib/checksums b/flatpak/appstream-glib/checksums @@ -0,0 +1 @@ +cb612c9e634275e574fa639737cf63711358cd10b9d0d377f70025653fefdd16 appstream_glib_0_7_17.tar.gz diff --git a/flatpak/appstream-glib/depends b/flatpak/appstream-glib/depends @@ -0,0 +1,5 @@ +cmake +glib +gperf +libarchive +libsoup diff --git a/flatpak/appstream-glib/sources b/flatpak/appstream-glib/sources @@ -0,0 +1 @@ +https://github.com/hughsie/appstream-glib/archive/appstream_glib_0_7_17.tar.gz diff --git a/flatpak/appstream-glib/version b/flatpak/appstream-glib/version @@ -0,0 +1 @@ +0.7.17 1 diff --git a/flatpak/flatpak/build b/flatpak/flatpak/build @@ -0,0 +1,42 @@ +#!/bin/sh -e + +patch -p1 < fix-musl.patch +patch -p1 < bubblewrap-musl.patch + +# Install python-pyparsing which is solely needed for +# flatpak and thus contained in this build. +{ + cd pyparsing + + python3 setup.py build + python3 setup.py install \ + --prefix=/usr \ + --root="$PWD/dist" + + # Use a glob to avoid having to figure out the Python + # version for the path below. + cd dist/usr/lib/python*/site-packages + + # Set the PYTHONPATH so python knows where to find mako. + # The one liner simply appends the existing path and + # handles the case where an unset PYTHONPATH breaks + # python as it will only contain our new addition. + PYTHONPATH=$PWD:$(python -c "import sys; print(':'.join(sys.path))") + + cd -; cd .. +} + +export PYTHONPATH + +./configure \ + --prefix=/usr \ + --without-systemd \ + --disable-system-helper \ + --disable-xauth \ + --disable-seccomp \ + --disable-sandboxed-triggers \ + --disable-documentation \ + --with-priv-mode=none + +make +make DESTDIR="$1" install diff --git a/flatpak/flatpak/checksums b/flatpak/flatpak/checksums @@ -0,0 +1,4 @@ +84ca5b06ef56ffe282a2603b157080bc242723f69731926a6593020a75ce2895 flatpak-1.7.2.tar.xz +c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 pyparsing-2.4.7.tar.gz +c2e8b0430715aa8d1a43be79d8279e1cd088a925ba6d375b0707aeda3f5408d2 fix-musl.patch +1f9f2f55965041953ce0ed4e436e181d73f8decc36457a923c6bc42442718da1 bubblewrap-musl.patch diff --git a/flatpak/flatpak/depends b/flatpak/flatpak/depends @@ -0,0 +1,11 @@ +appstream-glib +fuse2 +gdk-pixbuf +gpgme +json-glib +libarchive +libcap +libsoup +libxml2 +ostree +python diff --git a/flatpak/flatpak/patches/bubblewrap-musl.patch b/flatpak/flatpak/patches/bubblewrap-musl.patch @@ -0,0 +1,46 @@ +add normpath(), originally written for xbps. +diff --git bind-mount.c.orig bind-mount.c +index 045fa0e..d05b540 100644 +--- a/bubblewrap/bind-mount.c.orig ++++ b/bubblewrap/bind-mount.c +@@ -23,6 +23,28 @@ + #include "utils.h" + #include "bind-mount.h" + ++#ifndef __GLIBC__ ++static char * ++normpath(char *path) ++{ ++ char *seg = NULL, *p = NULL; ++ ++ for (p = path, seg = NULL; *p; p++) { ++ if (strncmp(p, "/../", 4) == 0 || strncmp(p, "/..", 4) == 0) { ++ memmove(seg ? seg : p, p+3, strlen(p+3) + 1); ++ return normpath(path); ++ } else if (strncmp(p, "/./", 3) == 0 || strncmp(p, "/.", 3) == 0) { ++ memmove(p, p+2, strlen(p+2) + 1); ++ } else if (strncmp(p, "//", 2) == 0 || strncmp(p, "/", 2) == 0) { ++ memmove(p, p+1, strlen(p+1) + 1); ++ } ++ if (*p == '/') ++ seg = p; ++ } ++ return path; ++} ++#endif ++ + static char * + skip_token (char *line, bool eat_whitespace) + { +@@ -397,7 +419,11 @@ bind_mount (int proc_fd, + path, so to find it in the mount table we need to do that too. */ + resolved_dest = realpath (dest, NULL); + if (resolved_dest == NULL) ++#ifdef __GLIBC__ + return 2; ++#else ++ resolved_dest = normpath(strdup(dest)); ++#endif + + mount_tab = parse_mountinfo (proc_fd, resolved_dest); + if (mount_tab[0].mountpoint == NULL) diff --git a/flatpak/flatpak/patches/fix-musl.patch b/flatpak/flatpak/patches/fix-musl.patch @@ -0,0 +1,17 @@ +--- a/config.h.in ++++ b/config.h.in +@@ -140,3 +140,14 @@ + + /* Define to 1 if you need to in order for `stat' and other things to work. */ + #undef _POSIX_SOURCE ++ ++/* taken from glibc unistd.h and fixes musl */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ diff --git a/flatpak/flatpak/post-install b/flatpak/flatpak/post-install @@ -0,0 +1,3 @@ +#!/bin/sh + +chmod u+s "$KISS_ROOT/usr/libexec/flatpak-bwrap" diff --git a/flatpak/flatpak/sources b/flatpak/flatpak/sources @@ -0,0 +1,4 @@ +https://github.com/flatpak/flatpak/releases/download/1.7.2/flatpak-1.7.2.tar.xz +https://github.com/pyparsing/pyparsing/releases/download/pyparsing_2.4.7/pyparsing-2.4.7.tar.gz pyparsing +patches/fix-musl.patch +patches/bubblewrap-musl.patch diff --git a/flatpak/flatpak/version b/flatpak/flatpak/version @@ -0,0 +1 @@ +1.7.2 1 diff --git a/flatpak/fuse2/build b/flatpak/fuse2/build @@ -0,0 +1,11 @@ +#!/bin/sh -e + +./configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --enable-lib \ + --enable-util \ + --disable-example + +make +make DESTDIR="$1" install diff --git a/flatpak/fuse2/checksums b/flatpak/fuse2/checksums @@ -0,0 +1 @@ +d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5 fuse-2.9.9.tar.gz diff --git a/flatpak/fuse2/sources b/flatpak/fuse2/sources @@ -0,0 +1 @@ +https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz diff --git a/flatpak/fuse2/version b/flatpak/fuse2/version @@ -0,0 +1 @@ +2.9.9 1 diff --git a/flatpak/gpgme/build b/flatpak/gpgme/build @@ -0,0 +1,9 @@ +#!/bin/sh -e + +sed -i "s/\${tests}//" Makefile.in + +./configure \ + --prefix=/usr + +make +make DESTDIR="$1" install diff --git a/flatpak/gpgme/checksums b/flatpak/gpgme/checksums @@ -0,0 +1 @@ +c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46 gpgme-1.13.1.tar.bz2 diff --git a/flatpak/gpgme/depends b/flatpak/gpgme/depends @@ -0,0 +1,2 @@ +libassuan +libgpg-error diff --git a/flatpak/gpgme/sources b/flatpak/gpgme/sources @@ -0,0 +1 @@ +https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.13.1.tar.bz2 diff --git a/flatpak/gpgme/version b/flatpak/gpgme/version @@ -0,0 +1 @@ +1.13.1 1 diff --git a/flatpak/json-glib/build b/flatpak/json-glib/build @@ -0,0 +1,17 @@ +#!/bin/sh -e + +export DESTDIR="$1" + +# Don't build tests. +sed -i "/subdir('tests')/d" json-glib/meson.build + +meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + -Ddocs=false \ + -Dintrospection=false \ + . output + +ninja -C output +ninja -C output install diff --git a/flatpak/json-glib/checksums b/flatpak/json-glib/checksums @@ -0,0 +1 @@ +720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47 json-glib-1.4.4.tar.xz diff --git a/flatpak/json-glib/depends b/flatpak/json-glib/depends @@ -0,0 +1 @@ +glib diff --git a/flatpak/json-glib/sources b/flatpak/json-glib/sources @@ -0,0 +1 @@ +https://download.gnome.org/sources/json-glib/1.4/json-glib-1.4.4.tar.xz diff --git a/flatpak/json-glib/version b/flatpak/json-glib/version @@ -0,0 +1 @@ +1.4.4 1 diff --git a/flatpak/libassuan/build b/flatpak/libassuan/build @@ -0,0 +1,7 @@ +#!/bin/sh -e + +./configure \ + --prefix=/usr + +make +make DESTDIR="$1" install diff --git a/flatpak/libassuan/checksums b/flatpak/libassuan/checksums @@ -0,0 +1 @@ +91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702 libassuan-2.5.3.tar.bz2 diff --git a/flatpak/libassuan/sources b/flatpak/libassuan/sources @@ -0,0 +1 @@ +https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.3.tar.bz2 diff --git a/flatpak/libassuan/version b/flatpak/libassuan/version @@ -0,0 +1 @@ +2.5.3 1 diff --git a/flatpak/ostree/build b/flatpak/ostree/build @@ -0,0 +1,7 @@ +#!/bin/sh -e + +./configure \ + --prefix=/usr + +make +make DESTDIR="$1" install diff --git a/flatpak/ostree/checksums b/flatpak/ostree/checksums @@ -0,0 +1 @@ +5877396ea092f5b6701c17bd20280746cad20f55a94c760dbeba0fa115818c05 libostree-2020.3.tar.xz diff --git a/flatpak/ostree/sources b/flatpak/ostree/sources @@ -0,0 +1 @@ +https://github.com/ostreedev/ostree/releases/download/v2020.3/libostree-2020.3.tar.xz diff --git a/flatpak/ostree/version b/flatpak/ostree/version @@ -0,0 +1 @@ +2020.3 1