From f29d569cd33a73da5ad675f43a34ad53c5cc9bc6 Mon Sep 17 00:00:00 2001 From: davidovski Date: Thu, 2 Feb 2023 14:10:02 +0000 Subject: Work --- skip/apache2/alpine.layout | 22 + skip/apache2/apache2-ssl.post-install | 30 + skip/apache2/apache2.confd | 54 + skip/apache2/apache2.initd | 154 ++ skip/apache2/apache2.logrotate | 10 + skip/apache2/apache2.pre-install | 8 + skip/apache2/apache2.pre-upgrade | 8 + skip/apache2/apache2.xibuild | 119 ++ skip/avahi/CVE-2021-3468.patch | 37 + skip/avahi/CVE-2021-36217.patch | 148 ++ skip/avahi/avahi.pre-install | 12 + skip/avahi/avahi.xibuild | 60 + skip/cabal/cabal.project.freeze | 47 +- skip/cabal/cabal.xibuild | 52 +- skip/dino/dino.xibuild | 32 + skip/dino/mobile-ui.patch | 967 +++++++++++ .../01_fix_static_datadir_evaluation.patch | 19 + ...418703_dont_use_abbreviated_sfnet_address.patch | 27 + ...3_fix_420153_filename_whitespace_handling.patch | 43 + ...ix_442782_preprocessor_declaration_syntax.patch | 90 + .../05_fix_439214_error_on_missing_refentry.patch | 33 + skip/docbook2x/06_fix_man_typo.patch | 24 + skip/docbook2x/docbook2x.xibuild | 39 + .../0001-apk-add-instead-of-apt-get-install.patch | 22 + skip/electrum/electrum.xibuild | 31 + skip/elvish/elvish.xibuild | 20 + skip/execline/execline.xibuild | 24 + skip/ext-dump/ext-dump.xibuild | 35 + skip/firefox/allow-custom-rust-vendor.patch | 564 +++++++ skip/firefox/avoid-redefinition.patch | 15 + skip/firefox/disable-moz-stackwalk.patch | 18 + skip/firefox/disable-neon-in-aom.patch | 39 + skip/firefox/firefox-safe.desktop | 11 + skip/firefox/firefox.desktop | 81 + skip/firefox/firefox.xibuild | 143 ++ skip/firefox/fix-fortify-system-wrappers.patch | 13 + skip/firefox/fix-neon-aom.patch | 13 + skip/firefox/fix-rust-target.patch | 31 + skip/firefox/fix-webrtc-glibcisms.patch | 20 + skip/firefox/mallinfo.patch | 20 + skip/firefox/no-ccache-stats.patch | 11 + skip/firefox/sandbox-fork.patch | 15 + skip/firefox/sandbox-largefile.patch | 17 + skip/firefox/sandbox-sched_setscheduler.patch | 16 + skip/firefox/stab.h | 71 + skip/firefox/zstandard.patch | 8 + skip/guitarix/guitarix-0.43.1-glib2.patch | 15 + skip/guitarix/guitarix.xibuild | 27 + skip/heimdal/005_all_heimdal-suid_fix.patch | 20 + skip/heimdal/CVE-2018-16860.patch | 147 ++ skip/heimdal/autoconf-270.patch | 27 + skip/heimdal/heimdal-kadmind.initd | 24 + skip/heimdal/heimdal-kdc.initd | 23 + skip/heimdal/heimdal-kpasswdd.initd | 24 + skip/heimdal/heimdal.xibuild | 82 + skip/heimdal/heimdal_missing-include.patch | 11 + ...silence-include-headers-redirect-warnings.patch | 80 + skip/leveldb/leveldb.xibuild | 28 + skip/libetonyek/libetonyek.xibuild | 30 + skip/liblangtag/liblangtag.xibuild | 26 + skip/libreoffice/autoconf-boost-macros.patch | 152 ++ skip/libreoffice/disable-liborcus-unittest.patch | 13 + skip/libreoffice/fix-execinfo.patch | 34 + skip/libreoffice/libreoffice-base.xibuild | 11 + skip/libreoffice/libreoffice-calc.xibuild | 11 + skip/libreoffice/libreoffice-common.xibuild | 10 + skip/libreoffice/libreoffice-draw.xibuild | 11 + skip/libreoffice/libreoffice-impress.xibuild | 11 + skip/libreoffice/libreoffice-math.xibuild | 11 + skip/libreoffice/libreoffice-postgres.xibuild | 10 + skip/libreoffice/libreoffice-sdk.xibuild | 10 + skip/libreoffice/libreoffice-writer.xibuild | 11 + skip/libreoffice/libreoffice.xibuild | 136 ++ skip/libreoffice/linux-musl.patch | 60 + skip/libreoffice/musl-libintl.patch | 15 + skip/libreoffice/musl-stacksize.patch | 40 + skip/libreoffice/pld-skia-patches.patch | 10 + skip/libreoffice/poppler-22.03.patch | 39 + skip/libreoffice/remove-backtrace.patch | 163 ++ skip/libreoffice/skia-freetype2.11.diff | 37 + skip/lsp-plugins/lsp-plugins.xibuild | 32 + skip/lsp-plugins/null.patch | 13 + skip/luakit/luakit.xibuild | 25 + ...gomp-Don-t-hard-code-MS-printf-attributes.patch | 53 + skip/mingw-w64-gcc/mingw-w64-gcc.xibuild | 72 + skip/pandoc/cabal.config | 223 +++ skip/pandoc/cabal.project.freeze | 249 --- skip/pandoc/pandoc.xibuild | 57 +- skip/php8/.php8.xibuild.swp | Bin 0 -> 24576 bytes skip/php8/atomic-lsapi.patch | 82 + skip/php8/disabled-tests.list | 213 +++ skip/php8/fix-tests-devserver.patch | 23 + skip/php8/includedir.patch | 41 + skip/php8/install-pear.patch | 14 + skip/php8/php8-fpm-version-suffix.patch | 79 + skip/php8/php8-fpm.initd | 93 ++ skip/php8/php8-fpm.logrotate | 13 + skip/php8/php8-module.conf | 13 + skip/php8/php8.xibuild | 215 +++ skip/php8/sharedir.patch | 11 + skip/php8/xfail-openssl-1.1-test.patch | 13 + .../python-pyqtwebengine.xibuild | 26 + skip/python-pyside2/python-3.10.patch | 119 ++ skip/python-pyside2/python-pyside2.xibuild | 39 + skip/qt5-qt3d/qt5-qt3d.xibuild | 35 + .../0001-pretend-to-stay-at-5.15.3.patch | 8 + ...hromium-musl-Match-syscalls-to-match-musl.patch | 44 + .../default-pthread-stacksize.patch | 23 + skip/qt5-qtwebengine/ffmpeg5.patch | 151 ++ skip/qt5-qtwebengine/fix-chromium-build.patch | 79 + skip/qt5-qtwebengine/fix-strncpy-error.patch | 10 + skip/qt5-qtwebengine/musl-hacks.patch | 13 + skip/qt5-qtwebengine/musl-sandbox.patch | 181 ++ skip/qt5-qtwebengine/nasm.patch | 13 + skip/qt5-qtwebengine/qt-chromium-python3.patch | 1752 ++++++++++++++++++++ skip/qt5-qtwebengine/qt-musl-crashpad.patch | 13 + .../qt5-qtwebengine/qt-musl-dispatch_to_musl.patch | 103 ++ skip/qt5-qtwebengine/qt-musl-elf-arm.patch | 13 + skip/qt5-qtwebengine/qt-musl-execinfo.patch | 108 ++ skip/qt5-qtwebengine/qt-musl-mallinfo.patch | 43 + skip/qt5-qtwebengine/qt-musl-off_t.patch | 10 + skip/qt5-qtwebengine/qt-musl-pread-pwrite.patch | 20 + skip/qt5-qtwebengine/qt-musl-pvalloc.patch | 14 + skip/qt5-qtwebengine/qt-musl-resolve.patch | 61 + skip/qt5-qtwebengine/qt-musl-siginfo_t.patch | 18 + skip/qt5-qtwebengine/qt-musl-stackstart.patch | 22 + .../qt-musl-sysreg-for__WORDSIZE.patch | 14 + .../qt5-qtwebengine/qt-musl-thread-stacksize.patch | 26 + skip/qt5-qtwebengine/qt-musl-tid-caching.patch | 81 + skip/qt5-qtwebengine/qt5-qtwebengine.xibuild | 76 + skip/qt5-qtwebengine/qt5-webengine-gcc12.patch | 13 + skip/qt5-qtwebengine/remove-glibc-check.patch | 78 + skip/qt5-qtwebengine/sndio.patch | 142 ++ skip/qt5-qtwebengine/support-python3.patch | 158 ++ skip/ripgrep/minimize-size.patch | 28 + skip/ripgrep/ripgrep.xibuild | 35 + skip/ruby-kramdown/gemspec.patch | 18 + skip/ruby-kramdown/ruby-kramdown.xibuild | 47 + ...-Prefer-libgcc_eh-over-libunwind-for-musl.patch | 24 - .../0007-do-not-install-libunwind-source.patch | 19 - skip/rust/alpine-move-py-scripts-to-share.patch | 23 - skip/rust/alpine-target.patch | 191 --- skip/rust/cargo.xibuild | 8 - skip/rust/check-rustc | 109 -- skip/rust/install-template-shebang.patch | 10 - skip/rust/link-musl-dynamically.patch | 17 - skip/rust/musl-fix-linux_musl_base.patch | 23 - skip/rust/need-rpath.patch | 62 - skip/rust/need-ssp_nonshared.patch | 13 - skip/rust/rust.xibuild | 77 - skip/samba/add_missing___compar_fn_t.patch | 14 + skip/samba/getpwent_r.patch | 80 + skip/samba/missing-headers.patch | 38 + skip/samba/musl_rm_unistd_incl.patch | 37 + skip/samba/musl_uintptr.patch | 35 + skip/samba/netapp.patch | 85 + skip/samba/netdb-defines.patch | 19 + skip/samba/pidl.patch | 114 ++ skip/samba/samba-bgqd-include-signal-h.patch | 13 + skip/samba/samba.confd | 9 + skip/samba/samba.initd | 79 + skip/samba/samba.logrotate | 9 + skip/samba/samba.xibuild | 78 + skip/samba/winbind.post-install | 6 + skip/samba/winbind.post-upgrade | 6 + skip/samba/winbind.pre-install | 5 + skip/samba/winbind.pre-upgrade | 5 + skip/thunderbird/allow-custom-rust-vendor.patch | 564 +++++++ skip/thunderbird/avoid-redefinition.patch | 15 + skip/thunderbird/cbindgen-0.24.patch | 17 + skip/thunderbird/disable-moz-stackwalk.patch | 18 + skip/thunderbird/disable-neon-in-aom.patch | 39 + skip/thunderbird/distribution.ini | 8 + skip/thunderbird/fix-fortify-system-wrappers.patch | 13 + skip/thunderbird/fix-libresolv-path.patch | 17 + skip/thunderbird/fix-rust-target.patch | 31 + skip/thunderbird/fix-tools.patch | 18 + skip/thunderbird/fix-webrtc-glibcisms.patch | 20 + skip/thunderbird/mallinfo.patch | 20 + skip/thunderbird/metainfo.patch | 12 + skip/thunderbird/psutil.patch | 9 + skip/thunderbird/sandbox-fork.patch | 15 + skip/thunderbird/sandbox-largefile.patch | 17 + skip/thunderbird/sandbox-sched_setscheduler.patch | 16 + skip/thunderbird/stab.h | 71 + skip/thunderbird/thunderbird.desktop | 64 + skip/thunderbird/thunderbird.xibuild | 204 +++ skip/thunderbird/vendor-prefs.js | 17 + skip/thunderbird/zstandard.patch | 8 + skip/webkit2gtk/webkit2gtk.xibuild | 59 + skip/wine/rpath.patch | 57 + skip/wine/wine.xibuild | 64 + 192 files changed, 11523 insertions(+), 878 deletions(-) create mode 100644 skip/apache2/alpine.layout create mode 100644 skip/apache2/apache2-ssl.post-install create mode 100644 skip/apache2/apache2.confd create mode 100755 skip/apache2/apache2.initd create mode 100644 skip/apache2/apache2.logrotate create mode 100644 skip/apache2/apache2.pre-install create mode 100644 skip/apache2/apache2.pre-upgrade create mode 100644 skip/apache2/apache2.xibuild create mode 100644 skip/avahi/CVE-2021-3468.patch create mode 100644 skip/avahi/CVE-2021-36217.patch create mode 100644 skip/avahi/avahi.pre-install create mode 100644 skip/avahi/avahi.xibuild create mode 100644 skip/dino/dino.xibuild create mode 100644 skip/dino/mobile-ui.patch create mode 100644 skip/docbook2x/01_fix_static_datadir_evaluation.patch create mode 100644 skip/docbook2x/02_fix_418703_dont_use_abbreviated_sfnet_address.patch create mode 100644 skip/docbook2x/03_fix_420153_filename_whitespace_handling.patch create mode 100644 skip/docbook2x/04_fix_442782_preprocessor_declaration_syntax.patch create mode 100644 skip/docbook2x/05_fix_439214_error_on_missing_refentry.patch create mode 100644 skip/docbook2x/06_fix_man_typo.patch create mode 100644 skip/docbook2x/docbook2x.xibuild create mode 100644 skip/electrum/0001-apk-add-instead-of-apt-get-install.patch create mode 100644 skip/electrum/electrum.xibuild create mode 100644 skip/elvish/elvish.xibuild create mode 100644 skip/execline/execline.xibuild create mode 100644 skip/ext-dump/ext-dump.xibuild create mode 100644 skip/firefox/allow-custom-rust-vendor.patch create mode 100644 skip/firefox/avoid-redefinition.patch create mode 100644 skip/firefox/disable-moz-stackwalk.patch create mode 100644 skip/firefox/disable-neon-in-aom.patch create mode 100644 skip/firefox/firefox-safe.desktop create mode 100644 skip/firefox/firefox.desktop create mode 100644 skip/firefox/firefox.xibuild create mode 100644 skip/firefox/fix-fortify-system-wrappers.patch create mode 100644 skip/firefox/fix-neon-aom.patch create mode 100644 skip/firefox/fix-rust-target.patch create mode 100644 skip/firefox/fix-webrtc-glibcisms.patch create mode 100644 skip/firefox/mallinfo.patch create mode 100644 skip/firefox/no-ccache-stats.patch create mode 100644 skip/firefox/sandbox-fork.patch create mode 100644 skip/firefox/sandbox-largefile.patch create mode 100644 skip/firefox/sandbox-sched_setscheduler.patch create mode 100644 skip/firefox/stab.h create mode 100644 skip/firefox/zstandard.patch create mode 100644 skip/guitarix/guitarix-0.43.1-glib2.patch create mode 100644 skip/guitarix/guitarix.xibuild create mode 100644 skip/heimdal/005_all_heimdal-suid_fix.patch create mode 100644 skip/heimdal/CVE-2018-16860.patch create mode 100644 skip/heimdal/autoconf-270.patch create mode 100755 skip/heimdal/heimdal-kadmind.initd create mode 100755 skip/heimdal/heimdal-kdc.initd create mode 100755 skip/heimdal/heimdal-kpasswdd.initd create mode 100644 skip/heimdal/heimdal.xibuild create mode 100644 skip/heimdal/heimdal_missing-include.patch create mode 100644 skip/heimdal/silence-include-headers-redirect-warnings.patch create mode 100644 skip/leveldb/leveldb.xibuild create mode 100644 skip/libetonyek/libetonyek.xibuild create mode 100644 skip/liblangtag/liblangtag.xibuild create mode 100644 skip/libreoffice/autoconf-boost-macros.patch create mode 100644 skip/libreoffice/disable-liborcus-unittest.patch create mode 100644 skip/libreoffice/fix-execinfo.patch create mode 100644 skip/libreoffice/libreoffice-base.xibuild create mode 100644 skip/libreoffice/libreoffice-calc.xibuild create mode 100644 skip/libreoffice/libreoffice-common.xibuild create mode 100644 skip/libreoffice/libreoffice-draw.xibuild create mode 100644 skip/libreoffice/libreoffice-impress.xibuild create mode 100644 skip/libreoffice/libreoffice-math.xibuild create mode 100644 skip/libreoffice/libreoffice-postgres.xibuild create mode 100644 skip/libreoffice/libreoffice-sdk.xibuild create mode 100644 skip/libreoffice/libreoffice-writer.xibuild create mode 100644 skip/libreoffice/libreoffice.xibuild create mode 100644 skip/libreoffice/linux-musl.patch create mode 100644 skip/libreoffice/musl-libintl.patch create mode 100644 skip/libreoffice/musl-stacksize.patch create mode 100644 skip/libreoffice/pld-skia-patches.patch create mode 100644 skip/libreoffice/poppler-22.03.patch create mode 100644 skip/libreoffice/remove-backtrace.patch create mode 100644 skip/libreoffice/skia-freetype2.11.diff create mode 100644 skip/lsp-plugins/lsp-plugins.xibuild create mode 100644 skip/lsp-plugins/null.patch create mode 100644 skip/luakit/luakit.xibuild create mode 100644 skip/mingw-w64-gcc/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch create mode 100644 skip/mingw-w64-gcc/mingw-w64-gcc.xibuild create mode 100644 skip/pandoc/cabal.config delete mode 100644 skip/pandoc/cabal.project.freeze create mode 100644 skip/php8/.php8.xibuild.swp create mode 100644 skip/php8/atomic-lsapi.patch create mode 100644 skip/php8/disabled-tests.list create mode 100644 skip/php8/fix-tests-devserver.patch create mode 100644 skip/php8/includedir.patch create mode 100644 skip/php8/install-pear.patch create mode 100644 skip/php8/php8-fpm-version-suffix.patch create mode 100644 skip/php8/php8-fpm.initd create mode 100644 skip/php8/php8-fpm.logrotate create mode 100644 skip/php8/php8-module.conf create mode 100644 skip/php8/php8.xibuild create mode 100644 skip/php8/sharedir.patch create mode 100644 skip/php8/xfail-openssl-1.1-test.patch create mode 100644 skip/python-pyqtwebengine/python-pyqtwebengine.xibuild create mode 100644 skip/python-pyside2/python-3.10.patch create mode 100644 skip/python-pyside2/python-pyside2.xibuild create mode 100644 skip/qt5-qt3d/qt5-qt3d.xibuild create mode 100644 skip/qt5-qtwebengine/0001-pretend-to-stay-at-5.15.3.patch create mode 100644 skip/qt5-qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch create mode 100644 skip/qt5-qtwebengine/default-pthread-stacksize.patch create mode 100644 skip/qt5-qtwebengine/ffmpeg5.patch create mode 100644 skip/qt5-qtwebengine/fix-chromium-build.patch create mode 100644 skip/qt5-qtwebengine/fix-strncpy-error.patch create mode 100644 skip/qt5-qtwebengine/musl-hacks.patch create mode 100644 skip/qt5-qtwebengine/musl-sandbox.patch create mode 100644 skip/qt5-qtwebengine/nasm.patch create mode 100644 skip/qt5-qtwebengine/qt-chromium-python3.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-crashpad.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-elf-arm.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-execinfo.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-mallinfo.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-off_t.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-pread-pwrite.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-pvalloc.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-resolve.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-siginfo_t.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-stackstart.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-sysreg-for__WORDSIZE.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-thread-stacksize.patch create mode 100644 skip/qt5-qtwebengine/qt-musl-tid-caching.patch create mode 100644 skip/qt5-qtwebengine/qt5-qtwebengine.xibuild create mode 100644 skip/qt5-qtwebengine/qt5-webengine-gcc12.patch create mode 100644 skip/qt5-qtwebengine/remove-glibc-check.patch create mode 100644 skip/qt5-qtwebengine/sndio.patch create mode 100644 skip/qt5-qtwebengine/support-python3.patch create mode 100644 skip/ripgrep/minimize-size.patch create mode 100644 skip/ripgrep/ripgrep.xibuild create mode 100644 skip/ruby-kramdown/gemspec.patch create mode 100644 skip/ruby-kramdown/ruby-kramdown.xibuild delete mode 100644 skip/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch delete mode 100644 skip/rust/0007-do-not-install-libunwind-source.patch delete mode 100644 skip/rust/alpine-move-py-scripts-to-share.patch delete mode 100644 skip/rust/alpine-target.patch delete mode 100644 skip/rust/cargo.xibuild delete mode 100644 skip/rust/check-rustc delete mode 100644 skip/rust/install-template-shebang.patch delete mode 100644 skip/rust/link-musl-dynamically.patch delete mode 100644 skip/rust/musl-fix-linux_musl_base.patch delete mode 100644 skip/rust/need-rpath.patch delete mode 100644 skip/rust/need-ssp_nonshared.patch delete mode 100644 skip/rust/rust.xibuild create mode 100644 skip/samba/add_missing___compar_fn_t.patch create mode 100644 skip/samba/getpwent_r.patch create mode 100644 skip/samba/missing-headers.patch create mode 100644 skip/samba/musl_rm_unistd_incl.patch create mode 100644 skip/samba/musl_uintptr.patch create mode 100644 skip/samba/netapp.patch create mode 100644 skip/samba/netdb-defines.patch create mode 100644 skip/samba/pidl.patch create mode 100644 skip/samba/samba-bgqd-include-signal-h.patch create mode 100644 skip/samba/samba.confd create mode 100644 skip/samba/samba.initd create mode 100644 skip/samba/samba.logrotate create mode 100644 skip/samba/samba.xibuild create mode 100644 skip/samba/winbind.post-install create mode 100644 skip/samba/winbind.post-upgrade create mode 100644 skip/samba/winbind.pre-install create mode 100644 skip/samba/winbind.pre-upgrade create mode 100644 skip/thunderbird/allow-custom-rust-vendor.patch create mode 100644 skip/thunderbird/avoid-redefinition.patch create mode 100644 skip/thunderbird/cbindgen-0.24.patch create mode 100644 skip/thunderbird/disable-moz-stackwalk.patch create mode 100644 skip/thunderbird/disable-neon-in-aom.patch create mode 100644 skip/thunderbird/distribution.ini create mode 100644 skip/thunderbird/fix-fortify-system-wrappers.patch create mode 100644 skip/thunderbird/fix-libresolv-path.patch create mode 100644 skip/thunderbird/fix-rust-target.patch create mode 100644 skip/thunderbird/fix-tools.patch create mode 100644 skip/thunderbird/fix-webrtc-glibcisms.patch create mode 100644 skip/thunderbird/mallinfo.patch create mode 100644 skip/thunderbird/metainfo.patch create mode 100644 skip/thunderbird/psutil.patch create mode 100644 skip/thunderbird/sandbox-fork.patch create mode 100644 skip/thunderbird/sandbox-largefile.patch create mode 100644 skip/thunderbird/sandbox-sched_setscheduler.patch create mode 100644 skip/thunderbird/stab.h create mode 100644 skip/thunderbird/thunderbird.desktop create mode 100644 skip/thunderbird/thunderbird.xibuild create mode 100644 skip/thunderbird/vendor-prefs.js create mode 100644 skip/thunderbird/zstandard.patch create mode 100644 skip/webkit2gtk/webkit2gtk.xibuild create mode 100644 skip/wine/rpath.patch create mode 100644 skip/wine/wine.xibuild (limited to 'skip') diff --git a/skip/apache2/alpine.layout b/skip/apache2/alpine.layout new file mode 100644 index 0000000..e9c948f --- /dev/null +++ b/skip/apache2/alpine.layout @@ -0,0 +1,22 @@ + + prefix: /usr + exec_prefix: ${prefix} + bindir: ${prefix}/bin + sbindir: ${prefix}/sbin + libdir: ${prefix}/lib + libexecdir: ${prefix}/lib+ + mandir: ${prefix}/share/man + sysconfdir: /etc+ + datadir: ${prefix}/share+ + installbuilddir: ${datadir}/build + errordir: ${datadir}/error + iconsdir: ${datadir}/icons + htdocsdir: /var/www/localhost/htdocs + manualdir: /usr/share/doc/apache2/manual + cgidir: /var/www/localhost/cgi-bin + includedir: /usr/include+ + localstatedir: /var + runtimedir: /run+ + logfiledir: ${localstatedir}/log+ + proxycachedir: ${localstatedir}/cache+ + diff --git a/skip/apache2/apache2-ssl.post-install b/skip/apache2/apache2-ssl.post-install new file mode 100644 index 0000000..1e8478a --- /dev/null +++ b/skip/apache2/apache2-ssl.post-install @@ -0,0 +1,30 @@ +#!/bin/sh + +ssldir=/etc/ssl/apache2 +sslkey=$ssldir/server.key +sslcert=$ssldir/server.pem + +umask 077 + +[ -f $sslkey ] || openssl genrsa 2048 > $sslkey 2>/dev/null + +FQDN=`hostname -f` +if [ "x${FQDN}" = "x" ]; then + FQDN=localhost.localdomain +fi + +if [ ! -f ${sslcert} ] ; then +cat << EOF | openssl req -new -key ${sslkey} \ + -x509 -days 365 -set_serial $RANDOM \ + -out ${sslcert} 2>/dev/null +-- +SomeState +SomeCity +SomeOrganization +SomeOrganizationalUnit +${FQDN} +root@${FQDN} +EOF +fi + + diff --git a/skip/apache2/apache2.confd b/skip/apache2/apache2.confd new file mode 100644 index 0000000..aeb3222 --- /dev/null +++ b/skip/apache2/apache2.confd @@ -0,0 +1,54 @@ +# /etc/conf.d/apache2: config file for /etc/init.d/apache2 + +# +# The default processing model (MPM) is the process-based +# 'prefork' model. A thread-based model, 'worker', is also +# available, but does not work with some modules (such as PHP). +# +#HTTPD=/usr/sbin/httpd.worker + +HTTPD="/usr/sbin/httpd" + +# +# To pass additional options (for instance, -D definitions) to the +# httpd binary at startup, set HTTPD_OPTS here. +# +HTTPD_OPTS= + +# Extended options for advanced uses of Apache ONLY +# You don't need to edit these unless you are doing crazy Apache stuff +# As not having them set correctly, or feeding in an incorrect configuration +# via them will result in Apache failing to start +# YOU HAVE BEEN WARNED. + +# PID file +#PIDFILE=/run/apache2/httpd.pid + +# timeout for startup/shutdown checks +#TIMEOUT=10 + +# ServerRoot setting +#SERVERROOT=/var/www + +# Configuration file location +# - If this does NOT start with a '/', then it is treated relative to +# $SERVERROOT by Apache +#CONFIGFILE=/etc/apache2/httpd.conf + +# Location to log startup errors to +# They are normally dumped to your terminal. +#STARTUPERRORLOG="/var/log/apache2/startuperror.log" + +# A command that outputs a formatted text version of the HTML at the URL +# of the command line. Designed for lynx, however other programs may work. +#LYNX="lynx -dump" + +# The URL to your server's mod_status status page. +# Required for status and fullstatus +#STATUSURL="http://localhost/server-status" + +# Method to use when reloading the server +# Valid options are 'restart' and 'graceful' +# See http://httpd.apache.org/docs/2.2/stopping.html for information on +# what they do and how they differ. +#RELOAD_TYPE="graceful" diff --git a/skip/apache2/apache2.initd b/skip/apache2/apache2.initd new file mode 100755 index 0000000..2975e7a --- /dev/null +++ b/skip/apache2/apache2.initd @@ -0,0 +1,154 @@ +#!/sbin/openrc-run + +extra_commands="configdump configtest modules virtualhosts" +extra_started_commands="fullstatus graceful gracefulstop reload" + +depend() { + need net + use mysql dns logger netmount postgresql + after sshd firewall +} + +configtest() { + ebegin "Checking ${SVCNAME} configuration" + checkconfig + eend $? +} + +checkconfd() { + PIDFILE="${PIDFILE:-/run/apache2/httpd.pid}" + TIMEOUT=${TIMEOUT:-10} + + SERVERROOT="${SERVERROOT:-/var/www}" + if [ ! -d ${SERVERROOT} ]; then + eerror "SERVERROOT does not exist: ${SERVERROOT}" + return 1 + fi + + CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}" + [ "${CONFIGFILE#/}" = "${CONFIGFILE}" ] && CONFIGFILE="${SERVERROOT}/${CONFIGFILE}" + if [ ! -r "${CONFIGFILE}" ]; then + eerror "Unable to read configuration file: ${CONFIGFILE}" + return 1 + fi + + HTTPD_OPTS="${HTTPD_OPTS} -d ${SERVERROOT}" + HTTPD_OPTS="${HTTPD_OPTS} -f ${CONFIGFILE}" + [ -n "${STARTUPERRORLOG}" ] && HTTPD_OPTS="${HTTPD_OPTS} -E ${STARTUPERRORLOG}" + return 0 + +} + +checkconfig() { + checkconfd || return 1 + + ${HTTPD} ${HTTPD_OPTS} -t 1>/dev/null 2>&1 + ret=$? + if [ $ret -ne 0 ]; then + eerror "${SVCNAME} has detected an error in your setup:" + ${HTTPD} ${HTTPD_OPTS} -t + fi + + return $ret +} + +start() { + checkconfig || return 1 + checkpath --directory $(dirname $PIDFILE) + + [ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache + + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start \ + --pidfile ${PIDFILE} \ + --exec ${HTTPD} \ + -- ${HTTPD_OPTS} -k start + eend $? +} + +stop() { + checkconfd || return 1 + + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${HTTPD} \ + --retry ${TIMEOUT} + eend $? +} + +reload() { + RELOAD_TYPE="${RELOAD_TYPE:-graceful}" + + checkconfig || return 1 + service_started "${SVCNAME}" || return + + if [ "${RELOAD_TYPE}" = "restart" ]; then + ebegin "Restarting ${SVCNAME}" + ${HTTPD} ${HTTPD_OPTS} -k restart + eend $? + elif [ "${RELOAD_TYPE}" = "graceful" ]; then + ebegin "Gracefully restarting ${SVCNAME}" + ${HTTPD} ${HTTPD_OPTS} -k graceful + eend $? + else + eerror "${RELOAD_TYPE} is not a valid RELOAD_TYPE. Please edit /etc/conf.d/${SVCNAME}" + fi +} + +graceful() { + checkconfig || return 1 + service_started "${SVCNAME}" || return + ebegin "Gracefully restarting ${SVCNAME}" + ${HTTPD} ${HTTPD_OPTS} -k graceful + eend $? +} + +gracefulstop() { + checkconfig || return 1 + ebegin "Gracefully stopping ${SVCNAME}" + start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${HTTPD} \ + --retry SIGWINCH/${TIMEOUT} + eend $? +} + +modules() { + checkconfig || return 1 + + ${HTTPD} ${HTTPD_OPTS} -M 2>&1 +} + +fullstatus() { + LYNX="${LYNX:-lynx -dump}" + STATUSURL="${STATUSURL:-http://localhost/server-status}" + + if ! service_started "${SVCNAME}"; then + eerror "${SVCNAME} not started" + elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then + eerror "lynx not installed!" + else + ${LYNX} ${STATUSURL} + fi +} + +virtualhosts() { + checkconfd || return 1 + ${HTTPD} ${HTTPD_OPTS} -S +} + +configdump() { + LYNX="${LYNX:-lynx -dump}" + INFOURL="${INFOURL:-http://localhost/server-info}" + + checkconfd || return 1 + + if ! service_started "${SVCNAME}"; then + eerror "${SVCNAME} not started" + elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then + eerror "lynx not installed!" + else + echo "${HTTPD} started with '${HTTPD_OPTS}'" + for i in config server list; do + ${LYNX} "${INFOURL}/?${i}" | sed '/Apache Server Information/d;/^[[:space:]]\+[_]\+$/Q' + done + fi +} + diff --git a/skip/apache2/apache2.logrotate b/skip/apache2/apache2.logrotate new file mode 100644 index 0000000..b50fb71 --- /dev/null +++ b/skip/apache2/apache2.logrotate @@ -0,0 +1,10 @@ +/var/log/apache2/*log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /etc/init.d/apache2 --quiet --ifstarted reload > /dev/null 2>/dev/null || true + endscript +} + diff --git a/skip/apache2/apache2.pre-install b/skip/apache2/apache2.pre-install new file mode 100644 index 0000000..d4ede74 --- /dev/null +++ b/skip/apache2/apache2.pre-install @@ -0,0 +1,8 @@ +#!/bin/sh + +addgroup -S -g 82 www-data 2>/dev/null +addgroup -S apache 2>/dev/null +adduser -S -D -H -h /var/www -s /sbin/nologin -G apache -g apache apache 2>/dev/null +addgroup apache www-data 2>/dev/null + +exit 0 diff --git a/skip/apache2/apache2.pre-upgrade b/skip/apache2/apache2.pre-upgrade new file mode 100644 index 0000000..d4ede74 --- /dev/null +++ b/skip/apache2/apache2.pre-upgrade @@ -0,0 +1,8 @@ +#!/bin/sh + +addgroup -S -g 82 www-data 2>/dev/null +addgroup -S apache 2>/dev/null +adduser -S -D -H -h /var/www -s /sbin/nologin -G apache -g apache apache 2>/dev/null +addgroup apache www-data 2>/dev/null + +exit 0 diff --git a/skip/apache2/apache2.xibuild b/skip/apache2/apache2.xibuild new file mode 100644 index 0000000..f2de5a4 --- /dev/null +++ b/skip/apache2/apache2.xibuild @@ -0,0 +1,119 @@ +#!/bin/sh + +NAME="apache2" +DESC="A high performance Unix-based HTTP server" + +MAKEDEPS=" apr apr-util autoconf automake brotli libxml2 lua nghttp2 openssl-dev>3 pcre sed zlib" + +_pkgreal=httpd + +PKG_VER=2.4.54 +SOURCE="https://dlcdn.apache.org/$_pkgreal/$_pkgreal-$PKG_VER.tar.bz2" + +ADDITIONAL=" +alpine.layout +apache2-ssl.post-install +apache2.confd +apache2.initd +apache2.logrotate +apache2.pre-install +apache2.pre-upgrade +conf +" + +prepare() { + for i in $source; do + case $i in + *.patch) echo $i; patch -p1 -i "$BUILD_ROOT"/$(basename $i);; + esac + done + + cat "$BUILD_ROOT/alpine.layout" >> config.layout +} + +build() { + ./configure \ + --prefix=/usr \ + --enable-so \ + --enable-suexec \ + --with-suexec-caller=apache \ + --with-suexec-docroot=/var/www \ + --with-suexec-logfile=/var/log/apache2/suexec.log \ + --with-suexec-bin=/usr/sbin/suexec \ + --with-suexec-uidmin=99 \ + --with-suexec-gidmin=99 \ + --with-apr=/usr/bin/apr-1-config \ + --with-apr-util=/usr/bin/apu-1-config \ + --with-pcre=/usr \ + --enable-mods-shared=all \ + --enable-mpms-shared=all \ + --with-mpm=prefork \ + --enable-ssl \ + --with-ssl \ + --enable-proxy \ + --enable-cache \ + --enable-disk-cache \ + --enable-mem-cache \ + --enable-file-cache \ + --enable-ldap \ + --enable-authnz-ldap \ + --enable-cgid \ + --enable-cgi \ + --enable-authn-anon \ + --enable-authn-alias \ + --disable-imagemap \ + --enable-proxy-connect \ + --enable-proxy-http \ + --enable-proxy-ftp \ + --enable-deflate \ + --enable-dbd \ + --enable-exception-hook \ + --enable-dav \ + --enable-dav-fs \ + --enable-dav-lock + make +} + +package() { + make -j1 DESTDIR="$PKG_DEST" install + + # config + rm -r "$PKG_DEST"/etc/apache2/extra/httpd-vhosts.conf \ + "$PKG_DEST"/etc/apache2/original + mv "$PKG_DEST"/etc/apache2/extra "$PKG_DEST"/etc/apache2/conf.d + for file in "$PKG_DEST"/etc/apache2/conf.d/httpd-*; do + mv "$file" \ + "$(dirname $file)/${file#$PKG_DEST/etc/apache2/conf.d/httpd-}" + done + sed -Ei \ + 's:^(\t?#?LoadModule .+ )lib/apache2/:\1modules/:;ta;b;:a;s/^#?LoadModule (dav.*|lbmethod_.+|.*ldap|lua|proxy.*|ssl|xml2enc)_module //;tb;b;:b;d' \ + "$PKG_DEST"/etc/apache2/httpd.conf + + # init scripts and logrotate + install -D -m755 "$BUILD_ROOT"/apache2.initd \ + "$PKG_DEST"/etc/init.d/apache2 + install -D -m644 "$BUILD_ROOT"/apache2.logrotate \ + "$PKG_DEST"/etc/logrotate.d/apache2 + install -D -m644 "$BUILD_ROOT"/apache2.confd \ + "$PKG_DEST"/etc/conf.d/apache2 + + install -d "$PKG_DEST"/var/www + install -d -m 2750 -g wheel "$PKG_DEST"/var/log/apache2 + ln -fs /var/log/apache2 "$PKG_DEST"/var/www/logs + ln -fs /run/apache2 "$PKG_DEST"/var/www/run + ln -fs /usr/lib/apache2 "$PKG_DEST"/var/www/modules + rm -fr "$PKG_DEST"/run + + # verify all MPMs are built + # ref #2866 + for i in prefork event worker; do + if ! [ -e "$PKG_DEST"/usr/lib/apache2/mod_mpm_$i.so ]; then + error "$i MPM was not built" + fi + done + + # create the run directory + # ref #9982 + mkdir -p "$PKG_DEST"/run/apache2 +} + diff --git a/skip/avahi/CVE-2021-3468.patch b/skip/avahi/CVE-2021-3468.patch new file mode 100644 index 0000000..3e0725a --- /dev/null +++ b/skip/avahi/CVE-2021-3468.patch @@ -0,0 +1,37 @@ +From 447affe29991ee99c6b9732fc5f2c1048a611d3b Mon Sep 17 00:00:00 2001 +From: Riccardo Schirone +Date: Fri, 26 Mar 2021 11:50:24 +0100 +Subject: [PATCH] Avoid infinite-loop in avahi-daemon by handling HUP event in + client_work + +If a client fills the input buffer, client_work() disables the +AVAHI_WATCH_IN event, thus preventing the function from executing the +`read` syscall the next times it is called. However, if the client then +terminates the connection, the socket file descriptor receives a HUP +event, which is not handled, thus the kernel keeps marking the HUP event +as occurring. While iterating over the file descriptors that triggered +an event, the client file descriptor will keep having the HUP event and +the client_work() function is always called with AVAHI_WATCH_HUP but +without nothing being done, thus entering an infinite loop. + +See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984938 +--- + avahi-daemon/simple-protocol.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c +index 3e0ebb11..6c0274d6 100644 +--- a/avahi-daemon/simple-protocol.c ++++ b/avahi-daemon/simple-protocol.c +@@ -424,6 +424,11 @@ static void client_work(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AvahiWatchEv + } + } + ++ if (events & AVAHI_WATCH_HUP) { ++ client_free(c); ++ return; ++ } ++ + c->server->poll_api->watch_update( + watch, + (c->outbuf_length > 0 ? AVAHI_WATCH_OUT : 0) | diff --git a/skip/avahi/CVE-2021-36217.patch b/skip/avahi/CVE-2021-36217.patch new file mode 100644 index 0000000..7b0449a --- /dev/null +++ b/skip/avahi/CVE-2021-36217.patch @@ -0,0 +1,148 @@ +From 9d31939e55280a733d930b15ac9e4dda4497680c Mon Sep 17 00:00:00 2001 +From: Tommi Rantala +Date: Mon, 8 Feb 2021 11:04:43 +0200 +Subject: [PATCH] Fix NULL pointer crashes from #175 + +avahi-daemon is crashing when running "ping .local". +The crash is due to failing assertion from NULL pointer. +Add missing NULL pointer checks to fix it. + +Introduced in #175 - merge commit 8f75a045709a780c8cf92a6a21e9d35b593bdecd +--- + avahi-core/browse-dns-server.c | 5 ++++- + avahi-core/browse-domain.c | 5 ++++- + avahi-core/browse-service-type.c | 3 +++ + avahi-core/browse-service.c | 3 +++ + avahi-core/browse.c | 3 +++ + avahi-core/resolve-address.c | 5 ++++- + avahi-core/resolve-host-name.c | 5 ++++- + avahi-core/resolve-service.c | 5 ++++- + 8 files changed, 29 insertions(+), 5 deletions(-) + +diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c +index 049752e9..c2d914fa 100644 +--- a/avahi-core/browse-dns-server.c ++++ b/avahi-core/browse-dns-server.c +@@ -343,7 +343,10 @@ AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new( + AvahiSDNSServerBrowser* b; + + b = avahi_s_dns_server_browser_prepare(server, interface, protocol, domain, type, aprotocol, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_dns_server_browser_start(b); + + return b; +-} +\ No newline at end of file ++} +diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c +index f145d56a..06fa70c0 100644 +--- a/avahi-core/browse-domain.c ++++ b/avahi-core/browse-domain.c +@@ -253,7 +253,10 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new( + AvahiSDomainBrowser *b; + + b = avahi_s_domain_browser_prepare(server, interface, protocol, domain, type, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_domain_browser_start(b); + + return b; +-} +\ No newline at end of file ++} +diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c +index fdd22dcd..b1fc7af8 100644 +--- a/avahi-core/browse-service-type.c ++++ b/avahi-core/browse-service-type.c +@@ -171,6 +171,9 @@ AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new( + AvahiSServiceTypeBrowser *b; + + b = avahi_s_service_type_browser_prepare(server, interface, protocol, domain, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_service_type_browser_start(b); + + return b; +diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c +index 5531360c..63e0275a 100644 +--- a/avahi-core/browse-service.c ++++ b/avahi-core/browse-service.c +@@ -184,6 +184,9 @@ AvahiSServiceBrowser *avahi_s_service_browser_new( + AvahiSServiceBrowser *b; + + b = avahi_s_service_browser_prepare(server, interface, protocol, service_type, domain, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_service_browser_start(b); + + return b; +diff --git a/avahi-core/browse.c b/avahi-core/browse.c +index 2941e579..e8a915e9 100644 +--- a/avahi-core/browse.c ++++ b/avahi-core/browse.c +@@ -634,6 +634,9 @@ AvahiSRecordBrowser *avahi_s_record_browser_new( + AvahiSRecordBrowser *b; + + b = avahi_s_record_browser_prepare(server, interface, protocol, key, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_record_browser_start_query(b); + + return b; +diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c +index ac0b29b1..e61dd242 100644 +--- a/avahi-core/resolve-address.c ++++ b/avahi-core/resolve-address.c +@@ -286,7 +286,10 @@ AvahiSAddressResolver *avahi_s_address_resolver_new( + AvahiSAddressResolver *b; + + b = avahi_s_address_resolver_prepare(server, interface, protocol, address, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_address_resolver_start(b); + + return b; +-} +\ No newline at end of file ++} +diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c +index 808b0e72..4e8e5973 100644 +--- a/avahi-core/resolve-host-name.c ++++ b/avahi-core/resolve-host-name.c +@@ -318,7 +318,10 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new( + AvahiSHostNameResolver *b; + + b = avahi_s_host_name_resolver_prepare(server, interface, protocol, host_name, aprotocol, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_host_name_resolver_start(b); + + return b; +-} +\ No newline at end of file ++} +diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c +index 66bf3cae..43771763 100644 +--- a/avahi-core/resolve-service.c ++++ b/avahi-core/resolve-service.c +@@ -519,7 +519,10 @@ AvahiSServiceResolver *avahi_s_service_resolver_new( + AvahiSServiceResolver *b; + + b = avahi_s_service_resolver_prepare(server, interface, protocol, name, type, domain, aprotocol, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_service_resolver_start(b); + + return b; +-} +\ No newline at end of file ++} diff --git a/skip/avahi/avahi.pre-install b/skip/avahi/avahi.pre-install new file mode 100644 index 0000000..89b2fd4 --- /dev/null +++ b/skip/avahi/avahi.pre-install @@ -0,0 +1,12 @@ +#!/bin/sh + +addgroup -S -g 28 netdev 2>/dev/null +addgroup -S -g 86 avahi 2>/dev/null +adduser -S -u 86 -D -H \ + -h /var/run/avahi-daemon \ + -s /sbin/nologin \ + -G avahi \ + -g "Avahi System User" \ + avahi 2>/dev/null + +exit 0 diff --git a/skip/avahi/avahi.xibuild b/skip/avahi/avahi.xibuild new file mode 100644 index 0000000..d1e53f4 --- /dev/null +++ b/skip/avahi/avahi.xibuild @@ -0,0 +1,60 @@ +#!/bin/sh + +NAME="avahi" +DESC="multicast/unicast DNS-SD framework" + +MAKEDEPS="gdbm intltool gobject-introspection expat libdaemon glib dbus libcap gettext autoconf automake libtool libevent" + +PKG_VER=0.8 +SOURCE="https://github.com/lathiat/avahi/releases/download/v$PKG_VER/avahi-$PKG_VER.tar.gz" + +ADDITIONAL=" +CVE-2021-3468.patch +CVE-2021-36217.patch +avahi.pre-install +" + +prepare() { + apply_patches + autoreconf -vif +} + +build() { + # we dont build autoipd since dhcpcd does same job + LDFLAGS="$LDFLAGS -lintl" \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-autoipd \ + --disable-qt3 \ + --disable-qt4 \ + --disable-qt5 \ + --disable-gtk \ + --disable-gtk3 \ + --disable-mono \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-xmltoman \ + --enable-compat-libdns_sd \ + --enable-compat-howl \ + --disable-python \ + --with-dbus-sys=/usr/share/dbus-1/system.d \ + --with-distro="gentoo" + make +} + +check() { + make check +} + +package() { + make DESTDIR="$PKG_DEST" install + + install -d -o avahi -g avahi "$PKG_DEST"/var/run/avahi-daemon + + ln -s avahi-compat-howl.pc "$PKG_DEST"/usr/lib/pkgconfig/howl.pc + ln -s avahi-compat-libdns_sd.pc "$PKG_DEST"/usr/lib/pkgconfig/libdns_sd.pc + ln -s avahi-compat-libdns_sd/dns_sd.h "$PKG_DEST"/usr/include/ +} + diff --git a/skip/cabal/cabal.project.freeze b/skip/cabal/cabal.project.freeze index 07c927e..f4c0bd7 100644 --- a/skip/cabal/cabal.project.freeze +++ b/skip/cabal/cabal.project.freeze @@ -1,65 +1,68 @@ active-repositories: hackage.haskell.org:merge -constraints: any.Cabal ==3.6.2.0, - Cabal -bundled-binary-generic, - any.HTTP ==4000.3.16, - HTTP -conduit10 -mtl1 +network-uri -warn-as-error -warp-tests, +constraints: any.Cabal ==3.8.1.0, + any.Cabal-syntax ==3.8.1.0, + any.HTTP ==4000.4.1, + HTTP -conduit10 +network-uri -warn-as-error -warp-tests, any.array ==0.5.4.0, any.async ==2.2.4, async -bench, - any.base ==4.15.0.0, - any.base-orphans ==0.8.6, + any.base ==4.15.1.0, + any.base-orphans ==0.8.7, any.base16-bytestring ==1.0.2.0, any.base64-bytestring ==1.2.1.0, any.binary ==0.8.8.0, any.bytestring ==0.10.12.1, - cabal-install -debug-conflict-sets -debug-expensive-assertions -debug-tracetree +lukko +native-dns, + cabal-install +lukko +native-dns, + any.cabal-install-solver ==3.8.1.0, + cabal-install-solver -debug-conflict-sets -debug-expensive-assertions -debug-tracetree, any.containers ==0.6.4.1, any.cryptohash-sha256 ==0.11.102.1, cryptohash-sha256 -exe +use-cbits, any.deepseq ==1.4.5.0, - any.directory ==1.3.6.1, + any.directory ==1.3.6.2, any.echo ==0.1.4, echo -example, any.ed25519 ==0.0.5.0, ed25519 +no-donna +test-doctests +test-hlint +test-properties, any.edit-distance ==0.2.2.1, + any.exceptions ==0.10.4, any.filepath ==1.4.2.1, - any.ghc-bignum ==1.0, - any.ghc-bignum-orphans ==0.1.1, - any.ghc-boot-th ==9.0.1, + any.ghc-bignum ==1.1, + any.ghc-boot-th ==9.0.2, any.ghc-prim ==0.7.0, - any.hackage-security ==0.6.0.1, - hackage-security +base48 +lukko -mtl21 -old-directory +use-network-uri, - any.hashable ==1.4.0.0, + any.hackage-security ==0.6.2.2, + hackage-security +base48 -cabal-syntax +lukko -mtl21 -old-directory +use-network-uri, + any.hashable ==1.4.1.0, hashable +containers +integer-gmp -random-initial-seed, any.hsc2hs ==0.68.8, hsc2hs -in-ghc-tree, any.lukko ==0.1.1.3, lukko +ofd-locking, any.mtl ==2.2.2, - any.network ==3.1.2.5, + any.network ==3.1.2.7, network -devel, any.network-uri ==2.6.4.1, any.parsec ==3.1.14.0, any.pretty ==1.1.3.6, - any.process ==1.6.11.0, - any.random ==1.2.1, + any.process ==1.6.15.0, + any.random ==1.2.1.1, any.regex-base ==0.94.0.2, any.regex-posix ==0.96.0.1, regex-posix -_regex-posix-clib, any.resolv ==0.1.2.0, - any.rts ==1.0, + any.rts ==1.0.2, + any.safe-exceptions ==0.1.7.3, any.splitmix ==0.1.0.4, splitmix -optimised-mixer, any.stm ==2.5.0.0, any.tar ==0.5.1.1, tar -old-bytestring -old-time, any.template-haskell ==2.17.0.0, - any.text ==1.2.4.1, - any.th-compat ==0.1.3, + any.text ==1.2.5.0, + any.th-compat ==0.1.4, any.time ==1.9.3, any.transformers ==0.5.6.2, any.unix ==2.7.2.2, - any.zlib ==0.6.2.3, + any.zlib ==0.6.3.0, zlib -bundled-c-zlib -non-blocking-ffi -pkg-config -index-state: hackage.haskell.org 2021-11-17T20:47:55Z +index-state: hackage.haskell.org 2022-08-16T18:13:49Z diff --git a/skip/cabal/cabal.xibuild b/skip/cabal/cabal.xibuild index 501b0e3..64bcd18 100644 --- a/skip/cabal/cabal.xibuild +++ b/skip/cabal/cabal.xibuild @@ -3,24 +3,37 @@ NAME="cabal" DESC="The Haskell Cabal" -MAKEDEPS="cabal-stage0" -DEPS="gmp libffi musl zlib " +MAKEDEPS="ghc gmp libffi zlib cabal-bootstrap" -PKG_VER=3.6.2.0 +PKG_VER=3.8.1.0 SOURCE="https://hackage.haskell.org/package/cabal-install-$PKG_VER/cabal-install-$PKG_VER.tar.gz" -ADDITIONAL="cabal.project.freeze " +ADDITIONAL=" +cabal.project.freeze +" + +cabal_update() { + cd $BUILD_ROOT + # Build a freeze file to make the build reproducible. + # This freeze file is stored in $source and thus tracked in Git. + HOME="$_cabal_home" cabal v2-update --allow-newer + ( + cd "$BUILD_ROOT" + HOME="$_cabal_home" cabal v2-freeze \ + --allow-newer --shadow-installed-packages + mv cabal.project.freeze "$startdir/" + ) +} -prepare () { - export cabal_home="$BUILD_ROOT/dist" - - ln -sf cabal.project.freeze \ - "cabal.project.freeze" +prepare() { + apply_patches + ln -sf "$BUILD_ROOT/cabal.project.freeze" \ + "$BUILD_ROOT/cabal.project.freeze" } -build () { - HOME="$cabal_home" cabal v2-update - HOME="$cabal_home" cabal v2-build all \ +build() { + HOME="$_cabal_home" cabal v2-update + HOME="$_cabal_home" cabal v2-build all \ --allow-newer \ --jobs=${JOBS:-1} \ --prefix=/usr \ @@ -28,13 +41,20 @@ build () { --sysconfdir=/etc } -package () { - HOME="$cabal_home" cabal list-bin --allow-newer all:exes | \ - xargs install -Dm755 -t "$PKG_DEST"/usr/bin +package() { + # With v2- cabal no longer wants us to separate v2-build and + # v2-install, however, we don't want to build everything in a + # fakeroot. We work around this by copying binaries build in the + # previous step manually. + # + # See https://github.com/haskell/cabal/issues/6919#issuecomment-761563498 + HOME="$_cabal_home" cabal list-bin --allow-newer all:exes | \ + xargs install -Dm755 -t "$PKG_DEST"/usr/bin mkdir -p "$PKG_DEST"/usr/share/man/man1 - HOME="$cabal_home" cabal man --raw \ + HOME="$_cabal_home" cabal man --raw \ > "$PKG_DEST"/usr/share/man/man1/cabal.1 install -Dm644 LICENSE "$PKG_DEST/usr/share/licenses/cabal/LICENSE" } + diff --git a/skip/dino/dino.xibuild b/skip/dino/dino.xibuild new file mode 100644 index 0000000..8f40781 --- /dev/null +++ b/skip/dino/dino.xibuild @@ -0,0 +1,32 @@ +#!/bin/sh + +NAME="dino" +DESC="Modern Jabber/XMPP client" + +MAKEDEPS=" cmake glib glib-networking gpgme gspell gst-libav gst-plugins-base gtk3 libgcrypt libgee libhandy1 libnice libqrencode libsignal-protocol-c libsoup libsrtp ninja sqlite vala webrtc-audio-processing" + +PKG_VER=0.3.0 +SOURCE="https://github.com/dino/dino/releases/download/v$PKG_VER/dino-$PKG_VER.tar.gz" + +ADDITIONAL=" +mobile-ui.patch +" + +build() { + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --with-tests + make +} + +check() { + build/xmpp-vala-test + build/signal-protocol-vala-test +} + +package() { + make DESTDIR="$PKG_DEST" install +} diff --git a/skip/dino/mobile-ui.patch b/skip/dino/mobile-ui.patch new file mode 100644 index 0000000..f274acf --- /dev/null +++ b/skip/dino/mobile-ui.patch @@ -0,0 +1,967 @@ +diff --git a/cmake/FindHandy.cmake b/cmake/FindHandy.cmake +new file mode 100644 +index 00000000..49148f0f +--- /dev/null ++++ b/cmake/FindHandy.cmake +@@ -0,0 +1,11 @@ ++include(PkgConfigWithFallback) ++find_pkg_config_with_fallback(Handy ++ PKG_CONFIG_NAME libhandy-1 ++ LIB_NAMES libhandy-1 ++ INCLUDE_NAMES handy.h ++) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(Handy ++ REQUIRED_VARS Handy_LIBRARY ++ VERSION_VAR Handy_VERSION) +diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt +index e052785a..f6c3edc7 100644 +--- a/main/CMakeLists.txt ++++ b/main/CMakeLists.txt +@@ -11,6 +11,7 @@ find_packages(MAIN_PACKAGES REQUIRED + GTK3 + ICU + Gspell ++ Handy + ) + + set(RESOURCE_LIST +diff --git a/main/data/add_conversation/select_jid_fragment.ui b/main/data/add_conversation/select_jid_fragment.ui +index 50bc0e36..be56e710 100644 +--- a/main/data/add_conversation/select_jid_fragment.ui ++++ b/main/data/add_conversation/select_jid_fragment.ui +@@ -1,82 +1,88 @@ + + +