diff options
685 files changed, 8038 insertions, 3753 deletions
diff --git a/experimental/elisa/APKBUILD b/experimental/elisa/APKBUILD new file mode 100644 index 000000000..f2d80d02f --- /dev/null +++ b/experimental/elisa/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=elisa +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE music player" +url="https://kde.org/applications/multimedia/org.kde.elisa" +arch="all" +license="LGPL-3.0-only" +depends="qt5-qtquickcontrols2" +makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtmultimedia-dev vlc-dev + qt5-qtquickcontrols2-dev qt5-qtsvg-dev cmake extra-cmake-modules + baloo-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev + kdbusaddons-dev kdeclarative-dev kdoctools-dev kfilemetadata-dev + ki18n-dev kio-dev kirigami2-dev kpackage-dev kxmlgui-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/elisa-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + # QML tests require OpenGL. + # databaseInterfaceTest known failure: https://phabricator.kde.org/D24563#563126 + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(elisaqmltests|databaseInterfaceTest)' +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="00afa92eaab736f5f38759a3076b9f579ee3f5fce84404042a73e11cdfe0e004b32a83f9e542ca6d0a962d66bcb3fcce9d12fc5dbdd8f937d9d4cea9321687b4 elisa-20.04.3.tar.xz" diff --git a/experimental/horizon/noninstall-mount.patch b/experimental/horizon/noninstall-mount.patch deleted file mode 100644 index 2b0e7152a..000000000 --- a/experimental/horizon/noninstall-mount.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc -index 143ae43..556a6f3 100644 ---- a/ui/qt5/horizonwizard.cc -+++ b/ui/qt5/horizonwizard.cc -@@ -542,7 +542,9 @@ QString HorizonWizard::toHScript() { - break; - } - -+#ifdef HAS_INSTALL_ENV - part_lines << (dynamic_cast<PartitionMountPage *>(page(Page_PartitionMount)))->mountLines(); -+#endif /* HAS_INSTALL_ENV */ - - if(chosen_disk.empty()) { - lines << part_lines; -diff --git a/ui/qt5/mountdialog.cc b/ui/qt5/mountdialog.cc -index f986423..103e442 100644 ---- a/ui/qt5/mountdialog.cc -+++ b/ui/qt5/mountdialog.cc -@@ -16,6 +16,7 @@ - #include <QLabel> - #include <QLineEdit> - #include <QPushButton> -+#include <QSet> - #include <QVBoxLayout> - - MountDialog::MountDialog(QStringList skipParts, QStringList skipMounts, -@@ -75,7 +76,11 @@ MountDialog::MountDialog(QStringList skipParts, QStringList skipMounts, - - QVBoxLayout *controlLayout = new QVBoxLayout; - controlLayout->addWidget(new QLabel(tr("Partition"))); -+#ifdef HAS_INSTALL_ENV - controlLayout->addWidget(partList); -+#else /* !HAS_INSTALL_ENV */ -+ controlLayout->addWidget(partInput); -+#endif /* HAS_INSTALL_ENV */ - controlLayout->addWidget(new QLabel(tr("will be mounted on"))); - controlLayout->addWidget(pathInput); - -@@ -87,14 +92,22 @@ MountDialog::MountDialog(QStringList skipParts, QStringList skipMounts, - } - - QString MountDialog::partition() const { -+#ifdef HAS_INSTALL_ENV - assert(partList->currentItem() != nullptr); - return partList->currentItem()->text(); -+#else /* !HAS_INSTALL_ENV */ -+ return partInput->text(); -+#endif /* HAS_INSTALL_ENV */ - } - - void MountDialog::setPartition(const QString &part) { -+#ifdef HAS_INSTALL_ENV - QList<QListWidgetItem *> candidate = partList->findItems(part, Qt::MatchExactly); - if(candidate.empty()) return; - partList->setCurrentItem(candidate.at(0)); -+#else /* !HAS_INSTALL_ENV */ -+ partInput->setText(part); -+#endif /* HAS_INSTALL_ENV */ - } - - QString MountDialog::mountPoint() const { diff --git a/experimental/sbcl/APKBUILD b/experimental/sbcl/APKBUILD index 86f9ab1f5..c7217542d 100644 --- a/experimental/sbcl/APKBUILD +++ b/experimental/sbcl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Lee Starnes <lee@canned-death.us> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=sbcl -pkgver=2.0.3 +pkgver=2.0.5 pkgrel=0 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org" @@ -11,9 +11,7 @@ depends="" makedepends="clisp clisp-dev" checkdepends="ed" subpackages="$pkgname-doc" -# Patch provided by Eric Timmons: https://bugs.launchpad.net/sbcl/+bug/1768368 -source="https://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2 - musl-libc.patch" +source="https://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2" prepare() { default_prepare @@ -34,5 +32,4 @@ package() { INSTALL_ROOT="$pkgdir"/usr sh install.sh } -sha512sums="c29c115fff0e118e5c05959dd8d73ae876458daeb5ddde67ce485b10e6d1583b1f8a9597b54b45606696ab1b1eea5392dcb09357c83fce31323f2a5a154f2dd1 sbcl-2.0.3-source.tar.bz2 -e6757e4cc623682c501ab5e255a881833ff393efac829ffe9f67fff0a005724c3c03a23352b4c88d58b3d15dbb0cf33c8cc58d72d3795abb2f12a4bca4302165 musl-libc.patch" +sha512sums="0c27e22dd76d157a74ef7e97dcd03030096dde0eb46901ea27acb60faa0ab34881d76a9c6708d963b0e6f62da6331b85b8d3de76fd1fc9163c159e631759f808 sbcl-2.0.5-source.tar.bz2" diff --git a/experimental/sbcl/musl-libc.patch b/experimental/sbcl/musl-libc.patch deleted file mode 100644 index 1aa5cb557..000000000 --- a/experimental/sbcl/musl-libc.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff --git a/contrib/sb-bsd-sockets/constants.lisp b/contrib/sb-bsd-sockets/constants.lisp -index 88f5bb7c4..23fd87277 100644 ---- a/contrib/sb-bsd-sockets/constants.lisp -+++ b/contrib/sb-bsd-sockets/constants.lisp -@@ -93,8 +93,8 @@ - (:integer EAFNOSUPPORT "EAFNOSUPPORT") - (:integer EINPROGRESS "EINPROGRESS") - -- (:integer NETDB-INTERNAL #+hpux "h_NETDB_INTERNAL" #-hpux "NETDB_INTERNAL" "See errno.") -- (:integer NETDB-SUCCESS #+hpux "h_NETDB_SUCCESS" #-hpux "NETDB_SUCCESS" "No problem.") -+ (:integer-no-check NETDB-INTERNAL #-os-provides-netdb-internal "-1" #+(and os-provides-netdb-internal hpux) "h_NETDB_INTERNAL" #+(and os-provides-netdb-internal (not hpux)) "NETDB_INTERNAL" "See errno.") -+ (:integer-no-check NETDB-SUCCESS #-os-provides-netdb-internal "0" #+(and os-provides-netdb-internal hpux) "h_NETDB_SUCCESS" #+(and os-provides-netdb-internal (not hpux)) "NETDB_SUCCESS" "No problem.") - (:integer HOST-NOT-FOUND "HOST_NOT_FOUND" "Authoritative Answer Host not found.") - (:integer TRY-AGAIN "TRY_AGAIN" "Non-Authoritative Host not found, or SERVERFAIL.") - (:integer NO-RECOVERY "NO_RECOVERY" "Non recoverable errors, FORMERR, REFUSED, NOTIMP.") -diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c -index fa4f5e490..60b5fea4e 100644 ---- a/src/runtime/linux-os.c -+++ b/src/runtime/linux-os.c -@@ -187,8 +187,15 @@ isnptl (void) - if (strstr (buf, "NPTL")) { - return 1; - } -+ else { -+ return 0; -+ } -+ } -+ else { -+ /* If the configuration variable is empty, just assume we have a -+ * good enough thread implementation. */ -+ return 1; - } -- return 0; - } - #endif - -diff --git a/tests/foreign.test.sh b/tests/foreign.test.sh -index 7fb757813..9ba8ed3cf 100755 ---- a/tests/foreign.test.sh -+++ b/tests/foreign.test.sh -@@ -248,16 +248,23 @@ cat > $TEST_FILESTEM.test.lisp <<EOF - (assert (= 13 foo)) - (assert (= 42 (bar))) - (note "/original definitions ok") -- (rename-file "$TEST_FILESTEM-b.so" "$TEST_FILESTEM-b.bak") -- (rename-file "$TEST_FILESTEM-b2.so" "$TEST_FILESTEM-b.so") -- (load-shared-object (truename "$TEST_FILESTEM-b.so")) -- (note "/reloading ok") -- (assert (= 42 foo)) -- (assert (= 13 (bar))) -- (note "/redefined versions ok") -- (rename-file "$TEST_FILESTEM-b.so" "$TEST_FILESTEM-b2.so") -- (rename-file "$TEST_FILESTEM-b.bak" "$TEST_FILESTEM-b.so") -- (note "/renamed back to originals") -+ ;; test late resolution -+ (eval-when (:compile-toplevel :load-toplevel :execute) -+ (setq *features* (union *features* sb-impl:+internal-features+))) -+ #+dlclose-is-noop -+ (note "/skipping reloading tests") -+ #-dlclose-is-noop -+ (progn -+ (rename-file "$TEST_FILESTEM-b.so" "$TEST_FILESTEM-b.bak") -+ (rename-file "$TEST_FILESTEM-b2.so" "$TEST_FILESTEM-b.so") -+ (load-shared-object (truename "$TEST_FILESTEM-b.so")) -+ (note "/reloading ok") -+ (assert (= 42 foo)) -+ (assert (= 13 (bar))) -+ (note "/redefined versions ok") -+ (rename-file "$TEST_FILESTEM-b.so" "$TEST_FILESTEM-b2.so") -+ (rename-file "$TEST_FILESTEM-b.bak" "$TEST_FILESTEM-b.so") -+ (note "/renamed back to originals")) - - ;; test late resolution - #+linkage-table -@@ -274,13 +278,17 @@ cat > $TEST_FILESTEM.test.lisp <<EOF - (load-shared-object (truename "$TEST_FILESTEM-c.so")) - (assert (= 43 late-foo)) - (assert (= 14 (late-bar))) -- (unload-shared-object (truename "$TEST_FILESTEM-c.so")) -- (multiple-value-bind (val err) (ignore-errors late-foo) -- (assert (not val)) -- (assert (typep err 'undefined-alien-error))) -- (multiple-value-bind (val err) (ignore-errors (late-bar)) -- (assert (not val)) -- (assert (typep err 'undefined-alien-error))) -+ #+dlclose-is-noop -+ (note "/skipping unloading tests") -+ #-dlclose-is-noop -+ (progn -+ (unload-shared-object (truename "$TEST_FILESTEM-c.so")) -+ (multiple-value-bind (val err) (ignore-errors late-foo) -+ (assert (not val)) -+ (assert (typep err 'undefined-alien-error))) -+ (multiple-value-bind (val err) (ignore-errors (late-bar)) -+ (assert (not val)) -+ (assert (typep err 'undefined-alien-error)))) - (note "/linkage table ok")) - - (sb-ext:exit :code $EXIT_LISP_WIN) ; success convention for Lisp program -diff --git a/tools-for-build/Makefile b/tools-for-build/Makefile -index 3f6e4ecf9..39bab2b92 100644 ---- a/tools-for-build/Makefile -+++ b/tools-for-build/Makefile -@@ -16,6 +16,9 @@ LDLIBS:=$(OS_LIBS) - - all: grovel-headers determine-endianness where-is-mcontext - -+dlclose-is-noop-test-helper.so: dlclose-is-noop-test-helper.c -+ @$(CC) $(LDFLAGS) -shared $< -o $@ $(LOADLIBES) $(LDLIBS) -+ - clean: - rm -f *.o grovel-headers determine-endianness where-is-mcontext - rm -f *.exe -diff --git a/tools-for-build/dlclose-is-noop-test-helper.c b/tools-for-build/dlclose-is-noop-test-helper.c -new file mode 100644 -index 000000000..4be7a8e5b ---- /dev/null -+++ b/tools-for-build/dlclose-is-noop-test-helper.c -@@ -0,0 +1 @@ -+int sbcl_dl_close_test = 42; -diff --git a/tools-for-build/dlclose-is-noop-test.c b/tools-for-build/dlclose-is-noop-test.c -new file mode 100644 -index 000000000..f4eab26a5 ---- /dev/null -+++ b/tools-for-build/dlclose-is-noop-test.c -@@ -0,0 +1,19 @@ -+/* test to build and run so that we know if we have a noop dlclose -+ */ -+ -+#include <dlfcn.h> -+#include <stddef.h> -+ -+int main () -+{ -+ void * handle = dlopen("./dlclose-is-noop-test-helper.so", RTLD_NOW | RTLD_GLOBAL); -+ dlclose(handle); -+ -+ handle = dlopen("./dlclose-is-noop-test-helper.so", RTLD_NOW | RTLD_NOLOAD); -+ -+ if (handle != NULL) { -+ return 104; -+ } else { -+ return 0; -+ } -+} -diff --git a/tools-for-build/grovel-features.sh b/tools-for-build/grovel-features.sh -index ffc4307eb..bf1448a6a 100644 ---- a/tools-for-build/grovel-features.sh -+++ b/tools-for-build/grovel-features.sh -@@ -36,3 +36,12 @@ - if [ "$sbcl_arch" = arm ] ; then - featurep arm-softfp - fi -+ -+featurep os-provides-netdb-internal -+ -+# We need a helper shared library to test dlclose-is-noop -+$GNUMAKE dlclose-is-noop-test-helper.so > /dev/null 2>&1 -+ -+featurep dlclose-is-noop -+ -+rm -f dlclose-is-noop-test-helper.so -diff --git a/tools-for-build/os-provides-netdb-internal-test.c b/tools-for-build/os-provides-netdb-internal-test.c -new file mode 100644 -index 000000000..cab08cc41 ---- /dev/null -+++ b/tools-for-build/os-provides-netdb-internal-test.c -@@ -0,0 +1,12 @@ -+#include <netdb.h> -+ -+int main () -+{ -+#if defined NETDB_INTERNAL && defined NETDB_SUCCESS -+ return 104; -+#elif defined h_NETDB_INTERNAL && defined h_NETDB_SUCCESS -+ return 104; -+#else -+ return 0; -+#endif -+} diff --git a/system/man-db/APKBUILD b/legacy/man-db/APKBUILD index 136e0720d..136e0720d 100644 --- a/system/man-db/APKBUILD +++ b/legacy/man-db/APKBUILD diff --git a/system/man-db/man-db-2.8.5-iconv.patch b/legacy/man-db/man-db-2.8.5-iconv.patch index c2232920d..c2232920d 100644 --- a/system/man-db/man-db-2.8.5-iconv.patch +++ b/legacy/man-db/man-db-2.8.5-iconv.patch diff --git a/system/man-db/man-db.trigger b/legacy/man-db/man-db.trigger index f9de5961c..f9de5961c 100644 --- a/system/man-db/man-db.trigger +++ b/legacy/man-db/man-db.trigger diff --git a/legacy/openjdk7/APKBUILD b/legacy/openjdk7/APKBUILD index e87060a19..b94d46452 100644 --- a/legacy/openjdk7/APKBUILD +++ b/legacy/openjdk7/APKBUILD @@ -25,6 +25,7 @@ install="" # upstream binary versions RHINO_VER=1.7.7.2 +_RHINO_VER=1_7_7_2 ANT_VER=1.9.11 case $CARCH in @@ -50,6 +51,8 @@ _jrelib="$INSTALL_BASE/jre/lib/$_jarch" ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli" sonameprefix="$pkgname:" +provides="$pkgname-bootstrap=$pkgver-r$pkgrel" + subpackages="$pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-jre-base:jrebase $pkgname-doc:doc" @@ -57,7 +60,7 @@ if [ "$BOOTSTRAP" != "no" ]; then makedepends="$makedepends java-gcj-compat" BOOTSTRAP_JAVA_HOME=/usr/lib/jvm/java-1.5-gcj/ else - makedepends="$makedepends $pkgname fastjar" + makedepends="$makedepends $pkgname-bootstrap fastjar" BOOTSTRAP_JAVA_HOME="$INSTALL_BASE" fi @@ -73,7 +76,7 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.g langtools-$_dropsver.tar.bz2::$_dropsurl/langtools.tar.bz2 hotspot-$_dropsver.tar.bz2::$_dropsurl/hotspot.tar.bz2 https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz - https://github.com/mozilla/rhino/releases/download/Rhino${RHINO_VER//./_}_Release/rhino-$RHINO_VER.zip + https://github.com/mozilla/rhino/releases/download/Rhino${_RHINO_VER}_Release/rhino-$RHINO_VER.zip icedtea-hotspot-musl.patch icedtea-hotspot-musl-ppc.patch diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD index 04b100e69..7cd92003d 100644 --- a/system/adelie-base/APKBUILD +++ b/system/adelie-base/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adelie-base pkgver=0.9.4 -pkgrel=0 +pkgrel=2 pkgdesc="The Adélie Linux Base System" url="https://www.adelielinux.org/" arch="noarch" @@ -13,8 +13,8 @@ _core_depends="apk-tools adelie-keys musl-utils shadow coreutils diffutils findutils util-linux net-tools nvi sed psmisc less tzdata" -depends="adelie-core binutils console-setup debianutils file gettys-openrc - libarchive-tools man-db patch sed sharutils sysklogd zsh" +depends="adelie-core binutils debianutils file gettys-openrc + kbd libarchive-tools mandoc patch sed sharutils sysklogd zsh" makedepends="" makedepends_host="$depends" subpackages="adelie-core:core $pkgname-doc $pkgname-posix $pkgname-lsb dev diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD index 99fb584f3..d85cd42b1 100644 --- a/system/bc/APKBUILD +++ b/system/bc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bc -pkgver=2.6.0 +pkgver=3.1.3 pkgrel=0 pkgdesc="An arbitrary precision numeric processing language (calculator)" url="https://github.com/gavinhoward/bc" @@ -25,4 +25,4 @@ package() { make install } -sha512sums="809ca124d110bb96ded253fe8799786b48dc5ff8ab540aa97dc8ed43f5a835841d44a71ed082ded17c1df39b6fe5dc2ce7247be0c771b22d7d354aec40434411 bc-2.6.0.tar.xz" +sha512sums="fb702e45fb994d4f1be55c2b05c4c4b4c67ae838f4f46864ba944890c1810b871fbafaa323d432f0f600f8182b4370757b75de756ae2795b595776e3fe03ba7b bc-3.1.3.tar.xz" diff --git a/system/bison/APKBUILD b/system/bison/APKBUILD index a053dd0b7..c0a5ed0c2 100644 --- a/system/bison/APKBUILD +++ b/system/bison/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bison -pkgver=3.5.3 +pkgver=3.5.4 pkgrel=0 pkgdesc="The GNU general-purpose parser generator" arch="all" @@ -15,6 +15,10 @@ provider_priority=1 subpackages="$pkgname-doc $pkgname-lang" source="https://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz" +# secfixes: +# 3.5.4-r0: +# - CVE-2020-14150 + build() { ./configure \ --build=$CBUILD \ @@ -40,4 +44,4 @@ package() { rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } -sha512sums="888a1e8d4aeda3ff2d7d0a3a88b63bbfe89bdb718cc64d48c244e05fe6c6cd39526fd88143db379fef3071cf6c2dc2ab2fd69834c24acb23ed5f739584ff6308 bison-3.5.3.tar.xz" +sha512sums="92f59122dc4d5cae1debdd5567253f269ef001c98582a5763a2051424fecb78e8710c80a09fc488f6784705e679a8bc82874bc11cc03e4eb83445cb9f418b331 bison-3.5.4.tar.xz" diff --git a/system/byacc/APKBUILD b/system/byacc/APKBUILD index f50b95754..770521ce7 100644 --- a/system/byacc/APKBUILD +++ b/system/byacc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Nathan Angelacos <nangel@alpinelinux.org> # Maintainer: pkgname=byacc -pkgver=20191103 +pkgver=20200330 pkgrel=0 pkgdesc="The Berkeley Yacc general-purpose parser generator" url="https://invisible-island.net/byacc/byacc.html" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="247cf5469da618733a9ce8d2f079e56ef485354c4fce462014ac9d3108ebf7eccb0147a3e005374a541895eff28b9a63f5f840a7576a26cb23ab34d968a2d05c byacc-20191103.tgz" +sha512sums="df8cc1aa550d633ab547a13a4f091d8c940a9a67b52dc5ecacad5b005fd54c3ceb1269593068c1a7949049e85b6e6eea20cffbbf4b408e049fde75c0ffe51f07 byacc-20200330.tgz" diff --git a/system/ca-certificates/APKBUILD b/system/ca-certificates/APKBUILD index 0785ec441..5e75d13d8 100644 --- a/system/ca-certificates/APKBUILD +++ b/system/ca-certificates/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ca-certificates -pkgver=20190131 -pkgrel=1 +pkgver=20200603 +pkgrel=0 pkgdesc="CA root certificates" url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/" arch="all" @@ -13,12 +13,11 @@ makedepends_host="openssl-dev" subpackages="$pkgname-doc" triggers="ca-certificates.trigger=/usr/share/ca-certificates:/usr/local/share/ca-certificates:/etc/ssl/certs:/etc/ca-certificates/update.d" install="$pkgname.post-deinstall" -source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz +source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.gz certhash " build() { - export CFLAGS="$CFLAGS -DSYMLINK_MAX=PATH_MAX" make } @@ -43,5 +42,5 @@ package() { install -D -m755 "$srcdir"/certhash "$pkgdir"/etc/ca-certificates/update.d/certhash } -sha512sums="aec43296636887a8ebefc08abe60c123b67002eb8cf450662b5ff8fcbd2ea10d3d24d17080b5924b13aed9a52b91ba55e93d306e27ed3196ca67cbbe30146328 ca-certificates-20190131.tar.xz +sha512sums="0125600481666979e0b736572aca7d0e3c4bf01169bc67638ef7bdd4fc97a0ebbb70798df7275eac92dfc2d03b16de3f0adc8ad382fc9e2fb4d8223c923b2eef ca-certificates-20200603.tar.gz 1efe48235f150052da6b872d2ebff174359825ab3bd66086c9d7f4c18dcd8aa8953c634dbf1aa8416d30d5623babf589660a25cf6e3a4cdcce707c14cc2f348a certhash" diff --git a/system/console-setup/APKBUILD b/system/console-setup/APKBUILD deleted file mode 100644 index b1e1b4c76..000000000 --- a/system/console-setup/APKBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=console-setup -pkgver=1.195 -pkgrel=0 -pkgdesc="Tools for configuring the console using X Window System key maps" -url="https://salsa.debian.org/installer-team/console-setup" -arch="noarch" -options="!check" # No test suite. -license="MIT AND GPL-2.0+ AND BSD-3-Clause" -depends="ckbcomp kbd" -makedepends="perl" -subpackages="$pkgname-doc console-fonts:fonts console-keymaps:keymaps - $pkgname-openrc ckbcomp" -source="http://ftp.de.debian.org/debian/pool/main/c/$pkgname/${pkgname}_$pkgver.tar.xz - console-setup.initd - " -builddir="$srcdir/$pkgname" - -build() { - make build-linux -} - -package() { - make prefix="$pkgdir/usr" etcdir="$pkgdir/etc" xkbdir= install-linux - install -D -m755 "$srcdir"/console-setup.initd "$pkgdir"/etc/init.d/console-setup -} - -fonts() { - pkgdesc="Console fonts for use with $pkgname" - mkdir -p "$subpkgdir"/usr/share - mv "$pkgdir"/usr/share/consolefonts "$subpkgdir"/usr/share/ -} - -keymaps() { - pkgdesc="Keyboard layouts for use with $pkgname" - mkdir -p "$subpkgdir"/etc/console-setup - mv "$pkgdir"/etc/console-setup/ckb "$subpkgdir"/etc/console-setup/ -} - -ckbcomp() { - pkgdesc="XKB keyboard layout translation utility" - depends="perl" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/ckbcomp "$subpkgdir"/usr/bin/ -} - -sha512sums="f9ee8df45cfb78dea12b1ba3020e32f245dd940bc1d22801849f673f4448853c0ebadb6944a92b462e3e56c59ee13fd6d2130c260a1a406e1bb1c72e9902c04d console-setup_1.195.tar.xz -3b8e2c9d8551f9a51bcd33e58771a4f55ff2840f8fe392e0070bd2b6a3911cd9ed9377873538f6904fd99836ac4e0280c712be69d275aae9183dd12ff7efddae console-setup.initd" diff --git a/system/console-setup/console-setup.initd b/system/console-setup/console-setup.initd deleted file mode 100644 index bf3479566..000000000 --- a/system/console-setup/console-setup.initd +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2007-2015 The OpenRC Authors. -# See the Authors file at the top-level directory of this distribution and -# https://github.com/OpenRC/openrc/blob/master/AUTHORS -# -# This file is part of OpenRC. It is subject to the license terms in -# the LICENSE file found in the top-level directory of this -# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE -# This file may not be copied, modified, propagated, or distributed -# except according to the terms contained in the LICENSE file. - -description="Applies a keymap and font for the consoles." - -depend() -{ - provide keymaps - need localmount termencoding - after bootmisc - keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu -} - -start() -{ - # Force linux keycodes for PPC. - if [ -f /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes ]; then - echo 1 > /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes - fi - - ebegin "Loading default key mappings / font" - setupcon - eend $? "Error loading key mappings / font" || return $? -} diff --git a/system/curl/APKBUILD b/system/curl/APKBUILD index 8303e6d75..fdf8be1e2 100644 --- a/system/curl/APKBUILD +++ b/system/curl/APKBUILD @@ -10,7 +10,7 @@ url="https://curl.haxx.se" arch="all" license="MIT" depends="ca-certificates" -makedepends_build="groff perl" +makedepends_build="perl" makedepends_host="zlib-dev openssl-dev libssh2-dev" makedepends="$makedepends_build $makedepends_host" source="https://curl.haxx.se/download/$pkgname-$pkgver.tar.xz" diff --git a/system/dash/APKBUILD b/system/dash/APKBUILD index 8abd44b65..a305b2121 100644 --- a/system/dash/APKBUILD +++ b/system/dash/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=dash -pkgver=0.5.10.2 +pkgver=0.5.11.1 pkgrel=0 pkgdesc="Small and fast POSIX-compliant shell" url="http://gondor.apana.org.au/~herbert/dash/" @@ -41,4 +41,4 @@ binsh() { ln -s /bin/dash "$subpkgdir"/bin/sh } -sha512sums="0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640 dash-0.5.10.2.tar.gz" +sha512sums="6403ac793c87c9101bd5f3b2df74200ce1a992d0c432aa79375d4479b87c83279f303239af5080728c8a64ef4520e39fe8f0f1e037a0a38ffce1e4dd057d9c72 dash-0.5.11.1.tar.gz" diff --git a/system/debianutils/APKBUILD b/system/debianutils/APKBUILD index d3f7d1ce8..ef7ba098e 100644 --- a/system/debianutils/APKBUILD +++ b/system/debianutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=debianutils -pkgver=4.9.1 +pkgver=4.11 pkgrel=0 pkgdesc="Miscellaneous utilities from Debian" url="https://packages.qa.debian.org/d/debianutils.html" @@ -37,4 +37,4 @@ which() { mv "${pkgdir}-doc"/usr/share/man/man1/which* "$subpkgdir"/usr/share/man/man1/ } -sha512sums="b442950febe6df9e15ec04a6fec0ee8be12d3eac38dc3f9331438d871e3382f4e0f599da0eaeff0e7e9ba0fa5136ce3c3b51c6718e4d7f11c1675f745052a9b1 debianutils_4.9.1.tar.xz" +sha512sums="87f6b7d9fecbaff615a5529328d384d8adf4ed69c8cc00acc54681d91fc146f4241a761dde2c9b092cb279b63d30dcaa6c2d0309ef4d29d6a2b09600c53c0ac6 debianutils_4.11.tar.xz" diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index a94f0e725..c22db250f 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -33,6 +33,9 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgmin asound-syntax-fix.patch kernel.h uapi-iphdr.patch + therm_windtunnel.patch + windfarm.patch + windfarm_pm112.patch " builddir="$srcdir/linux-${_pkgminver}" @@ -143,4 +146,7 @@ e5f8f07c588ebbaa53166711b9940aa6d14a72e017df50300f3817c34a1abc2931f191431246d313 581da20b2e0db48fcb29fe97ce6cf5d2e6a7092cbe2fd1b48cbdaddc1bc15d24e2470e56394624ff61b94b6ccf25035d07a18d9cbc4c16ac7f2865913a13c0d8 config-m68k 4b2cd7dd0010aaec617c756e7587be7fad6ff0ab3dbc1ed038e3dc72c9308fc9e347c6e5296c30711d914e286aa254600586e2ad954a5da226e6e4c1522b75b5 asound-syntax-fix.patch 61dcd633d72876566b7738dd08856b26850c935b4a81ab2364711335fe01c397083160f530b3382bbc239c6a8135be6a032e93039083ec2cefdae2902429a2e0 kernel.h -6f309a18c65c991240265afd200cc79a706f5d9e5d072838a9a641ab3676a5e4c32033f9767fc723ff4c45ee462169a0f77bd7dfe63b547d521dadd073f827a7 uapi-iphdr.patch" +6f309a18c65c991240265afd200cc79a706f5d9e5d072838a9a641ab3676a5e4c32033f9767fc723ff4c45ee462169a0f77bd7dfe63b547d521dadd073f827a7 uapi-iphdr.patch +33d1565228bfeed362f9ebf3a4a260469902d96002e7805516f705fafd7a488dfbe7683d911f6cb3e5293d02af026fb8fe593c058b6361457d7333323b3eabe7 therm_windtunnel.patch +b83ed1db626211b38c2308902306ccb4f2e215f1d82356a0fe3798e227239586817ef341b5298e227cbf436ef3c19af80eb449cbd98c373f1de5dd461a1fdb4b windfarm.patch +e5667717e988d28b8450ffd06d6402212c26da992c2e8aa041f37e21cc3c1fbf54712a8216ebd3ef8ae59ac48c8ecdde5596a8c25028338f782b615c4a6c232c windfarm_pm112.patch" diff --git a/system/easy-kernel/therm_windtunnel.patch b/system/easy-kernel/therm_windtunnel.patch new file mode 100644 index 000000000..5cfb92d7f --- /dev/null +++ b/system/easy-kernel/therm_windtunnel.patch @@ -0,0 +1,136 @@ +From 176cacef0119a441af14ccdfa125461635a1054d Mon Sep 17 00:00:00 2001 +From: Wolfram Sang <wsa@the-dreams.de> +Date: Tue, 25 Feb 2020 15:12:29 +0100 +Subject: [PATCH] macintosh: therm_windtunnel: fix regression when + instantiating devices + +commit 38b17afb0ebb9ecd41418d3c08bcf9198af4349d upstream. + +Removing attach_adapter from this driver caused a regression for at +least some machines. Those machines had the sensors described in their +DT, too, so they didn't need manual creation of the sensor devices. The +old code worked, though, because manual creation came first. Creation of +DT devices then failed later and caused error logs, but the sensors +worked nonetheless because of the manually created devices. + +When removing attach_adaper, manual creation now comes later and loses +the race. The sensor devices were already registered via DT, yet with +another binding, so the driver could not be bound to it. + +This fix refactors the code to remove the race and only manually creates +devices if there are no DT nodes present. Also, the DT binding is updated +to match both, the DT and manually created devices. Because we don't +know which device creation will be used at runtime, the code to start +the kthread is moved to do_probe() which will be called by both methods. + +Fixes: 3e7bed52719d ("macintosh: therm_windtunnel: drop using attach_adapter") +Link: https://bugzilla.kernel.org/show_bug.cgi?id=201723 +Reported-by: Erhard Furtner <erhard_f@mailbox.org> +Tested-by: Erhard Furtner <erhard_f@mailbox.org> +Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) +Signed-off-by: Wolfram Sang <wsa@the-dreams.de> +Cc: stable@kernel.org # v4.19+ +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/macintosh/therm_windtunnel.c | 52 +++++++++++++++++----------- + 1 file changed, 31 insertions(+), 21 deletions(-) + +diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c +index 8c744578122a..a0d87ed9da69 100644 +--- a/drivers/macintosh/therm_windtunnel.c ++++ b/drivers/macintosh/therm_windtunnel.c +@@ -300,9 +300,11 @@ static int control_loop(void *dummy) + /* i2c probing and setup */ + /************************************************************************/ + +-static int +-do_attach( struct i2c_adapter *adapter ) ++static void do_attach(struct i2c_adapter *adapter) + { ++ struct i2c_board_info info = { }; ++ struct device_node *np; ++ + /* scan 0x48-0x4f (DS1775) and 0x2c-2x2f (ADM1030) */ + static const unsigned short scan_ds1775[] = { + 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, +@@ -313,25 +315,24 @@ do_attach( struct i2c_adapter *adapter ) + I2C_CLIENT_END + }; + +- if( strncmp(adapter->name, "uni-n", 5) ) +- return 0; +- +- if( !x.running ) { +- struct i2c_board_info info; ++ if (x.running || strncmp(adapter->name, "uni-n", 5)) ++ return; + +- memset(&info, 0, sizeof(struct i2c_board_info)); +- strlcpy(info.type, "therm_ds1775", I2C_NAME_SIZE); ++ np = of_find_compatible_node(adapter->dev.of_node, NULL, "MAC,ds1775"); ++ if (np) { ++ of_node_put(np); ++ } else { ++ strlcpy(info.type, "MAC,ds1775", I2C_NAME_SIZE); + i2c_new_probed_device(adapter, &info, scan_ds1775, NULL); ++ } + +- strlcpy(info.type, "therm_adm1030", I2C_NAME_SIZE); ++ np = of_find_compatible_node(adapter->dev.of_node, NULL, "MAC,adm1030"); ++ if (np) { ++ of_node_put(np); ++ } else { ++ strlcpy(info.type, "MAC,adm1030", I2C_NAME_SIZE); + i2c_new_probed_device(adapter, &info, scan_adm1030, NULL); +- +- if( x.thermostat && x.fan ) { +- x.running = 1; +- x.poll_task = kthread_run(control_loop, NULL, "g4fand"); +- } + } +- return 0; + } + + static int +@@ -404,8 +405,8 @@ attach_thermostat( struct i2c_client *cl ) + enum chip { ds1775, adm1030 }; + + static const struct i2c_device_id therm_windtunnel_id[] = { +- { "therm_ds1775", ds1775 }, +- { "therm_adm1030", adm1030 }, ++ { "MAC,ds1775", ds1775 }, ++ { "MAC,adm1030", adm1030 }, + { } + }; + MODULE_DEVICE_TABLE(i2c, therm_windtunnel_id); +@@ -414,6 +415,7 @@ static int + do_probe(struct i2c_client *cl, const struct i2c_device_id *id) + { + struct i2c_adapter *adapter = cl->adapter; ++ int ret = 0; + + if( !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA + | I2C_FUNC_SMBUS_WRITE_BYTE) ) +@@ -421,11 +423,19 @@ do_probe(struct i2c_client *cl, const struct i2c_device_id *id) + + switch (id->driver_data) { + case adm1030: +- return attach_fan( cl ); ++ ret = attach_fan(cl); ++ break; + case ds1775: +- return attach_thermostat(cl); ++ ret = attach_thermostat(cl); ++ break; + } +- return 0; ++ ++ if (!x.running && x.thermostat && x.fan) { ++ x.running = 1; ++ x.poll_task = kthread_run(control_loop, NULL, "g4fand"); ++ } ++ ++ return ret; + } + + static struct i2c_driver g4fan_driver = { diff --git a/system/easy-kernel/windfarm.patch b/system/easy-kernel/windfarm.patch new file mode 100644 index 000000000..bad7fe159 --- /dev/null +++ b/system/easy-kernel/windfarm.patch @@ -0,0 +1,182 @@ +From f19bbb24a1082b2790eb113fcc5cd55fca340f49 Mon Sep 17 00:00:00 2001 +From: Wolfram Sang <wsa@the-dreams.de> +Date: Tue, 3 Mar 2020 13:50:46 +0100 +Subject: [PATCH] macintosh: windfarm: fix MODINFO regression + +commit bcf3588d8ed3517e6ffaf083f034812aee9dc8e2 upstream. + +Commit af503716ac14 made sure OF devices get an OF style modalias with +I2C events. It assumed all in-tree users were converted, yet it missed +some Macintosh drivers. + +Add an OF module device table for all windfarm drivers to make them +automatically load again. + +Fixes: af503716ac14 ("i2c: core: report OF style module alias for devices registered via OF") +Link: https://bugzilla.kernel.org/show_bug.cgi?id=199471 +Reported-by: Erhard Furtner <erhard_f@mailbox.org> +Tested-by: Erhard Furtner <erhard_f@mailbox.org> +Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) +Signed-off-by: Wolfram Sang <wsa@the-dreams.de> +Cc: stable@kernel.org # v4.17+ +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/macintosh/windfarm_ad7417_sensor.c | 7 +++++++ + drivers/macintosh/windfarm_fcu_controls.c | 7 +++++++ + drivers/macintosh/windfarm_lm75_sensor.c | 16 +++++++++++++++- + drivers/macintosh/windfarm_lm87_sensor.c | 7 +++++++ + drivers/macintosh/windfarm_max6690_sensor.c | 7 +++++++ + drivers/macintosh/windfarm_smu_sat.c | 7 +++++++ + 6 files changed, 50 insertions(+), 1 deletion(-) + +diff --git a/drivers/macintosh/windfarm_ad7417_sensor.c b/drivers/macintosh/windfarm_ad7417_sensor.c +index 125605987b44..e7dec328c7cf 100644 +--- a/drivers/macintosh/windfarm_ad7417_sensor.c ++++ b/drivers/macintosh/windfarm_ad7417_sensor.c +@@ -312,9 +312,16 @@ static const struct i2c_device_id wf_ad7417_id[] = { + }; + MODULE_DEVICE_TABLE(i2c, wf_ad7417_id); + ++static const struct of_device_id wf_ad7417_of_id[] = { ++ { .compatible = "ad7417", }, ++ { } ++}; ++MODULE_DEVICE_TABLE(of, wf_ad7417_of_id); ++ + static struct i2c_driver wf_ad7417_driver = { + .driver = { + .name = "wf_ad7417", ++ .of_match_table = wf_ad7417_of_id, + }, + .probe = wf_ad7417_probe, + .remove = wf_ad7417_remove, +diff --git a/drivers/macintosh/windfarm_fcu_controls.c b/drivers/macintosh/windfarm_fcu_controls.c +index 3c971297b6dc..89b48e8ac6ef 100644 +--- a/drivers/macintosh/windfarm_fcu_controls.c ++++ b/drivers/macintosh/windfarm_fcu_controls.c +@@ -582,9 +582,16 @@ static const struct i2c_device_id wf_fcu_id[] = { + }; + MODULE_DEVICE_TABLE(i2c, wf_fcu_id); + ++static const struct of_device_id wf_fcu_of_id[] = { ++ { .compatible = "fcu", }, ++ { } ++}; ++MODULE_DEVICE_TABLE(of, wf_fcu_of_id); ++ + static struct i2c_driver wf_fcu_driver = { + .driver = { + .name = "wf_fcu", ++ .of_match_table = wf_fcu_of_id, + }, + .probe = wf_fcu_probe, + .remove = wf_fcu_remove, +diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c +index 282c28a17ea1..1e5fa09845e7 100644 +--- a/drivers/macintosh/windfarm_lm75_sensor.c ++++ b/drivers/macintosh/windfarm_lm75_sensor.c +@@ -14,6 +14,7 @@ + #include <linux/init.h> + #include <linux/wait.h> + #include <linux/i2c.h> ++#include <linux/of_device.h> + #include <asm/prom.h> + #include <asm/machdep.h> + #include <asm/io.h> +@@ -91,9 +92,14 @@ static int wf_lm75_probe(struct i2c_client *client, + const struct i2c_device_id *id) + { + struct wf_lm75_sensor *lm; +- int rc, ds1775 = id->driver_data; ++ int rc, ds1775; + const char *name, *loc; + ++ if (id) ++ ds1775 = id->driver_data; ++ else ++ ds1775 = !!of_device_get_match_data(&client->dev); ++ + DBG("wf_lm75: creating %s device at address 0x%02x\n", + ds1775 ? "ds1775" : "lm75", client->addr); + +@@ -164,9 +170,17 @@ static const struct i2c_device_id wf_lm75_id[] = { + }; + MODULE_DEVICE_TABLE(i2c, wf_lm75_id); + ++static const struct of_device_id wf_lm75_of_id[] = { ++ { .compatible = "lm75", .data = (void *)0}, ++ { .compatible = "ds1775", .data = (void *)1 }, ++ { } ++}; ++MODULE_DEVICE_TABLE(of, wf_lm75_of_id); ++ + static struct i2c_driver wf_lm75_driver = { + .driver = { + .name = "wf_lm75", ++ .of_match_table = wf_lm75_of_id, + }, + .probe = wf_lm75_probe, + .remove = wf_lm75_remove, +diff --git a/drivers/macintosh/windfarm_lm87_sensor.c b/drivers/macintosh/windfarm_lm87_sensor.c +index e44525b19071..1a1f8f3f0abc 100644 +--- a/drivers/macintosh/windfarm_lm87_sensor.c ++++ b/drivers/macintosh/windfarm_lm87_sensor.c +@@ -166,9 +166,16 @@ static const struct i2c_device_id wf_lm87_id[] = { + }; + MODULE_DEVICE_TABLE(i2c, wf_lm87_id); + ++static const struct of_device_id wf_lm87_of_id[] = { ++ { .compatible = "lm87cimt", }, ++ { } ++}; ++MODULE_DEVICE_TABLE(of, wf_lm87_of_id); ++ + static struct i2c_driver wf_lm87_driver = { + .driver = { + .name = "wf_lm87", ++ .of_match_table = wf_lm87_of_id, + }, + .probe = wf_lm87_probe, + .remove = wf_lm87_remove, +diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c +index e666cc020683..1e7b03d44ad9 100644 +--- a/drivers/macintosh/windfarm_max6690_sensor.c ++++ b/drivers/macintosh/windfarm_max6690_sensor.c +@@ -120,9 +120,16 @@ static const struct i2c_device_id wf_max6690_id[] = { + }; + MODULE_DEVICE_TABLE(i2c, wf_max6690_id); + ++static const struct of_device_id wf_max6690_of_id[] = { ++ { .compatible = "max6690", }, ++ { } ++}; ++MODULE_DEVICE_TABLE(of, wf_max6690_of_id); ++ + static struct i2c_driver wf_max6690_driver = { + .driver = { + .name = "wf_max6690", ++ .of_match_table = wf_max6690_of_id, + }, + .probe = wf_max6690_probe, + .remove = wf_max6690_remove, +diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c +index c84ec49c3741..cb75dc035616 100644 +--- a/drivers/macintosh/windfarm_smu_sat.c ++++ b/drivers/macintosh/windfarm_smu_sat.c +@@ -341,9 +341,16 @@ static const struct i2c_device_id wf_sat_id[] = { + }; + MODULE_DEVICE_TABLE(i2c, wf_sat_id); + ++static const struct of_device_id wf_sat_of_id[] = { ++ { .compatible = "smu-sat", }, ++ { } ++}; ++MODULE_DEVICE_TABLE(of, wf_sat_of_id); ++ + static struct i2c_driver wf_sat_driver = { + .driver = { + .name = "wf_smu_sat", ++ .of_match_table = wf_sat_of_id, + }, + .probe = wf_sat_probe, + .remove = wf_sat_remove, diff --git a/system/easy-kernel/windfarm_pm112.patch b/system/easy-kernel/windfarm_pm112.patch new file mode 100644 index 000000000..2b8e8a3ec --- /dev/null +++ b/system/easy-kernel/windfarm_pm112.patch @@ -0,0 +1,99 @@ +From c6077abc067fb6bf57a2b1acffd918b1b9211047 Mon Sep 17 00:00:00 2001 +From: Michael Ellerman <mpe@ellerman.id.au> +Date: Thu, 23 Apr 2020 16:00:38 +1000 +Subject: [PATCH] drivers/macintosh: Fix memleak in windfarm_pm112 driver + +commit 93900337b9ac2f4eca427eff6d187be2dc3b5551 upstream. + +create_cpu_loop() calls smu_sat_get_sdb_partition() which does +kmalloc() and returns the allocated buffer. In fact it's called twice, +and neither buffer is freed. + +This results in a memory leak as reported by Erhard: + unreferenced object 0xc00000047081f840 (size 32): + comm "kwindfarm", pid 203, jiffies 4294880630 (age 5552.877s) + hex dump (first 32 bytes): + c8 06 02 7f ff 02 ff 01 fb bf 00 41 00 20 00 00 ...........A. .. + 00 07 89 37 00 a0 00 00 00 00 00 00 00 00 00 00 ...7............ + backtrace: + [<0000000083f0a65c>] .smu_sat_get_sdb_partition+0xc4/0x2d0 [windfarm_smu_sat] + [<000000003010fcb7>] .pm112_wf_notify+0x104c/0x13bc [windfarm_pm112] + [<00000000b958b2dd>] .notifier_call_chain+0xa8/0x180 + [<0000000070490868>] .blocking_notifier_call_chain+0x64/0x90 + [<00000000131d8149>] .wf_thread_func+0x114/0x1a0 + [<000000000d54838d>] .kthread+0x13c/0x190 + [<00000000669b72bc>] .ret_from_kernel_thread+0x58/0x64 + unreferenced object 0xc0000004737089f0 (size 16): + comm "kwindfarm", pid 203, jiffies 4294880879 (age 5552.050s) + hex dump (first 16 bytes): + c4 04 01 7f 22 11 e0 e6 ff 55 7b 12 ec 11 00 00 ...."....U{..... + backtrace: + [<0000000083f0a65c>] .smu_sat_get_sdb_partition+0xc4/0x2d0 [windfarm_smu_sat] + [<00000000b94ef7e1>] .pm112_wf_notify+0x1294/0x13bc [windfarm_pm112] + [<00000000b958b2dd>] .notifier_call_chain+0xa8/0x180 + [<0000000070490868>] .blocking_notifier_call_chain+0x64/0x90 + [<00000000131d8149>] .wf_thread_func+0x114/0x1a0 + [<000000000d54838d>] .kthread+0x13c/0x190 + [<00000000669b72bc>] .ret_from_kernel_thread+0x58/0x64 + +Fix it by rearranging the logic so we deal with each buffer +separately, which then makes it easy to free the buffer once we're +done with it. + +Fixes: ac171c46667c ("[PATCH] powerpc: Thermal control for dual core G5s") +Cc: stable@vger.kernel.org # v2.6.16+ +Reported-by: Erhard F. <erhard_f@mailbox.org> +Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Tested-by: Erhard F. <erhard_f@mailbox.org> +Link: https://lore.kernel.org/r/20200423060038.3308530-1-mpe@ellerman.id.au +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/macintosh/windfarm_pm112.c | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +diff --git a/drivers/macintosh/windfarm_pm112.c b/drivers/macintosh/windfarm_pm112.c +index 4150301a89a5..e8377ce0a95a 100644 +--- a/drivers/macintosh/windfarm_pm112.c ++++ b/drivers/macintosh/windfarm_pm112.c +@@ -132,14 +132,6 @@ static int create_cpu_loop(int cpu) + s32 tmax; + int fmin; + +- /* Get PID params from the appropriate SAT */ +- hdr = smu_sat_get_sdb_partition(chip, 0xC8 + core, NULL); +- if (hdr == NULL) { +- printk(KERN_WARNING"windfarm: can't get CPU PID fan config\n"); +- return -EINVAL; +- } +- piddata = (struct smu_sdbp_cpupiddata *)&hdr[1]; +- + /* Get FVT params to get Tmax; if not found, assume default */ + hdr = smu_sat_get_sdb_partition(chip, 0xC4 + core, NULL); + if (hdr) { +@@ -152,6 +144,16 @@ static int create_cpu_loop(int cpu) + if (tmax < cpu_all_tmax) + cpu_all_tmax = tmax; + ++ kfree(hdr); ++ ++ /* Get PID params from the appropriate SAT */ ++ hdr = smu_sat_get_sdb_partition(chip, 0xC8 + core, NULL); ++ if (hdr == NULL) { ++ printk(KERN_WARNING"windfarm: can't get CPU PID fan config\n"); ++ return -EINVAL; ++ } ++ piddata = (struct smu_sdbp_cpupiddata *)&hdr[1]; ++ + /* + * Darwin has a minimum fan speed of 1000 rpm for the 4-way and + * 515 for the 2-way. That appears to be overkill, so for now, +@@ -174,6 +176,9 @@ static int create_cpu_loop(int cpu) + pid.min = fmin; + + wf_cpu_pid_init(&cpu_pid[cpu], &pid); ++ ++ kfree(hdr); ++ + return 0; + } + diff --git a/system/ed/APKBUILD b/system/ed/APKBUILD index d13ab5a2b..f57513f33 100644 --- a/system/ed/APKBUILD +++ b/system/ed/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=ed -pkgver=1.15 +pkgver=1.16 pkgrel=0 pkgdesc="GNU version of standard text editor" url="https://www.gnu.org/software/ed/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="27a16db41e88626b9718b1868f2fc629b609e436aca2450846f87492c61bf60cec3db0c54ff9a421d9bcbf59fe91a8c672aee5772e1b1eec8a365f227c30ecba ed-1.15.tar.lz" +sha512sums="1ca999edd7007c56bf9aa91436997a813e665910dda19a3307fa5b85adc05667eb120cb54cb6544b919f1c7f631baf3ee03079abe1171b875fb9653f535fa7bd ed-1.16.tar.lz" diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD index 252daeb63..9565e76d5 100644 --- a/system/execline/APKBUILD +++ b/system/execline/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=execline -pkgver=2.6.0.0 +pkgver=2.6.1.0 pkgrel=0 pkgdesc="A small scripting language for non-interactive scripts" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9.1.0 +_skalibs_version=2.9.2.1 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" @@ -61,5 +61,4 @@ doc() { mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } - -sha512sums="890a533a6ffad98b066adda34ae4a7e69daa98950974fcdb4635cff4c8957851b7fc6beaf25802c7ed5085285fc9b2aa9d9806afdb1aaa6884745a978b969f7a execline-2.6.0.0.tar.gz" +sha512sums="5bddf400f4cddeb8ddf8c80415c426553f14c879feeb4e69d5e21adb517c76a781581e8b4769c8560b56dc6f89f10a8b38fcf296baa6989b86c73bdb2cd6603e execline-2.6.1.0.tar.gz" diff --git a/system/file/APKBUILD b/system/file/APKBUILD index 57cf3346b..b2968c3ca 100644 --- a/system/file/APKBUILD +++ b/system/file/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=file -pkgver=5.38 +pkgver=5.39 pkgrel=0 pkgdesc="File type identification utility" url="http://www.darwinsys.com/file/" @@ -41,4 +41,4 @@ libmagic() { mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr } -sha512sums="b8920b0b886600b50ef83d949028972e99830d5ac2e9545a5ff7177e5f4c3db20bfc00884d6b6961e4707a920f0290c59ae89439a02cd8cc2a8673284c4100c4 file-5.38.tar.gz" +sha512sums="5633bf2fffc0eda03f2e8cdc8a413f4e97dab6f12f4a5727ec0f4ba6595f2887579612fe508d5d76bbc8bd63d344ed07ee60e0a17e42f4f2d9d9490574a32633 file-5.39.tar.gz" diff --git a/system/help2man/APKBUILD b/system/help2man/APKBUILD index 0bb2530e1..b98b576c3 100644 --- a/system/help2man/APKBUILD +++ b/system/help2man/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=help2man -pkgver=1.47.13 +pkgver=1.47.16 pkgrel=0 pkgdesc="Create simple man pages from --help output" url="https://www.gnu.org/software/help2man" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7bf4c75a42c103dd8413a94505f383c6e2b215f9a4cc506e11935acc7f108caad01a5fa489ee157ebef5fa02299145592f65cc828fc016417af557382975d57a help2man-1.47.13.tar.xz" +sha512sums="b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544 help2man-1.47.16.tar.xz" diff --git a/system/kbd/APKBUILD b/system/kbd/APKBUILD index d54e7f29c..144ddcefc 100644 --- a/system/kbd/APKBUILD +++ b/system/kbd/APKBUILD @@ -2,18 +2,25 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbd pkgver=2.2.0_git20190823 -pkgrel=0 +pkgrel=2 pkgdesc="Console keyboard and font management utilities" -url=" " +url="https://kbd-project.org/" arch="all" options="!check" # padding error on at least ppc64 license="GPL-2.0+" depends="" checkdepends="check-dev" makedepends="linux-headers linux-pam-dev autoconf automake libtool" -subpackages="$pkgname-doc $pkgname-fonts::noarch $pkgname-keymaps::noarch - $pkgname-lang" -source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.xz" +provides="$pkgname-keymaps" +replaces="$pkgname-keymaps" +subpackages="$pkgname-doc $pkgname-fonts::noarch + $pkgname-lang $pkgname-openrc" +source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.xz + consolefont.confd + consolefont.initd + keymaps.confd + keymaps.initd + " prepare() { default_prepare @@ -37,6 +44,19 @@ check() { package() { make DESTDIR="$pkgdir" install + + for i in consolefont keymaps; do + install -Dm644 "$srcdir"/$i.confd \ + "$pkgdir"/etc/conf.d/$i + install -Dm755 "$srcdir"/$i.initd \ + "$pkgdir"/etc/init.d/$i + done +} + +openrc() { + default_openrc + license="BSD-2-Clause" + replaces="openrc<0.24.1-r10" } fonts() { @@ -44,12 +64,8 @@ fonts() { mkdir -p "$subpkgdir"/usr/share mv "$pkgdir"/usr/share/consolefonts "$subpkgdir"/usr/share/ } - -keymaps() { - pkgdesc="Legacy keymaps shipped with Linux kbd tools" - mkdir -p "$subpkgdir"/usr/share - mv "$pkgdir"/usr/share/keymaps "$subpkgdir"/usr/share/ - mv "$pkgdir"/usr/share/unimaps "$subpkgdir"/usr/share/ -} - -sha512sums="7f6202aeb17d6224095447a92d999478220457e1e7cadb90a7c40ca7f3b0c5b1f672db1995fb69652ca37558a75df582bfb5fea5772f3b1e040fe39f8f54504e kbd-2.2.0_git20190823.tar.xz" +sha512sums="7f6202aeb17d6224095447a92d999478220457e1e7cadb90a7c40ca7f3b0c5b1f672db1995fb69652ca37558a75df582bfb5fea5772f3b1e040fe39f8f54504e kbd-2.2.0_git20190823.tar.xz +837054b29050b955b4c3f1ddd6481c79792a66e2415bafbcfbf3e12a27066ddd3ce35e069448dfb1b2a00e843cec180dd6940edbd9014cd2a0c2aaa1b76c9fb0 consolefont.confd +1e67f75f27ec5de8f71489c83f78e53e8fd0925ae2d82dabf516f98905c5aff206a8e943e92b6af413eae5f0ecb9c2240526dfc3c56811a8dc1d19ced561bba3 consolefont.initd +9391671bbe8b3b7b4eba63ff4e4b7f17297712393abca69f0e24e3a5304a545faa213de8bc799de922b69ee52048d6e6cf352d7213b459991286ef6dea77e8c3 keymaps.confd +510d7eb582a914fa7cfb868d0c3d55a21ee1519033117d0943a153528b5810d09f6421ddc02d93906c1a66fb7e07e86240f38dad0d38cfb5a8c7e9a6335a937f keymaps.initd" diff --git a/system/kbd/consolefont.confd b/system/kbd/consolefont.confd new file mode 100644 index 000000000..9e8a30505 --- /dev/null +++ b/system/kbd/consolefont.confd @@ -0,0 +1,20 @@ +# The consolefont service is not activated by default. If you need to +# use it, you should run "rc-update add consolefont boot" as root. +# +# consolefont specifies the default font that you'd like Linux to use on the +# console. You will have to install a package such as kbd-fonts or +# terminus-font to have a selection; they will be installed in +# /usr/share/consolefonts. +# +# The following (from terminus-font) is a good font for HiDPI screens. +#consolefont="ter-i32n" + +# consoletranslation is the charset map file to use. Leave commented to use +# the default one. Have a look in /usr/share/consoletrans for a selection of +# map files you can use. +#consoletranslation="8859-1_to_uni" + +# unicodemap is the unicode map file to use. Leave commented to use the +# default one. Have a look in /usr/share/unimaps for a selection of map +# files you can use. +#unicodemap="iso01" diff --git a/system/kbd/consolefont.initd b/system/kbd/consolefont.initd new file mode 100644 index 000000000..63d8601c5 --- /dev/null +++ b/system/kbd/consolefont.initd @@ -0,0 +1,70 @@ +#!/sbin/openrc-run +# Copyright (c) 2007-2015 The OpenRC Authors. +# See the Authors file at the top-level directory of this distribution and +# https://github.com/OpenRC/openrc/blob/master/AUTHORS +# +# This file is part of OpenRC. It is subject to the license terms in +# the LICENSE file found in the top-level directory of this +# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE +# This file may not be copied, modified, propagated, or distributed +# except according to the terms contained in the LICENSE file. + +description="Sets a font for the consoles." + +depend() +{ + need localmount termencoding + after hotplug bootmisc modules + keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu +} + +start() +{ + ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} + consolefont=${consolefont:-${CONSOLEFONT}} + unicodemap=${unicodemap:-${UNICODEMAP}} + consoletranslation=${consoletranslation:-${CONSOLETRANSLATION}} + + if [ -z "$consolefont" ]; then + ebegin "Using the default console font" + eend 0 + return 0 + fi + + if [ "$ttyn" = 0 ]; then + ebegin "Skipping font setup (rc_tty_number == 0)" + eend 0 + return 0 + fi + + local x= param= sf_param= retval=0 ttydev=/dev/tty + + # Get additional parameters + if [ -n "$consoletranslation" ]; then + param="$param -m $consoletranslation" + fi + if [ -n "${unicodemap}" ]; then + param="$param -u $unicodemap" + fi + + # Set the console font + ebegin "Setting console font [$consolefont]" + [ -d /dev/vc ] && ttydev=/dev/vc/ + x=1 + while [ $x -le $ttyn ]; do + if ! setfont $consolefont $param -C $ttydev$x >/dev/null; then + retval=1 + break + fi + : $(( x += 1 )) + done + eend $retval + + # Store the font so we can use it ASAP on boot + if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then + mkdir -p "$RC_LIBEXECDIR"/console + setfont -O "$RC_LIBEXECDIR"/console/font + fi + + return $retval +} diff --git a/system/kbd/keymaps.confd b/system/kbd/keymaps.confd new file mode 100644 index 000000000..30e65188a --- /dev/null +++ b/system/kbd/keymaps.confd @@ -0,0 +1,23 @@ +# Use keymap to specify the default console keymap. There is a complete tree +# of keymaps in /usr/share/keymaps to choose from. +keymap="us" + +# Should we first load the 'windowkeys' console keymap? Most x86 users will +# say "yes" here. Note that non-x86 users should leave it as "no". +# Loading this keymap will enable VT switching (like ALT+Left/Right) +# using the special windows keys on the linux console. +windowkeys="NO" + +# The maps to load for extended keyboards. Most users will leave this as is. +extended_keymaps="" +#extended_keymaps="backspace keypad euro2" + +# Tell dumpkeys(1) to interpret character action codes to be +# from the specified character set. +# This only matters if you set unicode="yes" in /etc/rc.conf. +# For a list of valid sets, run `dumpkeys --help` +dumpkeys_charset="" + +# Some fonts map AltGr-E to the currency symbol instead of the Euro. +# To fix this, set to "yes" +fix_euro="NO" diff --git a/system/kbd/keymaps.initd b/system/kbd/keymaps.initd new file mode 100644 index 000000000..49e41b0e7 --- /dev/null +++ b/system/kbd/keymaps.initd @@ -0,0 +1,77 @@ +#!/sbin/openrc-run +# Copyright (c) 2007-2015 The OpenRC Authors. +# See the Authors file at the top-level directory of this distribution and +# https://github.com/OpenRC/openrc/blob/master/AUTHORS +# +# This file is part of OpenRC. It is subject to the license terms in +# the LICENSE file found in the top-level directory of this +# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE +# This file may not be copied, modified, propagated, or distributed +# except according to the terms contained in the LICENSE file. + +description="Applies a keymap for the consoles." + +depend() +{ + need localmount termencoding + after bootmisc + keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu +} + +start() +{ + ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} + : ${unicode:=$UNICODE} + : ${keymap:=$KEYMAP} + : ${extended_keymaps:=$EXTENDED_KEYMAPS} + : ${windowkeys:=$SET_WINDOWSKEYS} + : ${fix_euro:=$FIX_EURO} + : ${dumpkeys_charset:=${DUMPKEYS_CHARSET}} + + if [ -z "$keymap" ]; then + eerror "You need to setup keymap in /etc/conf.d/keymaps first" + return 1 + fi + + local ttydev=/dev/tty n= + [ -d /dev/vc ] && ttydev=/dev/vc/ + + # Force linux keycodes for PPC. + if [ -f /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes ]; then + echo 1 > /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes + fi + + local wkeys= kmode="-a" msg="ASCII" + if yesno $unicode; then + kmode="-u" + msg="UTF-8" + fi + yesno $windowkeys && wkeys="windowkeys" + + # Set terminal encoding to either ASCII or UNICODE. + # See utf-8(7) for more information. + ebegin "Setting keyboard mode [$msg]" + n=1 + while [ $n -le $ttyn ]; do + kbd_mode $kmode -C $ttydev$n + : $(( n += 1 )) + done + eend 0 + + ebegin "Loading key mappings [$keymap]" + loadkeys -q $wkeys $keymap $extended_keymaps + eend $? "Error loading key mappings" || return $? + + if yesno $fix_euro; then + ebegin "Fixing font for euro symbol" + # Fix some fonts displaying the Euro, #173528. + echo "altgr keycode 18 = U+20AC" | loadkeys -q - + eend $? + fi + + # Save the keymapping for use immediately at boot + if checkpath -W "$RC_LIBEXECDIR"; then + mkdir -p "$RC_LIBEXECDIR"/console + dumpkeys >"$RC_LIBEXECDIR"/console/keymap + fi +} diff --git a/system/libarchive/APKBUILD b/system/libarchive/APKBUILD index a805b3b10..76c1f7833 100644 --- a/system/libarchive/APKBUILD +++ b/system/libarchive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libarchive -pkgver=3.4.2 +pkgver=3.4.3 pkgrel=0 pkgdesc="Multi-format archive and compression library" url="https://libarchive.org/" @@ -56,5 +56,5 @@ tools() { ln -s bsdcpio "$subpkgdir"/usr/bin/cpio } -sha512sums="a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021 libarchive-3.4.2.tar.gz +sha512sums="d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d libarchive-3.4.3.tar.gz ff2567f243ba7e9ce20bc4f7fa422a922c5c23049004efdd8f71f29f93ab9be9aadd4c100e8c6dca318442d583fbad9bd6466017a23f83af18b9808c718b9fce seek-error.patch" diff --git a/system/libgcrypt/APKBUILD b/system/libgcrypt/APKBUILD index 37fda1300..115b6a9f5 100644 --- a/system/libgcrypt/APKBUILD +++ b/system/libgcrypt/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgcrypt -pkgver=1.8.5 +pkgver=1.8.6 pkgrel=0 pkgdesc="GnuPG cryptography library" url="https://www.gnupg.org" @@ -49,4 +49,4 @@ package() { rm -f ${pkgdir}/usr/share/info/dir } -sha512sums="b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89 libgcrypt-1.8.5.tar.bz2" +sha512sums="28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b libgcrypt-1.8.6.tar.bz2" diff --git a/system/libgpg-error/APKBUILD b/system/libgpg-error/APKBUILD index 31c22df59..a9ee99fdd 100644 --- a/system/libgpg-error/APKBUILD +++ b/system/libgpg-error/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgpg-error -pkgver=1.37 +pkgver=1.38 pkgrel=0 pkgdesc="GnuPG runtime library" url="https://www.gnupg.org" @@ -36,4 +36,4 @@ lisp() { mv "$pkgdir"/usr/share "$subpkgdir"/usr/share/ } -sha512sums="fa12977237fcc872e944cda39ca43ee7d2cc9c52e243ede6077f4a31ae135e322dc848b4b55cffdc4ec53f27601ba30ddb368b090a94cd00d9345a55b323f179 libgpg-error-1.37.tar.bz2" +sha512sums="b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de libgpg-error-1.38.tar.bz2" diff --git a/system/libucontext/APKBUILD b/system/libucontext/APKBUILD index 78b079435..eb9f4a933 100644 --- a/system/libucontext/APKBUILD +++ b/system/libucontext/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libucontext -pkgver=0.10 +pkgver=0.11 pkgrel=0 pkgdesc="Implementation of software-defined threading" url=" " @@ -9,9 +9,7 @@ license="ISC" depends="" makedepends="" subpackages="$pkgname-dev" -source="https://distfiles.dereferenced.org/libucontext/libucontext-$pkgver.tar.xz - git.patch - " +source="https://distfiles.dereferenced.org/libucontext/libucontext-$pkgver.tar.xz" case "$CTARGET_ARCH" in aarch64_be) LIBUCONTEXT_ARCH="aarch64" ;; @@ -33,5 +31,4 @@ package() { make ARCH="$LIBUCONTEXT_ARCH" DESTDIR="$pkgdir" install } -sha512sums="ef04485f66edd94711a15681953aed12652ea3821036e6a5b10d1ba3c0371ffabd689c85ee2403bc6a94544932e64855d8f5412f46b50d8b5a934f70a771fcb1 libucontext-0.10.tar.xz -f3f5da2f76302fb3aeba8cca6e3485f264714ad12160e83ef92785a5f2a318cb4cea88e350df71dd6c976d075525361f36e67467ffb82b30fed6acee11be8095 git.patch" +sha512sums="afc8ea6e03b5f1757aec0035090e0553c58d84c03bab6809cf00df8f12a0a3d5aa6c3516f258f1fb531ff38ba7d39e3f72e450903a159df6e85d22da850cb3bb libucontext-0.11.tar.xz" diff --git a/system/libucontext/git.patch b/system/libucontext/git.patch deleted file mode 100644 index d42ee0803..000000000 --- a/system/libucontext/git.patch +++ /dev/null @@ -1,115 +0,0 @@ -From d7688a41df4cbe51e52bfebbab7d411548ed7738 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Mon, 30 Mar 2020 02:22:43 -0500 -Subject: [PATCH 1/3] README: Remove support section - -This is no longer a member of the gcompat family of projects; -remove the mention of that and the gcompat mailing list link. ---- - README.md | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/README.md b/README.md -index 97a03b6..1db0516 100644 ---- a/README.md -+++ b/README.md -@@ -38,8 +38,3 @@ $ make ARCH=x86_64 check - $ make ARCH=x86_64 DESTDIR=out install - ``` - -- --## support -- --`libucontext` is offered as part of the `gcompat` project. Accordingly, please address all questions --and bug reports to gcompat@lists.adelielinux.org. - -From e2178de76a7d3f41fed7cc5bef3e68eea623a72a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 30 Mar 2020 08:21:20 +0000 -Subject: [PATCH 2/3] Makefile: Add LIBDIR variable - -This ensures that it can be installed into custom location and also - -Upstream-Status: Submitted -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index a8dedc2..74ebdbf 100644 ---- a/Makefile -+++ b/Makefile -@@ -3,6 +3,7 @@ ifeq ($(ARCH),$(filter $(ARCH),i386 i686)) - override ARCH = x86 - endif - -+LIBDIR := /lib - CFLAGS = -ggdb3 -O2 -Wall -Iarch/${ARCH} -Iarch/common - - LIBUCONTEXT_C_SRC = $(wildcard arch/${ARCH}/*.c) -@@ -13,8 +14,8 @@ LIBUCONTEXT_SOVERSION = 0 - LIBUCONTEXT_NAME = libucontext.so - LIBUCONTEXT_STATIC_NAME = libucontext.a - LIBUCONTEXT_SONAME = libucontext.so.${LIBUCONTEXT_SOVERSION} --LIBUCONTEXT_PATH = /lib/${LIBUCONTEXT_SONAME} --LIBUCONTEXT_STATIC_PATH = /lib/${LIBUCONTEXT_STATIC_NAME} -+LIBUCONTEXT_PATH = ${LIBDIR}/${LIBUCONTEXT_SONAME} -+LIBUCONTEXT_STATIC_PATH = ${LIBDIR}/${LIBUCONTEXT_STATIC_NAME} - - all: ${LIBUCONTEXT_SONAME} ${LIBUCONTEXT_STATIC_NAME} - -@@ -39,9 +40,9 @@ clean: - ${LIBUCONTEXT_OBJ} test_libucontext - - install: all -- install -D -m755 ${LIBUCONTEXT_NAME} ${DESTDIR}/${LIBUCONTEXT_PATH} -- install -D -m664 ${LIBUCONTEXT_STATIC_NAME} ${DESTDIR}/${LIBUCONTEXT_STATIC_PATH} -- ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}/lib/${LIBUCONTEXT_NAME} -+ install -D -m755 ${LIBUCONTEXT_NAME} ${DESTDIR}${LIBUCONTEXT_PATH} -+ install -D -m664 ${LIBUCONTEXT_STATIC_NAME} ${DESTDIR}${LIBUCONTEXT_STATIC_PATH} -+ ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}${LIBDIR}/${LIBUCONTEXT_NAME} - - check: test_libucontext ${LIBUCONTEXT_SONAME} - env LD_LIBRARY_PATH=$(shell pwd) ./test_libucontext - -From 467ee2916d0eacbd32af10ead14e5d86e365fa2b Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Mon, 30 Mar 2020 17:25:30 -0500 -Subject: [PATCH 3/3] x86: Update copyright statement -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit d0ccf2f96f12bfa040cc056f7dc26b3fd25c168d contains the makecontext -fix from Adélie commit aaeb73ea701388e55b7640e32509a5f6a57f6350[1], as -seen at AdelieLinux/libucontext@aaeb73ea – but it didn't include the -addition of my author line. - -The full commit text, for future documentation/reference, was: - -``` -x86: Write link pointer at correct stack offset - -It must come *after* the parameters, not *before*. -``` - -Fixes: d0ccf2f96f12 ("x86: modernize") -Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> - -[1]: https://code.foxkit.us/adelie/libucontext/commit/aaeb73ea701388e55b7640e32509a5f6a57f6350 ---- - arch/x86/makecontext.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/x86/makecontext.c b/arch/x86/makecontext.c -index ee9c2e2..bc8163c 100644 ---- a/arch/x86/makecontext.c -+++ b/arch/x86/makecontext.c -@@ -1,5 +1,6 @@ - /* - * Copyright (c) 2018 Ariadne Conill <ariadne@dereferenced.org> -+ * Copyright (c) 2019 A. Wilcox <awilfox@adelielinux.org> - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD index 3baea9c09..77a888240 100644 --- a/system/lvm2/APKBUILD +++ b/system/lvm2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lvm2 -pkgver=2.03.08 -pkgrel=1 +pkgver=2.03.09 +pkgrel=0 pkgdesc="Logical Volume Manager 2 utilities" url="https://sourceware.org/lvm2/" arch="all" @@ -87,7 +87,7 @@ udev() { } -sha512sums="411c76de2acd8d7d707b60a4aab3f846004a1fbdc7b1d3f34d21af8ed45716adc0516b11491a26261580da7396d13a506e3994b32f5d1cefdf49c97e5d62d2e3 LVM2.2.03.08.tgz +sha512sums="8540e46a6025ab14b592ccd9493b3224ffc0f962739a0a8de6d7b25c65c6ad96fc83ddb0e3d877b123a5e1b104476d0c20ccee2ead6d322257ec82ad1e3362d4 LVM2.2.03.09.tgz bc4473c2f48ff6cab121f92211cd1b67589a6abadd8e32ffa366fed6ddbf9c87be695aa54a6e97b5b79203bf1a7d22cdb5974da84d38b4977592ef7a061612e7 fix-stdio-usage.patch 9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch d190c40a137b006d7b63298069c93ff08d2804b990e85d44739cd7c48beec9a569903b98f0d940895fc7365723ba886acd7ef0e08f1f65a1a391d1c448ce080e mlockall-default-config.patch diff --git a/system/man-pages/APKBUILD b/system/man-pages/APKBUILD index b543f78c6..81f54970d 100644 --- a/system/man-pages/APKBUILD +++ b/system/man-pages/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=man-pages -pkgver=5.05 +pkgver=5.07 _posixver=2013-a pkgrel=0 pkgdesc="Linux man pages" @@ -49,5 +49,5 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/localedef* } -sha512sums="4f1b9f69c44fb054de9834ad4356fc633416ce98285d137fc616967129f326c8dd28eba05d4fe12a385aced9ff478ed42dde777631be124b2ddc7569ee27a395 man-pages-5.05.tar.xz +sha512sums="701837b6a8dd3bf9e0fa3d0234384bcc8af4ba8b6a4fdce01a441a146c5101bb14b96cfd68b48613c2ddd2237d01c63fb24a8478c4fff5482265f6605bcbe2f5 man-pages-5.07.tar.xz e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14 man-pages-posix-2013-a.tar.xz" diff --git a/system/mandoc/APKBUILD b/system/mandoc/APKBUILD new file mode 100644 index 000000000..b3a4c018c --- /dev/null +++ b/system/mandoc/APKBUILD @@ -0,0 +1,94 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=mandoc +pkgver=1.14.5 +pkgrel=0 +pkgdesc="Manual page database, compiler, and viewer" +url="https://mandoc.bsd.lv/" +arch="all" +license="ISC AND BSD-2-Clause AND BSD-3-Clause" +replaces="man-db" +depends="less" +makedepends="zlib-dev" +checkdepends="perl" +subpackages="$pkgname-doc $pkgname-cgi" +install="$pkgname.post-deinstall" +triggers="$pkgname.trigger=/usr/share/man" +source="https://mandoc.bsd.lv/snapshots/mandoc-$pkgver.tar.gz + configure.patch + empty-tbl-null-deref.patch + tbl-colwidth-oob.patch + less.patch + doc.patch + cgi-adelie.patch + cgi-gz.patch + cgi-search.patch + " + +prepare() { + default_prepare + cat >"configure.local" <<-EOF + PREFIX=/usr + MANDIR=/usr/share/man + WWWPREFIX=/var/lib/mandoc-cgi + # remove /usr/X11R6 from the following. + MANPATH_BASE=/usr/share/man + MANPATH_DEFAULT=/usr/share/man:/usr/local/share/man + # groff also provides a soelim. + BINM_SOELIM=mandoc-soelim + + CFLAGS="$CFLAGS" + LDFLAGS="$LDFLAGS" + LN="ln -sf" + OSNAME="Adelie Linux" + UTF8_LOCALE=C.UTF-8 + + BUILD_CATMAN=1 + BUILD_CGI=1 + EOF + + cat >"cgi.h" <<-EOF + #define SCRIPT_NAME "" + #define MAN_DIR "/var/lib/mandoc-cgi" + #define CSS_DIR "" + #define CUSTOMIZE_TITLE "Adelie Linux manual pages" + EOF +} + +build() { + ./configure + make +} + +check() { + make regress +} + +package() { + make DESTDIR="$pkgdir" install + install -Dm644 -t "$pkgdir"/usr/share/man/man8 man.cgi.8 + + mkdir -p "$pkgdir"/etc + cat >"$pkgdir"/etc/man.conf <<-EOF + # See man.conf(5). + #manpath /usr/share/man + #manpath /usr/local/share/man + EOF +} + +cgi() { + pkgdesc="$pkgdesc (web interface)" + depends="$pkgname=$pkgver-r$pkgrel" + mkdir -p "$subpkgdir"/var/lib + mv "$pkgdir"/var/lib/mandoc-cgi \ + "$subpkgdir"/var/lib +} + +sha512sums="848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52 mandoc-1.14.5.tar.gz +074dc73b45c71b5c178750db6c7a4a45e97d97b5388fa5d6028faa90600358dd2b954781280ca41d17da3c577ad5a1a7a13ddc4dbea72ac5e86f1652e03ecde7 configure.patch +c4055371a92be958f0d385c83b4788dc4c18bc990b1f780137309c83e174b8d3e65cae077aba3c5286a97fcee1514d61f6b7507ca25bd5155b8d577a7e8acd3a empty-tbl-null-deref.patch +9a8953f17e2db75bf3667e1d51c7db21ccc5e3042c59035ed6178094963eac919b7367f96708c9bcc81450ffc13842d12c23edd9bca3330be730149625db88e7 tbl-colwidth-oob.patch +4b17b144b53ee30f9aae87c7824597151e16e6f5ad795e7b03e701f2d13ca47a62c696cb837689c75d5f34d3c190255c8f0583bc91a0f83f61afde7563a6fb2b less.patch +f35268ed507d5c6431f8cafe5a311d1ffe990083c6e1d22f5db479e19745d486cd45a699b64c4fb6757d1c0ab588c3e8d0778bfd75e98e751d1a786e89e8b925 doc.patch +0dfe9e39570a2b6764303708b98f29b2b57114e124a0f37e9c77d4d33f25d474a79d271df46babd700e4cc93e3385a02356f19caa44ebe4e9b056fa4be96b95b cgi-adelie.patch +957bbaef888fb2ea15f9b795b15952332e65aed70d2e70f3142305a4fb9313ade455eae6dfc923af3ef008834e771b1a85d71389b86cd0ff9a1c31e84fef861c cgi-gz.patch +37be119308814b060ed9d5517b54eb02b210d677ffb085385929b6aa0e8e8bef2c6c1ab2055713ed8c72f2bc85593bf8744d2d0f163dd1aff65ce439c474b640 cgi-search.patch" diff --git a/system/mandoc/cgi-adelie.patch b/system/mandoc/cgi-adelie.patch new file mode 100644 index 000000000..66ce6a9ba --- /dev/null +++ b/system/mandoc/cgi-adelie.patch @@ -0,0 +1,60 @@ +Adjustments for Adélie manual sections and architecture names. + +--- mandoc-1.14.5/cgi.c 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/cgi.c 2020-06-05 15:54:05.681060852 -0500 +@@ -101,36 +101,28 @@ static const char *scriptname = SCRIPT_ + + static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9}; + static const char *const sec_numbers[] = { +- "0", "1", "2", "3", "3p", "4", "5", "6", "7", "8", "9" ++ "0", "0p", "1", "1p", "2", "3", "3p", "3pm", "4", "5", "6", "7", "8" + }; + static const char *const sec_names[] = { + "All Sections", ++ "0p - POSIX C Headers", + "1 - General Commands", ++ "1p - POSIX Commands", + "2 - System Calls", + "3 - Library Functions", +- "3p - Perl Library", ++ "3p - POSIX C Library Functions", ++ "3pm - Perl Library", + "4 - Device Drivers", +- "5 - File Formats", ++ "5 - File formats and configuration files", + "6 - Games", +- "7 - Miscellaneous Information", +- "8 - System Manager\'s Manual", +- "9 - Kernel Developer\'s Manual" ++ "7 - Overview, conventions, and miscellaneous", ++ "8 - System Administrator\'s Manual" + }; + static const int sec_MAX = sizeof(sec_names) / sizeof(char *); + + static const char *const arch_names[] = { +- "amd64", "alpha", "armv7", "arm64", +- "hppa", "i386", "landisk", +- "loongson", "luna88k", "macppc", "mips64", +- "octeon", "sgi", "socppc", "sparc64", +- "amiga", "arc", "armish", "arm32", +- "atari", "aviion", "beagle", "cats", +- "hppa64", "hp300", +- "ia64", "mac68k", "mvme68k", "mvme88k", +- "mvmeppc", "palm", "pc532", "pegasos", +- "pmax", "powerpc", "solbourne", "sparc", +- "sun3", "vax", "wgrisc", "x68k", +- "zaurus" ++ "aarch64", "armv7", "pmmx", ++ "ppc", "ppc64", "x86_64", + }; + static const int arch_MAX = sizeof(arch_names) / sizeof(char *); + +@@ -655,7 +661,7 @@ pg_searchres(const struct req *req, stru + == NULL) ? 3 : + ((archend = strchr(arch + 1, '/')) + == NULL) ? 0 : +- strncmp(arch, "amd64/", ++ strncmp(arch, "ppc64/", + archend - arch) ? 2 : 1; + if (archprio < archpriouse) { + archpriouse = archprio; diff --git a/system/mandoc/cgi-gz.patch b/system/mandoc/cgi-gz.patch new file mode 100644 index 000000000..ac506b797 --- /dev/null +++ b/system/mandoc/cgi-gz.patch @@ -0,0 +1,77 @@ +Handle the case where some of the entries in the manpath are gzipped by +removing the .gz extension and allowing mparse_open to add it back and +mark the page as gzipped. This is part of the documented contract for +mparse_open, see mandoc(3). + +--- mandoc-1.14.5/cgi.c 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/cgi.c 2020-06-05 15:54:05.681060852 -0500 +@@ -93,7 +93,7 @@ static void resp_searchform(const stru + static void resp_show(const struct req *, const char *); + static void set_query_attr(char **, char **); + static int validate_arch(const char *); +-static int validate_filename(const char *); ++static int validate_filename(char *); + static int validate_manpath(const struct req *, const char *); + static int validate_urifrag(const char *); + +@@ -517,8 +509,13 @@ validate_arch(const char *arch) + } + + static int +-validate_filename(const char *file) ++validate_filename(char *file) + { ++ char *cp; ++ ++ cp = strrchr(file, '.'); ++ if (cp != NULL && ! strcmp(cp + 1, "gz")) ++ *cp = '\0'; + + if ('.' == file[0] && '/' == file[1]) + file += 2; +@@ -854,14 +862,15 @@ resp_format(const struct req *req, const + int fd; + int usepath; + +- if (-1 == (fd = open(file, O_RDONLY, 0))) { +- puts("<p>You specified an invalid manual file.</p>"); +- return; +- } +- + mchars_alloc(); + mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1 | + MPARSE_VALIDATE, MANDOC_OS_OTHER, req->q.manpath); ++ ++ if (-1 == (fd = mparse_open(mp, file))) { ++ puts("<p>You specified an invalid manual file.</p>"); ++ goto out; ++ } ++ + mparse_readfd(mp, fd, file); + close(fd); + meta = mparse_result(mp); +@@ -882,10 +891,11 @@ resp_format(const struct req *req, const + html_man(vp, meta); + + html_free(vp); +- mparse_free(mp); +- mchars_free(); + free(conf.man); + free(conf.style); ++out: ++ mparse_free(mp); ++ mchars_free(); + } + + static void +@@ -904,8 +914,8 @@ resp_show(const struct req *req, const c + static void + pg_show(struct req *req, const char *fullpath) + { +- char *manpath; +- const char *file; ++ char *manpath; ++ char *file; + + if ((file = strchr(fullpath, '/')) == NULL) { + pg_error_badrequest( diff --git a/system/mandoc/cgi-search.patch b/system/mandoc/cgi-search.patch new file mode 100644 index 000000000..dd74be9ef --- /dev/null +++ b/system/mandoc/cgi-search.patch @@ -0,0 +1,48 @@ +Don't exit immediately if mansearch returns some paths that man.cgi +considers invalid, in particular translated manpages (e.g. +./de/man1/chfn.1). Just mark them as invalid (section 10, see struct +manpage in mansearch.h) and skip them later. + +--- mandoc-1.14.5/cgi.c 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/cgi.c 2020-06-05 15:54:05.681060852 -0500 +@@ -605,13 +602,20 @@ pg_searchres(const struct req *req, stru + size_t i, iuse; + int archprio, archpriouse; + int prio, priouse; ++ int results = 0; + + for (i = 0; i < sz; i++) { +- if (validate_filename(r[i].file)) ++ if (validate_filename(r[i].file)) { ++ results = 1; + continue; ++ } + warnx("invalid filename %s in %s database", + r[i].file, req->q.manpath); +- pg_error_internal(); ++ r[i].sec = 10; ++ } ++ ++ if (! results) { ++ pg_noresult(req, "No results found."); + return; + } + +@@ -642,6 +646,8 @@ pg_searchres(const struct req *req, stru + priouse = 20; + archpriouse = 3; + for (i = 0; i < sz; i++) { ++ if (r[i].sec == 10) ++ continue; + sec = r[i].file; + sec += strcspn(sec, "123456789"); + if (sec[0] == '\0') +@@ -681,6 +687,8 @@ pg_searchres(const struct req *req, stru + if (sz > 1) { + puts("<table class=\"results\">"); + for (i = 0; i < sz; i++) { ++ if (r[i].sec == 10) ++ continue; + printf(" <tr>\n" + " <td>" + "<a class=\"Xr\" href=\"/"); diff --git a/system/mandoc/configure.patch b/system/mandoc/configure.patch new file mode 100644 index 000000000..2fda25409 --- /dev/null +++ b/system/mandoc/configure.patch @@ -0,0 +1,21 @@ +--- mandoc-1.14.5/test-recvmsg.c 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/test-recvmsg.c 2020-06-04 20:08:33.420299034 -0500 +@@ -4,5 +4,6 @@ + int + main(void) + { +- return recvmsg(-1, NULL, 0) != -1; ++ struct msghdr buf; ++ return recvmsg(-1, &buf, 0) != -1; + } +--- mandoc-1.14.5/configure 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/configure 2020-06-04 20:03:24.790295729 -0500 +@@ -41,7 +41,7 @@ OSENUM= + OSNAME= + UTF8_LOCALE= + +-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -` ++CC=cc + CFLAGS= + LDADD= + LDFLAGS= diff --git a/system/mandoc/doc.patch b/system/mandoc/doc.patch new file mode 100644 index 000000000..955a5f205 --- /dev/null +++ b/system/mandoc/doc.patch @@ -0,0 +1,132 @@ +--- mandoc-1.14.5/mandoc.1 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/mandoc.1 2020-06-05 02:12:50.320533119 -0500 +@@ -897,7 +897,7 @@ An + macro references a manual page that is not found in the base system. + The path to look for base system manuals is configurable at compile + time and defaults to +-.Pa /usr/share/man : /usr/X11R6/man . ++.Pa /usr/share/man . + .El + .Ss Style suggestions + .Bl -ohang +--- mandoc-1.14.5/mandoc.db.5 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/mandoc.db.5 2020-06-05 02:14:48.380534383 -0500 +@@ -189,10 +189,6 @@ followed by the number 0. + .Bl -tag -width /usr/share/man/mandoc.db -compact + .It Pa /usr/share/man/mandoc.db + The manual page database for the base system. +-.It Pa /usr/X11R6/man/mandoc.db +-The same for the +-.Xr X 7 +-Window System. + .It Pa /usr/local/man/mandoc.db + The same for + .Xr packages 7 . +--- mandoc-1.14.5/man.conf.5 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/man.conf.5 2020-06-05 02:11:34.650532308 -0500 +@@ -117,7 +117,6 @@ installing it is equivalent to not havin + file at all. + .Bd -literal -offset indent + manpath /usr/share/man +-manpath /usr/X11R6/man + manpath /usr/local/man + .Ed + .Sh SEE ALSO + +--- mandoc-1.14.5/man.1 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/man.1 2020-06-05 02:51:15.910557811 -0500 +@@ -174,28 +174,32 @@ Only select manuals from the specified + The currently available sections are: + .Pp + .Bl -tag -width "localXXX" -offset indent -compact ++.It 0p ++POSIX C headers. + .It 1 + General commands + .Pq tools and utilities . ++.It 1p ++POSIX commands. + .It 2 + System calls and error numbers. + .It 3 + Library functions. + .It 3p ++POSIX C library functions. ++.It 3pm + .Xr perl 1 + programmer's reference guide. + .It 4 + Device drivers. + .It 5 +-File formats. ++File formats and configuration files. + .It 6 + Games. + .It 7 +-Miscellaneous information. ++Overview, conventions, and miscellaneous information. + .It 8 + System maintenance and operation commands. +-.It 9 +-Kernel internals. + .El + .Pp + If not specified and a match is found in more than one section, +--- mandoc-1.14.5/man.cgi.8 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/man.cgi.8 2020-06-05 16:26:12.541081488 -0500 +@@ -342,7 +342,7 @@ page to acquire the named parameters it + .El + .Sh FILES + .Bl -tag -width Ds +-.It Pa /var/www ++.It Pa /var/lib/mandoc-cgi + Default web server + .Xr chroot 2 + directory. +@@ -366,13 +366,7 @@ This is part of the web server configura + A style sheet for + .Xr mandoc 1 + HTML styling, referenced from each generated HTML page. +-.It Pa /man +-Default +-.Nm +-data directory containing all the manual trees. +-Can be overridden by +-.Dv MAN_DIR . +-.It Pa /man/manpath.conf ++.It Pa /manpath.conf + The list of available manpaths, one per line. + If any of the lines in this file contains a slash + .Pq Sq / +@@ -380,13 +374,13 @@ or any character not contained in the + .Sx Restricted character set , + .Nm + reports an internal server error and exits without doing anything. +-.It Pa /man/header.html ++.It Pa /header.html + An optional file containing static HTML code to be inserted right + after opening the <BODY> element. +-.It Pa /man/footer.html ++.It Pa /footer.html + An optional file containing static HTML code to be inserted right + before closing the <BODY> element. +-.It Pa /man/OpenBSD-current/man1/mandoc.1 ++.It Pa /OpenBSD-current/man1/mandoc.1 + An example + .Xr mdoc 7 + source file located below the +--- mandoc-1.14.5/soelim.1 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/soelim.1 2020-06-05 16:38:40.101089494 -0500 +@@ -25,10 +25,10 @@ + .\" SUCH DAMAGE. + .\" + .Dd $Mdocdate: July 4 2017 $ +-.Dt SOELIM 1 ++.Dt MANDOC-SOELIM 1 + .Os + .Sh NAME +-.Nm soelim ++.Nm mandoc-soelim + .Nd interpret .so requests in manpages + .Sh SYNOPSIS + .Nm diff --git a/system/mandoc/empty-tbl-null-deref.patch b/system/mandoc/empty-tbl-null-deref.patch new file mode 100644 index 000000000..3e14ce32b --- /dev/null +++ b/system/mandoc/empty-tbl-null-deref.patch @@ -0,0 +1,62 @@ +From mboxrd@z Thu Jan 1 00:00:00 1970 +Received: from localhost (fantadrom.bsd.lv [local]) + by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 25e99424 + for <source@mandoc.bsd.lv>; + Mon, 18 Mar 2019 03:01:04 -0500 (EST) +Date: Mon, 18 Mar 2019 03:01:04 -0500 (EST) +X-Mailinglist: mandoc-source +Reply-To: source@mandoc.bsd.lv +MIME-Version: 1.0 +From: schwarze@mandoc.bsd.lv +To: source@mandoc.bsd.lv +Subject: mandoc: fix a NULL pointer access on empty tbl(7) data cells that +X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ +Content-Type: text/plain; charset=utf-8 +Message-ID: <e3f22222366ad31d@fantadrom.bsd.lv> +Archived-At: <http://inbox.vuxu.org/mandoc-source/e3f22222366ad31d@fantadrom.bsd.lv/> +List-Archive: <http://inbox.vuxu.org/mandoc-source/> +List-Post: <mailto:source@mandoc.bsd.lv> + +Log Message: +----------- +fix a NULL pointer access on empty tbl(7) data cells +that bentley@ found in syncthing-bep(7) + +Modified Files: +-------------- + mandoc: + tbl_term.c + +Revision Data +------------- +Index: tbl_term.c +=================================================================== +RCS file: /home/cvs/mandoc/mandoc/tbl_term.c,v +retrieving revision 1.69 +retrieving revision 1.70 +diff -Ltbl_term.c -Ltbl_term.c -u -p -r1.69 -r1.70 +--- a/tbl_term.c ++++ b/tbl_term.c +@@ -629,7 +629,8 @@ tbl_hrule(struct termp *tp, const struct + + lw = cpp == NULL || cpn == NULL || + (cpn->pos != TBL_CELL_DOWN && +- (dpn == NULL || strcmp(dpn->string, "\\^") != 0)) ++ (dpn == NULL || dpn->string == NULL || ++ strcmp(dpn->string, "\\^") != 0)) + ? hw : 0; + tbl_direct_border(tp, BHORIZ * lw, + col->width + col->spacing / 2); +@@ -675,7 +676,8 @@ tbl_hrule(struct termp *tp, const struct + + rw = cpp == NULL || cpn == NULL || + (cpn->pos != TBL_CELL_DOWN && +- (dpn == NULL || strcmp(dpn->string, "\\^") != 0)) ++ (dpn == NULL || dpn->string == NULL || ++ strcmp(dpn->string, "\\^") != 0)) + ? hw : 0; + + /* The line crossing at the end of this column. */ +-- + To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv + diff --git a/system/mandoc/less.patch b/system/mandoc/less.patch new file mode 100644 index 000000000..19d567365 --- /dev/null +++ b/system/mandoc/less.patch @@ -0,0 +1,58 @@ +Default to using less(1) instead of more(1) if MANPAGER and PAGER are +unset, and also set a pretty prompt and smart case searching like man-db +does if less is used as a pager. + +The name of the manpage is not available in the scope of the patched +function - maybe add it at some point. + +--- mandoc-1.14.5/main.c 2019-03-10 04:56:43.000000000 -0500 ++++ mandoc-1.14.5/main.c 2020-06-05 01:59:10.640524340 -0500 +@@ -1170,8 +1170,9 @@ spawn_pager(struct tag_files *tag_files) + pager = getenv("MANPAGER"); + if (pager == NULL || *pager == '\0') + pager = getenv("PAGER"); +- if (pager == NULL || *pager == '\0') +- pager = "more -s"; ++ if (pager == NULL || *pager == '\0') { ++ pager = "less"; ++ } + cp = mandoc_strdup(pager); + + /* +@@ -1195,10 +1196,24 @@ spawn_pager(struct tag_files *tag_files) + /* For less(1), use the tag file. */ + + use_ofn = 1; +-#if HAVE_LESS_T + if ((cmdlen = strlen(argv[0])) >= 4) { + cp = argv[0] + cmdlen - 4; + if (strcmp(cp, "less") == 0) { ++ /* ++ * Set a few options like man-db does. ++ * -i: smart case search ++ * -mPm: set prompt to following string terminated by $ ++ */ ++ argv[argc++] = "-imPm" \ ++ " Manual page" \ ++ /* ++ * print " (END)" if EOF, else % in file followed by % sign. ++ * ?X if X:else not X. ++ */ ++ "?e (END):?pB %pB\\%.. " \ ++ "(press h for help or q to quit)" \ ++ "$"; ++#if HAVE_LESS_T + argv[argc++] = mandoc_strdup("-T"); + argv[argc++] = tag_files->tfn; + if (tag_files->tagname != NULL) { +@@ -1206,9 +1221,9 @@ spawn_pager(struct tag_files *tag_files) + argv[argc++] = tag_files->tagname; + use_ofn = 0; + } ++#endif + } + } +-#endif + if (use_ofn) + argv[argc++] = tag_files->ofn; + argv[argc] = NULL; diff --git a/system/mandoc/mandoc.post-deinstall b/system/mandoc/mandoc.post-deinstall new file mode 100644 index 000000000..0a8d5b9df --- /dev/null +++ b/system/mandoc/mandoc.post-deinstall @@ -0,0 +1,3 @@ +#!/bin/sh + +exec rm -f /usr/share/man/mandoc.db 2>/dev/null diff --git a/system/mandoc/mandoc.trigger b/system/mandoc/mandoc.trigger new file mode 100644 index 000000000..34fc1decc --- /dev/null +++ b/system/mandoc/mandoc.trigger @@ -0,0 +1,3 @@ +#!/bin/sh + +exec makewhatis -a -T utf8 "$@" diff --git a/system/mandoc/tbl-colwidth-oob.patch b/system/mandoc/tbl-colwidth-oob.patch new file mode 100644 index 000000000..0b7b0acad --- /dev/null +++ b/system/mandoc/tbl-colwidth-oob.patch @@ -0,0 +1,62 @@ +From mboxrd@z Thu Jan 1 00:00:00 1970 +Received: from localhost (fantadrom.bsd.lv [local]) + by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 0ff00a97 + for <source@mandoc.bsd.lv>; + Fri, 29 Mar 2019 16:27:36 -0500 (EST) +Date: Fri, 29 Mar 2019 16:27:36 -0500 (EST) +X-Mailinglist: mandoc-source +Reply-To: source@mandoc.bsd.lv +MIME-Version: 1.0 +From: schwarze@mandoc.bsd.lv +To: source@mandoc.bsd.lv +Subject: mandoc: Set the maximum column index in a tbl(7) to the maximum *right* +X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ +Content-Type: text/plain; charset=utf-8 +Message-ID: <e3fceff42218668d@fantadrom.bsd.lv> +Archived-At: <http://inbox.vuxu.org/mandoc-source/e3fceff42218668d@fantadrom.bsd.lv/> +List-Archive: <http://inbox.vuxu.org/mandoc-source/> +List-Post: <mailto:source@mandoc.bsd.lv> + +Log Message: +----------- +Set the maximum column index in a tbl(7) to the maximum *right* edge +of any cell span, not to the maximum *left* edge, which may be smaller +if the last column of the table is only reached by horizontal spans, +but not by any regular cell in any row of the table. +Otherwise, the algorithm calculating column widths accessed memomy +after the end of the colwidth[] array, while it was trying to handle +the rightmost column(s). + +Crash reported by Jason Thorpe <thorpej at NetBSD> +via https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54069 +and via Thomas Klausner (wiz@). +Christos@ Zoulas sent a (correct, but slightly confusing) patch. +The patch i'm committing here is easier to understand. + +Modified Files: +-------------- + mandoc: + out.c + +Revision Data +------------- +Index: out.c +=================================================================== +RCS file: /home/cvs/mandoc/mandoc/out.c,v +retrieving revision 1.77 +retrieving revision 1.78 +diff -Lout.c -Lout.c -u -p -r1.77 -r1.78 +--- a/out.c ++++ b/out.c +@@ -149,7 +149,7 @@ tblcalc(struct rofftbl *tbl, const struc + gp = &first_group; + for (dp = sp->first; dp != NULL; dp = dp->next) { + icol = dp->layout->col; +- while (icol > maxcol) ++ while (maxcol < icol + dp->hspans) + tbl->cols[++maxcol].spacing = SIZE_MAX; + col = tbl->cols + icol; + col->flags |= dp->layout->flags; +-- + To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv + diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD index f7596ebb5..8517b148b 100644 --- a/system/musl/APKBUILD +++ b/system/musl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=musl pkgver=1.2.0 -pkgrel=0 +pkgrel=1 pkgdesc="System library (libc) implementation" url="https://www.musl-libc.org/" arch="all" @@ -26,6 +26,7 @@ source="https://musl.libc.org/releases/$pkgname-$pkgver.tar.gz 3001-make-real-lastlog-h.patch handle-aux-at_base.patch fgetspent_r.patch + threads_minus_1.patch ldconfig getent.c @@ -121,6 +122,7 @@ f01ab92b9d385c15369c0bb7d95e1bc06a009c8851e363517d0ba1bae3fc2647af69fc2f363b5d96 88ae443dbb8e0a4368235bdc3a1c5c7b718495afa75e06deb8e01becc76cb1f0d6964589e2204fc749c9c1b3190b8b9ac1ae2c0099cab8e2ce3ec877103d4332 3001-make-real-lastlog-h.patch 6a7ff16d95b5d1be77e0a0fbb245491817db192176496a57b22ab037637d97a185ea0b0d19da687da66c2a2f5578e4343d230f399d49fe377d8f008410974238 handle-aux-at_base.patch ded41235148930f8cf781538f7d63ecb0c65ea4e8ce792565f3649ee2523592a76b2a166785f0b145fc79f5852fd1fb1729a7a09110b3b8f85cba3912e790807 fgetspent_r.patch +68830961e297d9a499f3b609be84848ad5d3326a1af56e9e54a40ecd972c48da11532c51da572d45e0df3574d63191e7ae0d3a1b84a029365f8d00691de96952 threads_minus_1.patch cb71d29a87f334c75ecbc911becde7be825ab30d8f39fa6d64cb53812a7c9abaf91d9804c72540e5be3ddd3c84cfe7fd9632274309005cb8bcdf9a9b09b4b923 ldconfig 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c" diff --git a/system/musl/threads_minus_1.patch b/system/musl/threads_minus_1.patch new file mode 100644 index 000000000..05307d97c --- /dev/null +++ b/system/musl/threads_minus_1.patch @@ -0,0 +1,267 @@ +https://www.openwall.com/lists/musl/2020/05/22/10 + +From 4d5aa20a94a2d3fae3e69289dc23ecafbd0c16c4 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Fri, 22 May 2020 17:35:14 -0400 +Subject: [PATCH 1/4] reorder thread list unlink in pthread_exit after all + locks + +since the backend for LOCK() skips locking if single-threaded, it's +unsafe to make the process appear single-threaded before the last use +of lock. + +this fixes potential unsynchronized access to a linked list via +__dl_thread_cleanup. +--- + src/thread/pthread_create.c | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c +index 5f491092..6a3b0c21 100644 +--- a/src/thread/pthread_create.c ++++ b/src/thread/pthread_create.c +@@ -90,14 +90,7 @@ _Noreturn void __pthread_exit(void *result) + exit(0); + } + +- /* At this point we are committed to thread termination. Unlink +- * the thread from the list. This change will not be visible +- * until the lock is released, which only happens after SYS_exit +- * has been called, via the exit futex address pointing at the lock. */ +- libc.threads_minus_1--; +- self->next->prev = self->prev; +- self->prev->next = self->next; +- self->prev = self->next = self; ++ /* At this point we are committed to thread termination. */ + + /* Process robust list in userspace to handle non-pshared mutexes + * and the detached thread case where the robust list head will +@@ -121,6 +114,16 @@ _Noreturn void __pthread_exit(void *result) + __do_orphaned_stdio_locks(); + __dl_thread_cleanup(); + ++ /* Last, unlink thread from the list. This change will not be visible ++ * until the lock is released, which only happens after SYS_exit ++ * has been called, via the exit futex address pointing at the lock. ++ * This needs to happen after any possible calls to LOCK() that might ++ * skip locking if libc.threads_minus_1 is zero. */ ++ libc.threads_minus_1--; ++ self->next->prev = self->prev; ++ self->prev->next = self->next; ++ self->prev = self->next = self; ++ + /* This atomic potentially competes with a concurrent pthread_detach + * call; the loser is responsible for freeing thread resources. */ + int state = a_cas(&self->detach_state, DT_JOINABLE, DT_EXITING); +-- +2.21.0 + +From e01b5939b38aea5ecbe41670643199825874b26c Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Thu, 21 May 2020 23:32:45 -0400 +Subject: [PATCH 2/4] don't use libc.threads_minus_1 as relaxed atomic for + skipping locks + +after all but the last thread exits, the next thread to observe +libc.threads_minus_1==0 and conclude that it can skip locking fails to +synchronize with any changes to memory that were made by the +last-exiting thread. this can produce data races. + +on some archs, at least x86, memory synchronization is unlikely to be +a problem; however, with the inline locks in malloc, skipping the lock +also eliminated the compiler barrier, and caused code that needed to +re-check chunk in-use bits after obtaining the lock to reuse a stale +value, possibly from before the process became single-threaded. this +in turn produced corruption of the heap state. + +some uses of libc.threads_minus_1 remain, especially for allocation of +new TLS in the dynamic linker; otherwise, it could be removed +entirely. it's made non-volatile to reflect that the remaining +accesses are only made under lock on the thread list. + +instead of libc.threads_minus_1, libc.threaded is now used for +skipping locks. the difference is that libc.threaded is permanently +true once an additional thread has been created. this will produce +some performance regression in processes that are mostly +single-threaded but occasionally creating threads. in the future it +may be possible to bring back the full lock-skipping, but more care +needs to be taken to produce a safe design. +--- + src/internal/libc.h | 2 +- + src/malloc/malloc.c | 2 +- + src/thread/__lock.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/internal/libc.h b/src/internal/libc.h +index ac97dc7e..c0614852 100644 +--- a/src/internal/libc.h ++++ b/src/internal/libc.h +@@ -21,7 +21,7 @@ struct __libc { + int can_do_threads; + int threaded; + int secure; +- volatile int threads_minus_1; ++ int threads_minus_1; + size_t *auxv; + struct tls_module *tls_head; + size_t tls_size, tls_align, tls_cnt; +diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c +index 96982596..2553a62e 100644 +--- a/src/malloc/malloc.c ++++ b/src/malloc/malloc.c +@@ -26,7 +26,7 @@ int __malloc_replaced; + + static inline void lock(volatile int *lk) + { +- if (libc.threads_minus_1) ++ if (libc.threaded) + while(a_swap(lk, 1)) __wait(lk, lk+1, 1, 1); + } + +diff --git a/src/thread/__lock.c b/src/thread/__lock.c +index 45557c88..5b9b144e 100644 +--- a/src/thread/__lock.c ++++ b/src/thread/__lock.c +@@ -18,7 +18,7 @@ + + void __lock(volatile int *l) + { +- if (!libc.threads_minus_1) return; ++ if (!libc.threaded) return; + /* fast path: INT_MIN for the lock, +1 for the congestion */ + int current = a_cas(l, 0, INT_MIN + 1); + if (!current) return; +-- +2.21.0 + +From f12888e9eb9eed60cc266b899dcafecb4752964a Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Fri, 22 May 2020 17:25:38 -0400 +Subject: [PATCH 3/4] cut down size of some libc struct members + +these are all flags that can be single-byte values. +--- + src/internal/libc.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/internal/libc.h b/src/internal/libc.h +index c0614852..d47f58e0 100644 +--- a/src/internal/libc.h ++++ b/src/internal/libc.h +@@ -18,9 +18,9 @@ struct tls_module { + }; + + struct __libc { +- int can_do_threads; +- int threaded; +- int secure; ++ char can_do_threads; ++ char threaded; ++ char secure; + int threads_minus_1; + size_t *auxv; + struct tls_module *tls_head; +-- +2.21.0 + +From 8d81ba8c0bc6fe31136cb15c9c82ef4c24965040 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Fri, 22 May 2020 17:45:47 -0400 +Subject: [PATCH 4/4] restore lock-skipping for processes that return to + single-threaded state + +the design used here relies on the barrier provided by the first lock +operation after the process returns to single-threaded state to +synchronize with actions by the last thread that exited. by storing +the intent to change modes in the same object used to detect whether +locking is needed, it's possible to avoid an extra (possibly costly) +memory load after the lock is taken. +--- + src/internal/libc.h | 1 + + src/malloc/malloc.c | 5 ++++- + src/thread/__lock.c | 4 +++- + src/thread/pthread_create.c | 8 ++++---- + 4 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/src/internal/libc.h b/src/internal/libc.h +index d47f58e0..619bba86 100644 +--- a/src/internal/libc.h ++++ b/src/internal/libc.h +@@ -21,6 +21,7 @@ struct __libc { + char can_do_threads; + char threaded; + char secure; ++ volatile signed char need_locks; + int threads_minus_1; + size_t *auxv; + struct tls_module *tls_head; +diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c +index 2553a62e..a803d4c9 100644 +--- a/src/malloc/malloc.c ++++ b/src/malloc/malloc.c +@@ -26,8 +26,11 @@ int __malloc_replaced; + + static inline void lock(volatile int *lk) + { +- if (libc.threaded) ++ int need_locks = libc.need_locks; ++ if (need_locks) { + while(a_swap(lk, 1)) __wait(lk, lk+1, 1, 1); ++ if (need_locks < 0) libc.need_locks = 0; ++ } + } + + static inline void unlock(volatile int *lk) +diff --git a/src/thread/__lock.c b/src/thread/__lock.c +index 5b9b144e..60eece49 100644 +--- a/src/thread/__lock.c ++++ b/src/thread/__lock.c +@@ -18,9 +18,11 @@ + + void __lock(volatile int *l) + { +- if (!libc.threaded) return; ++ int need_locks = libc.need_locks; ++ if (!need_locks) return; + /* fast path: INT_MIN for the lock, +1 for the congestion */ + int current = a_cas(l, 0, INT_MIN + 1); ++ if (need_locks < 0) libc.need_locks = 0; + if (!current) return; + /* A first spin loop, for medium congestion. */ + for (unsigned i = 0; i < 10; ++i) { +diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c +index 6a3b0c21..6bdfb44f 100644 +--- a/src/thread/pthread_create.c ++++ b/src/thread/pthread_create.c +@@ -118,8 +118,8 @@ _Noreturn void __pthread_exit(void *result) + * until the lock is released, which only happens after SYS_exit + * has been called, via the exit futex address pointing at the lock. + * This needs to happen after any possible calls to LOCK() that might +- * skip locking if libc.threads_minus_1 is zero. */ +- libc.threads_minus_1--; ++ * skip locking if process appears single-threaded. */ ++ if (!--libc.threads_minus_1) libc.need_locks = -1; + self->next->prev = self->prev; + self->prev->next = self->next; + self->prev = self->next = self; +@@ -339,7 +339,7 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att + ~(1UL<<((SIGCANCEL-1)%(8*sizeof(long)))); + + __tl_lock(); +- libc.threads_minus_1++; ++ if (!libc.threads_minus_1++) libc.need_locks = 1; + ret = __clone((c11 ? start_c11 : start), stack, flags, args, &new->tid, TP_ADJ(new), &__thread_list_lock); + + /* All clone failures translate to EAGAIN. If explicit scheduling +@@ -363,7 +363,7 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att + new->next->prev = new; + new->prev->next = new; + } else { +- libc.threads_minus_1--; ++ if (!--libc.threads_minus_1) libc.need_locks = 0; + } + __tl_unlock(); + __restore_sigs(&set); +-- +2.21.0 + diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD index 67df0d1b7..73f5d922b 100644 --- a/system/ncurses/APKBUILD +++ b/system/ncurses/APKBUILD @@ -12,7 +12,7 @@ depends="" makedepends_build="ncurses" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-terminfo-base:base:noarch $pkgname-terminfo:terminfo:noarch" -source="https://invisible-mirror.net/archives/ncurses/current/ncurses-$_ver.tgz" +source="https://mirrormaster.adelielinux.org/source/upstream/ncurses-$_ver.tgz" builddir="$srcdir"/ncurses-$_ver diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD index 944668272..65295d30d 100644 --- a/system/nss/APKBUILD +++ b/system/nss/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nss -pkgver=3.51 +pkgver=3.52 _ver=$(printf '%s' "$pkgver" | tr . _) -pkgrel=1 +pkgrel=0 pkgdesc="Mozilla Network Security Services" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" arch="all" @@ -18,7 +18,6 @@ source="https://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${_ver}_RTM/s nss-util.pc.in nss-softokn.pc.in nss-config.in - add_spi+cacert_ca_certs.patch " # secfixes: @@ -44,6 +43,7 @@ build() { export FREEBL_NO_DEPEND=0 export NSS_USE_SYSTEM_SQLITE=1 export NSS_ENABLE_WERROR=0 + export NSS_ENABLE_ECC=1 export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` case "$CARCH" in @@ -61,8 +61,7 @@ build() { export NSS_DISABLE_ALTIVEC=1 make -j 1 -C nss/coreconf - make -j 1 -C nss/lib/dbm - make -j 1 -C nss + make -C nss } package() { @@ -157,9 +156,8 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="9c894b1ea41449b000750a7b3a89fcb43dfc3d0d4d6dcc0dc288bc73996f76f1ee1ede927a8aecae6d4a07f9f3d3e3a042c6a60cf06e27e0cdc004fce2e510fd nss-3.51.tar.gz +sha512sums="a45baf38717bceda03c292b2c01def680a24a846327e17d36044a85e30ed40c68220c78c0a2c3025c11778ee58f5d5eb0fff1b4cd274b95c408fb59e394e62c6 nss-3.52.tar.gz 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in 0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09 nss-util.pc.in 09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15 nss-softokn.pc.in -2971669e128f06a9af40a5ba88218fa7c9eecfeeae8b0cf42e14f31ed12bf6fa4c5ce60289e078f50e2669a9376b56b45d7c29d726a7eac69ebe1d1e22dc710b nss-config.in -6e04556858499aec465d6670818465327ba2cb099061c2afee4b5cac8aa61938e0095906acfb38df6a1b70a6bde6dd69f08bb4c00a9d188e4cb3131b26c1bc16 add_spi+cacert_ca_certs.patch" +2971669e128f06a9af40a5ba88218fa7c9eecfeeae8b0cf42e14f31ed12bf6fa4c5ce60289e078f50e2669a9376b56b45d7c29d726a7eac69ebe1d1e22dc710b nss-config.in" diff --git a/system/nss/add_spi+cacert_ca_certs.patch b/system/nss/add_spi+cacert_ca_certs.patch deleted file mode 100644 index ccf973103..000000000 --- a/system/nss/add_spi+cacert_ca_certs.patch +++ /dev/null @@ -1,561 +0,0 @@ ---- a/nss/lib/ckfw/builtins/certdata.txt -+++ b/nss/lib/ckfw/builtins/certdata.txt -@@ -20926,3 +20926,558 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 1 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063 -+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060 -+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007 -+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002 -+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011 -+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315 -+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230 -+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272 -+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016 -+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052 -+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262 -+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140 -+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150 -+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273 -+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022 -+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234 -+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334 -+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070 -+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232 -+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044 -+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355 -+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252 -+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352 -+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276 -+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306 -+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320 -+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167 -+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335 -+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324 -+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246 -+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106 -+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272 -+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334 -+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304 -+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060 -+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265 -+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071 -+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230 -+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260 -+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001 -+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037 -+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160 -+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157 -+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006 -+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164 -+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060 -+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045 -+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 -+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077 -+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102 -+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165 -+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164 -+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040 -+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167 -+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006 -+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001 -+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201 -+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275 -+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234 -+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323 -+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073 -+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140 -+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353 -+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160 -+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334 -+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231 -+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116 -+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145 -+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031 -+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363 -+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330 -+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367 -+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260 -+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223 -+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335 -+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026 -+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005 -+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361 -+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371 -+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246 -+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206 -+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153 -+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344 -+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143 -+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362 -+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226 -+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175 -+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305 -+\103 -+END -+ -+# Trust for Certificate "CAcert.org Class 1 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106 -+\166\316\217\063 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 3 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143 -+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004 -+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004 -+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040 -+\063\040\122\157\157\164 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065 -+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060 -+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022 -+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156 -+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164 -+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157 -+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143 -+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164 -+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 -+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 -+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335 -+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175 -+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163 -+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144 -+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001 -+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171 -+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313 -+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011 -+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353 -+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277 -+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331 -+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205 -+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073 -+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161 -+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371 -+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047 -+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252 -+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102 -+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064 -+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133 -+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242 -+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137 -+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325 -+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150 -+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230 -+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140 -+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347 -+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321 -+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206 -+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257 -+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164 -+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373 -+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003 -+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006 -+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006 -+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072 -+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162 -+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034 -+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162 -+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003 -+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001 -+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002 -+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160 -+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206 -+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241 -+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072 -+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135 -+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253 -+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364 -+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172 -+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302 -+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214 -+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074 -+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154 -+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025 -+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352 -+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231 -+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213 -+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325 -+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242 -+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214 -+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027 -+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057 -+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224 -+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134 -+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356 -+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005 -+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355 -+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143 -+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123 -+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243 -+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005 -+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156 -+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317 -+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360 -+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101 -+\322\156\245\033\231\047\200\347\013\251\250\000 -+END -+ -+# Trust for Certificate "CAcert.org Class 3 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304 -+\030\116\052\055 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000 -+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206 -+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003 -+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010 -+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125 -+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163 -+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167 -+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151 -+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003 -+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061 -+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146 -+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061 -+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026 -+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151 -+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063 -+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060 -+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125 -+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023 -+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004 -+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061 -+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141 -+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143 -+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125 -+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036 -+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151 -+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045 -+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150 -+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156 -+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051 -+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074 -+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271 -+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240 -+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321 -+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265 -+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175 -+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375 -+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161 -+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342 -+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172 -+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056 -+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247 -+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310 -+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361 -+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356 -+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110 -+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151 -+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316 -+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307 -+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320 -+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205 -+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123 -+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154 -+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275 -+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356 -+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250 -+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204 -+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147 -+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305 -+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057 -+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124 -+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060 -+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161 -+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122 -+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346 -+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102 -+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061 -+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016 -+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025 -+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141 -+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037 -+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040 -+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061 -+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141 -+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103 -+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 -+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015 -+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100 -+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216 -+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377 -+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206 -+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035 -+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102 -+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151 -+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164 -+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102 -+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141 -+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055 -+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206 -+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057 -+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143 -+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125 -+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164 -+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016 -+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015 -+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002 -+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162 -+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030 -+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255 -+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065 -+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014 -+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306 -+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051 -+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017 -+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302 -+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213 -+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017 -+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162 -+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152 -+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357 -+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266 -+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104 -+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177 -+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253 -+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206 -+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217 -+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265 -+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225 -+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140 -+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207 -+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252 -+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340 -+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254 -+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275 -+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132 -+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151 -+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005 -+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004 -+\243\140 -+END -+ -+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044 -+\251\220\103\034 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/system/nvi/APKBUILD b/system/nvi/APKBUILD index c0daf1a1e..a148971ea 100644 --- a/system/nvi/APKBUILD +++ b/system/nvi/APKBUILD @@ -2,7 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nvi pkgver=1.81.6 -pkgrel=0 +_debver=15 +pkgrel=1 pkgdesc="Berkeley text editor" url="https://sites.google.com/a/bostic.com/keithbostic/vi/" arch="all" @@ -11,12 +12,21 @@ license="BSD-4-Clause-UC" depends="" makedepends="db-dev ncurses-dev" subpackages="$pkgname-doc" -source="https://fossies.org/linux/privat/old/nvi-$pkgver.tar.gz +source="http://deb.debian.org/debian/pool/main/n/nvi/nvi_$pkgver.orig.tar.gz + http://deb.debian.org/debian/pool/main/n/nvi/nvi_$pkgver-$_debver.debian.tar.xz build-fix.patch " +# secfixes: +# 1.81.6-r1: +# - CVE-2001-1562 + prepare() { default_prepare + while read -r i; do + msg "$i" + patch -p1 -i "../debian/patches/$i" + done < ../debian/patches/series cd "$builddir"/dist chmod u+w config.sub @@ -49,5 +59,6 @@ package() { mv "$pkgdir"/usr/share/man/man1/view.1 "$pkgdir"/usr/share/man/man1/view.nvi.1 } -sha512sums="1be798daf0cd05010ddaf0aa0510dc799708fd79d4b243e2700adff18e931ddd9d11621796fa8086088c3e93ba20f15ab86783732665169c52b73eaf587ff0b3 nvi-1.81.6.tar.gz +sha512sums="1be798daf0cd05010ddaf0aa0510dc799708fd79d4b243e2700adff18e931ddd9d11621796fa8086088c3e93ba20f15ab86783732665169c52b73eaf587ff0b3 nvi_1.81.6.orig.tar.gz +7756ca0ba9503516fcbf1a5fe51465bebf74bf107e040cea80de0dd501854fe0f25d67ddbd4142e58057ad015be12f8b711ef861fd6ad3f317bc619327579513 nvi_1.81.6-15.debian.tar.xz b84cfb83ea5ed15f5c7d9e608771a2248531be388fa19340e90074d37e10f6f75c8b965a40f5288275973f23ed6fda54aa4ef990b43d4828d174b66fd3ced1e9 build-fix.patch" diff --git a/system/openrc/0007-make-consolefont-service-compatible-with-busyboxs-se.patch b/system/openrc/0007-make-consolefont-service-compatible-with-busyboxs-se.patch deleted file mode 100644 index 6c23e2ab0..000000000 --- a/system/openrc/0007-make-consolefont-service-compatible-with-busyboxs-se.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 3d0d2b89745597ea973129eafa3f999cf19d761f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> -Date: Wed, 17 Aug 2016 17:52:58 +0200 -Subject: [PATCH 7/7] make consolefont service compatible with busyboxs setfont - applet - -Compared to kdbs setfont program it doesn't support -O and -m. ---- - conf.d/consolefont | 11 ++--------- - init.d/consolefont.in | 7 ++----- - 2 files changed, 4 insertions(+), 14 deletions(-) - -diff --git a/conf.d/consolefont b/conf.d/consolefont -index e01ae842..75544b2f 100644 ---- a/conf.d/consolefont -+++ b/conf.d/consolefont -@@ -3,16 +3,9 @@ - # - # consolefont specifies the default font that you'd like Linux to use on the - # console. You can find a good selection of fonts in /usr/share/consolefonts; --# you shouldn't specify the trailing ".psf.gz", just the font name below. --# To use the default console font, comment out the CONSOLEFONT setting below. --consolefont="default8x16" -+consolefont="default8x16.psf.gz" - - # consoletranslation is the charset map file to use. Leave commented to use - # the default one. Have a look in /usr/share/consoletrans for a selection of - # map files you can use. --#consoletranslation="8859-1_to_uni" -- --# unicodemap is the unicode map file to use. Leave commented to use the --# default one. Have a look in /usr/share/unimaps for a selection of map files --# you can use. --#unicodemap="iso01" -+#consoletranslation="8859-1_to_uni.trans" -diff --git a/init.d/consolefont.in b/init.d/consolefont.in -index 9fe95afa..173ed426 100644 ---- a/init.d/consolefont.in -+++ b/init.d/consolefont.in -@@ -22,7 +22,6 @@ start() - { - ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} - consolefont=${consolefont:-${CONSOLEFONT}} -- unicodemap=${unicodemap:-${UNICODEMAP}} - consoletranslation=${consoletranslation:-${CONSOLETRANSLATION}} - - if [ -z "$consolefont" ]; then -@@ -43,9 +42,6 @@ start() - if [ -n "$consoletranslation" ]; then - param="$param -m $consoletranslation" - fi -- if [ -n "${unicodemap}" ]; then -- param="$param -u $unicodemap" -- fi - - # Set the console font - ebegin "Setting console font [$consolefont]" -@@ -63,7 +59,8 @@ start() - # Store the font so we can use it ASAP on boot - if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then - mkdir -p "$RC_LIBEXECDIR"/console -- setfont -O "$RC_LIBEXECDIR"/console/font -+ zcat "/usr/share/consolefonts/$consolefont" \ -+ > "$RC_LIBEXECDIR"/console/font - fi - - return $retval --- -2.11.0 - diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD index 2b1c5f520..c2cb32220 100644 --- a/system/openrc/APKBUILD +++ b/system/openrc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=openrc pkgver=0.24.1 -pkgrel=8 +pkgrel=10 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="https://github.com/OpenRC/openrc" arch="all" @@ -19,7 +19,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve 0004-hide-error-when-migrating-var-run-to-run.patch 0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch 0006-mount-efivars-read-only.patch - 0007-make-consolefont-service-compatible-with-busyboxs-se.patch openrc-configuration.patch @@ -69,8 +68,11 @@ package() { rm "$pkgdir"/etc/conf.d/network rm "$pkgdir"/etc/init.d/network - # we use console-setup for keymaps - rm "$pkgdir"/etc/init.d/keymaps + # we ship these in system/kbd + for i in consolefont keymaps; do + rm "$pkgdir"/etc/conf.d/$i + rm "$pkgdir"/etc/init.d/$i + done # we use gettys-openrc for TTY rm "$pkgdir"/etc/init.d/agetty @@ -86,7 +88,6 @@ aedf77f9159fefb4bd5f30a29a33b6aedbc986c9a0f993aa928cc79fbe24aac76bd9e5974dcce52e d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc0d301aa91967137d144effbe5f574394af768ce4ebc48738 0004-hide-error-when-migrating-var-run-to-run.patch 39a35c54ec9112fe84c901ed155a711cec8e194af02d5483ee60b80743dab12391e6fdc7b3da2f86844dd4edcf53e681ff95bd4d6fa1101a89ce54dce2ddbb7c 0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch 7221dd2daccd8844f6f9481b7b5921abc2711c8abd1a4bb72f04db8fd8e734b817f5d0d571daea0e2e05d3bc687f75ee1d8025249996bdee0b3328e18d9da7d3 0006-mount-efivars-read-only.patch -234c4f3cf39df3350dbea25c00b8d584794b28194f44c726767a6a16d91a26fee1b5d2dd16635f19803fc015b4e9d99c52b23128e6b815938b88365feba8cf59 0007-make-consolefont-service-compatible-with-busyboxs-se.patch 2dde266f3176456724e4b0c40476e7061e31986b67744b4a53c71ba0d3896860b4569e3af2ea4777a9d8fe3b6282ff869666570f1daa86cdc410c0e09805c990 openrc-configuration.patch 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec openrc.logrotate 99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd hostname.initd diff --git a/system/openrc/openrc.post-install b/system/openrc/openrc.post-install index 0f6572ef7..9632de2ee 100644 --- a/system/openrc/openrc.post-install +++ b/system/openrc/openrc.post-install @@ -1,6 +1,6 @@ #!/bin/sh -if [ -d /etc/runlevels ]; then +if [ -d /etc/runlevels/sysinit ]; then exit 0 fi diff --git a/system/pax-utils/APKBUILD b/system/pax-utils/APKBUILD index 6c121b48a..481a7077e 100644 --- a/system/pax-utils/APKBUILD +++ b/system/pax-utils/APKBUILD @@ -12,7 +12,7 @@ depends="scanelf" makedepends_build="" makedepends_host="linux-headers libcap-dev" makedepends="$makedepends_build $makedepends_host" -source="http://distfiles.gentoo.org/distfiles/${pkgname}-${pkgver}.tar.xz +source="https://mirrormaster.adelielinux.org/source/upstream/pax-utils-$pkgver.tar.xz fix-eitype.patch" subpackages="$pkgname-doc scanelf:_scanelf" diff --git a/system/perl-io-socket-ssl/APKBUILD b/system/perl-io-socket-ssl/APKBUILD index ac8d7ccbf..a20f98860 100644 --- a/system/perl-io-socket-ssl/APKBUILD +++ b/system/perl-io-socket-ssl/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=IO-Socket-SSL _author=SULLR _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.067 +pkgver=2.068 pkgrel=0 pkgdesc="Perl module implementing SSL/TLS with IO::Socket interface" url="https://metacpan.org/release/IO-Socket-SSL" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="b7b9edc470f2283c363a6296d3ce23f8754cc1b1a763329ccc8a0bc81dca7ffbaf9a833fc8ac31e62f5f72cab7c689ea0d4d0e293f75fe176d1b5c71ed723516 IO-Socket-SSL-2.067.tar.gz" +sha512sums="9bccce1a85d24a4e06394a7a0eb8c1c834a71d1fecf99e3a7c0fea1828dcad0da24768bfe0db996d70f3e153135fc958d85ae65fab300ebfd8b520441aa27cfa IO-Socket-SSL-2.068.tar.gz" diff --git a/system/perl-json-maybexs/APKBUILD b/system/perl-json-maybexs/APKBUILD index 760b09e19..e650c0b13 100644 --- a/system/perl-json-maybexs/APKBUILD +++ b/system/perl-json-maybexs/APKBUILD @@ -3,18 +3,18 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-json-maybexs _pkgreal=JSON-MaybeXS -_author=HAARG +_author=ETHER _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.004000 +pkgver=1.004002 pkgrel=0 pkgdesc="Use <Cpanel::JSON::XS> with a fallback to <JSON::XS> and <JSON::PP>" url="https://metacpan.org/release/JSON-MaybeXS" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl-cpanel-json-xs" -makedepends="" -checkdepends="perl-test-without-module" +checkdepends="perl-test-needs perl-test-without-module" +makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="caebd00e49f4bd79f9a9a748077d58d963f53b656e4f48f9577a14fb36a80e956ff393f0ccdf7066129bcd7ebcec73a201c1c6fc778ce2488522b4e3886d2bbb JSON-MaybeXS-1.004000.tar.gz" +sha512sums="5e8965323051f34e8b0f2ad9ed2eb7ec05a6479112c1c56c450f7d3224e82bf382f643e897c33f11218e2fb7d8807ad3c5306f83b7eb53081602d9d8fafc4fbe JSON-MaybeXS-1.004002.tar.gz" diff --git a/system/perl-test-requires/APKBUILD b/system/perl-test-requires/APKBUILD index b32b599b4..bb2f245cb 100644 --- a/system/perl-test-requires/APKBUILD +++ b/system/perl-test-requires/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Test-Requires _author=TOKUHIROM _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.10 +pkgver=0.11 pkgrel=0 pkgdesc="Checks to see if a Perl module can be loaded" url="https://metacpan.org/release/Test-Requires" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="5bc6bf52ae5ab3c56f49b7b17faedf7d6afef2cadfca8aab4770f2c2f91cd4fcb98921e1af159d1dc42684b80f50d4b7fc12bd05ef9dccdcbeeeb6100a9e5ae6 Test-Requires-0.10.tar.gz" +sha512sums="770ea2469e386296fe1ded3630fa9b7f30ee22acd3522fb83ad95171ccb96812ef2fc5fa30d658a405dc1c435d35b6d476cc054021d74e04b419b517f6f898fa Test-Requires-0.11.tar.gz" diff --git a/system/perl-test-simple/APKBUILD b/system/perl-test-simple/APKBUILD index f2e5f8580..ebdd0942c 100644 --- a/system/perl-test-simple/APKBUILD +++ b/system/perl-test-simple/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test-Simple _author=EXODIST _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.302171 +pkgver=1.302175 pkgrel=0 pkgdesc="Basic utilities for writing Perl tests" url="https://metacpan.org/release/Test-Simple" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="abae294e5c941c807b08ceafb2b30603c013fa669e9e6605c3495f6468a65303d5a639af719651b1f0bab6ea10771fc38cd2443a93142511ee27a1cd840d7ef9 Test-Simple-1.302171.tar.gz" +sha512sums="526b876f7e8b783e1f5c4b16a40d1a1392f4c43c782106117bfebecf3d7eddc0b98c6168b6baae7da48d1df15079ca9c35787310f0785a7ba7ce806b2fb177a7 Test-Simple-1.302175.tar.gz" diff --git a/system/pkgconf/APKBUILD b/system/pkgconf/APKBUILD index 49d76d0ae..80c9f3a26 100644 --- a/system/pkgconf/APKBUILD +++ b/system/pkgconf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pkgconf -pkgver=1.6.3 +pkgver=1.7.3 pkgrel=0 pkgdesc="Toolkit for maintaining development package metadata" url="http://pkgconf.org/" @@ -46,4 +46,4 @@ dev() { mv "$subpkgdir"/usr/share/aclocal/pkg.m4 "$pkgdir"/usr/share/aclocal/ } -sha512sums="437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1 pkgconf-1.6.3.tar.xz" +sha512sums="37b6c4f9f3b93970e35b6970fde22fbbde65e7fa32a5634b3fdfc25cc1f33843582722ad13d9a8e96fd6768406fcbe86bf5feb76996ddd0bb66d6ff91e65f0b6 pkgconf-1.7.3.tar.xz" diff --git a/system/psmisc/APKBUILD b/system/psmisc/APKBUILD index f8a16af1f..4414d28b9 100644 --- a/system/psmisc/APKBUILD +++ b/system/psmisc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: pkgname=psmisc -pkgver=23.2 +pkgver=23.3 pkgrel=0 pkgdesc="Miscellaneous utilities that use the proc filesystem" url="https://gitlab.com/psmisc/psmisc" @@ -51,5 +51,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="210dd327f1ff614587ff5b4ae60cd843426302a020fe7f1c018ddba99dcdff7b7ad0620e2b1f10f6204402c1dc0deebcb4332235bcca082d6be21dcb68043619 psmisc-23.2.tar.bz2 +sha512sums="0571aadcd89ecbc89f991a80b02372b3cb881abed97313640bb23905e133473e1c7a51bf8d6c6dbd3d12a013b3aad88d7f94adfcdc3f6f22a53c57e1e0b33016 psmisc-23.3.tar.bz2 a910611896368a088503f50a04a1c2af00d57ee20f3613e81c79cd89574805a505dff43e356ed833a464e3b59d7c1e11fd52cf0bbf32fcfece4dbd2380f23b71 fix-peekfd-on-ppc.patch" diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index c3985d7d3..49a69ddad 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-init -pkgver=1.0.4.0 +pkgver=1.0.4.2 pkgrel=0 pkgdesc="A s6-based init system" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9.1.0 -depends="execline s6 s6-linux-init-common" +_skalibs_version=2.9.2.1 +_s6_version=2.9.2.0 +depends="execline s6>=$_s6_version s6-linux-init-common" makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev utmps-dev" subpackages="$pkgname-common:common:noarch $pkgname-early-getty:earlygetty:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.init runlevel rc.shutdown reboot.sh earlygetty.run" @@ -119,7 +120,7 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="791e376911c9217adace72c6048a295d4b486fc51c0a73578a40a0b020a735d9444f58e5f49d613e99a81aadd63d016ae60c8b056c49c1b50693a7b054890926 s6-linux-init-1.0.4.0.tar.gz +sha512sums="31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53 s6-linux-init-1.0.4.2.tar.gz 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD index cc7148513..b56132a15 100644 --- a/system/s6-rc/APKBUILD +++ b/system/s6-rc/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-rc pkgver=0.5.1.2 -pkgrel=0 +pkgrel=1 pkgdesc="skarnet.org's service manager, working on top of s6" url="https://skarnet.org/software/s6-rc/" arch="all" options="!check" license="ISC" -_skalibs_version=2.9.1.0 -_s6_version=2.9.0.1 +_skalibs_version=2.9.2.1 +_s6_version=2.9.2.0 depends="execline" makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev>=$_s6_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index e2a601690..4909c3daf 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.9.1.0 +pkgver=2.9.2.0 pkgrel=0 pkgdesc="skarnet.org's small & secure supervision software suite" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9.1.0 +_skalibs_version=2.9.2.1 depends="execline" makedepends="skalibs-dev>=$_skalibs_version execline-dev" install="$pkgname.post-upgrade" @@ -66,5 +66,4 @@ doc() { mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } - -sha512sums="190660ed3af678b304230c688d3364a20dfb8d6e944314506bc27c90fc2ccf1062c7b2931df93620dd3b6f5f794d6119d984f28cb2f4562c1abb8609270b90f5 s6-2.9.1.0.tar.gz" +sha512sums="ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee s6-2.9.2.0.tar.gz" diff --git a/system/sed/APKBUILD b/system/sed/APKBUILD index 545d10970..17f50b841 100644 --- a/system/sed/APKBUILD +++ b/system/sed/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=sed -pkgver=4.7 +pkgver=4.8 pkgrel=0 pkgdesc="GNU stream editor" url="https://www.gnu.org/software/sed" @@ -39,6 +39,6 @@ package() { rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } -sha512sums="e0be5db4cdf8226b34aaa9071bc5ae0eafde1c52227cee3512eea7fe2520d6c5cebf15266aa5c4adffbb51bf125c140a15644e28d57759893c12823ea9bbf4fb sed-4.7.tar.xz -aeb55f85a5c724f0dacbf2f39e0f99ae4c66159115b00aa36d65f234f87e52e660878cb18b772a494349632dfa1b616b9306a4cafe87e91182ea8936c308506a disable-mbrtowc-test.patch +sha512sums="7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8 sed-4.8.tar.xz +103ab7c87a920dcd73a95a5d93a722082ff48a782cd85f68f493abfb9c9acd52323ca368a4bd807d8435f4c26ae2e3d9ec00372959d4a1aa05c2583a931d64b8 disable-mbrtowc-test.patch 8dc38bbd731885c69e83d2ed45d5df28542d9401f196295871135aa157d48ac77f1f926afcaab3ee0098ab0eb6232efc4664060177c3bf109a3e673f5adf9b85 gnulib-tests-dont-require-gpg-passphrase.patch" diff --git a/system/sed/disable-mbrtowc-test.patch b/system/sed/disable-mbrtowc-test.patch index 51cdf3c25..001502310 100644 --- a/system/sed/disable-mbrtowc-test.patch +++ b/system/sed/disable-mbrtowc-test.patch @@ -4,7 +4,7 @@ #!/bin/sh -# Test whether the POSIX locale has encoding errors. -LC_ALL=C \ --./test-mbrtowc${EXEEXT} 5 || exit +-${CHECKER} ./test-mbrtowc${EXEEXT} 5 || exit -LC_ALL=POSIX \ --./test-mbrtowc${EXEEXT} 5 +-${CHECKER} ./test-mbrtowc${EXEEXT} 5 +exit 77 diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD index ada2b303c..129fa7e79 100644 --- a/system/skalibs/APKBUILD +++ b/system/skalibs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=skalibs -pkgver=2.9.2.0 +pkgver=2.9.2.1 pkgrel=0 pkgdesc="A set of general-purpose C programming libraries for skarnet.org software" url="https://skarnet.org/software/skalibs/" @@ -57,4 +57,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="a351cb8d048cefa495cc35fd2758579879d5ac11d2a1fc00c694d5655aa9e430228517c01fc91bdbc70c3992f73429a68a5365cb46039a7b7bb11358f0f4506d skalibs-2.9.2.0.tar.gz" +sha512sums="bd507faf30f0564fb8d3e5f86de04ab4b39961dab2497ba9f4a81980a57f7ff68cad366b9847b25d555b5b9263460d13f096e1774d080d1d286979f2e7324c54 skalibs-2.9.2.1.tar.gz" diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD index 879a86235..28df01723 100644 --- a/system/strace/APKBUILD +++ b/system/strace/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=strace -pkgver=5.5 +pkgver=5.7 pkgrel=0 pkgdesc="A useful diagnositic, instructional, and debugging tool" url="https://strace.io/" @@ -54,5 +54,5 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231 strace-5.5.tar.xz +sha512sums="aef481238196204495cf9507cd48ce30af799f79904478e6be57a267311a999c868f18540cc1e025f5e486730cfe9ccb256f528f6f796d204a7347ebdf2042f1 strace-5.7.tar.xz 6616161b6e015c5e56b7171995d28ab63a865156b7f9826b4be26beaac863f0ebc341014910ea53157a810c6afafc10ce80b2d31f4d649d28718a9be78795c6c nlattr-fix.patch" diff --git a/system/sudo/APKBUILD b/system/sudo/APKBUILD index 3bad54e5e..10386f068 100644 --- a/system/sudo/APKBUILD +++ b/system/sudo/APKBUILD @@ -3,13 +3,13 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=sudo -pkgver=1.8.28 +pkgver=1.9.1 if [ "${pkgver%_*}" != "$pkgver" ]; then _realver=${pkgver%_*}${pkgver#*_} else _realver=$pkgver fi -pkgrel=1 +pkgrel=0 pkgdesc="Give certain users the ability to run some commands as root" url="https://www.sudo.ws/sudo/" arch="all" @@ -26,12 +26,22 @@ source="https://www.sudo.ws/dist/sudo-${_realver}.tar.gz SIGUNUSED.patch " builddir="$srcdir"/$pkgname-$_realver +somask="audit_json.so + group_file.so + libsudo_noexec.so + libsudo_util.so.0 + sample_approval.so + sudoers.so + system_group.so + " # secfixes: # 1.8.20_p2-r0: # - CVE-2017-1000368 -# 1.8.28: +# 1.8.28-r0: # - CVE-2019-14287 +# 1.9.0-r0: +# - CVE-2019-19232 build() { ./configure \ @@ -46,7 +56,10 @@ build() { --without-skey \ --with-passprompt="[sudo] Password for %p: " \ --with-insults=disabled \ - --with-all-insults + --with-all-insults \ + --enable-python=no \ + --disable-log-server \ + --disable-log-client # Workaround until SIGUNUSED.patch is not needed anymore rm lib/util/mksiglist.h lib/util/mksigname.h @@ -67,7 +80,7 @@ package() { rm -rf "$pkgdir"/var/run } -sha512sums="09e589cdfd18d7c43b0859a0e11c008b3cb995ae4f8c89c717c5242db9e5696361eb574ebe74a0b5316afffb3a8037f7a7f3c249176e8ed9caffeb4cd860ddc7 sudo-1.8.28.tar.gz +sha512sums="7994c7d8f020188eda51787bb5f6fe7668518cc89b711e7840470db7e5bac1219490ffccc73854fecb14ceb3ffaf0fc605f3438c87b83f27921ea3626365105c sudo-1.9.1.tar.gz f0f462f40502da2194310fe4a72ec1a16ba40f95a821ba9aa6aabaa423d28c4ab26b684afa7fb81c2407cf60de9327bdab01de51b878c5d4de49b0d62645f53c fix-cross-compile.patch dcc03abdd672c934f90dfd3683b3f81a8d39cfff91307d2dbd20a31a852022ab605d034c4fe11860ba99b78d391a9812fca1d6e052620b8ff2c42e4f0c7a1a62 musl-fix-headers.patch 2733c220ccbdaf61a32d8c72a5bc0209673733014f0d71b568f1523b71416e9d1754dd8c95bc6cd99aa7f935ed6e93c5f19b1a1dbb7dfc2daf9917fd37f96e78 SIGUNUSED.patch" diff --git a/system/tcl/APKBUILD b/system/tcl/APKBUILD index e12202883..bec856ea5 100644 --- a/system/tcl/APKBUILD +++ b/system/tcl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=tcl -pkgver=8.6.9 +pkgver=8.6.10 pkgrel=0 pkgdesc="The Tcl scripting language" url="http://tcl.sourceforge.net/" @@ -72,5 +72,5 @@ dev() { done } -sha512sums="707fc0fb4f45c85e8f21692e5035d727cde27d87a2e1cd2e748ad373ebd3517aeca25ecaef3382a2f0e0a1feff96ce94a62b87abcf085e1a0afe2a23ef460112 tcl8.6.9-src.tar.gz +sha512sums="c89b886e483320a284033de51b5363758ef4748d6248ae73eb8e90fbe76c180395f485135ca9bf1246dd567159a77ffc1e8cb537bc2fc4a09b01448928d0afd7 tcl8.6.10-src.tar.gz cd52cbe80fd2be227c9018dbe38fa0888302293402e7a57f2e231c195b7c1902f1b58bc87d19c9d123915ca757e871abf084c0ef23b1a7f187bc03ba93904cc2 tcl-stat64.patch" diff --git a/system/tzdata/APKBUILD b/system/tzdata/APKBUILD index 4fbdec71f..445031801 100644 --- a/system/tzdata/APKBUILD +++ b/system/tzdata/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tzdata -pkgver=2019c -_tzcodever=2019c +pkgver=2020a +_tzcodever=2020a _ptzver=0.5 pkgrel=0 pkgdesc="Time zone data" @@ -54,7 +54,7 @@ package() { "$pkgdir"/usr/bin/posixtz } -sha512sums="61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b tzcode2019c.tar.gz -2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565 tzdata2019c.tar.gz +sha512sums="5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2 tzcode2020a.tar.gz +2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d tzdata2020a.tar.gz 68dbaab9f4aef166ac2f2d40b49366527b840bebe17a47599fe38345835e4adb8a767910745ece9c384b57af815a871243c3e261a29f41d71f8054df3061b3fd posixtz-0.5.tar.xz f54ce213d74c5a8387e1a7c56299bc6eee65a035772288222128abc249a112067b8791b88b45c342b2d4d8d12e9e4f1f2f5c92c5de67f8b6413b1ebf1d7de467 0001-posixtz-fix-up-lseek.patch" diff --git a/system/unzip/10-unzip-handle-pkware-verify.patch b/system/unzip/10-unzip-handle-pkware-verify.patch deleted file mode 100644 index b373ce07d..000000000 --- a/system/unzip/10-unzip-handle-pkware-verify.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Steven Schweda -Subject: Handle the PKWare verification bit of internal attributes -Bug-Debian: http://bugs.debian.org/630078 -X-Debian-version: 6.0-5 - ---- a/process.c -+++ b/process.c -@@ -1729,6 +1729,13 @@ - else if (uO.L_flag > 1) /* let -LL force lower case for all names */ - G.pInfo->lcflag = 1; - -+ /* Handle the PKWare verification bit, bit 2 (0x0004) of internal -+ attributes. If this is set, then a verification checksum is in the -+ first 3 bytes of the external attributes. In this case all we can use -+ for setting file attributes is the last external attributes byte. */ -+ if (G.crec.internal_file_attributes & 0x0004) -+ G.crec.external_file_attributes &= (ulg)0xff; -+ - /* do Amigas (AMIGA_) also have volume labels? */ - if (IS_VOLID(G.crec.external_file_attributes) && - (G.pInfo->hostnum == FS_FAT_ || G.pInfo->hostnum == FS_HPFS_ || diff --git a/system/unzip/20-unzip-uidgid-fix.patch b/system/unzip/20-unzip-uidgid-fix.patch deleted file mode 100644 index 3a308990e..000000000 --- a/system/unzip/20-unzip-uidgid-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: sms -Subject: Restore uid and gid information when requested -Bug-Debian: http://bugs.debian.org/689212 -X-Debian-version: 6.0-8 - ---- a/process.c -+++ b/process.c -@@ -2904,7 +2904,7 @@ - #ifdef IZ_HAVE_UXUIDGID - if (eb_len >= EB_UX3_MINLEN - && z_uidgid != NULL -- && (*((EB_HEADSIZE + 0) + ef_buf) == 1) -+ && (*((EB_HEADSIZE + 0) + ef_buf) == 1)) - /* only know about version 1 */ - { - uch uid_size; -@@ -2916,10 +2916,10 @@ - flags &= ~0x0ff; /* ignore any previous UNIX field */ - - if ( read_ux3_value((EB_HEADSIZE + 2) + ef_buf, -- uid_size, z_uidgid[0]) -+ uid_size, &z_uidgid[0]) - && - read_ux3_value((EB_HEADSIZE + uid_size + 3) + ef_buf, -- gid_size, z_uidgid[1]) ) -+ gid_size, &z_uidgid[1]) ) - { - flags |= EB_UX2_VALID; /* signal success */ - } diff --git a/system/unzip/APKBUILD b/system/unzip/APKBUILD index e915966a0..9b3f696f3 100644 --- a/system/unzip/APKBUILD +++ b/system/unzip/APKBUILD @@ -4,7 +4,8 @@ pkgname=unzip pkgver=6.0 _pkgver=$(printf '%s' "$pkgver" | tr -d .) -pkgrel=3 +_debver=25 +pkgrel=5 pkgdesc="Extract PKZIP-compatible .zip files" url="http://www.info-zip.org/UnZip.html" arch="all" @@ -12,16 +13,39 @@ license="Info-ZIP" subpackages="$pkgname-doc" # normally ftp://ftp.info-zip.org/pub/infozip/src/$pkgname$_pkgver.zip source="$pkgname-$pkgver.tgz::https://distfiles.adelielinux.org/source/$pkgname$_pkgver.tgz - 10-unzip-handle-pkware-verify.patch - 20-unzip-uidgid-fix.patch - unzip-6.0-heap-overflow-infloop.patch + http://deb.debian.org/debian/pool/main/u/unzip/unzip_$pkgver-$_debver.debian.tar.xz + cflags.patch + format-secure.patch + unzipsfx-bomb-32bit.patch " builddir="$srcdir/$pkgname$_pkgver" +# secfixes: +# 6.0-r4: +# - CVE-2014-8139 +# - CVE-2014-8140 +# - CVE-2014-8141 +# - CVE-2014-9636 +# - CVE-2014-9913 +# - CVE-2016-9844 +# - CVE-2018-18384 +# - CVE-2018-1000035 +# - CVE-2019-13232 + +prepare() { + cd "$builddir" + while read -r i; do + msg "$i" + patch -p1 -i "../debian/patches/$i" + done < ../debian/patches/series + default_prepare +} + build() { make -f unix/Makefile \ CC="${CHOST}-gcc" \ - LOCAL_ZIP="${CFLAGS} ${CPPFLAGS}" \ + LOCAL_UNZIP="${CFLAGS} ${CPPFLAGS}" \ + STRIP=: \ prefix=/usr generic } @@ -38,6 +62,7 @@ package() { } sha512sums="0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d unzip-6.0.tgz -9d2914f22fb0075a2b6f72825c235f46eafd8d47b6fb6fcc8303fc69336e256b15923c002d2615bb6af733344c2315e4a8504d77bae301e10c11d4736faa2c81 10-unzip-handle-pkware-verify.patch -57699582e9056af0817dcb67f8db67e6a1ff8208c137fbebcf559429e5f12b471b75d7e1ef938e5bbb5416074a51ac7342e4ce8057f4bbdcb0bf079b8d7832af 20-unzip-uidgid-fix.patch -b1e3fac6a787828efaaef8ec7cc52e1573aea27a6f29830af37ec4ba8bcd2a6488c953ab10eee0561c78e82c7401833ef172bebee793405d93632ce788756301 unzip-6.0-heap-overflow-infloop.patch" +13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21 unzip_6.0-25.debian.tar.xz +029447a48972234e60c6b45c58b01dbe411594b1ffe0db00d028810b0bcfa7244dcc89f765e1ee6e8805ba2d2db9bc1d05a1e30ef0d9dd08d33ff6f04af811ab cflags.patch +4bdf55937a181d496261a8f426a97d63844ba96f23beea7906c5e4f7064f55c188ee5ec3ae2d6f2011b5f26b6ac0941dcffb83c06370ed9648b2262917cde64d format-secure.patch +81777dfa1ad707046b238fa9205f8be0f48363f0f23bc0d2d83b67b143ceeba6818cc11058355195a03432cdd6ed4f392202ff3029e14d4b1435c9e2cb5ca6bf unzipsfx-bomb-32bit.patch" diff --git a/system/unzip/cflags.patch b/system/unzip/cflags.patch new file mode 100644 index 000000000..f85192155 --- /dev/null +++ b/system/unzip/cflags.patch @@ -0,0 +1,20 @@ +--- unzip60/unix/configure 2009-04-16 14:25:12.000000000 -0500 ++++ unzip60/unix/configure 2020-06-13 22:59:57.259771113 -0500 +@@ -17,7 +17,7 @@ CFLAGSR=${CFLAGS} + IZ_BZIP2=${3} + CFLAGS="${CFLAGS} -I. -DUNIX" + LFLAGS1="" +-LFLAGS2="-s" ++LFLAGS2="" + LN="ln -s" + + CFLAGS_OPT='' +@@ -130,6 +130,8 @@ _EOF_ + fi + fi + ++CFLAGS_OPT="" ++ + # optimization flags + if test -n "${CFLAGS_OPT}"; then + CFLAGSR="${CFLAGSR} ${CFLAGS_OPT}" diff --git a/system/unzip/format-secure.patch b/system/unzip/format-secure.patch new file mode 100644 index 000000000..5b766f31d --- /dev/null +++ b/system/unzip/format-secure.patch @@ -0,0 +1,93 @@ +Cherry picked from Fedora +https://src.fedoraproject.org/rpms/unzip/blob/874f1688f1662bb3baf76021969277cafeea6ea8/f/unzip-6.0-format-secure.patch + +diff --git a/extract.c b/extract.c +index eeb2f57..a0a4929 100644 +--- a/extract.c ++++ b/extract.c +@@ -472,8 +472,8 @@ int extract_or_test_files(__G) /* return PK-type error code */ + */ + Info(slide, 0x401, ((char *)slide, + LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1)); +- Info(slide, 0x401, ((char *)slide, +- LoadFarString(ReportMsg))); ++ Info(slide, 0x401, ++ ((char *)slide,"%s", LoadFarString(ReportMsg))); + error_in_archive = PK_BADERR; + } + reached_end = TRUE; /* ...so no more left to do */ +@@ -752,8 +752,8 @@ int extract_or_test_files(__G) /* return PK-type error code */ + + #ifndef SFX + if (no_endsig_found) { /* just to make sure */ +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); +- Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg))); ++ Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg))); ++ Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(ReportMsg))); + if (!error_in_archive) /* don't overwrite stronger error */ + error_in_archive = PK_WARN; + } +diff --git a/list.c b/list.c +index 15e0011..f7359c3 100644 +--- a/list.c ++++ b/list.c +@@ -181,7 +181,7 @@ int list_files(__G) /* return PK-type error code */ + Info(slide, 0x401, + ((char *)slide, LoadFarString(CentSigMsg), j)); + Info(slide, 0x401, +- ((char *)slide, LoadFarString(ReportMsg))); ++ ((char *)slide,"%s", LoadFarString(ReportMsg))); + return PK_BADERR; /* sig not found */ + } + } +@@ -507,7 +507,8 @@ int list_files(__G) /* return PK-type error code */ + && (!G.ecrec.is_zip64_archive) + && (memcmp(G.sig, end_central_sig, 4) != 0) + ) { /* just to make sure again */ +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); ++ Info(slide, 0x401, ++ ((char *)slide,"%s", LoadFarString(EndSigMsg))); + error_in_archive = PK_WARN; /* didn't find sig */ + } + +@@ -591,7 +592,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */ + Info(slide, 0x401, + ((char *)slide, LoadFarString(CentSigMsg), j)); + Info(slide, 0x401, +- ((char *)slide, LoadFarString(ReportMsg))); ++ ((char *)slide,"%s", LoadFarString(ReportMsg))); + return PK_BADERR; /* sig not found */ + } + } +@@ -674,7 +675,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */ + ---------------------------------------------------------------------------*/ + + if (memcmp(G.sig, end_central_sig, 4)) { /* just to make sure again */ +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); ++ Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg))); + error_in_archive = PK_WARN; + } + if (*nmember == 0L && error_in_archive <= PK_WARN) +diff --git a/zipinfo.c b/zipinfo.c +index 6e22cc8..ac5c61b 100644 +--- a/zipinfo.c ++++ b/zipinfo.c +@@ -771,7 +771,7 @@ int zipinfo(__G) /* return PK-type error code */ + Info(slide, 0x401, + ((char *)slide, LoadFarString(CentSigMsg), j)); + Info(slide, 0x401, +- ((char *)slide, LoadFarString(ReportMsg))); ++ ((char *)slide,"%s", LoadFarString(ReportMsg))); + error_in_archive = PK_BADERR; /* sig not found */ + break; + } +@@ -960,7 +960,8 @@ int zipinfo(__G) /* return PK-type error code */ + && (!G.ecrec.is_zip64_archive) + && (memcmp(G.sig, end_central_sig, 4) != 0) + ) { /* just to make sure again */ +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); ++ Info(slide, 0x401, ++ ((char *)slide,"%s", LoadFarString(EndSigMsg))); + error_in_archive = PK_WARN; /* didn't find sig */ + } + diff --git a/system/unzip/unzip-6.0-heap-overflow-infloop.patch b/system/unzip/unzip-6.0-heap-overflow-infloop.patch deleted file mode 100644 index 160c512f9..000000000 --- a/system/unzip/unzip-6.0-heap-overflow-infloop.patch +++ /dev/null @@ -1,104 +0,0 @@ -From bdd4a0cecd745cb4825e4508b5bdf2579731086a Mon Sep 17 00:00:00 2001 -From: Petr Stodulka <pstodulk@redhat.com> -Date: Mon, 14 Sep 2015 18:23:17 +0200 -Subject: [PATCH 1/3] upstream fix for heap overflow - -https://bugzilla.redhat.com/attachment.cgi?id=1073002 ---- - crypt.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/crypt.c b/crypt.c -index 784e411..a8975f2 100644 ---- a/crypt.c -+++ b/crypt.c -@@ -465,7 +465,17 @@ int decrypt(__G__ passwrd) - GLOBAL(pInfo->encrypted) = FALSE; - defer_leftover_input(__G); - for (n = 0; n < RAND_HEAD_LEN; n++) { -- b = NEXTBYTE; -+ /* 2012-11-23 SMS. (OUSPG report.) -+ * Quit early if compressed size < HEAD_LEN. The resulting -+ * error message ("unable to get password") could be improved, -+ * but it's better than trying to read nonexistent data, and -+ * then continuing with a negative G.csize. (See -+ * fileio.c:readbyte()). -+ */ -+ if ((b = NEXTBYTE) == (ush)EOF) -+ { -+ return PK_ERR; -+ } - h[n] = (uch)b; - Trace((stdout, " (%02x)", h[n])); - } --- -2.4.6 - - -From 4b48844661ff9569f2ecf582a387d46a5775b5d8 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka <kdudka@redhat.com> -Date: Mon, 14 Sep 2015 18:24:56 +0200 -Subject: [PATCH 2/3] fix infinite loop when extracting empty bzip2 data - -Bug: https://sourceforge.net/p/infozip/patches/23/ ---- - extract.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/extract.c b/extract.c -index 7134bfe..29db027 100644 ---- a/extract.c -+++ b/extract.c -@@ -2733,6 +2733,12 @@ __GDEF - int repeated_buf_err; - bz_stream bstrm; - -+ if (G.incnt <= 0 && G.csize <= 0L) { -+ /* avoid an infinite loop */ -+ Trace((stderr, "UZbunzip2() got empty input\n")); -+ return 2; -+ } -+ - #if (defined(DLL) && !defined(NO_SLIDE_REDIR)) - if (G.redirect_slide) - wsize = G.redirect_size, redirSlide = G.redirect_buffer; --- -2.4.6 - - -From bd150334fb4084f5555a6be26b015a0671cb5b74 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka <kdudka@redhat.com> -Date: Tue, 22 Sep 2015 18:52:23 +0200 -Subject: [PATCH 3/3] extract: prevent unsigned overflow on invalid input - -Suggested-by: Stefan Cornelius ---- - extract.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/extract.c b/extract.c -index 29db027..b9ae667 100644 ---- a/extract.c -+++ b/extract.c -@@ -1257,8 +1257,17 @@ static int extract_or_test_entrylist(__G__ numchunk, - if (G.lrec.compression_method == STORED) { - zusz_t csiz_decrypted = G.lrec.csize; - -- if (G.pInfo->encrypted) -+ if (G.pInfo->encrypted) { -+ if (csiz_decrypted <= 12) { -+ /* handle the error now to prevent unsigned overflow */ -+ Info(slide, 0x401, ((char *)slide, -+ LoadFarStringSmall(ErrUnzipNoFile), -+ LoadFarString(InvalidComprData), -+ LoadFarStringSmall2(Inflate))); -+ return PK_ERR; -+ } - csiz_decrypted -= 12; -+ } - if (G.lrec.ucsize != csiz_decrypted) { - Info(slide, 0x401, ((char *)slide, - LoadFarStringSmall2(WrnStorUCSizCSizDiff), --- -2.5.2 - diff --git a/system/unzip/unzipsfx-bomb-32bit.patch b/system/unzip/unzipsfx-bomb-32bit.patch new file mode 100644 index 000000000..f834a919b --- /dev/null +++ b/system/unzip/unzipsfx-bomb-32bit.patch @@ -0,0 +1,14 @@ +Explicitly cast literal 0 to the expected bound_t type because K&R C is +awful. + +--- unzip60/extract.c 2020-06-13 22:51:33.799778287 -0500 ++++ unzip60/extract.c 2020-06-14 00:00:50.669719055 -0500 +@@ -520,7 +520,7 @@ int extract_or_test_files(__G) /* ret + return PK_MEM; + } + if ((G.extra_bytes != 0 && +- cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) || ++ cover_add((cover_t *)G.cover, (bound_t)0, G.extra_bytes) != 0) || + (G.ecrec.have_ecr64 && + cover_add((cover_t *)G.cover, G.ecrec.ec64_start, + G.ecrec.ec64_end) != 0) || diff --git a/system/util-linux/APKBUILD b/system/util-linux/APKBUILD index 6d03248ad..7441521c5 100644 --- a/system/util-linux/APKBUILD +++ b/system/util-linux/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=util-linux -pkgver=2.35.1 +pkgver=2.35.2 case $pkgver in *.*.*) _v=${pkgver%.*};; @@ -94,5 +94,5 @@ libmount() { mv "$pkgdir"/lib/libmount.so.* "$subpkgdir"/lib/ } -sha512sums="6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a util-linux-2.35.1.tar.xz +sha512sums="59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2 util-linux-2.35.2.tar.xz 876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h" diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index b60248950..c78339725 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=utmps pkgver=0.0.3.2 -pkgrel=0 +pkgrel=1 pkgdesc="A secure utmp/wtmp implementation" url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite license="ISC" depends="execline s6" -_skalibs_version=2.9.1.0 +_skalibs_version=2.9.2.1 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" install="$pkgname.post-upgrade" diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index cb2f7090f..8c0d476c5 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=vim -pkgver=8.2.0529 +pkgver=8.2.1017 _pkgver=${pkgver%.*.*}${pkgver#*.} _pkgver=${_pkgver%.*} pkgrel=0 @@ -79,5 +79,5 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="73cd3eb1522189f603c65ef1e80c0d1c860ce7332817967ab289aa8f2fdf376235fc9c30af53a66164cfe83a882b55003b4073b27852061295ca9b5fe203501d vim-8.2.0529.tar.gz +sha512sums="6fe243c3aeefe2d63d67e1710d5212a4b76b8fd49e037ca588655e25901ca2af4285128cc97146622c42d0df77194e18fb7d5a2bdd74f26c3534f0c2cc0e5d8b vim-8.2.1017.tar.gz 12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc" diff --git a/system/xfsprogs/APKBUILD b/system/xfsprogs/APKBUILD index b1083da33..8a2058955 100644 --- a/system/xfsprogs/APKBUILD +++ b/system/xfsprogs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xfsprogs -pkgver=5.4.0 +pkgver=5.6.0 pkgrel=0 pkgdesc="XFS filesystem utilities" url="https://xfs.org/index.php/Main_Page" @@ -48,6 +48,6 @@ base() { mv "$subpkgdir"/sbin/xfs_scrub "$pkgdir"/sbin/ } -sha512sums="4d520881f4556976c3d64c5f72f51ea5531c7f380b22c48a1fb72bfde078ac725c70899c8c58263aa2a7aed2213de604121f2863e88b5cf8fb0dcc54446e133e xfsprogs-5.4.0.tar.gz +sha512sums="ee96e0789657c4a5dc5710e472957e861e7aab65eb99f30c9598bc4bb3f2c998b27a4ed0112bae311b1a9e0a4b7dc9dbbdc3089da40405a3f30668a25ded9969 xfsprogs-5.6.0.tar.gz c23d5dca744c4589ede517701fc8ea02f9b7a59568d907269048741806d2e6c9e56ed3493163d63dbf16193ff99471206548b25efcda18e3e5dff14eb38066d4 fix-mmap.patch 29c77c550fa8f7a0b3794649d278a2cb3a65c9368db19415866910160adb6d5a52f1be4f8713b58c5c87f149b6212c068ae27a4547a6c4e4fe7b1584e1261dae no-utmp-header.patch" diff --git a/system/xz/APKBUILD b/system/xz/APKBUILD index 71c504ebe..68fefcf80 100644 --- a/system/xz/APKBUILD +++ b/system/xz/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=xz -pkgver=5.2.4 -pkgrel=1 +pkgver=5.2.5 +pkgrel=0 pkgdesc="Library and command line tools for XZ and LZMA compressed files" url="https://tukaani.org/xz/" arch="all" @@ -45,5 +45,5 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname } -sha512sums="e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578 xz-5.2.4.tar.gz +sha512sums="7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce xz-5.2.5.tar.gz 9310ae2568dd6ac474e3cb9895e1339ca2dbe8834f856edbb7d2264c0019bde4bbd94aa1edd34e5c8d0aed1f35a1877b0e053ed08a270835ea81e59c7be5edb3 dont-use-libdir-for-pkgconfig.patch" diff --git a/system/yaml/APKBUILD b/system/yaml/APKBUILD index 7542e1305..c15955678 100644 --- a/system/yaml/APKBUILD +++ b/system/yaml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=yaml -pkgver=0.2.2 +pkgver=0.2.5 pkgrel=0 pkgdesc="YAML 1.1 parser and emitter written in C" url="https://pyyaml.org/wiki/LibYAML" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="13d2197135946204323dbfccafa0ac7b3d05437e920545a56f46811fd7319c01419a58083090ce85fccd4d6901a620ceb9f1190078cc0830bc0ce769bb024f51 yaml-0.2.2.tar.gz" +sha512sums="dadd7d8e0d88b5ebab005e5d521d56d541580198aa497370966b98c904586e642a1cd4f3881094eb57624f218d50db77417bbfd0ffdce50340f011e35e8c4c02 yaml-0.2.5.tar.gz" diff --git a/system/zstd/APKBUILD b/system/zstd/APKBUILD index adc82aec3..948afd7e8 100644 --- a/system/zstd/APKBUILD +++ b/system/zstd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=zstd -pkgver=1.4.4 +pkgver=1.4.5 pkgrel=0 pkgdesc="Fast real-time compression algorithm" url="https://facebook.github.io/zstd/" @@ -25,4 +25,4 @@ package() { make PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="f12b6f38bd322a0538179ef90e4c83d2cba29e1fef391a8e8e964785e5761e7ba685f62e9a5a1d6b66171fd64e4fd6374e607569531e2f4c05c470cff2294454 zstd-1.4.4.tar.gz" +sha512sums="417b813ade6c8436690bd9d6da34a9f87f50e7378752b72e63066befbee496392a4b72896fa56688d814f461871ab31d3c6637497ff2ed7a282d58513631a38b zstd-1.4.5.tar.gz" diff --git a/user/adwaita-icon-theme/APKBUILD b/user/adwaita-icon-theme/APKBUILD index 4996402cb..d63dd1819 100644 --- a/user/adwaita-icon-theme/APKBUILD +++ b/user/adwaita-icon-theme/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adwaita-icon-theme -pkgver=3.36.0 +pkgver=3.36.1 pkgrel=0 pkgdesc="GNOME system icon set" url="https://www.gnome.org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b5414e4e38d9ffdd5ae8e14cb2f467fc449ca833b3ffd888fa8dde8708ba0cd9292bec8d3c0bc9d917c3117a8d21f828d4113a85c3786d5dcadde46367659934 adwaita-icon-theme-3.36.0.tar.xz" +sha512sums="5df33c8592ebd17e05fb36590423177fa3e07345565302a5b7ef58fb7d7a9b2b3a1789907a81f5ca0abc7446f7e83af059ca9d6432e8182d5274394c79a24fb9 adwaita-icon-theme-3.36.1.tar.xz" diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD index 8681e7991..25cbe8d4d 100644 --- a/user/akonadi-contacts/APKBUILD +++ b/user/akonadi-contacts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-contacts -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Library for integrating contact lists with Akonadi" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="23f896114ba66cce06069538768559c665e6d0bf7bc24b3cd2d801d41e7421f2f79f670a0af740dfbcd3fdc48584ff77cf2e156159450e484b0b8b137cdee4c2 akonadi-contacts-19.12.3.tar.xz" +sha512sums="ccb65c3874853dc9d9f9dd5b39d8f541357d49543386302c99bd1e978d87c9c5b9aee45f5e5589a4f61a04fd82a2867baf1d4fac0936036559957a9be463bb2d akonadi-contacts-20.04.3.tar.xz" diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD index 013d8e49c..238d026f5 100644 --- a/user/akonadi-mime/APKBUILD +++ b/user/akonadi-mime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-mime -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Libraries to implement basic MIME message handling" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d8c22ae1a2a349990248f209be017ceb2976bbb138ed25dc1e67993738d91c426897371f0844e6baecf095b5b39240b8dd836babb970c50b61af3aecc45dc251 akonadi-mime-19.12.3.tar.xz" +sha512sums="a22c8eaa5912fc2b13cf018b89062063157eb87570a9367d9fc4cabdf87e132fc564c81b21583fd0693b7ae4b2f13da6e2f7d6683a441ac2f320f594123bde0a akonadi-mime-20.04.3.tar.xz" diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD index 2b8ba158a..77c35b8ac 100644 --- a/user/akonadi/APKBUILD +++ b/user/akonadi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Libraries and storage system for PIM data" url="https://community.kde.org/KDE_PIM/Akonadi" @@ -18,6 +18,7 @@ makedepends="$depends_dev cmake extra-cmake-modules libxslt-dev qt5-qttools-dev subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-$pkgver.tar.xz akonadiserverrc + atomics.patch " build() { @@ -47,5 +48,6 @@ package() { "$pkgdir"/usr/share/config/akonadi } -sha512sums="d8eb31948a649e4f3ba4d5d000a384d1188075aee8971fea401cfb9e392e111c4f2b19888783ea4a9430443c9c216ea7a2a8275555935cc3965335bfc07296b0 akonadi-19.12.3.tar.xz -b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc" +sha512sums="29612920af6794f096d6ae51d98830f38f4d94bfb3669e11b748fbf7556b2396fac1837f1ee14cfdbc2285164c8b08206d2d46a62d0929354af47c77d9978698 akonadi-20.04.3.tar.xz +b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc +6cdeece137523f0b67fac0384de446562ddca7530cf4a9cc7736d3eb582b6630e24a125f3648778f76b2b576b47e33d5b99a6bfd96770afa0dad97d1a1260cd1 atomics.patch" diff --git a/user/akonadi/atomics.patch b/user/akonadi/atomics.patch new file mode 100644 index 000000000..078501362 --- /dev/null +++ b/user/akonadi/atomics.patch @@ -0,0 +1,10 @@ +--- akonadi-20.04.2/src/server/CMakeLists.txt.old 2020-06-02 07:09:51.000000000 +0000 ++++ akonadi-20.04.2/src/server/CMakeLists.txt 2020-06-16 00:56:48.253282683 +0000 +@@ -170,6 +170,7 @@ + set_target_properties(libakonadiserver PROPERTIES OUTPUT_NAME akonadiserver) + target_link_libraries(libakonadiserver + akonadi_shared ++ atomic + KF5AkonadiPrivate + Qt5::Core + Qt5::Network diff --git a/user/alpine/APKBUILD b/user/alpine/APKBUILD index 6023176f3..2ac0989d2 100644 --- a/user/alpine/APKBUILD +++ b/user/alpine/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=alpine -pkgver=2.22 +pkgver=2.23 pkgrel=0 pkgdesc="Terminal-based email client" url="http://alpine.x10host.com/alpine/" @@ -11,14 +11,7 @@ depends="" makedepends="aspell-dev krb5-dev linux-pam-dev ncurses-dev openldap-dev openssl-dev autoconf automake libtool" subpackages="$pkgname-doc" -source="http://alpine.x10host.com/alpine/release/src/alpine-$pkgver.tar.xz - support-musl.patch - " - -prepare() { - default_prepare - autoreconf -vif -} +source="http://alpine.x10host.com/alpine/release/src/alpine-$pkgver.tar.xz" build() { ./configure \ @@ -39,5 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7737dce02ac94170948df7fccb61380c6cb101190e37f5b3ba281d573f54df1db24569d177b460f49bfff381a922be2e4b0f3a0f1a213d88a64d361aedc3c4f1 alpine-2.22.tar.xz -f26aaac4f81762227254e913f15c18b444e89d92b6885d62755d673d1f3097a126d297dc655b619d91b83bf5645ed0b4d5454c74a95cc142cd5fe3cb391e81cd support-musl.patch" +sha512sums="abc3675b18d6bd20a547b8e2c3f1f4c668aee2f2d20f426f28b4b3d4cfd66762777007441da3b0fda74e625c71bc2ef05434089508c2af804e62cf216df5554b alpine-2.23.tar.xz" diff --git a/user/alpine/support-musl.patch b/user/alpine/support-musl.patch deleted file mode 100644 index a63a351d9..000000000 --- a/user/alpine/support-musl.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./configure.ac.orig -+++ ./configure.ac -@@ -726,7 +726,7 @@ - else - dnl preload c-client default locations/options - case $host in -- *-linux-gnu*|*-k*bsd*-gnu*|*-gnu*) -+ *-linux-gnu*|*-k*bsd*-gnu*|*-gnu*|*-linux-musl*) - if test -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/redhat_version ; then - alpine_SSLTYPE="nopwd" - if test -d /etc/pki/tls ; then -@@ -1070,7 +1070,7 @@ - dnl build from c-client. Most of this will go away when c-client - dnl adopts configure - case "$host" in -- *-linux-gnu*|*-k*bsd*-gnu*|*-gnu*) -+ *-linux-gnu*|*-k*bsd*-gnu*|*-gnu*|*-linux-musl*) - alpine_path_delim="/" - alpine_mode_readonly="(0600)" - if test -f /etc/fedora-release ; then diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD index f4e12d964..d44a0451f 100644 --- a/user/analitza/APKBUILD +++ b/user/analitza/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=analitza -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Mathematical object library" url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3b858af0a79174ec8c7ae28a703d067a6d2545dd5319a2d37d72831bba9f6196c6a6cedf6d277eb5ede812fb39ffab297f966da6c40926b26c0943ca10426eb9 analitza-19.12.3.tar.xz" +sha512sums="25a5f20505f27902623029f0da416209186dd8274479c808a466225759efb0389816388e2fc77e708362ebde4815ca298840d67c98cbd43f516b73d66159c629 analitza-20.04.3.tar.xz" diff --git a/user/apkfoundry/APKBUILD b/user/apkfoundry/APKBUILD new file mode 100644 index 000000000..007c3d913 --- /dev/null +++ b/user/apkfoundry/APKBUILD @@ -0,0 +1,31 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=apkfoundry +pkgver=0.5 +pkgrel=0 +pkgdesc="APK build orchestrator and distribution builder" +url="https://dev.sick.bike/apkfoundry/" +arch="all" +options="!check" # Cannot be run inside itself. +license="GPL-2.0-only AND MIT" +depends="bubblewrap-nosuid python3 shadow-uidmap" +makedepends="" +subpackages="$pkgname-doc" +source="https://dev.sick.bike/dist/apkfoundry-$pkgver.tar.gz" + +build() { + cat >config.mk <<-EOF + DEFAULT_ARCH = $CARCH + EOF + make configure + make +} + +check() { + make check +} + +package() { + make install DESTDIR="$pkgdir" +} + +sha512sums="169caf3b594929814c87fa7a3b7d8e56476a7862d64eaf7bfdf13468c4258e8879f5de738758de39631085a5cbae4b47f7656b4335bb4d7fafd2abce834ee233 apkfoundry-0.5.tar.gz" diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index f6240a428..048af3204 100644 --- a/user/ark/APKBUILD +++ b/user/ark/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ark -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f1a155bcfaca1b28b5035943a3d881de89a68c5e8bac156dd1304aa431c5700b6da6dc70e43e82560594bc5aab0ee1d3f3ec50ed4dd15e7f3dd053acbb1a14a ark-19.12.3.tar.xz" +sha512sums="6274483bc7cad9b8b3842a622a3f243fd5756aec147624eb9041459efd5c833e203c286412185bb105133d8c83a7503c8c7e519b8cb9cbd13830793c3429e142 ark-20.04.3.tar.xz" diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD index a66845948..0441318f7 100644 --- a/user/artikulate/APKBUILD +++ b/user/artikulate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=artikulate -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Pronunciation trainer for languages" url="https://www.kde.org/applications/education/artikulate/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aaf8054d928a7e76ac868ca0bbf99edde6d3402dd175880cb04088f18b8b23d15c7281775d694be0b0bef4ec37a2101f5cf1873a6d933ff5a3cdf4352b017e32 artikulate-19.12.3.tar.xz" +sha512sums="ee7292aff6a4639f310284e2d508dcecad49f9b12550dfa9616e8a56f6955ae3b872733e20f7ba0135321a16bc9cc7b3fc72019b1e4b8ff00d8df31124f8c0ab artikulate-20.04.3.tar.xz" diff --git a/user/aspell-dict-pl/APKBUILD b/user/aspell-dict-pl/APKBUILD index a3bade532..ff226f2fe 100644 --- a/user/aspell-dict-pl/APKBUILD +++ b/user/aspell-dict-pl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=aspell-dict-pl -pkgver=20190107 +pkgver=20200619 pkgrel=0 pkgdesc="Polish dictionaries for aspell" url="https://sjp.pl/slownik/ort/" @@ -10,7 +10,7 @@ options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="https://distfiles.adelielinux.org/source/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2" +source="https://dev.sick.bike/dist/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz"2 builddir="$srcdir/aspell6-pl-6.0_$pkgver-0" build() { @@ -22,4 +22,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a898462495e4797173141f2f82ce74fadb80dfc469e7c4b44871f2622137d5958fad30fd0525ac9cf7a07c31b74d805bb789f022ccbcacadd0d4d1f172986665 sjp-aspell6-pl-6.0_20190107-0.tar.bz2" +sha512sums="76be557382fbc255b32c1be13124090ce65514b2472e57a7205fdeefeae8dac929c8d4a075c2ff18d6bb0dc195fcb4294c621c06b128dad9de12431bfe338c49 sjp-aspell6-pl-6.0_20200619-0.tar.bz2" diff --git a/user/at-spi2-atk/APKBUILD b/user/at-spi2-atk/APKBUILD index 0ca0f7cc1..b64c2e0f2 100644 --- a/user/at-spi2-atk/APKBUILD +++ b/user/at-spi2-atk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-atk -pkgver=2.34.1 +pkgver=2.34.2 pkgrel=0 pkgdesc="GTK+ module to bridge ATK to D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -28,4 +28,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="d30c07a37e42d33ac0658f55e881ab2ca6faa45c251acbd99433ec0f119466f41bb2b6f4b953a7830dd120959aa7f1ee86a763881784e42ea9454f19893a6576 at-spi2-atk-2.34.1.tar.xz" +sha512sums="59e7ad5c944748ca00af8b0a9df03c9ffbc6afae6e65c25a2566a9e2a30e66724c4492076be1730c2894c636f82c795c533669572584d8d5675f68b349ad16c4 at-spi2-atk-2.34.2.tar.xz" diff --git a/user/at-spi2-core/APKBUILD b/user/at-spi2-core/APKBUILD index 4e7ea3109..5788deb50 100644 --- a/user/at-spi2-core/APKBUILD +++ b/user/at-spi2-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-core -pkgver=2.34.0 +pkgver=2.36.0 pkgrel=0 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -26,4 +26,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8 at-spi2-core-2.34.0.tar.xz" +sha512sums="f45d7e68bfcd9b93cebc47e30febce1ae6a4d9df2fbc9d5bdc25babb123c922d0f9a229485770b2f6ed386178144c20486fa3e46195041ea65a54ab019b1cbb6 at-spi2-core-2.36.0.tar.xz" diff --git a/user/atk/APKBUILD b/user/atk/APKBUILD index c6040d0c6..e4829b041 100644 --- a/user/atk/APKBUILD +++ b/user/atk/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=atk -pkgver=2.34.1 +pkgver=2.36.0 pkgrel=0 pkgdesc="A library providing a set of interfaces for accessibility" url="https://www.gtk.org/" @@ -24,4 +24,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e atk-2.34.1.tar.xz" +sha512sums="d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634 atk-2.36.0.tar.xz" diff --git a/user/attica/APKBUILD b/user/attica/APKBUILD index 7688326f4..cd5f1f6cc 100644 --- a/user/attica/APKBUILD +++ b/user/attica/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=attica -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt 5-based implementation of Open Collaboration Services" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="225bec1c0e54ce1c13273aeb8ea2350c15f147c0d68c6a4427b5da381f72dfb5817eabb5f2a798cece49d14b111ca205b21576222ed8eeb8000b7fa760a1d30d attica-5.68.0.tar.xz" +sha512sums="b8730c6b3f0b268c07e2b6f9752ccf0b41953148bdb91087ddee5bbdfb496012e119486e66c48ecb9d4790a875baa8e0066e0c008396027f0ee440f74648c38b attica-5.72.0.tar.xz" diff --git a/user/audacious-plugins/APKBUILD b/user/audacious-plugins/APKBUILD index 3b9fca102..7fd39917d 100644 --- a/user/audacious-plugins/APKBUILD +++ b/user/audacious-plugins/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=audacious-plugins -pkgver=4.0.1 +pkgver=4.0.4 pkgrel=0 pkgdesc="Playlist-oriented media player (plugins)" url="https://audacious-media-player.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6611a9204f3f6e70b126ec4712078ba3e5a317b8a41e6d753a24e37e9b19894444ae091654240c6aa0c4d13d53b72d722549edf6077a565ebdd8caf3000823a0 audacious-plugins-4.0.1.tar.bz2" +sha512sums="d0b435658f5aff9318e521e85d335444e089f80a267c2b9391123365b1c95b535bfa668ea772d9c437ad2611288ec7961a2ecf1d8cf8687f3b32a3cb1e14ddf8 audacious-plugins-4.0.4.tar.bz2" diff --git a/user/audacious/APKBUILD b/user/audacious/APKBUILD index 473e37ff2..bb7048441 100644 --- a/user/audacious/APKBUILD +++ b/user/audacious/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=audacious -pkgver=4.0.1 +pkgver=4.0.4 pkgrel=0 pkgdesc="A playlist-oriented media player with multiple interfaces" url="https://audacious-media-player.org/" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bd1387af281e7f533d4a21bf9fdb8ae49d5a406c051bcfa3a509b9d3cf8fdf6faff21dee841fad9ce1c9bf1a24ce1c08d9dc27a7a28b78ade3f0075fa89aad3d audacious-4.0.1.tar.bz2" +sha512sums="76bafb2cece861b58650e52cc8c338a0645387e43b7d3548b23528024195605c11789479d8fb2ae25d5986cd5ccb03182eb2427c9ba394d4fd6611f06359f94d audacious-4.0.4.tar.bz2" diff --git a/user/avahi/APKBUILD b/user/avahi/APKBUILD new file mode 100644 index 000000000..f1534a5e5 --- /dev/null +++ b/user/avahi/APKBUILD @@ -0,0 +1,74 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=avahi +pkgver=0.8 +pkgrel=0 +pkgdesc="Local network service discovery library" +url="https://avahi.org/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="dbus-dev expat-dev glib-dev gobject-introspection-dev + gtk+3.0-dev libdaemon-dev libevent-dev qt5-qtbase-dev doxygen + py3-dbus-python py3-pygobject-dev" +pkgusers="avahi avahi-autoipd" +pkggroups="avahi avahi-autoipd" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc + $pkgname-gtk3 $pkgname-py3 $pkgname-qt5" +install="$pkgname.pre-install $pkgname.pre-upgrade" +source="https://avahi.org/download/avahi-$pkgver.tar.gz + build-db + " + +prepare() { + default_prepare + # Missing from release tarballs: + # https://github.com/lathiat/avahi/pull/281 + mv "$srcdir"/build-db "$builddir"/service-type-database/ +} + +build() { + [ "$CBUILD_ARCH" = "$CTARGET_ARCH" ] || \ + die "You cannot cross-build Avahi; dbm files are not portable." + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --with-distro=gentoo \ + --enable-core-docs \ + --disable-mono \ + --disable-gdbm + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +gtk3() { + pkgdesc="$pkgdesc (Gtk+ 3 bindings)" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libavahi*gtk3* "$subpkgdir"/usr/lib/ +} + +py3() { + pkgdesc="$pkgdesc (Python bindings)" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ +} + +qt5() { + pkgdesc="$pkgdesc (Qt 5 bindings)" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libavahi*qt5* "$subpkgdir"/usr/lib/ +} + +sha512sums="c6ba76feb6e92f70289f94b3bf12e5f5c66c11628ce0aeb3cadfb72c13a5d1a9bd56d71bdf3072627a76cd103b9b056d9131aa49ffe11fa334c24ab3b596c7de avahi-0.8.tar.gz +60f5cab8417ba1f7ef9b3e30a9f33923fd71a11ae846dda9c29fd0327008821f55f6c77f8ef8442e6dd164d1b777d858cec95c31b7b3bc7f1121417620ca5f08 build-db" diff --git a/user/avahi/avahi.pre-install b/user/avahi/avahi.pre-install new file mode 100644 index 000000000..4d6a7d061 --- /dev/null +++ b/user/avahi/avahi.pre-install @@ -0,0 +1,10 @@ +#!/bin/sh + +groupadd -r -g 201 avahi 2>/dev/null +groupadd -r -g 202 avahi-autoipd 2>/dev/null +useradd -c "Service Discovery User" -s /sbin/nologin -g avahi \ + -d /var/empty -M -N -u 201 2>/dev/null +useradd -c "IPv4LL network address configuration daemon" -s /sbin/nologin \ + -g avahi-autoipd -d /var/empty -M -N -u 202 2>/dev/null + +exit 0 diff --git a/user/avahi/avahi.pre-upgrade b/user/avahi/avahi.pre-upgrade new file mode 120000 index 000000000..6b36c801b --- /dev/null +++ b/user/avahi/avahi.pre-upgrade @@ -0,0 +1 @@ +avahi.pre-install
\ No newline at end of file diff --git a/user/avahi/build-db b/user/avahi/build-db new file mode 100644 index 000000000..78ee892f6 --- /dev/null +++ b/user/avahi/build-db @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# -*-python-*- +# This file is part of avahi. +# +# avahi 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. +# +# avahi 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 Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +try: + import anydbm as dbm +except ImportError: + import dbm + +import sys + +if len(sys.argv) > 1: + infn = sys.argv[1] +else: + infn = "service-types" + +if len(sys.argv) > 2: + outfn = sys.argv[2] +else: + outfn = infn + ".db" + +db = dbm.open(outfn, "n") + +for ln in open(infn, "r"): + ln = ln.strip(" \r\n\t") + + if ln == "" or ln.startswith("#"): + continue + + t, n = ln.split(":", 1) + + db[t.strip()] = n.strip() + +db.close() diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD index dcdb6d85e..609bbac16 100644 --- a/user/baloo-widgets/APKBUILD +++ b/user/baloo-widgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=baloo-widgets -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Widgets that utilise the Baloo desktop indexing engine" url="https://www.KDE.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="99c4f0aef513015371c9dce10e25e64b3eb7bf2e9dd741451332d141459bce777a0b0be29f2fb5cb198193ce6055d53744e84e9e5be089d958e829c39eb79f0f baloo-widgets-19.12.3.tar.xz" +sha512sums="831a063d15958cb96d86e4273fe66fb7fc8d0f408fd9ecac2871da411ed41b88623680ff4a449ba2013aa006cba0c2e6b5ff9e2e3214513f0eed1306b62dd504 baloo-widgets-20.04.3.tar.xz" diff --git a/user/baloo/APKBUILD b/user/baloo/APKBUILD index 4f84cbb32..b1672e90b 100644 --- a/user/baloo/APKBUILD +++ b/user/baloo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=baloo -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Semantic desktop search framework" url="https://www.kde.org/" @@ -54,5 +54,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="54aa3d9a8e135fbc76b0583b2e5261bf027163addafabc7179e990a6c8c92eadc49195b6f66d77408a3ad74c2f7a3ab4328bc7afb243d1be519e78d0223ea2a6 baloo-5.68.0.tar.xz +sha512sums="0c23bd056bfb934b1e623e0aeaa151d47d2f0f4938c40ece1b738b35bf81eb424b2d4772b276f8893e8c914b904c172f7b28d25ea2b5e96771cc5d1f121e64e5 baloo-5.72.0.tar.xz a65c36808c56dff4bc3bb91e791fcc9cba3cdaca686a214adf51e4d87d86ef7ee07d9dd8e0634dfc53a732b77668c6942322c993be5054bc4fc51e7bd69908ac initialise-variable.patch" diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD index 1ec66b771..f7592b23f 100644 --- a/user/blinken/APKBUILD +++ b/user/blinken/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=blinken -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Memory enhancement game" url="https://www.kde.org/applications/education/blinken/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2903269216465affa06a82bab2e91bc81be98e780ee6005b652a3f08781911d4fff5a441b835780711cda9f765e9b1008c1a38ac5ba379ceb08f424cfa7f3938 blinken-19.12.3.tar.xz" +sha512sums="5c84a319d980be8273a593d2ae00fb75cd6444347f54f00b3f533d8d9b4cf5f1612f3db8a4a040a650dd30506d3070ad647a179d7498be4727315eb30ad2975e blinken-20.04.3.tar.xz" diff --git a/user/bluez-qt/APKBUILD b/user/bluez-qt/APKBUILD index 2f4fc80a2..d4a8635d4 100644 --- a/user/bluez-qt/APKBUILD +++ b/user/bluez-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bluez-qt -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt integration with BlueZ" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c11a43b29f1c04fc67abf2c7f5a2e53e098cdeeddde84ed88a46a15d1dce537442d24422c245f23506840aef2d84d5d828b4c7951362537725b59d31a9a402c7 bluez-qt-5.68.0.tar.xz" +sha512sums="3b935d88e0ed5637b35f01ea1aaf32c693d2cbbcbcb0d64c06f7134995dd3b348399d7597fb26874bbb9a98fa2a224b09106ceb87aa797ebc064257c8242e862 bluez-qt-5.72.0.tar.xz" diff --git a/user/bluez/APKBUILD b/user/bluez/APKBUILD index af4f09ba8..44cc8d6a1 100644 --- a/user/bluez/APKBUILD +++ b/user/bluez/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bluez -pkgver=5.53 -pkgrel=1 +pkgver=5.54 +pkgrel=0 pkgdesc="Linux Bluetooth protocol stack" url="http://www.bluez.org/" arch="all" @@ -29,6 +29,10 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz time64.patch " +# secfixes: +# 5.54-r0: +# - CVE-2020-0556 + prepare() { default_prepare @@ -128,7 +132,7 @@ tools() { done } -sha512sums="62956e6293ec2517ec453dc7a6c82d34a8c446df8add8fe411b0a45fd5604817f3a19fbc646ad6f68df435f3cd2bd10ae040890e30db83b022f90b54cc6b3c74 bluez-5.53.tar.xz +sha512sums="e19d15d3a478a7af47c1921c8827843492e38787b1182152155bd3d8ad9e1d8ee25c5fda1f24e38c54ebbf946b09fe75007dca9a24d1c35f73303558e558dcbe bluez-5.54.tar.xz 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f readline-8.0.tar.gz fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e bluetooth.initd 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd diff --git a/user/bolt/APKBUILD b/user/bolt/APKBUILD index b14289263..b9b75ff19 100644 --- a/user/bolt/APKBUILD +++ b/user/bolt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bolt -pkgver=0.8 +pkgver=0.9 pkgrel=0 pkgdesc="Thunderbolt 3 device manager" url=" " @@ -10,9 +10,7 @@ license="LGPL-2.1-only" depends="" makedepends="eudev-dev glib-dev meson ninja polkit-dev" subpackages="" -source="https://gitlab.freedesktop.org/bolt/bolt/-/archive/$pkgver/bolt-$pkgver.tar.gz - wakeup.patch - " +source="https://gitlab.freedesktop.org/bolt/bolt/-/archive/$pkgver/bolt-$pkgver.tar.gz" build() { meson \ @@ -32,5 +30,4 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09 bolt-0.8.tar.gz -487f2c7824edba318692d40ffc4e55f893602587b1380b18877d9dca3b5b22b14e27001b3547369a8ec1a6c5fe7a5facc1fa97e92b3a5011a67ec967afce25ea wakeup.patch" +sha512sums="427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78 bolt-0.9.tar.gz" diff --git a/user/bolt/wakeup.patch b/user/bolt/wakeup.patch deleted file mode 100644 index a10d420c4..000000000 --- a/user/bolt/wakeup.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ea3e3e30eb3ce76f6a0ae816a0f35809872f4edf Mon Sep 17 00:00:00 2001 -From: Christian Kellner <christian@kellner.me> -Date: Mon, 13 Jan 2020 17:38:47 +0100 -Subject: [PATCH] manager: ignore wakeup device uevents for probing - -The probing detection code should ignore wakeup device uevents -because these virtual devices can be added (and removed) without -and correspondence to any physical thunderbolt device (un-)plug -events. ---- - boltd/bolt-manager.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/boltd/bolt-manager.c b/boltd/bolt-manager.c -index 877c008..c8b60da 100644 ---- a/boltd/bolt-manager.c -+++ b/boltd/bolt-manager.c -@@ -2043,6 +2043,16 @@ device_is_thunderbolt_root (struct udev_device *dev) - bolt_streq (driver, "thunderbolt"); - } - -+static gboolean -+device_is_wakeup (struct udev_device *dev) -+{ -+ const char *subsys; -+ -+ subsys = udev_device_get_subsystem (dev); -+ -+ return bolt_streq (subsys, "wakeup"); -+} -+ - static gboolean - probing_add_root (BoltManager *mgr, - struct udev_device *dev) -@@ -2080,6 +2090,12 @@ manager_probing_device_added (BoltManager *mgr, - if (syspath == NULL) - return; - -+ /* ignore events for wakeup devices which get removed -+ * and added at random time without any connection to -+ * any physical thunderbolt device */ -+ if (device_is_wakeup (dev)) -+ return; -+ - roots = mgr->probing_roots; - for (guint i = 0; i < roots->len; i++) - { --- -2.24.1 - diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD index 029cb84a2..09519b7c7 100644 --- a/user/bomber/APKBUILD +++ b/user/bomber/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bomber -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Arcade bombing game" url="https://www.kde.org/applications/games/bomber/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="09eed297e60bf05aa2197c70deb4b5c67c59a4bef61a78496a90a03241eb379a950f56ac1102d89cba6f4abd15a528f79b5496d90ceab4831f08aa0108ed90fb bomber-19.12.3.tar.xz" +sha512sums="c4ecae31c9f1a4af628dc5a7dbc587f5d05d3bb141942584bb8ca6cb932f32e5df1cd77f8891189fb9fdad510cd027b664c75e520e9c90bf3d054a930dc6935d bomber-20.04.3.tar.xz" diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD index 4f98235e9..1cfaa4ff7 100644 --- a/user/bovo/APKBUILD +++ b/user/bovo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bovo -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Gomoku or Connect Five game" url="https://www.kde.org/applications/games/bovo/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a2b13a7e59c39188b642c7c5d43b071a7702cd770497ffef5f0f4b44d8b6117c3aa61e0e7d8db3fcf4c9f8db72d1a57c7cb4afc5831d13eb56aa723b35763855 bovo-19.12.3.tar.xz" +sha512sums="cf01b8713aa79f562dd89744e7f6b070fdad30b257bd13d570c6e26a38b3bfb96882a36159ba432dc06fa4a81591a17a613deecdb09b2bfd129b97c2d6aa8bda bovo-20.04.3.tar.xz" diff --git a/user/breeze-icons/APKBUILD b/user/breeze-icons/APKBUILD index 2142678a6..6832d03e6 100644 --- a/user/breeze-icons/APKBUILD +++ b/user/breeze-icons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=breeze-icons -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Modern, coherent icon set for desktops" url="https://www.kde.org/" @@ -45,4 +45,4 @@ dark() { mv "$pkgdir"/usr/share/icons/breeze-dark "$subpkgdir"/usr/share/icons/ } -sha512sums="d66ee651d8d69e5e162cf2f74f1f84255db121e90e8a2150813a06a918af8642b41a23b3b5885b8b10d23ec0a3bdb654affca78790b6d2158833a34e7bc1d7d3 breeze-icons-5.68.0.tar.xz" +sha512sums="c6a42baeb391ab236cfc28f856176dbb9a435dc967adc9ab30172dbdf344f6c53380fc9f5149c3b2eac5d42d1e1b3e886d7576a908e3768b66226cb0e92e4d84 breeze-icons-5.72.0.tar.xz" diff --git a/user/btrfs-progs/APKBUILD b/user/btrfs-progs/APKBUILD index 079282295..e8412ef96 100644 --- a/user/btrfs-progs/APKBUILD +++ b/user/btrfs-progs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=btrfs-progs -pkgver=5.4.1 +pkgver=5.7 pkgrel=0 pkgdesc="File system utilities for Btrfs" url="https://btrfs.wiki.kernel.org/index.php/Main_Page" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f btrfs-progs-v5.4.1.tar.xz" +sha512sums="72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16 btrfs-progs-v5.7.tar.xz" diff --git a/user/bzflag/APKBUILD b/user/bzflag/APKBUILD index 41ebe01f6..2ab70e6f1 100644 --- a/user/bzflag/APKBUILD +++ b/user/bzflag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=bzflag -pkgver=2.4.18 +pkgver=2.4.20 pkgrel=0 pkgdesc="3D networked multi-player multi-platform tank battle game" url="https://www.bzflag.org/" @@ -10,9 +10,7 @@ license="LGPL-2.1+ AND MPL-2.0" depends="" makedepends="c-ares-dev curl-dev glew-dev ncurses-dev sdl2-dev zlib-dev" subpackages="$pkgname-doc" -source="https://download.bzflag.org/bzflag/source/$pkgver/$pkgname-$pkgver.tar.bz2 - defineAddrLen.patch - " +source="https://download.bzflag.org/bzflag/source/$pkgver/$pkgname-$pkgver.tar.bz2" build() { LIBS="-ltinfo" ./configure \ @@ -33,5 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8e3183f2d78b686c92f3b9911b3cad2fa0df5693401537dc674c75e192fd59451167b7ddc546aa8a090b38d7864b8f22459ba9a4702451987f9c1dfa87fdb246 bzflag-2.4.18.tar.bz2 -6c7a1873706140b1b0b254d6f8350f47adef8f499a7e7b3418331beda11bdc71e2e0dee74e17d4a955960de66adf90d22796b440e1afa78d328077235e2e3dde defineAddrLen.patch" +sha512sums="6140123d37065bead3021ef9c36db1210ad2c71a4a7deb6894bb3f856a571197a7eac37d16b8e3b587549dc201c4ac8d7bbe03d1a05d067dc452861924005169 bzflag-2.4.20.tar.bz2" diff --git a/user/bzflag/defineAddrLen.patch b/user/bzflag/defineAddrLen.patch deleted file mode 100644 index a25eb96c3..000000000 --- a/user/bzflag/defineAddrLen.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bzflag-2.4.16/include/network.h.old 2018-09-27 19:16:48.015111918 -0700 -+++ bzflag-2.4.16/include/network.h 2018-09-27 19:17:06.195370763 -0700 -@@ -57,7 +57,7 @@ - # include <bstring.h> - #endif - --#if defined(BSD) || defined(__sun__) || defined(__GLIBC__) -+#if defined(BSD) || defined(__sun__) || defined(__linux__) - # define AddrLen socklen_t - #elif defined (__APPLE__) - # include <AvailabilityMacros.h> diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD index e7e1a9b11..2ffb273ab 100644 --- a/user/cantor/APKBUILD +++ b/user/cantor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cantor -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE worksheet interface for popular mathematical applications" url="https://edu.kde.org/cantor/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="83324f7a1702b5ed5d74ecab7664b653b8f318b03b6c856c7a70133b2aaf0927cf8b16a8ba9e27a7224d4d8d5900f1dcdbc89e70f40871f000db29f6f072668a cantor-19.12.3.tar.xz" +sha512sums="07351d8b4b72653394a337bc3ae5c8f8c669dd8cd66f4cf9d41bbdd25b47a8b3666f79580e319ef56c878ab626ce959d825b4a34243c5f639de96674a1bc111d cantor-20.04.3.tar.xz" diff --git a/user/cbindgen/APKBUILD b/user/cbindgen/APKBUILD index 8d0a30b7e..8bd26157c 100644 --- a/user/cbindgen/APKBUILD +++ b/user/cbindgen/APKBUILD @@ -1,9 +1,10 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Contributor: Gentoo Rust Maintainers <rust@gentoo.org> # Contributor: Samuel Holland <samuel@sholland.org> -# Maintainer: Molly Miller <sysvinit@adelielinux.org> +# Contributor: Molly Miller <adelie@m-squa.red> +# Maintainer: pkgname=cbindgen -pkgver=0.13.2 +pkgver=0.14.2 pkgrel=0 pkgdesc="Tool to generate C bindings from Rust code" url="https://github.com/eqrion/cbindgen" @@ -22,6 +23,7 @@ c2-chacha-0.2.3 cfg-if-0.1.10 clap-2.33.0 getrandom-0.1.13 +heck-0.3.1 itoa-0.4.4 libc-0.2.66 log-0.4.8 @@ -43,6 +45,7 @@ syn-1.0.11 tempfile-3.1.0 textwrap-0.11.0 toml-0.5.5 +unicode-segmentation-1.6.0 unicode-width-0.1.7 unicode-xid-0.2.0 vec_map-0.8.1 @@ -102,7 +105,7 @@ package() { } -sha512sums="2e894c6cf2b08321418ef78228fbebb5f504aea1576b8e159b4d8d66442cb65cee4f611f0ce13fa58539c08fe21932358fcfead52acbe5413adc9fdba05faf66 cbindgen-0.13.2.tar.gz +sha512sums="d3ab0a4c217c9047bc3ada7911d4ae1bdfc09092835f78d232bb56ef0d9a499df43e358532dfb828a04df61a0cacccd7e57214cd15f466791eb1b8edd9f92ed0 cbindgen-0.14.2.tar.gz a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa ansi_term-0.11.0.tar.gz 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad atty-0.2.13.tar.gz ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b bitflags-1.2.1.tar.gz @@ -110,6 +113,7 @@ ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 cfg-if-0.1.10.tar.gz f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925 getrandom-0.1.13.tar.gz +134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6 heck-0.3.1.tar.gz f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d itoa-0.4.4.tar.gz 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975 libc-0.2.66.tar.gz 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b log-0.4.8.tar.gz @@ -131,6 +135,7 @@ ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5 tempfile-3.1.0.tar.gz f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz 8f6a04dc24ea775a9a28cc948039f20540ec983c46b287ebfa820e29cc5867803765ce099283f79d3b4a22c513b386603dbd8130808cb3354bc63b5d4706cb33 toml-0.5.5.tar.gz +80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e unicode-segmentation-1.6.0.tar.gz 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84 unicode-width-0.1.7.tar.gz 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359 unicode-xid-0.2.0.tar.gz 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 vec_map-0.8.1.tar.gz diff --git a/user/ccache/APKBUILD b/user/ccache/APKBUILD index 9076bbb09..f19caa9f9 100644 --- a/user/ccache/APKBUILD +++ b/user/ccache/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ccache -pkgver=3.7.7 +pkgver=3.7.10 pkgrel=0 pkgdesc="A fast C/C++ compiler cache" url="https://ccache.dev/" @@ -47,4 +47,4 @@ package() { done } -sha512sums="f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816 ccache-3.7.7.tar.xz" +sha512sums="64b0d42af7fd2dfdda65668b04dbd16807a22324e336e61f6c6a91c00110fb535c7ac9062a9c14c924a7ddaf42247f69a43d83dd0fd187ce3b0737158b5bb8fc ccache-3.7.10.tar.xz" diff --git a/user/cervisia/APKBUILD b/user/cervisia/APKBUILD new file mode 100644 index 000000000..8229df3f3 --- /dev/null +++ b/user/cervisia/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=cervisia +pkgver=20.04.3 +pkgrel=0 +pkgdesc="CVS Frontend" +url="https://kde.org/applications/development/org.kde.cervisia" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kdoctools-dev kdesu-dev + kiconthemes-dev kinit-dev kitemviews-dev knotifications-dev kparts-dev + kwidgetsaddons-dev + + kauth-dev kcodecs-dev kcompletion-dev kconfigwidgets-dev kcoreaddons-dev + kdbusaddons-dev kio-dev kjobwidgets-dev kpty-dev kservice-dev solid-dev + sonnet-dev kwindowsystem-dev kxmlgui-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/cervisia-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="cdbd6d9c212e92ca7f925c23c20442fa72cb07f666a5f2895a1cb631ff9bc87024bdf2bdbb8b2c638104f688cca585b64eaec5c8ed20ea153fa1184a2f5193c2 cervisia-20.04.3.tar.xz" diff --git a/user/cgit/APKBUILD b/user/cgit/APKBUILD index 9a3be5d89..bc910040e 100644 --- a/user/cgit/APKBUILD +++ b/user/cgit/APKBUILD @@ -3,9 +3,9 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: pkgname=cgit -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=0 -_gitver=2.25.0 +_gitver=2.25.1 pkgdesc="A fast Web interface for Git" url="https://git.zx2c4.com/cgit/" arch="all" @@ -57,5 +57,5 @@ package() { ln -s cgit.cgi "$pkgdir"/usr/share/webapps/cgit/cgit } -sha512sums="ac006db0b14ae84fc9304b4cb1b49c3445d229593071be39b2d6e2709b54d03b11efd0ac1b5daef8160278303a7611c897fb6cf1e008c66c3f2463151e650af9 cgit-1.2.2.tar.xz -8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191 git-2.25.0.tar.xz" +sha512sums="58f9bb644b07be49dc51f3ef30a3d0e53699cede3c06b1d6920f3874fe846c83dd2589632aa84357b70ea2d60272448409aa1b892f405d14dd6745f5559b4504 cgit-1.2.3.tar.xz +15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344 git-2.25.1.tar.xz" diff --git a/user/checkbashisms/APKBUILD b/user/checkbashisms/APKBUILD index b616e4fab..735afa9e2 100644 --- a/user/checkbashisms/APKBUILD +++ b/user/checkbashisms/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=checkbashisms -pkgver=2.20.2 +pkgver=2.20.4 pkgrel=0 pkgdesc="Check shell scripts for POSIX compliance" url="https://salsa.debian.org/debian/devscripts" @@ -37,4 +37,4 @@ bashcomp() { "$subpkgdir/usr/share/bash-completion/completions/$pkgname" } -sha512sums="d9147604a718582a19c036a040c62612427163146048dbf9e3665545072e8132d08f51dccfd3f0a01453c0405a0326dad8f83afd10270eec5c69fa0612cb8510 devscripts_2.20.2.tar.xz" +sha512sums="49e9ae38ca3682f399a17f2108a7ee15198dc955d8c7c4c1b043456c19cb35b47b6116de9a2cfaccbdd7560e79426ca0953674e5a89ac226d21af2c1cf847e5c devscripts_2.20.4.tar.xz" diff --git a/user/chntpw/APKBUILD b/user/chntpw/APKBUILD new file mode 100644 index 000000000..a62408ce0 --- /dev/null +++ b/user/chntpw/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: CyberLeo <cyberleo@cyberleo.net> +# Maintainer: CyberLeo <cyberleo@cyberleo.net> +pkgname=chntpw +pkgver=140201 +pkgrel=0 +pkgdesc="Change passwords in Windows SAM files" +url="https://pogostick.net/~pnh/ntpasswd/" +arch="all" +options="!check" # No test suite. +license="(LGPL-2.1-only AND GPL-2.0-only)" +depends="" +makedepends="" +source="https://pogostick.net/~pnh/ntpasswd/$pkgname-source-$pkgver.zip + stdint.patch + chntpw-080526-correct-test-for-failing-open-syscall.patch + chntpw-110511-detect-failure-to-write-key.patch + chntpw-110511-reged-no-deref-null.patch + chntpw-110511-robustness.patch + chntpw-140201-get_abs_path.patch + getopt-signed-char-return.patch + " + +build() { + make CC="${CC:-gcc}" CFLAGS="$CFLAGS" \ + chntpw cpnt reged +} + +package() { + install -d "$pkgdir"/usr/bin + install chntpw cpnt reged "$pkgdir"/usr/bin/ +} + +sha512sums="a26d747f6e077d1bb3e9b8077781f8c37dd978e07b7426495862f15c9004572b706c34736fc4d1ed8856b1a43335d726b4d87c688f7f9a11fd6cc3a74d71a7fa chntpw-source-140201.zip +3ed747119d125b3e4dc8dbb2a697d411ef2f4403ec84c60177d8e35389bc695bb0c65f7aa4314ca320ffceec87e60e2a0c81d52544b90463fe23aa7d4a50df67 stdint.patch +1332407858eb20e0f1304472bc458789ef78638059137b91ff0b7bac9619740e8a608aace0330ace363853b5c02642fdbbc66bc47dac19f6807dae57cdaca4ca chntpw-080526-correct-test-for-failing-open-syscall.patch +a570451f52943a2ccdced349c5fe4e82e1a338dd6d0067ddaf18dc328b2c3ee3976d08827eee866b4654ccbda93ad95dcbabaddd0b6487a1e4112b66fc63bde1 chntpw-110511-detect-failure-to-write-key.patch +c61ea69ea1f039e470f501fddd1d3674ee7427e9084361a1aba03402d302a07efd1a2630e16f479bd3cef13b17e85c14cbfff53cb33bccb470465276b1b7ac22 chntpw-110511-reged-no-deref-null.patch +bcc314545272b5be04612e435a2f9dd13cbf065cfbd80aed2ed57147ee9e73b2478cd18e95cbaa7ad3b5dfcf4788a3026b5ddd767f89ea9c80ba7a2efc7ea8c4 chntpw-110511-robustness.patch +1bb5939d2cfd3718b9e630998b250c3c37d50d5769463f4f8456ede9fa4521e1bf9d9f05986883df36418d91bef591b34a81cd36bfacca053160e4d95c03cb4b chntpw-140201-get_abs_path.patch +85bbe9c7f21362cdff6becd94fe402d051a770105ec2eeb61e1936693e0a39ee03b6e971843c251f7768499444711392d966227f6126c328f7f58055cafe38d7 getopt-signed-char-return.patch" diff --git a/user/chntpw/chntpw-080526-correct-test-for-failing-open-syscall.patch b/user/chntpw/chntpw-080526-correct-test-for-failing-open-syscall.patch new file mode 100644 index 000000000..3c68146b0 --- /dev/null +++ b/user/chntpw/chntpw-080526-correct-test-for-failing-open-syscall.patch @@ -0,0 +1,75 @@ +From jim@meyering.net Mon Jul 20 20:05:55 2009 +Return-Path: jim@meyering.net +X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on amd.home.annexia.org +X-Spam-Level: +X-Spam-Status: No, score=-2.2 required=5.0 tests=AWL,BAYES_00, + UNPARSEABLE_RELAY autolearn=ham version=3.2.5 +Received: from mail.corp.redhat.com [10.5.5.51] + by amd.home.annexia.org with IMAP (fetchmail-6.3.8) + for <rjones@localhost> (single-drop); Mon, 20 Jul 2009 20:05:55 +0100 (BST) +Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO + zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by + mail06.corp.redhat.com with LMTP; Mon, 20 Jul 2009 15:05:47 -0400 (EDT) +Received: from localhost (localhost.localdomain [127.0.0.1]) + by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 2C1134E4EB + for <rjones@redhat.com>; Mon, 20 Jul 2009 15:05:47 -0400 (EDT) +Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1]) + by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id a7N9dvNRkYQB for <rjones@redhat.com>; + Mon, 20 Jul 2009 15:05:47 -0400 (EDT) +Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) + by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 034384E4D6 + for <rjones@mail.corp.redhat.com>; Mon, 20 Jul 2009 15:05:46 -0400 (EDT) +Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) + by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n6KJ5kIt032703 + for <rjones@int-mx2.corp.redhat.com>; Mon, 20 Jul 2009 15:05:46 -0400 +Received: from mx.meyering.net (sebastian-int.corp.redhat.com [172.16.52.221]) + by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n6KJ5jf3021050 + for <rjones@redhat.com>; Mon, 20 Jul 2009 15:05:45 -0400 +Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000) + id D674638154; Mon, 20 Jul 2009 21:05:44 +0200 (CEST) +From: Jim Meyering <jim@meyering.net> +To: "Richard W. M. Jones" <rjones@redhat.com> +Subject: chntpw [PATCH] correct test for failing "open" syscall +Date: Mon, 20 Jul 2009 21:05:44 +0200 +Message-ID: <878wij899z.fsf@meyering.net> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 +Status: RO +Content-Length: 1103 +Lines: 33 + +This one is weird. +It must be code that is never exercised, +since the existing code is totally bogus. +The condition, !open(...), will almost always be true. +(sole exception is when starting a program with stdin +initially closed) + +>From bc4cddb06cf13c189fbdc93e6962cad072779097 Mon Sep 17 00:00:00 2001 +From: Jim Meyering <meyering@redhat.com> +Date: Mon, 20 Jul 2009 14:59:19 -0400 +Subject: [PATCH] correct test for failing "open" syscall + +* ntreg.c (writeHive): Test open() < 0, not !open(). +--- + ntreg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ntreg.c b/ntreg.c +index be6b680..21cd3e3 100644 +--- a/ntreg.c ++++ b/ntreg.c +@@ -2765,7 +2765,7 @@ int writeHive(struct hive *hdesc) + if ( !(hdesc->state & HMODE_DIRTY)) return(0); + + if ( !(hdesc->state & HMODE_OPEN)) { /* File has been closed */ +- if (!(hdesc->filedesc = open(hdesc->filename,O_RDWR))) { ++ if ((hdesc->filedesc = open(hdesc->filename,O_RDWR)) < 0) { + fprintf(stderr,"writeHive: open(%s) failed: %s, FILE NOT WRITTEN!\n",hdesc->filename,strerror(errno)); + return(1); + } +-- +1.6.2.5 + diff --git a/user/chntpw/chntpw-110511-detect-failure-to-write-key.patch b/user/chntpw/chntpw-110511-detect-failure-to-write-key.patch new file mode 100644 index 000000000..818639d83 --- /dev/null +++ b/user/chntpw/chntpw-110511-detect-failure-to-write-key.patch @@ -0,0 +1,19 @@ +diff -ur chntpw-110511.orig/ntreg.c chntpw-110511/ntreg.c +--- chntpw-110511.orig/ntreg.c 2011-05-11 12:33:56.000000000 -0700 ++++ chntpw-110511/ntreg.c 2011-11-01 13:45:02.550421729 -0700 +@@ -3389,7 +3389,14 @@ + + fprintf(file,"\r\n"); /* Must end file with an empty line, windows does that */ + +- fclose(file); ++ if (ferror (file)) { ++ printf("failed to write file '%s'\n", filename); ++ fclose (file); ++ return; ++ } ++ if (fclose(file)) ++ printf("failed to write file '%s': %s\n", filename, ++ strerror(errno)); + } + + /* ================================================================ */ diff --git a/user/chntpw/chntpw-110511-reged-no-deref-null.patch b/user/chntpw/chntpw-110511-reged-no-deref-null.patch new file mode 100644 index 000000000..0193cd493 --- /dev/null +++ b/user/chntpw/chntpw-110511-reged-no-deref-null.patch @@ -0,0 +1,15 @@ +diff -ur chntpw-110511.orig/reged.c chntpw-110511/reged.c +--- chntpw-110511.orig/reged.c 2011-05-11 12:33:56.000000000 -0700 ++++ chntpw-110511/reged.c 2011-11-01 13:46:55.569625286 -0700 +@@ -167,6 +167,11 @@ + + if (edit) { /* Call editor. Rest of arguments are considered hives to load */ + hivename = argv[optind+no_hives]; ++ if (!hivename) { ++ fprintf(stderr,"with -e you must specify at least one hive file name\n"); ++ usage(); ++ exit(1); ++ } + do { + if (!(hive[no_hives] = openHive(hivename, + HMODE_RW|mode))) { diff --git a/user/chntpw/chntpw-110511-robustness.patch b/user/chntpw/chntpw-110511-robustness.patch new file mode 100644 index 000000000..ea2363f34 --- /dev/null +++ b/user/chntpw/chntpw-110511-robustness.patch @@ -0,0 +1,39 @@ +--- chntpw-110511.orig/ntreg.c 2011-05-11 12:33:56.000000000 -0700 ++++ chntpw-110511/ntreg.c 2011-12-18 17:09:06.290818997 -0800 +@@ -190,14 +190,18 @@ + + int fmyinput(char *prmpt, char *ibuf, int maxlen) + { +- ++ int len; + printf("%s",prmpt); + + fgets(ibuf,maxlen+1,stdin); ++ len = strlen(ibuf); + +- ibuf[strlen(ibuf)-1] = 0; ++ if (len) { ++ ibuf[len-1] = 0; ++ --len; ++ } + +- return(strlen(ibuf)); ++ return len; + } + + /* Print len number of hexbytes */ +@@ -4119,6 +4123,14 @@ + closeHive(hdesc); + return(NULL); + } ++ ++ if (r < sizeof (*hdesc)) { ++ fprintf(stderr, ++ "file is too small; got %d bytes while expecting %d or more\n", ++ r, sizeof (*hdesc)); ++ closeHive(hdesc); ++ return(NULL); ++ } + + /* Now run through file, tallying all pages */ + /* NOTE/KLUDGE: Assume first page starts at offset 0x1000 */ diff --git a/user/chntpw/chntpw-140201-get_abs_path.patch b/user/chntpw/chntpw-140201-get_abs_path.patch new file mode 100644 index 000000000..c9f1a3dec --- /dev/null +++ b/user/chntpw/chntpw-140201-get_abs_path.patch @@ -0,0 +1,10 @@ +--- chntpw-140201/ntreg.c.orig 2014-02-01 08:54:37.000000000 -0800 ++++ chntpw-140201/ntreg.c 2018-07-02 16:10:39.625152640 -0700 +@@ -1511,6 +1511,7 @@ + } + + strncpy(tmp,path,ABSPATHLEN-1); ++ tmp[ABSPATHLEN-1] = '\0'; + + if (key->type & 0x20) + keyname = mem_str(key->keyname, key->len_name); diff --git a/user/chntpw/getopt-signed-char-return.patch b/user/chntpw/getopt-signed-char-return.patch new file mode 100644 index 000000000..6dc78c624 --- /dev/null +++ b/user/chntpw/getopt-signed-char-return.patch @@ -0,0 +1,37 @@ +diff -ur chntpw-140201.orig/chntpw.c chntpw-140201/chntpw.c +--- chntpw-140201.orig/chntpw.c 2020-06-08 14:21:55.839494887 +0000 ++++ chntpw-140201/chntpw.c 2020-06-08 14:22:29.922115922 +0000 +@@ -1026,7 +1026,8 @@ + int mode = HMODE_INFO; + extern int /* opterr, */ optind; + extern char* optarg; +- char *filename,c; ++ char *filename; ++ signed char c; + char *who = "Administrator"; + char iwho[100]; + FILE *ch; /* Write out names of touched files to this */ +diff -ur chntpw-140201.orig/sampasswd.c chntpw-140201/sampasswd.c +--- chntpw-140201.orig/sampasswd.c 2020-06-08 14:21:49.661563576 +0000 ++++ chntpw-140201/sampasswd.c 2020-06-08 14:22:21.009215027 +0000 +@@ -140,7 +140,7 @@ + int first = 0; + int ret, wret, il; + char *hivename; +- char c; ++ signed char c; + char *usr = NULL; + + char *options = "rlHu:vNEthaf"; +diff -ur chntpw-140201.orig/samusrgrp.c chntpw-140201/samusrgrp.c +--- chntpw-140201.orig/samusrgrp.c 2020-06-08 14:21:47.330589493 +0000 ++++ chntpw-140201/samusrgrp.c 2020-06-08 14:22:19.218234941 +0000 +@@ -176,7 +176,7 @@ + int human = 0; + int ret, wret, il; + char *hivename; +- char c; ++ signed char c; + char *usr = NULL; + char *grp = NULL; + diff --git a/user/chntpw/stdint.patch b/user/chntpw/stdint.patch new file mode 100644 index 000000000..841e25ed7 --- /dev/null +++ b/user/chntpw/stdint.patch @@ -0,0 +1,11 @@ +--- ./ntreg.h.orig ++++ ./ntreg.h +@@ -25,6 +25,8 @@ + #ifndef _INCLUDE_NTREG_H + #define _INCLUDE_NTREG_H 1 + ++#include <stdint.h> ++ + #define SZ_MAX 4096 /* Max unicode strlen before we truncate */ + + #define KEY_ROOT 0x2c /* Type ID of ROOT key node */ diff --git a/user/choqok/APKBUILD b/user/choqok/APKBUILD new file mode 100644 index 000000000..889566410 --- /dev/null +++ b/user/choqok/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=choqok +pkgver=1.7.0 +pkgrel=0 +pkgdesc="Microblogging client from KDE" +url="https://kde.org/applications/internet/org.kde.choqok" +arch="all" +license="GPL-3.0+" +depends="" +makedepends="qt5-qtbase-dev qt5-qtnetworkauth-dev cmake extra-cmake-modules + kcmutils-dev kconfigwidgets-dev kcoreaddons-dev kdoctools-dev + kemoticons-dev kglobalaccel-dev kguiaddons-dev ki18n-dev kio-dev + knotifications-dev knotifyconfig-dev ktextwidgets-dev kwallet-dev + kwidgetsaddons-dev kxmlgui-dev purpose-dev qca-dev sonnet-dev + kdewebkit-dev kparts-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/choqok/1.7/src/choqok-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="6f5998078e555f7b4a40270ad0a4defa2d15bb8440b810320fc4cfc38d78cb34bb9b2f6a38eb33eb3217b51a78a7fbc7f79224cd0ddb0fcbf8c9035d8e600e96 choqok-1.7.0.tar.xz" diff --git a/user/ckbcomp/APKBUILD b/user/ckbcomp/APKBUILD new file mode 100644 index 000000000..8f4de4ff3 --- /dev/null +++ b/user/ckbcomp/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ckbcomp +pkgver=1.195 +pkgrel=0 +pkgdesc="XKB keyboard layout translation utility" +url="https://salsa.debian.org/installer-team/console-setup" +arch="noarch" +options="!check" # No test suite. +license="GPL-2.0+" +depends="perl" +makedepends="" +subpackages="$pkgname-doc" +source="http://ftp.de.debian.org/debian/pool/main/c/console-setup/console-setup_$pkgver.tar.xz" +builddir="$srcdir/console-setup" + +package() { + install -Dm755 -t "$pkgdir"/usr/bin Keyboard/ckbcomp + install -Dm644 -t "$pkgdir"/usr/share/man/man1 man/ckbcomp.1 +} + +sha512sums="f9ee8df45cfb78dea12b1ba3020e32f245dd940bc1d22801849f673f4448853c0ebadb6944a92b462e3e56c59ee13fd6d2130c260a1a406e1bb1c72e9902c04d console-setup_1.195.tar.xz" diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD index c05fdc470..328305587 100644 --- a/user/cloc/APKBUILD +++ b/user/cloc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=cloc -pkgver=1.84 +pkgver=1.86 pkgrel=0 pkgdesc="Perl utility for counting lines of code in various languages" url="https://github.com/AlDanial/cloc" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" -C Unix install } -sha512sums="cfcc1854d7f3257bcd66f13b1053a856ae31acc35f94537e20cbb341ab256390bded1f00ff6b1ce2bc60a1a69379b6915d398297e2f878bc4eea190c59b22669 cloc-1.84.tar.gz" +sha512sums="dc88f7499ab371eef5ae39352e10539a507bd77fa7b83d562e3b9774e053872ea56529ea937db9fafd50971900e03d95236450348d8981fa0123f936e893975c cloc-1.86.tar.gz" diff --git a/user/cogl/APKBUILD b/user/cogl/APKBUILD index 81910704b..5cb9f34ef 100644 --- a/user/cogl/APKBUILD +++ b/user/cogl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=cogl -pkgver=1.22.6 +pkgver=1.22.8 pkgrel=0 pkgdesc="GObject-based GL/GLES abstraction library" url="https://gnome.org" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b3475fa4fff3b6725f643b0d17d2de242fce1503cd83bd18031d98495501917bf5173152fb1aba7f2614fcf6553029fbb6f26bda5a497f5f12e2849ed301a483 cogl-1.22.6.tar.xz" +sha512sums="702d5b1b22dc34bffaa82c9c57021caf036ee3a13fa7ca24a90cca1ebc0f8b7a86070cc1fe5125757132b02774fa874bb55675c96d1ccbc233fac0e6132da65f cogl-1.22.8.tar.xz" diff --git a/user/comic-neue/APKBUILD b/user/comic-neue/APKBUILD index 6becb4de9..0142a6618 100644 --- a/user/comic-neue/APKBUILD +++ b/user/comic-neue/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=comic-neue -pkgver=2.4 +pkgver=2.5 pkgrel=0 pkgdesc="Casual typeface" url="http://comicneue.com/" @@ -15,7 +15,7 @@ source="$pkgname-$pkgver.zip::https://github.com/crozynski/comicneue/archive/v$p builddir="$srcdir/comicneue-$pkgver" package() { - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/OTF/*.otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/Fonts/OTF/ComicNeue/*.otf } -sha512sums="12c93efc00e1caecd6be9080de37ecf2049384185c4043dc250945b7cb47fbbe3fcc973ebdf7d58f3351ba11f87341c24af7e1039b873d463b0d84da9c72f0b8 comic-neue-2.4.zip" +sha512sums="32cc6370f127dd7d773ce80a1c0530c9fe329a5e06fab6e416e1075f99f27a9eb551f3e27c0bec307862b171130d5ae774f32f8385618c3f91a2abb796c3715c comic-neue-2.5.zip" diff --git a/user/command-not-found/APKBUILD b/user/command-not-found/APKBUILD index ed9919343..c91ff15a4 100644 --- a/user/command-not-found/APKBUILD +++ b/user/command-not-found/APKBUILD @@ -4,7 +4,7 @@ pkgname=command-not-found pkgver=0.3 pkgrel=0 pkgdesc="Provide suggestions for missing commands via APK" -url="https://git.dereferenced.org/kaniini/command-not-found" +url=" " arch="noarch" options="!check" # No test suite. license="MIT" diff --git a/user/compton-conf/APKBUILD b/user/compton-conf/APKBUILD index 3899919dd..093054850 100644 --- a/user/compton-conf/APKBUILD +++ b/user/compton-conf/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=compton-conf -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="GUI configuration tool for the Compton X compositor" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev - libconfig-dev liblxqt-dev lxqt-build-tools>=0.6.0" + libconfig-dev liblxqt-dev lxqt-build-tools>=$_lxqt_build" subpackages="" source="https://github.com/lxqt/compton-conf/releases/download/$pkgver/compton-conf-$pkgver.tar.xz" @@ -33,4 +34,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="76cacb0960112ab3d0b7a05fba3ac2418c2bd37f4273fc20383b49ce035fd045a2a8e8a1ae5a8a5dc116f46ab6ccd7a5764dd2c3ec64822d930c7dd268533db4 compton-conf-0.14.1.tar.xz" +sha512sums="c7390de74304e362a0c63c901c718dbf0427eb821d06236ceb5746b67c27a6ff9ef53a456808d01019fa7ff10fbf11c909c1234560d75ab97df8057d39fc1f4a compton-conf-0.15.0.tar.xz" diff --git a/user/dbus/APKBUILD b/user/dbus/APKBUILD index d9a305186..fcd7da74d 100644 --- a/user/dbus/APKBUILD +++ b/user/dbus/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dbus -pkgver=1.12.16 -pkgrel=1 +pkgver=1.12.20 +pkgrel=0 pkgdesc="IPC/message bus system, allowing user applications to communicate" -url="http://www.freedesktop.org/wiki/Software/dbus/" +url="https://www.freedesktop.org/wiki/Software/dbus/" pkggroups="messagebus" pkgusers="messagebus" arch="all" @@ -23,7 +23,9 @@ source="http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz # secfixes: # 1.12.16-r0: -# - CVE-2019-12749 +# - CVE-2019-12749 +# 1.12.18-r0: +# - CVE-2020-12049 build() { ./configure \ @@ -65,5 +67,5 @@ x11() { mv "$pkgdir"/usr/bin/dbus-launch "$subpkgdir"/usr/bin/ } -sha512sums="27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb dbus-1.12.16.tar.gz +sha512sums="0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056 dbus-1.12.20.tar.gz df74e7d6a4f76f777d356e94bd23422b17656aa51a5b2d3c655fcabb32c84f2f06b9f5cd8827920d51842f89e8c0d968a6e723315e4bf216e55711fcda9b0ee9 dbus.initd" diff --git a/user/ddrescue/APKBUILD b/user/ddrescue/APKBUILD index a62b71c5e..0a45a2ce6 100644 --- a/user/ddrescue/APKBUILD +++ b/user/ddrescue/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ddrescue -pkgver=1.24 +pkgver=1.25 pkgrel=0 pkgdesc="Data recovery tool for block devices with errors" url="https://www.gnu.org/s/ddrescue/ddrescue.html" -arch="all !aarch64" +arch="all" license="GPL-3.0+" depends="" makedepends="" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2c6a86c80bad122e0c44d6f8da49239e10362fbfbdb70acf39055ce02637daa05cce4f24adac732a1bb3a6fc97cf6985dd20827e99ab3bf6bad4db015a00fbaa ddrescue-1.24.tar.lz" +sha512sums="90e344a618e385730836218817588f6854db6d1acdf357bf60bdba04c76382e73041dfc367ba4de60062992ee74b2da58417f6e464ffbeed10ec89fac110f4b8 ddrescue-1.25.tar.lz" diff --git a/user/desktop-file-utils/APKBUILD b/user/desktop-file-utils/APKBUILD index 62a1e58bb..4dd077102 100644 --- a/user/desktop-file-utils/APKBUILD +++ b/user/desktop-file-utils/APKBUILD @@ -1,34 +1,29 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=desktop-file-utils -pkgver=0.24 +pkgver=0.26 pkgrel=0 pkgdesc="Utilities for working with Desktop Entry files" url="https://www.freedesktop.org/wiki/Software/desktop-file-utils/" arch="all" +options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="glib-dev" +makedepends="glib-dev meson ninja" subpackages="$pkgname-doc" source="https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-$pkgver.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make + meson -Dprefix=/usr build + ninja -C build } check() { - make check + ninja -C build check } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0 desktop-file-utils-0.24.tar.xz" +sha512sums="5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831 desktop-file-utils-0.26.tar.xz" diff --git a/user/dhcpcd/APKBUILD b/user/dhcpcd/APKBUILD index 19b63bc1a..d8c3e6a1e 100644 --- a/user/dhcpcd/APKBUILD +++ b/user/dhcpcd/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=dhcpcd -pkgver=8.1.6 +pkgver=8.1.9 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="https://roy.marples.name/projects/dhcpcd" @@ -42,6 +42,6 @@ package() { "$pkgdir"/etc/init.d/dhcpcd } -sha512sums="f4d7ea5f4c139a2735e795e13be68f6edac89d86d97589c2cdd67f89b890a093675dcc207c681332e2163b1094da8ce75bda2ee614c19bafd01410d9fadf19df dhcpcd-8.1.6.tar.xz +sha512sums="40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a dhcpcd-8.1.9.tar.xz 1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch e777432c2efc84285b41e63a4687f3bd543f6864218d037529ab78b5ad934de154f28f478bd9facb56628f2953aad8a932bc2eb8b1dfffa0ce2278ffcfc4d880 dhcpcd.initd" diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD index c7ffa7108..ada33e4a5 100644 --- a/user/dolphin/APKBUILD +++ b/user/dolphin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dolphin -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Lightweight desktop file manager" url="https://www.kde.org/applications/system/dolphin/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d4922774adea1aa5f68654f5fc0db5e2da653487ffbf8bc519d1b03f141355cedfb4d52aebf6570ab2fb40a0edac2bba42ecece983cbf31dca2ee02fa3b98fb5 dolphin-19.12.3.tar.xz" +sha512sums="fc4ad5ff645387d7a058cff42db00d55db8b0cb7793cdc3adbbaff2e8465c469a5ad6040625bfde564e18c25c16ae3962d6eb7ac9618e0ae8783a2fe030fc5ca dolphin-20.04.3.tar.xz" diff --git a/user/dosbox/APKBUILD b/user/dosbox/APKBUILD index e811aa22c..f3a83f46e 100644 --- a/user/dosbox/APKBUILD +++ b/user/dosbox/APKBUILD @@ -21,6 +21,12 @@ source="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-wip-20180513 builddir="$srcdir/dosbox-x-dosbox-x-wip-20180513-1316" build() { + _extra_conf="" + + case $CTARGET_ARCH in + pmmx) _extra_conf="--disable-dynamic-x86";; + esac + ./autogen.sh ./configure \ --build=$CBUILD \ @@ -28,7 +34,8 @@ build() { --prefix=/usr \ --enable-debug \ --enable-core-inline \ - --enable-sdl2 + --enable-sdl2 \ + $_extra_conf make } diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD index f78987820..5af5254e1 100644 --- a/user/dovecot/APKBUILD +++ b/user/dovecot/APKBUILD @@ -5,8 +5,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=dovecot -pkgver=2.3.10 -_pkgvermajor=${pkgver%.*} +pkgver=2.3.10.1 +_pkgvermajor=2.3 pkgrel=0 _pigeonholever=0.5.9 _pigeonholevermajor=${_pigeonholever%.*} @@ -67,6 +67,12 @@ source="https://www.dovecot.org/releases/$_pkgvermajor/dovecot-$pkgver.tar.gz " _builddir_pigeonhole="$srcdir/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever" +# secfixes: +# 2.3.10.1-r0: +# - CVE-2020-10957 +# - CVE-2020-10958 +# - CVE-2020-10967 + _configure() { ./configure \ --build=$CBUILD \ @@ -270,7 +276,7 @@ _submv() { done } -sha512sums="73e10d7d1e616d6599eb53f2d2d1ac0f0f2e6e84019faac5cd525e833da44839a7e483635b61d432e3254a9e5f6f90915bec8940c584210341085241949dffa2 dovecot-2.3.10.tar.gz +sha512sums="5c07436a3e861993f241caa2c60f035c533c5fceb5c8540c1717d31bedd54b82299f7ea11bfee12c72d4d33985d93a7130c4f56877864a7ad21cf7373a29cc06 dovecot-2.3.10.1.tar.gz 1b8d2ac8d3985dde035fc45df519788a924ba971f3e39717f5196ea56a982d4156226586d0a964473525d086967883ea52f2e624e81f7035cb0952b76f2414d8 dovecot-2.3-pigeonhole-0.5.9.tar.gz fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch 794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch diff --git a/user/doxygen/APKBUILD b/user/doxygen/APKBUILD index eefc391ce..9255fda64 100644 --- a/user/doxygen/APKBUILD +++ b/user/doxygen/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: pkgname=doxygen -pkgver=1.8.16 +pkgver=1.8.18 _pkgver=${pkgver%.*.*}_${pkgver#*.} _pkgver=${_pkgver%.*}_${pkgver#*.*.} -pkgrel=1 +pkgrel=0 pkgdesc="A documentation system for C++, C, Java, IDL, and PHP" url="http://www.doxygen.org/" arch="all" @@ -12,7 +12,6 @@ depends="" makedepends="bison cmake coreutils flex perl python3" checkdepends="libxml2-utils" source="https://github.com/doxygen/doxygen/archive/Release_$_pkgver.tar.gz - doxygen-1.8.14-install.patch time64.patch " builddir="$srcdir/doxygen-Release_$_pkgver" @@ -22,8 +21,8 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -Dbuild_xmlparser=ON \ - -DMAN_INSTALL_DIR=/usr/share/man/man1 \ - -DDOC_INSTALL_DIR=/usr/share/doc/doxygen + -DMAN_INSTALL_DIR=share/man/man1 \ + -DDOC_INSTALL_DIR=share/doc/doxygen make } @@ -38,6 +37,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="546ceaae949cf5cc8162309bc804dad7a00b970c14a2dd66d27111e03f2fbebfec299ddc559f8c915ed00776217d2c439843806d2b6c15b58cf29f490979bd8f Release_1_8_16.tar.gz -725a29a6f21ffc8ec6ca8ed6d746a69cc78060e97704c7fe909abee603ba0a99f27dc3b80c414afd886d0ee81d9948b13f29c43f7db2e00aae8c0c3a32aa9ec1 doxygen-1.8.14-install.patch +sha512sums="32b0d9e5fbb44e947eb771f323ce4aa76f8b31e940f47dcec2af6c5e98a20b58cb4627eff6e70faac6b8cb2ad67b88b0280496310a5b784466196c22e1174233 Release_1_8_18.tar.gz 92d82c0799d7cdbb6fb37069514d7c6dbadb0c3d88409803e88180bcfcf4be9a2f346c035cd49de8f7496eed2ffd1519d96a1ec3c22db21c2dfdc4e437dada50 time64.patch" diff --git a/user/doxygen/doxygen-1.8.14-install.patch b/user/doxygen/doxygen-1.8.14-install.patch deleted file mode 100644 index 71448b8b4..000000000 --- a/user/doxygen/doxygen-1.8.14-install.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- doxygen-1.8.14/doc/CMakeLists.txt.config 2017-12-31 15:28:32.351163123 +0100 -+++ doxygen-1.8.14/doc/CMakeLists.txt 2017-12-31 15:29:11.490119182 +0100 -@@ -168,15 +168,15 @@ install(FILES - "${PROJECT_BINARY_DIR}/man/doxywizard.1" - "${PROJECT_BINARY_DIR}/man/doxysearch.1" - "${PROJECT_BINARY_DIR}/man/doxyindexer.1" -- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 -+ DESTINATION "${MAN_INSTALL_DIR}" - ) - - install(FILES - "${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf" -- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}" -+ DESTINATION "${DOC_INSTALL_DIR}" - ) - - install(DIRECTORY - "${PROJECT_BINARY_DIR}/html" -- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}" -+ DESTINATION "${DOC_INSTALL_DIR}" - ) diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD index f0d269483..43548942e 100644 --- a/user/dragonplayer/APKBUILD +++ b/user/dragonplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dragonplayer -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Multimedia player with a focus on simplicity" url="https://www.kde.org/applications/multimedia/dragonplayer/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="29ba89a2292842e47f47dbbe313a6c8d4bfae22d6d7563336f4614f6ea561187e714baf76ac830c65bf5c5ce97077865a04418f905bd6ec902d10631e93a66b8 dragon-19.12.3.tar.xz" +sha512sums="1e802291d58fed6e9f0a51dfea8157e897b36ddab4e61a7af4d9350116f0d8ae871c15289f3bb0ee0c63401e830f8dc256f7709fa9d309b06f4f0f01afc8b59b dragon-20.04.3.tar.xz" diff --git a/user/elixir/APKBUILD b/user/elixir/APKBUILD index e23466f18..83731fd94 100644 --- a/user/elixir/APKBUILD +++ b/user/elixir/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Marlus Saraiva <marlus.saraiva@gmail.com> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=elixir -pkgver=1.10.3 +pkgver=1.10.4 pkgrel=0 pkgdesc="Dynamic, functional language designed for building scalable and maintainable applications" url="https://elixir-lang.org/" @@ -11,7 +11,10 @@ license="Apache-2.0" depends="erlang" makedepends="erlang-dev" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/elixir-lang/elixir/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/elixir-lang/elixir/archive/v$pkgver.tar.gz + tests1.patch + tests2.patch + " build() { make @@ -25,4 +28,6 @@ package() { make DESTDIR="$pkgdir" PREFIX=/usr install } -sha512sums="66b18b983e5374afbd4d94c43a880c5e46a9aa150fa6f38be74ff7f58a19eaaee00248b202d9ae3f6b78e2495fc8d5cec755de644256a731be367766c3812855 elixir-1.10.3.tar.gz" +sha512sums="844e405cf344539a9d32dc7f1ead0dc1dfb0d70a9ab718269f4e25e5262f611f96346f5be93cf8e34a75c58c6aabb12e8a796c5cb182955922510c270ef169e7 elixir-1.10.4.tar.gz +4b014bc616c729dba673693b8157e1923eff840d83798051aeb297056383c7b3490fb9d0749eb21ba6c09f6128b36510f1c943e2d8daf393d4c719d021693978 tests1.patch +fa2f24514e4859449ec260cb179a1e523580d8681a9ad55aff7e447ae4feee6f5a09a4f1857b481a973d4f8e759cb194ffdd9b2b230ec8a59bd33fd53ad47730 tests2.patch" diff --git a/user/elixir/tests1.patch b/user/elixir/tests1.patch new file mode 100644 index 000000000..7c74074a9 --- /dev/null +++ b/user/elixir/tests1.patch @@ -0,0 +1,87 @@ +From aaae97992d33ba11374a9140e2ad8aa9aca45e32 Mon Sep 17 00:00:00 2001 +From: Jonny Stoten <jonny@jonnystoten.com> +Date: Mon, 13 Jan 2020 08:37:20 +0000 +Subject: [PATCH] Don't GPG sign commits or tags in git tests (#9719) + +If the machine/user git config is set to sign all commits/tags, +these tests fail. +--- + lib/mix/test/mix/tasks/escript_test.exs | 2 +- + lib/mix/test/test_helper.exs | 16 ++++++++-------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/lib/mix/test/mix/tasks/escript_test.exs b/lib/mix/test/mix/tasks/escript_test.exs +index 5d9eb8390a..f8f1baaf15 100644 +--- a/lib/mix/test/mix/tasks/escript_test.exs ++++ b/lib/mix/test/mix/tasks/escript_test.exs +@@ -351,7 +351,7 @@ defmodule Mix.Tasks.EscriptTest do + """) + + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "ok"]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) + + send(self(), {:mix_shell_input, :yes?, true}) + Mix.Tasks.Escript.Install.run(["git", File.cwd!()]) +diff --git a/lib/mix/test/test_helper.exs b/lib/mix/test/test_helper.exs +index b652cd07b2..65e41aa1d1 100644 +--- a/lib/mix/test/test_helper.exs ++++ b/lib/mix/test/test_helper.exs +@@ -218,7 +218,7 @@ unless File.dir?(target) do + System.cmd("git", ~w[config user.email "mix@example.com"]) + System.cmd("git", ~w[config user.name "mix-repo"]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "bad"]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "bad"]) + end) + + File.write!(Path.join(target, "mix.exs"), """ +@@ -237,8 +237,8 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "ok"]) +- System.cmd("git", ~w[tag without_module]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) ++ System.cmd("git", ~w[tag --no-sign without_module]) + end) + + File.write!(Path.join(target, "lib/git_repo.ex"), """ +@@ -279,8 +279,8 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "lib"]) +- System.cmd("git", ~w[tag with_module]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "lib"]) ++ System.cmd("git", ~w[tag --no-sign with_module]) + end) + end + +@@ -309,7 +309,7 @@ unless File.dir?(target) do + System.cmd("git", ~w[config user.email "mix@example.com"]) + System.cmd("git", ~w[config user.name "mix-repo"]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m without-dep]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m without-dep]) + end) + + File.write!(Path.join(target, "mix.exs"), """ +@@ -336,7 +336,7 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m with-dep]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m with-dep]) + end) + end + +@@ -364,7 +364,7 @@ unless File.dir?(target) do + System.cmd("git", ~w[config user.email "mix@example.com"]) + System.cmd("git", ~w[config user.name "mix-repo"]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit -m "ok"]) ++ System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) + end) + end + diff --git a/user/elixir/tests2.patch b/user/elixir/tests2.patch new file mode 100644 index 000000000..f44b028df --- /dev/null +++ b/user/elixir/tests2.patch @@ -0,0 +1,159 @@ +From 3d1c1b4e2396e9891d38d00185889bd4a421db1a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@dashbit.co> +Date: Sat, 13 Jun 2020 10:01:10 +0200 +Subject: [PATCH] Use global gitconfig instead of individual options on + commands + +Closes #10098. +--- + lib/mix/lib/mix/scm/git.ex | 7 ++-- + lib/mix/test/mix/tasks/escript_test.exs | 2 +- + lib/mix/test/test_helper.exs | 45 +++++++++++++------------ + 3 files changed, 29 insertions(+), 25 deletions(-) + +diff --git a/lib/mix/lib/mix/scm/git.ex b/lib/mix/lib/mix/scm/git.ex +index 2c07b9515f..6f66202052 100644 +--- a/lib/mix/lib/mix/scm/git.ex ++++ b/lib/mix/lib/mix/scm/git.ex +@@ -251,8 +251,11 @@ defmodule Mix.SCM.Git do + opts = cmd_opts(into: into, stderr_to_stdout: true) + + case System.cmd("git", args, opts) do +- {response, 0} -> response +- {_, _} -> Mix.raise("Command \"git #{Enum.join(args, " ")}\" failed") ++ {response, 0} -> ++ response ++ ++ {response, _} -> ++ Mix.raise("Command \"git #{Enum.join(args, " ")}\" failed with reason: #{response}") + end + end + +diff --git a/lib/mix/test/mix/tasks/escript_test.exs b/lib/mix/test/mix/tasks/escript_test.exs +index f8f1baaf15..5d9eb8390a 100644 +--- a/lib/mix/test/mix/tasks/escript_test.exs ++++ b/lib/mix/test/mix/tasks/escript_test.exs +@@ -351,7 +351,7 @@ defmodule Mix.Tasks.EscriptTest do + """) + + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) ++ System.cmd("git", ~w[commit -m "ok"]) + + send(self(), {:mix_shell_input, :yes?, true}) + Mix.Tasks.Escript.Install.run(["git", File.cwd!()]) +diff --git a/lib/mix/test/test_helper.exs b/lib/mix/test/test_helper.exs +index 88c6434816..1dec2be0b0 100644 +--- a/lib/mix/test/test_helper.exs ++++ b/lib/mix/test/test_helper.exs +@@ -182,18 +182,23 @@ defmodule MixTest.Case do + end + end + +-## Set up Mix home with Rebar ++## Set up globals + +-home = MixTest.Case.tmp_path(".mix") ++home = MixTest.Case.tmp_path(".home") + File.mkdir_p!(home) +-System.put_env("MIX_HOME", home) ++System.put_env("HOME", home) ++ ++mix = MixTest.Case.tmp_path(".mix") ++File.mkdir_p!(mix) ++System.put_env("MIX_HOME", mix) ++ + System.delete_env("XDG_DATA_HOME") + System.delete_env("XDG_CONFIG_HOME") + + rebar = System.get_env("REBAR") || Path.expand("fixtures/rebar", __DIR__) +-File.cp!(rebar, Path.join(home, "rebar")) ++File.cp!(rebar, Path.join(mix, "rebar")) + rebar = System.get_env("REBAR3") || Path.expand("fixtures/rebar3", __DIR__) +-File.cp!(rebar, Path.join(home, "rebar3")) ++File.cp!(rebar, Path.join(mix, "rebar3")) + + ## Copy fixtures to tmp + +@@ -207,6 +212,8 @@ Enum.each(fixtures, fn fixture -> + end) + + ## Generate Git repo fixtures ++System.cmd("git", ~w[config --global user.email "mix@example.com"]) ++System.cmd("git", ~w[config --global user.name "mix-repo"]) + + # Git repo + target = Path.expand("fixtures/git_repo", __DIR__) +@@ -220,11 +227,9 @@ unless File.dir?(target) do + """) + + File.cd!(target, fn -> +- System.cmd("git", ~w[-c core.hooksPath='' init]) +- System.cmd("git", ~w[config user.email "mix@example.com"]) +- System.cmd("git", ~w[config user.name "mix-repo"]) ++ System.cmd("git", ~w[init]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "bad"]) ++ System.cmd("git", ~w[commit -m "bad"]) + end) + + File.write!(Path.join(target, "mix.exs"), """ +@@ -243,8 +248,8 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) +- System.cmd("git", ~w[tag --no-sign without_module]) ++ System.cmd("git", ~w[commit -m "ok"]) ++ System.cmd("git", ~w[tag without_module]) + end) + + File.write!(Path.join(target, "lib/git_repo.ex"), """ +@@ -285,8 +290,8 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "lib"]) +- System.cmd("git", ~w[tag --no-sign with_module]) ++ System.cmd("git", ~w[commit -m "lib"]) ++ System.cmd("git", ~w[tag with_module]) + end) + end + +@@ -311,11 +316,9 @@ unless File.dir?(target) do + """) + + File.cd!(target, fn -> +- System.cmd("git", ~w[-c core.hooksPath='' init]) +- System.cmd("git", ~w[config user.email "mix@example.com"]) +- System.cmd("git", ~w[config user.name "mix-repo"]) ++ System.cmd("git", ~w[init]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m without-dep]) ++ System.cmd("git", ~w[commit -m without-dep]) + end) + + File.write!(Path.join(target, "mix.exs"), """ +@@ -342,7 +345,7 @@ unless File.dir?(target) do + + File.cd!(target, fn -> + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m with-dep]) ++ System.cmd("git", ~w[commit -m with-dep]) + end) + end + +@@ -366,11 +369,9 @@ unless File.dir?(target) do + """) + + File.cd!(target, fn -> +- System.cmd("git", ~w[-c core.hooksPath='' init]) +- System.cmd("git", ~w[config user.email "mix@example.com"]) +- System.cmd("git", ~w[config user.name "mix-repo"]) ++ System.cmd("git", ~w[init]) + System.cmd("git", ~w[add .]) +- System.cmd("git", ~w[commit --no-gpg-sign -m "ok"]) ++ System.cmd("git", ~w[commit -m "ok"]) + end) + end + diff --git a/user/enchant/APKBUILD b/user/enchant/APKBUILD index bb270f035..f1aba2563 100644 --- a/user/enchant/APKBUILD +++ b/user/enchant/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=enchant -pkgver=2.2.7 +pkgver=2.2.8 pkgrel=0 pkgdesc="Generic library for spell checking" url="https://abiword.github.io/enchant/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="696455cf782b3186d19988ed59ca3cc6030a431d44ef3828039590afb08fd282a79ce6246a342e6bf7a0bf3bf63d4822d841ba01394da9f9e4394a491b2373b6 enchant-2.2.7.tar.gz" +sha512sums="4bfa771af0deab3d0ca5523abab1fdb14cb596747dba7cf887e8cd812601015f52502cbd3df68247f102bba259cb281414e9ccde83b8bdd3c8cc83c2fcbc9090 enchant-2.2.8.tar.gz" diff --git a/user/eudev/APKBUILD b/user/eudev/APKBUILD index 16858e1f5..86a8e30f8 100644 --- a/user/eudev/APKBUILD +++ b/user/eudev/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=eudev pkgver=3.2.9 -pkgrel=0 +pkgrel=1 pkgdesc="OpenRC compatible fork of systemd-udev" url="https://wiki.gentoo.org/wiki/Project:Eudev" arch="all" @@ -91,12 +91,16 @@ openrc() { replaces="udev-init-scripts-openrc" default_openrc install -d "$subpkgdir"/usr/share/openrc/runlevels/sysinit + install -d "$subpkgdir"/etc/runlevels/sysinit # https://bts.adelielinux.org/show_bug.cgi?id=51 # if eudev is installed, it should be running in the sysinit runlevel ln -s /etc/init.d/udev \ "$subpkgdir"/usr/share/openrc/runlevels/sysinit/udev + ln -s /etc/init.d/udev "$subpkgdir"/etc/runlevels/sysinit/udev ln -s /etc/init.d/udev-trigger \ "$subpkgdir"/usr/share/openrc/runlevels/sysinit/udev-trigger + ln -s /etc/init.d/udev-trigger \ + "$subpkgdir"/etc/runlevels/sysinit/udev-trigger } sha512sums="09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f eudev-3.2.9.tar.gz diff --git a/user/evince/APKBUILD b/user/evince/APKBUILD index 6ddc8cf92..8d6368a9b 100644 --- a/user/evince/APKBUILD +++ b/user/evince/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=evince -pkgver=3.36.0 +pkgver=3.36.7 pkgrel=0 pkgdesc="GNOME document viewer" url="https://wiki.gnome.org/Apps/Evince" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="914c182f0ca71a0df99036339fe18f7c93514bae461ddecd719c5659c1cc67701f825e7a58b1eb203051ec55ccd402371fc70d3a27134ccdf915966e5bad8b7a evince-3.36.0.tar.xz" +sha512sums="dacc26d2d75c3dcadceb0a35c995ae3501bd91e84632cdf87decd359350e74032444707ea152e24c01fb57fe0ef2a426813a33919833cefdeb8699f8c642d910 evince-3.36.7.tar.xz" diff --git a/user/extra-cmake-modules/APKBUILD b/user/extra-cmake-modules/APKBUILD index 37a599524..3d2b55f65 100644 --- a/user/extra-cmake-modules/APKBUILD +++ b/user/extra-cmake-modules/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=extra-cmake-modules -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="CMake modules needed for KDE development" url="https://www.kde.org/" @@ -37,5 +37,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0e3d7d9c6fd58dbf87923ec35709bbf11386d65038f698461de51bdb65a9f05c84fe9902184f97f47b133dfb88118d6306f30f6eeee912f89b9c41a3e30ffac1 extra-cmake-modules-5.68.0.tar.xz +sha512sums="4bae3b862b473df8115246924813b379f2b957ae700c4be45f13fe44519d7f011c235459a0dc8b10aad920dee318435747f1ff3ea8c270ca53ec2f4ebe90b098 extra-cmake-modules-5.72.0.tar.xz a9e5d5e7ac8372099458ed18d2a6023fa0acf46955f51509880e7a467b4bd9e5df67c44c9ad032b1d70139efb73206390eaf7cd2baf63a82131e6e2b4acdbd71 posix.patch" diff --git a/user/f2fs-tools/APKBUILD b/user/f2fs-tools/APKBUILD new file mode 100644 index 000000000..7784c170d --- /dev/null +++ b/user/f2fs-tools/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: CyberLeo <cyberleo@cyberleo.net> +# Maintainer: CyberLeo <cyberleo@cyberleo.net> +pkgname=f2fs-tools +pkgver=1.13.0 +pkgrel=0 +pkgdesc="Tools for the Flash-Friendly File System (F2FS)" +url="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git" +arch="all" +options="!check" # No test suite. +license="GPL-2.0+ OR LGPL-2.1+" +depends="" +makedepends="automake autoconf bsd-compat-headers libtool util-linux-dev linux-headers" +subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" +source="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/$pkgname-$pkgver.tar.gz" + +prepare() { + default_prepare + ./autogen.sh +} + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr + make +} + +package() { + make install DESTDIR="$pkgdir" + install -D -m644 mkfs/f2fs_format_utils.h "$pkgdir"/usr/include/ +} + +sha512sums="fd920a19e8705a65395809aeef55791c5678ed31c026cdf41fc173e0dbcacdef1db7e0e184ec1aae8637b1784e2ad6e0207583e918255483fe43c73f89bd7f7f f2fs-tools-1.13.0.tar.gz" diff --git a/user/faad2/APKBUILD b/user/faad2/APKBUILD index 679d7831e..0a81a14f9 100644 --- a/user/faad2/APKBUILD +++ b/user/faad2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=faad2 -pkgver=2.9.1 +pkgver=2.9.2 _pkgver="$(printf '%s' "$pkgver" | tr . _)" pkgrel=0 pkgdesc="ISO AAC audio decoder" @@ -55,4 +55,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1015f5b49baebf6c9404cfcd7b9d524cc76a57abcd1a46bb851463ae5226bfd8b80155b661708f66548466422855cd7aeec5676463cd1346c5fb1dc0821621ce faad2-2.9.1.tar.gz" +sha512sums="996c279a56c6abde13da964b91d4ff87ac4c611e889f1dd59882fa3898093dec68ab0714cf106db10a5e24952e2d6dddc049ec9bf4f07ff68378a705d5debee2 faad2-2.9.2.tar.gz" diff --git a/user/fdupes/APKBUILD b/user/fdupes/APKBUILD index 944256215..fa0891b31 100644 --- a/user/fdupes/APKBUILD +++ b/user/fdupes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fdupes -pkgver=1.6.1 +pkgver=2.1.1 pkgrel=0 pkgdesc="Identify or delete duplicate files in a directory tree" url=" " @@ -9,16 +9,23 @@ arch="all" options="!check" # No test suite. license="MIT" depends="" -makedepends="" +makedepends="autoconf automake ncurses-dev pcre2-dev" subpackages="$pkgname-doc" source="fdupes-$pkgver.tar.gz::https://github.com/adrianlopezroche/fdupes/archive/v$pkgver.tar.gz" +prepare() { + default_prepare + autoreconf -vif +} + build() { - make PREFIX=/usr + LIBS="-ltinfow" ./configure \ + --prefix=/usr + make } package() { - make PREFIX=/usr DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } -sha512sums="6c6662b70068c2f48f4be64a6830c81a66852d650391d0756f20b9ac0df7d70c1a32918bd7cbd50e19de524d9ebc09ea338c19636e1807b071eb96b325e641db fdupes-1.6.1.tar.gz" +sha512sums="e098647f57d0f9fb183b9f3c4cc36d33427edb3982763a894251c5a9f8432302329cc8d1ab5a09dc27a247065bdd40936c48d3846f1babf3300ca011a37a1b7d fdupes-2.1.1.tar.gz" diff --git a/user/featherpad/APKBUILD b/user/featherpad/APKBUILD index e88d1344e..848ca9e9b 100644 --- a/user/featherpad/APKBUILD +++ b/user/featherpad/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=featherpad -pkgver=0.13.1 +pkgver=0.14.2 pkgrel=0 pkgdesc="Featureful Qt-based text editor" url="https://github.com/tsujan/FeatherPad" @@ -31,5 +31,5 @@ package() { make INSTALL_ROOT="$pkgdir" PREFIX=/usr install } -sha512sums="287a97907baba93a760751f8f28472b12d6c65ebb0855fcf684e126d8635adbc4e00b2fb4703bbabdc182b8a337dd9281b5b2c97add4b571fca976d90ecc7db9 FeatherPad-0.13.1.tar.gz +sha512sums="d66b999b11fb42de0ffe270b01186a9fbdedd211bf03f81c3b2adc717c2d427f5292008c1e5319c01a90e50ec23bc92767940741a80780fa9160fd3ce4839016 FeatherPad-0.14.2.tar.gz 471714eec9a376b138cc4c6c7b7d1339c9767091309c95b11ef2a8536250c796367b1544dca9610cc10babdbd08ac1436784d71292680b9da90e681dd855aaf0 hunspell-link.patch" diff --git a/user/feh/APKBUILD b/user/feh/APKBUILD index 899461202..b95aaf01d 100644 --- a/user/feh/APKBUILD +++ b/user/feh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=feh -pkgver=3.3 +pkgver=3.4.1 pkgrel=0 pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" url="https://feh.finalrewind.org/" @@ -12,7 +12,14 @@ checkdepends="perl-test-command" makedepends="curl-dev imlib2-dev libexif-dev libjpeg-turbo-dev libpng-dev libxinerama-dev libxt-dev" subpackages="$pkgname-doc" -source="https://feh.finalrewind.org/$pkgname-$pkgver.tar.bz2" +source="https://feh.finalrewind.org/$pkgname-$pkgver.tar.bz2 + getopt.patch + " + +prepare() { + default_prepare + rm src/getopt.c src/getopt1.c src/getopt.h +} build() { make PREFIX=/usr curl=1 exif=1 xinerama=1 @@ -31,4 +38,5 @@ package() { install } -sha512sums="0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9 feh-3.3.tar.bz2" +sha512sums="d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66 feh-3.4.1.tar.bz2 +cf02fbfcb1fd4f4e5cf899f7f94fd42521dbe8f1b805268eae5ae6222b85884c31abc3346a95ed46dfece7b89b445018e159ff8a42b799b3db18275e29eba1e3 getopt.patch" diff --git a/user/feh/getopt.patch b/user/feh/getopt.patch new file mode 100644 index 000000000..be7616fa9 --- /dev/null +++ b/user/feh/getopt.patch @@ -0,0 +1,100 @@ +--- feh-3.4.1/src/feh.h 2020-05-29 21:55:03.000000000 +0000 ++++ feh-3.4.1/src/feh.h 2020-06-20 02:22:16.040051483 +0000 +@@ -74,7 +74,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE + #include "menu.h" + + #include "utils.h" +-#include "getopt.h" ++#include <getopt.h> + + #include "debug.h" + +--- feh-3.4.1/src/Makefile 2020-05-29 21:55:03.000000000 +0000 ++++ feh-3.4.1/src/Makefile 2020-06-20 02:22:43.660051920 +0000 +@@ -4,8 +4,6 @@ TARGETS = \ + events.c \ + feh_png.c \ + filelist.c \ +- getopt.c \ +- getopt1.c \ + gib_hash.c \ + gib_imlib.c \ + gib_list.c \ +--- feh-3.4.1/src/deps.mk 2020-05-29 21:55:03.000000000 +0000 ++++ feh-3.4.1/src/deps.mk 2020-06-20 02:23:33.810052712 +0000 +@@ -1,57 +1,55 @@ + events.o: events.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h winwidget.h \ ++ structs.h menu.h utils.h debug.h filelist.h winwidget.h \ + timers.h options.h events.h thumbnail.h + feh_png.o: feh_png.c feh_png.h feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h ++ gib_style.h structs.h menu.h utils.h debug.h + filelist.o: filelist.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + signals.h options.h +-getopt.o: getopt.c +-getopt1.o: getopt1.c getopt.h + gib_hash.o: gib_hash.c gib_hash.h gib_list.h utils.h debug.h + gib_imlib.o: gib_imlib.c gib_imlib.h gib_style.h gib_list.h utils.h \ + debug.h + gib_list.o: gib_list.c gib_list.h utils.h debug.h + gib_style.o: gib_style.c gib_style.h gib_list.h utils.h debug.h + imlib.o: imlib.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h signals.h \ ++ structs.h menu.h utils.h debug.h filelist.h signals.h \ + winwidget.h options.h + index.o: index.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h winwidget.h \ ++ structs.h menu.h utils.h debug.h filelist.h winwidget.h \ + options.h index.h + keyevents.o: keyevents.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h thumbnail.h \ ++ gib_style.h structs.h menu.h utils.h debug.h thumbnail.h \ + filelist.h winwidget.h options.h + list.o: list.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h options.h ++ structs.h menu.h utils.h debug.h filelist.h options.h + main.o: main.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h winwidget.h \ ++ structs.h menu.h utils.h debug.h filelist.h winwidget.h \ + timers.h options.h events.h signals.h wallpaper.h + md5.o: md5.c md5.h + menu.o: menu.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h thumbnail.h filelist.h \ ++ structs.h menu.h utils.h debug.h thumbnail.h filelist.h \ + winwidget.h wallpaper.h options.h + multiwindow.o: multiwindow.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h winwidget.h \ ++ gib_style.h structs.h menu.h utils.h debug.h winwidget.h \ + timers.h filelist.h options.h signals.h + options.o: options.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h options.h ++ structs.h menu.h utils.h debug.h filelist.h options.h + signals.o: signals.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h winwidget.h \ ++ structs.h menu.h utils.h debug.h filelist.h winwidget.h \ + options.h + slideshow.o: slideshow.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + timers.h winwidget.h options.h signals.h + thumbnail.o: thumbnail.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + winwidget.h options.h thumbnail.h md5.h feh_png.h index.h signals.h + timers.o: timers.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h options.h timers.h ++ structs.h menu.h utils.h debug.h options.h timers.h + utils.o: utils.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h options.h ++ structs.h menu.h utils.h debug.h options.h + wallpaper.o: wallpaper.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + options.h wallpaper.h + winwidget.o: winwidget.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + winwidget.h options.h events.h diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD index 82d7730c7..6986f1947 100644 --- a/user/ffmpegthumbs/APKBUILD +++ b/user/ffmpegthumbs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpegthumbs -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE video thumbnail system using FFmpeg" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4364902f570dad6d6cbb814e64c31d4a39aebd3a82aeb81598f3484464f5f0ce6da1c16f8a57f3bc6075f0e91ecacf60ffbffc6b76c6582f6859c1a52af35191 ffmpegthumbs-19.12.3.tar.xz" +sha512sums="8b9cbcbad56aed5924fa416d295a42cbe1fa992287919fb8475d1dde41fd45608afeb97fd8a747a77d71823f92597428c99896792291a3def0d539f29df3870e ffmpegthumbs-20.04.3.tar.xz" diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD index 82a4e5276..2796e3e36 100644 --- a/user/firefox-esr/APKBUILD +++ b/user/firefox-esr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Molly Miller <adelie@m-squa.red> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=firefox-esr -pkgver=68.8.0 +pkgver=68.10.0 pkgrel=0 pkgdesc="Firefox web browser (extended support release)" url="https://www.mozilla.org/firefox/" @@ -41,8 +41,8 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f mozilla-build-arm.patch ppc32-fix.patch rust-32bit.patch - rust-config.patch - seccomp-membarrier.patch + seccomp-musl.patch + seccomp-time64.patch shut-up-warning.patch skia-sucks1.patch skia-sucks2.patch @@ -126,6 +126,17 @@ ldpath="$_mozappdir" # - CVE-2020-12387 # - CVE-2020-12392 # - CVE-2020-12395 +# 68.9.0-r0: +# - CVE-2020-12399 +# - CVE-2020-12405 +# - CVE-2020-12406 +# - CVE-2020-12410 +# 68.10.0-r0: +# - CVE-2020-12417 +# - CVE-2020-12418 +# - CVE-2020-12419 +# - CVE-2020-12420 +# - CVE-2020-12421 unpack() { default_unpack @@ -241,7 +252,7 @@ package() { EOF } -sha512sums="139a63dc85ae76a50da6be9a31425f97144e6c7e4a65b0f3009a84eb5c8c9566f6bb331e26590f8aecd5045c4d730ab4e848cf7220f3444a31147b5533c742b3 firefox-68.8.0esr.source.tar.xz +sha512sums="c5c1833560364851e7cf8ea51659bc4fb60239b960125cdb20fe31f742d757ffdaef8f314f800dc91214ee8e358033dc2af971c08bbba474ef6158b101881653 firefox-68.10.0esr.source.tar.xz 16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0 Python-2.7.16.tar.xz f82758d279cd12a1b30a9b36ac3c265cfb137df3db7ae185f2c538504e46fa70ace1b051fce847356851062b5cc9cd741a6d33d54f8cd103aa0c8272cb19ccc4 mozconfig ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch @@ -252,8 +263,8 @@ de8e3b15cd7dffb0eca5a729434986e5916234914cdc5fdcdbbc67d8bb439a535ed932293518dd74 e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch 06a3f4ee6d3726adf3460952fcbaaf24bb15ef8d15b3357fdd1766c7a62b00bd53a1e943b5df7f4e1a69f4fae0d44b64fae1e027d7812499c77894975969ea10 ppc32-fix.patch 7c615703dc9b8427eeadd13bc9beda02e1c3d986cac1167feaf48fdfdcc15b7456460d4d58f301054cf459242ee75bbcd76bf67e26c2a443bc5655975d24ca1b rust-32bit.patch -45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8 rust-config.patch -36369f2e237e894b2f9e70ffa0579bb3cddf1efa638a36b3469e9f529c28d7b72611fa426c5534d93094a8deb1376f43f6661447072dc6dfc6191ca5eebd4604 seccomp-membarrier.patch +efc77a320850e10e8b99e6fb5d3dd28a3044e287fd87efbdf95807de26a6885235b2d994743cb374345d91a0353abd70a5790b829e37b717b77605e24d4f7f98 seccomp-musl.patch +4b20dfa3ef3d470af069a274c53ea35c67d2d123f1b543ee243e7038ed94f5a1a6121f1f67713a9442e246b979c042f11efc7a6c32d0b8d3fd2c448dd1258733 seccomp-time64.patch 39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch e751ffab263f03d4c74feebc617e3af115b1b53cf54fe16c3acc585eec67773f37aa8de4c19599fa6478179b01439025112ef2b759aa9923c9900e7081cb65a9 skia-sucks1.patch 9152bd3e6dc446337e6a2ed602279c620aedecc796ba28e777854c4f41fcf3067f9ebd086a4b63a6b76c2e69ec599ac6435b8eeda4f7488b1c45f69113facba4 skia-sucks2.patch diff --git a/user/firefox-esr/rust-config.patch b/user/firefox-esr/rust-config.patch deleted file mode 100644 index eab72a0e4..000000000 --- a/user/firefox-esr/rust-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urw firefox-68.0-old/build/moz.configure/rust.configure firefox-68.0/build/moz.configure/rust.configure ---- firefox-68.0-old/build/moz.configure/rust.configure 2019-07-07 15:56:29.345963800 +0000 -+++ firefox-68.0/build/moz.configure/rust.configure 2019-07-07 16:19:25.990645334 +0000 -@@ -193,12 +193,16 @@ - ambiguous = set() - per_raw_os = {} - for t in out: -+ if 'fuchsia' in t: continue - t = split_triplet(t, allow_unknown=True) - endianness = t.endianness - if t.cpu.startswith('thumb') and endianness not in ('big', 'little'): - endianness = 'little' - key = (t.cpu, endianness, t.os) - if key in per_os: -+ # hax to allow Adélie toolchains to work -+ if 'foxkit' in per_os[key].alias: -+ continue - previous = per_os[key] - per_raw_os[(previous.cpu, previous.endianness, - previous.raw_os)] = previous diff --git a/user/firefox-esr/seccomp-membarrier.patch b/user/firefox-esr/seccomp-membarrier.patch deleted file mode 100644 index be1744113..000000000 --- a/user/firefox-esr/seccomp-membarrier.patch +++ /dev/null @@ -1,12 +0,0 @@ -musl ldso issues a membarrier when setting up TLS - ---- firefox-68.7.0/security/sandbox/linux/SandboxFilter.cpp 2020-04-03 19:30:03.000000000 +0000 -+++ firefox-68.7.0/security/sandbox/linux/SandboxFilter.cpp 2020-04-19 04:59:30.280000000 +0000 -@@ -529,6 +529,7 @@ class SandboxPolicyCommon : public Sandb - - // ipc::Shmem; also, glibc when creating threads: - case __NR_mprotect: -+ case __NR_membarrier: - return Allow(); - - // madvise hints used by malloc; see bug 1303813 and bug 1364533 diff --git a/user/firefox-esr/seccomp-musl.patch b/user/firefox-esr/seccomp-musl.patch new file mode 100644 index 000000000..edd4a3024 --- /dev/null +++ b/user/firefox-esr/seccomp-musl.patch @@ -0,0 +1,49 @@ +Backport of https://hg.mozilla.org/mozilla-central/rev/a0be746532f437055e4190cc8db802ad1239405e + +diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp +--- a/security/sandbox/linux/SandboxFilter.cpp ++++ b/security/sandbox/linux/SandboxFilter.cpp +@@ -419,16 +419,20 @@ class SandboxPolicyCommon : public Sandb + case __NR_faccessat: + return Trap(AccessAtTrap, mBroker); + CASES_FOR_stat: + return Trap(StatTrap, mBroker); + CASES_FOR_lstat: + return Trap(LStatTrap, mBroker); + CASES_FOR_fstatat: + return Trap(StatAtTrap, mBroker); ++ // Used by new libc and Rust's stdlib, if available. ++ // We don't have broker support yet so claim it does not exist. ++ case __NR_statx: ++ return Error(ENOSYS); + case __NR_chmod: + return Trap(ChmodTrap, mBroker); + case __NR_link: + return Trap(LinkTrap, mBroker); + case __NR_mkdir: + return Trap(MkdirTrap, mBroker); + case __NR_symlink: + return Trap(SymlinkTrap, mBroker); +@@ -538,16 +542,20 @@ class SandboxPolicyCommon : public Sandb + .ElseIf(advice == MADV_HUGEPAGE, Allow()) + .ElseIf(advice == MADV_NOHUGEPAGE, Allow()) + #ifdef MOZ_ASAN + .ElseIf(advice == MADV_DONTDUMP, Allow()) + #endif + .Else(InvalidSyscall()); + } + ++ // musl libc will set this up in pthreads support. ++ case __NR_membarrier: ++ return Allow(); ++ + // Signal handling + #if defined(ANDROID) || defined(MOZ_ASAN) + case __NR_sigaltstack: + #endif + CASES_FOR_sigreturn: + CASES_FOR_sigprocmask: + CASES_FOR_sigaction: + return Allow(); + + diff --git a/user/firefox-esr/seccomp-time64.patch b/user/firefox-esr/seccomp-time64.patch new file mode 100644 index 000000000..72cc28b5d --- /dev/null +++ b/user/firefox-esr/seccomp-time64.patch @@ -0,0 +1,112 @@ +This drops the use of the chromium sandbox syscall headers which were +defining syscall numbers if they were undefined. This masked the time64 +issue initially since while musl renamed several of the time32 syscall +numbers to catch breakage like this, these headers were silently +bringing them back. I did this by comparing the syscall numbers provided +by the chromium and musl headers and redefining the generic names to +their time64 counterparts. + +For gettimeofday and settimeofday there does not appear to be a time64 +counterpart so I have defined them as the time32 versions. For +settimeofday this should not matter (the seccomp filter will block this +by virture of not being on the whitelist - no content process needs to +set the time anyway). + +It is not possible to entirely block the usage of time32 syscalls +because musl uses them internally when it can or in fallback paths. + +I did not check the MIPS headers since we don't currently ship a MIPS +port, so in the future those includes should be examined and dropped +too... + +--- firefox-68.8.0/security/sandbox/chromium/sandbox/linux/system_headers/linux_syscalls.h 2020-04-29 16:49:45.000000000 -0500 ++++ firefox-68.8.0/security/sandbox/chromium/sandbox/linux/system_headers/linux_syscalls.h 2020-05-20 03:09:47.369457646 -0500 +@@ -8,18 +8,7 @@ + + #ifndef SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ + #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ +- +-#if defined(__x86_64__) +-#include "sandbox/linux/system_headers/x86_64_linux_syscalls.h" +-#endif +- +-#if defined(__i386__) +-#include "sandbox/linux/system_headers/x86_32_linux_syscalls.h" +-#endif +- +-#if defined(__arm__) && defined(__ARM_EABI__) +-#include "sandbox/linux/system_headers/arm_linux_syscalls.h" +-#endif ++#include <sys/syscall.h> + + #if defined(__mips__) && (_MIPS_SIM == _ABIO32) + #include "sandbox/linux/system_headers/mips_linux_syscalls.h" +@@ -33,5 +22,36 @@ + #include "sandbox/linux/system_headers/arm64_linux_syscalls.h" + #endif + ++#if !defined(__NR_clock_getres) && defined(__NR_clock_getres_time64) ++#define __NR_clock_getres __NR_clock_getres_time64 ++#endif ++#if !defined(__NR_clock_gettime) && defined(__NR_clock_gettime64) ++#define __NR_clock_gettime __NR_clock_gettime64 ++#endif ++#if !defined(__NR_clock_nanosleep) && defined(__NR_clock_nanosleep_time64) ++#define __NR_clock_nanosleep __NR_clock_nanosleep_time64 ++#endif ++#if !defined(__NR_clock_settime) && defined(__NR_clock_settime64) ++#define __NR_clock_settime __NR_clock_settime64 ++#endif ++#if !defined(__NR_gettimeofday) && defined(__NR_gettimeofday_time32) ++#define __NR_gettimeofday __NR_gettimeofday_time32 ++#endif ++#if !defined(__NR_settimeofday) && defined(__NR_settimeofday_time32) ++#define __NR_settimeofday __NR_settimeofday_time32 ++#endif ++#if !defined(__NR_timer_gettime) && defined(__NR_timer_gettime64) ++#define __NR_timer_gettime __NR_timer_gettime64 ++#endif ++#if !defined(__NR_timer_settime) && defined(__NR_timer_settime64) ++#define __NR_timer_settime __NR_timer_settime64 ++#endif ++#if !defined(__NR_timerfd_gettime) && defined(__NR_timerfd_gettime64) ++#define __NR_timerfd_gettime __NR_timerfd_gettime64 ++#endif ++#if !defined(__NR_timerfd_settime) && defined(__NR_timerfd_settime64) ++#define __NR_timerfd_settime __NR_timerfd_settime64 ++#endif ++ + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ + +--- firefox-68.8.0/security/sandbox/linux/SandboxFilter.cpp 2020-04-29 16:49:45.000000000 -0500 ++++ firefox-68.8.0/security/sandbox/linux/SandboxFilter.cpp 2020-05-19 23:33:27.829642593 -0500 +@@ -478,6 +478,9 @@ class SandboxPolicyCommon : public Sandb + + // Thread synchronization + case __NR_futex: ++#ifdef __NR_futex_time64 ++ case __NR_futex_time64: ++#endif + // FIXME: This could be more restrictive.... + return Allow(); + +@@ -488,6 +491,9 @@ class SandboxPolicyCommon : public Sandb + case __NR_epoll_pwait: + case __NR_epoll_ctl: + case __NR_ppoll: ++#ifdef __NR_ppoll_time64 ++ case __NR_ppoll_time64: ++#endif + case __NR_poll: + return Allow(); + +@@ -1017,6 +1023,9 @@ class ContentSandboxPolicy : public Sand + + CASES_FOR_select: + case __NR_pselect6: ++#ifdef __NR_pselect6_time64 ++ case __NR_pselect6_time64: ++#endif + return Allow(); + + CASES_FOR_getdents: diff --git a/user/fish/APKBUILD b/user/fish/APKBUILD index 9754c4a0b..08e2a6e47 100644 --- a/user/fish/APKBUILD +++ b/user/fish/APKBUILD @@ -1,34 +1,35 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=fish -pkgver=3.0.2 +pkgver=3.1.2 pkgrel=0 pkgdesc="Modern interactive commandline shell" url="http://www.fishshell.com" arch="all" -options="!check" # No test suite. license="BSD-3-Clause AND BSD-2-Clause AND GPL-2.0+ AND GPL-2.0-only AND ISC" -depends="bc" +depends="bc groff" depends_dev="$pkgname-tools" -makedepends="libtool doxygen ncurses-dev pcre2-dev" +checkdepends="expect" +makedepends="cmake doxygen ncurses-dev pcre2-dev" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-tools::noarch" source="https://github.com/fish-shell/fish-shell/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCURSES_NEED_NCURSES=ON \ + -Bbuild . + make -C build +} + +check() { + make -C build test } package() { - make install DESTDIR="$pkgdir" - rm -fr "$pkgdir"/usr/share/$pkgname/groff + make -C build install DESTDIR="$pkgdir" } dev() { @@ -53,4 +54,4 @@ tools() { mv "$pkgdir"/usr/share/$pkgname/tools "$subpkgdir"/usr/share/$pkgname } -sha512sums="cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3 fish-3.0.2.tar.gz" +sha512sums="b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563 fish-3.1.2.tar.gz" diff --git a/user/fluidsynth/APKBUILD b/user/fluidsynth/APKBUILD index 7f061b427..ef9dee55b 100644 --- a/user/fluidsynth/APKBUILD +++ b/user/fluidsynth/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fluidsynth -pkgver=2.1.1 +pkgver=2.1.3 pkgrel=0 pkgdesc="Real-time, software synthesiser based on SoundFont 2" url="http://www.fluidsynth.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f8776c59aa0aa4a25fe3c38973c994e8608f8fad8a2e478db0d0232d4c787983dfdcba200c558cd810e892930b50184af4bc4a7f3c98ec5c38e147fd715e51b8 fluidsynth-2.1.1.tar.gz" +sha512sums="cc956a3d8926a5d5368c4d36472a9706e5da1597bab76f1b59132e6253a888f422d9f74723c74f801963a90d9e0f6b36267114cd168977c47b1b935ea3dc8927 fluidsynth-2.1.3.tar.gz" diff --git a/user/fonttosfnt/APKBUILD b/user/fonttosfnt/APKBUILD index c8c4c8739..4c9243a9b 100644 --- a/user/fonttosfnt/APKBUILD +++ b/user/fonttosfnt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fonttosfnt -pkgver=1.0.5 +pkgver=1.1.0 pkgrel=0 pkgdesc="Wrap X11 bitmap fonts in TrueType containers" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dba990098c95b07bc7240699a5c9ea11f056fbfddd70f669ae283548cbf20d756b28d817a99548c23ba81de9792877296ab6f35ee3c630e5c3cd8f14650ce297 fonttosfnt-1.0.5.tar.bz2" +sha512sums="f4fb9814c23bfd6f83771959444d2c37eb4ba32edee43c37cf21f0181be80c6e278307641b0f4dae4ee5d10db3289e95194f99757ea4bbca343fff15498e7173 fonttosfnt-1.1.0.tar.bz2" diff --git a/user/frameworkintegration/APKBUILD b/user/frameworkintegration/APKBUILD index 8b7f57f3f..61acf6bce 100644 --- a/user/frameworkintegration/APKBUILD +++ b/user/frameworkintegration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=frameworkintegration -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3aa3c8cd7d5c1b7d444be504fbf1d3ff3cabdd4c043d98436e82d57415c8d9f99158f90065cf3f06b007585dfd2d4a5a8ee978795f4f7285f0e50c52dc74e372 frameworkintegration-5.68.0.tar.xz" +sha512sums="2b3da662fcb4b7f64597c4d69d0f8988466353a5064ecae80a4f82bb6f8b3d8b849aef83dce83cf6fc53577f47daee345d439d761548ff0b5f16f38d0b762df0 frameworkintegration-5.72.0.tar.xz" diff --git a/user/freetds/APKBUILD b/user/freetds/APKBUILD index 3687b3cdc..d1827f3e4 100644 --- a/user/freetds/APKBUILD +++ b/user/freetds/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=freetds -pkgver=1.1.6 +pkgver=1.1.42 pkgrel=0 pkgdesc="Library for accessing Sybase and MS SQL Server databases" url="https://www.freetds.org/" @@ -13,6 +13,10 @@ subpackages="$pkgname-doc $pkgname-dev" source="ftp://ftp.freetds.org/pub/freetds/stable/$pkgname-$pkgver.tar.gz fix-includes.patch" +# secfixes: +# 1.1.40-r0: +# - CVE-2019-13508 + build() { ./configure \ --build=$CBUILD \ @@ -36,5 +40,5 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="fcd3ed52ffbf482535d8d343b2d45c999875d2bfcbf13ef72a15f4440c791ff138b839798bad05593428c0839981e667133473f7d76570e0de3ebf9e474ea632 freetds-1.1.6.tar.gz +sha512sums="af00e73e761efdd54511bbf98a4d4bd3929658eb56a5749f6266c55dd0ae1036e371ada95eee10705786de1c710e38f7550e9df0e45f50c086945a0df21121d7 freetds-1.1.42.tar.gz d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6 fix-includes.patch" diff --git a/user/freetype/APKBUILD b/user/freetype/APKBUILD index cc04fd333..78c8d96ae 100644 --- a/user/freetype/APKBUILD +++ b/user/freetype/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=freetype -pkgver=2.10.1 +pkgver=2.10.2 pkgrel=0 pkgdesc="TrueType font rendering library" url="https://www.freetype.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650 freetype-2.10.1.tar.xz" +sha512sums="cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa freetype-2.10.2.tar.xz" diff --git a/user/fribidi/APKBUILD b/user/fribidi/APKBUILD index 39523b2db..224dfca76 100644 --- a/user/fribidi/APKBUILD +++ b/user/fribidi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fribidi -pkgver=1.0.8 +pkgver=1.0.10 pkgrel=0 pkgdesc="Free Implementation of the Unicode Bidirectional algorithm" url="http://fribidi.org" @@ -9,7 +9,7 @@ license="LGPL-2.1+" depends="" makedepends="" subpackages="$pkgname-dev $pkgname-doc" -source="https://github.com/fribidi/fribidi/releases/download/v$pkgver/fribidi-$pkgver.tar.bz2" +source="https://github.com/fribidi/fribidi/releases/download/v$pkgver/fribidi-$pkgver.tar.xz" build() { ./configure \ @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d66b1524b26d227fd6a628f438efb875c023ae3be708acaaad11f1f62d0902de0a5f57124458291ef2b0fcd89356c52ab8ae5559b0b5a93fa435b92f1d098ba2 fribidi-1.0.8.tar.bz2" +sha512sums="cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360 fribidi-1.0.10.tar.xz" diff --git a/user/fuse3/APKBUILD b/user/fuse3/APKBUILD index 14cafec71..5d8d8f7bd 100644 --- a/user/fuse3/APKBUILD +++ b/user/fuse3/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=fuse3 _pkgname=fuse -pkgver=3.9.1 +pkgver=3.9.2 pkgrel=0 pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface" url="https://github.com/libfuse/libfuse" @@ -80,6 +80,6 @@ openrc() { install_if="openrc fuse-common=$pkgver-r$pkgrel" } -sha512sums="295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329 fuse-3.9.1.tar.xz +sha512sums="47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed fuse-3.9.2.tar.xz 1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd" diff --git a/user/gcompat/APKBUILD b/user/gcompat/APKBUILD index bbc4eedc9..5dc8d6c74 100644 --- a/user/gcompat/APKBUILD +++ b/user/gcompat/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gcompat -pkgver=0.4.0 +pkgver=0.9.0 pkgrel=0 pkgdesc="The GNU C Library compatibility layer for musl" url="https://code.foxkit.us/adelie/gcompat" @@ -32,4 +32,4 @@ package() { make LINKER_PATH="/lib/ld-musl-${_link_arch}.so.1" LOADER_NAME="$_ld" WITH_LIBUCONTEXT=YesPlease DESTDIR="$pkgdir" install } -sha512sums="32b4038a031b9af2d5febb547fe9268eb829f40bb2437c94afe5b939e06e7337448ad7f2dce34362829d19672ede54eec8fc34dc755736dbc76f347906ba5ead gcompat-0.4.0.tar.xz" +sha512sums="d19a1b450f84de80579ce562946ad3da155fa50c2c0642f4b94c8ec22517151493852888455f6d813529816d7518468ec7b5178bb536514045596700fd05738c gcompat-0.9.0.tar.xz" diff --git a/user/gitlab-runner/APKBUILD b/user/gitlab-runner/APKBUILD new file mode 100644 index 000000000..62c9ef24c --- /dev/null +++ b/user/gitlab-runner/APKBUILD @@ -0,0 +1,88 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=gitlab-runner +pkgver=12.1.0 +pkgrel=0 +_testver=91956efe +_branch="${pkgver%.*}" +_branch="${pkgver%%.*}-${_branch#*.}-stable" +pkgdesc="GitLab runner for CI/CD jobs" +url="https://docs.gitlab.com/runner/" +# golang.org packages do not support ppc32 +arch="all !ppc" +pkgusers="gitlab-runner" +pkggroups="gitlab-runner" +options="!check" # Tests require network (git cloning) +license="MIT" +depends="" +makedepends="gcc-go" +subpackages="$pkgname-openrc" +install="$pkgname.pre-install" +source="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$pkgver/gitlab-runner-v$pkgver.tar.gz + https://dev.sick.bike/dist/gitlab-test-$_testver.tar.gz + $pkgname.confd + $pkgname.initd + clean-tmpdirs.patch + disable-crap.patch + gccgo.patch + posix-shell.patch + posix-shell-escape.patch + tests.patch + " +builddir="$srcdir/$pkgname-v$pkgver" + +unpack() { + default_unpack + mkdir "$builddir"/tmp + mv gitlab-test "$builddir"/tmp +} + +_make() { + make "$@" VERSION="$pkgver" REVISION="v$pkgver" BRANCH="$_branch" +} + +build() { + _make build_simple +} + +check() { + # Even with network access and a clean chroot, there are some + # tests that fail: + # + # gitlab.com/gitlab-org/gitlab-runner/commands/helpers : + # TestCacheArchiverAddingUntrackedFiles + # TestCacheArchiverAddingUntrackedUnicodeFiles + + # gitlab.com/gitlab-org/gitlab-runner/executors/shell : + # TestBuildWithGitStrategyFetchWithLFS + # TestBuildWithGitStrategyCloneWithLFS + # TestBuildWithSubmoduleLFSPullsLFSObject + # + # gitlab.com/gitlab-org/gitlab-runner/network (error: use of + # undefined type ‘RegisterRunnerParameters’) + _make test +} + +package() { + install -Dm755 out/binaries/gitlab-runner \ + "$pkgdir"/usr/bin/gitlab-runner + install -dm750 -g gitlab-runner \ + "$pkgdir"/etc/gitlab-runner + install -dm750 -o gitlab-runner -g gitlab-runner \ + "$pkgdir"/var/lib/gitlab-runner + + install -Dm644 "$srcdir"/$pkgname.confd \ + "$pkgdir"/etc/conf.d/$pkgname + install -Dm755 "$srcdir"/$pkgname.initd \ + "$pkgdir"/etc/init.d/$pkgname +} + +sha512sums="1b3f06b7000252631bec04a58474dda826b0fb8d28c4144051a231fba5ef0c5c4b6e0f9ca6bdf9bf9b16b9117cbcf6385eb7bac85bda7b9f99de4300cbcc2066 gitlab-runner-v12.1.0.tar.gz +7bccab81aa1cb88c6a0f83a6d3dfc509e6f9ecb4d0168a5b30cc4e8fdd823294b95fe3633e09757905466f83bb3bf73b1d28fac475dff2dc3164604db4b5b995 gitlab-test-91956efe.tar.gz +f8a0c7e77cd563d7e5b4fb2319181ceab8de44c555cefa4803e985ad3ac6a9fea7bca469d80b28974edcfb65f2095d019bfdf0abd8a3221464276a8d89debc0d gitlab-runner.confd +7f785a65b46919f6a6695e25fdc414ee3204eb9aa1a3735e7884575434af94b20a48f2fe7a1fb787473de23a7bd2d56bc1e9c1fc6b522c6f0c05c47b3d37ab1c gitlab-runner.initd +f17a6b5053933d83d90272be7e98d4abf8d63e8a9c5ad30bbb61a29dbfa1e1b55421ba14be9f7db17cae30b2ff04efcb5da68543a2fa3d0e3e1882bc128cac06 clean-tmpdirs.patch +a32b7a6fa28c7f5bcb505308e615f17de179c15ce8c2ef73078143204195e36d99b18489114ce694c3d821378c1e9ccb26a999a50372b97df163e2512080f07e disable-crap.patch +4bc8f827cbcec212fcb1c5598aaf725138efa9a1de699d6261a65207cca7ef46f441edc02987efdd6d7c6e62943fda8f3f2a5a596d8d33b49fb78ba5df612e8b gccgo.patch +444adec507c5eebcfae268f2f475d29316119f30750f06877a91dff56942d0e4d34ed3011b774b0d7acd59acfe2ddbe75082b3cd5aebd72ddb4703fd083ad301 posix-shell.patch +05d12046448c79a12bf92974089ff97781304083f7bf35abb0b0c0f990c536bd6ff51652e16035a38e4ba5620dcad6e051ecdf4a80eb62039a15371073e525b5 posix-shell-escape.patch +dae9c3f86fdf21bd41202fc2c0bc7dd764078ea9215d7ddbac1f7bc47b0943f7a912250a3006122f74ed50052378ed2c946eefe5c1ce8400cd682b183221025a tests.patch" diff --git a/user/gitlab-runner/clean-tmpdirs.patch b/user/gitlab-runner/clean-tmpdirs.patch new file mode 100644 index 000000000..89efd7a22 --- /dev/null +++ b/user/gitlab-runner/clean-tmpdirs.patch @@ -0,0 +1,21 @@ +Backport of: https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1978 + +--- gitlab-runner-v12.1.0/executors/custom/executor.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/executors/custom/executor.go 2020-04-27 00:19:46.613372635 +0000 +@@ -7,6 +7,7 @@ import ( + "fmt" + "io" + "io/ioutil" ++ "os" + "path/filepath" + + "github.com/sirupsen/logrus" +@@ -216,6 +217,8 @@ func (e *executor) Cleanup() { + return + } + ++ defer os.RemoveAll(e.tempDir) ++ + // nothing to do, as there's no cleanup_script + if e.config.CleanupExec == "" { + return diff --git a/user/gitlab-runner/disable-crap.patch b/user/gitlab-runner/disable-crap.patch new file mode 100644 index 000000000..b375934fc --- /dev/null +++ b/user/gitlab-runner/disable-crap.patch @@ -0,0 +1,21 @@ +--- gitlab-runner-v12.1.0/main.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/main.go 2020-03-04 22:28:31.741878923 +0000 +@@ -11,18 +11,11 @@ import ( + "gitlab.com/gitlab-org/gitlab-runner/helpers/cli" + "gitlab.com/gitlab-org/gitlab-runner/log" + +- _ "gitlab.com/gitlab-org/gitlab-runner/cache/gcs" +- _ "gitlab.com/gitlab-org/gitlab-runner/cache/s3" + _ "gitlab.com/gitlab-org/gitlab-runner/commands" + _ "gitlab.com/gitlab-org/gitlab-runner/commands/helpers" + _ "gitlab.com/gitlab-org/gitlab-runner/executors/custom" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/docker" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/docker/machine" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/kubernetes" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/parallels" + _ "gitlab.com/gitlab-org/gitlab-runner/executors/shell" + _ "gitlab.com/gitlab-org/gitlab-runner/executors/ssh" +- _ "gitlab.com/gitlab-org/gitlab-runner/executors/virtualbox" + _ "gitlab.com/gitlab-org/gitlab-runner/shells" + ) + diff --git a/user/gitlab-runner/gccgo.patch b/user/gitlab-runner/gccgo.patch new file mode 100644 index 000000000..6c10893c7 --- /dev/null +++ b/user/gitlab-runner/gccgo.patch @@ -0,0 +1,68 @@ +* does not support -X ldflag: https://github.com/golang/go/issues/25183 +* does not support -cover testflag +* needs CGO to be enabled to build syscall module +* wants -gccgoflags, not -ldflags +* don't test stuff we've disabled + +--- gitlab-runner-v12.1.0/Makefile 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/Makefile 2020-04-26 23:58:20.823352305 +0000 +@@ -4,7 +4,6 @@ export VERSION := $(shell ./ci/version) + REVISION := $(shell git rev-parse --short=8 HEAD || echo unknown) + BRANCH := $(shell git show-ref | grep "$(REVISION)" | grep -v HEAD | awk '{print $$2}' | sed 's|refs/remotes/origin/||' | sed 's|refs/heads/||' | sort | head -n 1) + BUILT := $(shell date -u +%Y-%m-%dT%H:%M:%S%z) +-export TESTFLAGS ?= -cover + + LATEST_STABLE_TAG := $(shell git -c versionsort.prereleaseSuffix="-rc" -c versionsort.prereleaseSuffix="-RC" tag -l "v*.*.*" --sort=-v:refname | awk '!/rc/' | head -n 1) + export IS_LATEST := +@@ -45,14 +44,11 @@ export PATH := $(GOPATH_BIN):$(PATH) + + # Packages in vendor/ are included in ./... + # https://github.com/golang/go/issues/11659 +-export OUR_PACKAGES ?= $(subst _$(BUILD_DIR),$(PKG),$(shell go list ./... | grep -v '/vendor/')) ++export OUR_PACKAGES ?= $(subst _$(BUILD_DIR),$(PKG),$(shell go list ./... | grep -ve '/vendor/' -e '/cache/gcs' -e '/cache/s3' -e '/docker' -e '/kubernetes' -e '/parallels' -e '/virtualbox')) + +-GO_LDFLAGS ?= -X $(COMMON_PACKAGE_NAMESPACE).NAME=$(PACKAGE_NAME) -X $(COMMON_PACKAGE_NAMESPACE).VERSION=$(VERSION) \ +- -X $(COMMON_PACKAGE_NAMESPACE).REVISION=$(REVISION) -X $(COMMON_PACKAGE_NAMESPACE).BUILT=$(BUILT) \ +- -X $(COMMON_PACKAGE_NAMESPACE).BRANCH=$(BRANCH) \ +- -s -w ++GO_LDFLAGS ?= -s -w + GO_FILES ?= $(shell find . -name '*.go' | grep -v './.gopath/') +-export CGO_ENABLED ?= 0 ++export CGO_ENABLED ?= 1 + + + # Development Tools +@@ -114,7 +110,7 @@ build: $(GOX) + build_simple: $(GOPATH_SETUP) + # Building $(NAME) in version $(VERSION) for current platform +- go build \ +- -ldflags "$(GO_LDFLAGS)" \ ++ go build -v \ ++ -gccgoflags "$(GO_LDFLAGS)" \ + -o "out/binaries/$(NAME)" \ + $(PKG) + +@@ -123,7 +119,7 @@ build_current: helper-docker build_simpl + check_race_conditions: + @./scripts/check_race_conditions $(OUR_PACKAGES) + +-test: $(PKG_BUILD_DIR) helper-docker ++test: $(PKG_BUILD_DIR) + go test $(OUR_PACKAGES) $(TESTFLAGS) + + parallel_test_prepare: $(GOPATH_SETUP) +--- gitlab-runner-v12.1.0/common/version.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/common/version.go 2020-04-27 00:57:04.923408027 +0000 +@@ -9,9 +9,9 @@ import ( + ) + + var NAME = "gitlab-runner" +-var VERSION = "development version" +-var REVISION = "HEAD" +-var BRANCH = "HEAD" ++var VERSION = "12.1.0" ++var REVISION = "v12.1.0" ++var BRANCH = "12-1-stable" + var BUILT = "unknown" + + var AppVersion AppVersionInfo diff --git a/user/gitlab-runner/gitlab-runner.confd b/user/gitlab-runner/gitlab-runner.confd new file mode 100644 index 000000000..05a3ac1bb --- /dev/null +++ b/user/gitlab-runner/gitlab-runner.confd @@ -0,0 +1,17 @@ +#export CONFIG_FILE="/etc/gitlab-runner/config.toml" +#command_args="--working-directory /var/lib/gitlab-runner" +#logfile="/var/log/gitlab-runner.log" + +# Time to wait (in seconds) when gracefully stopping before forcefully +# stopping. +#timeout="300" + +# Time to wait (in seconds) when forcefully stopping the server before +# giving up. The runner can be a little slower than the OpenRC default +# of 5 seconds to stop when jobs are running. +#retry="60" + +# Run user service (default): +#command_user="gitlab-runner:gitlab-runner" +# Run system service: +#command_user="root:root" diff --git a/user/gitlab-runner/gitlab-runner.initd b/user/gitlab-runner/gitlab-runner.initd new file mode 100644 index 000000000..a5f65dacb --- /dev/null +++ b/user/gitlab-runner/gitlab-runner.initd @@ -0,0 +1,46 @@ +#!/sbin/openrc-run + +: "${CONFIG_FILE:=/etc/gitlab-runner/config.toml}" +: "${command_args:=--working-directory /var/lib/gitlab-runner}" +: "${logfile:=/var/log/gitlab-runner.log}" +: "${timeout:=300}" +: "${retry:=60}" +: "${command_user:=gitlab-runner:gitlab-runner}" +export CONFIG_FILE + +command="/usr/bin/gitlab-runner" +command_args="run --service ${RC_SVCNAME} ${command_args}" +command_background="true" +start_stop_daemon_args="--stdout ${logfile} --stderr ${logfile}" +pidfile="/run/${RC_SVCNAME}.pid" + +extra_started_commands="reload gracefulstop" +description_reload="Reload configuration" +description_gracefulstop="Finish current jobs, then stop" + +start_pre() { + checkpath -f -m 640 -o "${command_user}" "${logfile}" +} + +reload() { + ebegin "Reloading ${RC_SVCNAME} configuration" + start-stop-daemon --quiet --signal HUP --pidfile "${pidfile}" + eend $? +} + +gracefulstop() { + ebegin "Gracefully stopping ${RC_SVCNAME}" + mark_service_stopping "${RC_SERVICE}" + start-stop-daemon --quiet --progress --stop --pidfile "${pidfile}" \ + --signal QUIT --retry "${timeout}" + if eend $?; then + mark_service_stopped "${RC_SVCNAME}" + else + eerror "${RC_SVCNAME} timed out, forcefully stopping" + if stop; then + mark_service_stopped "${RC_SVCNAME}" + else + return 1 + fi + fi +} diff --git a/user/gitlab-runner/gitlab-runner.pre-install b/user/gitlab-runner/gitlab-runner.pre-install new file mode 100644 index 000000000..9ef046f29 --- /dev/null +++ b/user/gitlab-runner/gitlab-runner.pre-install @@ -0,0 +1,7 @@ +#!/bin/sh + +groupadd -r gitlab-runner 2>/dev/null +useradd -c gitlab-runner -s /sbin/nologin -g gitlab-runner \ + -d /var/lib/gitlab-runner -r gitlab-runner 2>/dev/null + +exit 0 diff --git a/user/gitlab-runner/posix-shell-escape.patch b/user/gitlab-runner/posix-shell-escape.patch new file mode 100644 index 000000000..b454141ed --- /dev/null +++ b/user/gitlab-runner/posix-shell-escape.patch @@ -0,0 +1,139 @@ +--- gitlab-runner-v12.1.0/helpers/shell_escape.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/helpers/shell_escape.go 2020-04-26 23:12:59.813309281 +0000 +@@ -4,7 +4,6 @@ package helpers + + import ( + "bytes" +- "encoding/hex" + "strings" + ) + +@@ -13,35 +12,10 @@ import ( + */ + + const ( +- ACK = 6 +- TAB = 9 +- LF = 10 +- CR = 13 +- US = 31 +- SPACE = 32 +- AMPERSTAND = 38 + SINGLE_QUOTE = 39 +- PLUS = 43 +- NINE = 57 +- QUESTION = 63 +- LOWERCASE_Z = 90 +- OPEN_BRACKET = 91 + BACKSLASH = 92 +- UNDERSCORE = 95 +- CLOSE_BRACKET = 93 +- BACKTICK = 96 +- TILDA = 126 +- DEL = 127 + ) + +-// ShellEscape is taken from https://github.com/solidsnack/shell-escape/blob/master/Text/ShellEscape/Bash.hs +-/* +-A Bash escaped string. The strings are wrapped in @$\'...\'@ if any +-bytes within them must be escaped; otherwise, they are left as is. +-Newlines and other control characters are represented as ANSI escape +-sequences. High bytes are represented as hex codes. Thus Bash escaped +-strings will always fit on one line and never contain non-ASCII bytes. +-*/ + func ShellEscape(str string) string { + if str == "" { + return "''" +@@ -50,85 +24,20 @@ func ShellEscape(str string) string { + out := bytes.NewBuffer(make([]byte, 0, len(str)*2)) + i := 0 + l := len(in) +- escape := false +- +- hex := func(char byte) { +- escape = true +- +- data := []byte{BACKSLASH, 'x', 0, 0} +- hex.Encode(data[2:], []byte{char}) +- out.Write(data) +- } +- +- backslash := func(char byte) { +- escape = true +- out.Write([]byte{BACKSLASH, char}) +- } +- +- escaped := func(str string) { +- escape = true +- out.WriteString(str) +- } +- +- quoted := func(char byte) { +- escape = true +- out.WriteByte(char) +- } +- +- literal := func(char byte) { +- out.WriteByte(char) +- } + ++ out.WriteByte(SINGLE_QUOTE) + for i < l { + char := in[i] +- switch { +- case char == TAB: +- escaped(`\t`) +- case char == LF: +- escaped(`\n`) +- case char == CR: +- escaped(`\r`) +- case char <= US: +- hex(char) +- case char <= AMPERSTAND: +- quoted(char) +- case char == SINGLE_QUOTE: +- backslash(char) +- case char <= PLUS: +- quoted(char) +- case char <= NINE: +- literal(char) +- case char <= QUESTION: +- quoted(char) +- case char <= LOWERCASE_Z: +- literal(char) +- case char == OPEN_BRACKET: +- quoted(char) +- case char == BACKSLASH: +- backslash(char) +- case char <= CLOSE_BRACKET: +- quoted(char) +- case char == UNDERSCORE: +- literal(char) +- case char <= BACKTICK: +- quoted(char) +- case char <= TILDA: +- quoted(char) +- case char == DEL: +- hex(char) +- default: +- hex(char) ++ if (char == SINGLE_QUOTE) { ++ out.Write([]byte{SINGLE_QUOTE, BACKSLASH, SINGLE_QUOTE, SINGLE_QUOTE}) ++ } else { ++ out.WriteByte(char) + } + i++ + } ++ out.WriteByte(SINGLE_QUOTE) + +- outStr := out.String() +- +- if escape { +- outStr = "$'" + outStr + "'" +- } +- +- return outStr ++ return out.String() + } + + func ToBackslash(path string) string { diff --git a/user/gitlab-runner/posix-shell.patch b/user/gitlab-runner/posix-shell.patch new file mode 100644 index 000000000..6169c3ecc --- /dev/null +++ b/user/gitlab-runner/posix-shell.patch @@ -0,0 +1,30 @@ +--- gitlab-runner-v12.1.0/shells/bash.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/shells/bash.go 2020-04-26 23:07:57.303304498 +0000 +@@ -102,12 +102,12 @@ func (b *BashWriter) Variable(variable c + } + + func (b *BashWriter) IfDirectory(path string) { +- b.Line(fmt.Sprintf("if [[ -d %q ]]; then", path)) ++ b.Line(fmt.Sprintf("if [ -d %q ]; then", path)) + b.Indent() + } + + func (b *BashWriter) IfFile(path string) { +- b.Line(fmt.Sprintf("if [[ -e %q ]]; then", path)) ++ b.Line(fmt.Sprintf("if [ -e %q ]; then", path)) + b.Indent() + } + +@@ -200,9 +200,10 @@ func (b *BashWriter) Finish(trace bool) + io.WriteString(w, "set -o xtrace\n") + } + +- io.WriteString(w, "set -eo pipefail\n") ++ io.WriteString(w, "set -e\n") + io.WriteString(w, "set +o noclobber\n") +- io.WriteString(w, ": | eval "+helpers.ShellEscape(b.String())+"\n") ++ io.WriteString(w, "(\nexec </dev/null\n") ++ io.WriteString(w, b.String() + "\n)\n") + io.WriteString(w, "exit 0\n") + w.Flush() + return buffer.String() diff --git a/user/gitlab-runner/tests.patch b/user/gitlab-runner/tests.patch new file mode 100644 index 000000000..1aff6c653 --- /dev/null +++ b/user/gitlab-runner/tests.patch @@ -0,0 +1,63 @@ +--- gitlab-runner-v12.1.0/shells/bash_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/shells/bash_test.go 2020-04-27 00:07:06.763360621 +0000 +@@ -10,12 +10,12 @@ func TestBash_CommandShellEscapes(t *tes + writer := &BashWriter{} + writer.Command("foo", "x&(y)") + +- assert.Equal(t, `$'foo' "x&(y)"`+"\n", writer.String()) ++ assert.Equal(t, `'foo' "x&(y)"`+"\n", writer.String()) + } + + func TestBash_IfCmdShellEscapes(t *testing.T) { + writer := &BashWriter{} + writer.IfCmd("foo", "x&(y)") + +- assert.Equal(t, `if $'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String()) ++ assert.Equal(t, `if 'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String()) + } +--- gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2020-04-27 00:01:12.813355024 +0000 +@@ -166,7 +166,7 @@ func TestBuildAbort(t *testing.T) { + defer abortTimer.Stop() + + err = runBuild(t, build) +- assert.EqualError(t, err, "aborted: interrupt") ++ assert.EqualError(t, err, "aborted: Interrupt") + }) + } + +--- gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2020-04-27 00:00:42.493354545 +0000 +@@ -234,7 +234,7 @@ func TestBuildAbort(t *testing.T) { + defer abortTimer.Stop() + + err = runBuild(t, build) +- assert.EqualError(t, err, "aborted: interrupt") ++ assert.EqualError(t, err, "aborted: Interrupt") + }) + } + +--- gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2020-04-27 00:02:36.213356343 +0000 +@@ -24,8 +24,8 @@ func TestShellEscape(t *testing.T) { + in string + out string + }{ +- {"standard string", "$'standard string'"}, +- {"+\t\n\r&", "$'+\\t\\n\\r&'"}, ++ {"standard string", "'standard string'"}, ++ {"+\t\n\r&", "'+\t\n\r&'"}, + {"", "''"}, + } + +--- gitlab-runner-v12.1.0/common/build_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/common/build_test.go 2020-04-27 00:23:35.173376249 +0000 +@@ -1133,7 +1133,7 @@ func TestWaitForTerminal(t *testing.T) { + }, + jobTimeout: 3600, + waitForTerminalTimeout: time.Hour, +- expectedErr: "terminal disconnected by system signal: interrupt", ++ expectedErr: "terminal disconnected by system signal: Interrupt", + }, + { + name: "Terminal Disconnect", diff --git a/user/glew/APKBUILD b/user/glew/APKBUILD index e5f6c1b18..374a8d512 100644 --- a/user/glew/APKBUILD +++ b/user/glew/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glew -pkgver=2.1.0 -pkgrel=2 +pkgver=2.2.0 +pkgrel=0 pkgdesc="Cross-platform C/C++ extension loading library" url="http://glew.sourceforge.net" arch="all" @@ -12,9 +12,7 @@ depends="" depends_dev="libxi-dev libxmu-dev mesa-dev" makedepends="$depends_dev glu-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz - mesa-compat.patch - " +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz" prepare() { default_prepare @@ -30,5 +28,4 @@ package() { install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -sha512sums="9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab glew-2.1.0.tgz -6598a3d8263b8e49ca45cea00fed6b6921b6e75ff120d7f4f86b6e181dd9c8d56d52d1664a1693cf807dda130cfebd1a9a0bf8b2edc02552c1831486378adf1a mesa-compat.patch" +sha512sums="57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1 glew-2.2.0.tgz" diff --git a/user/glew/mesa-compat.patch b/user/glew/mesa-compat.patch deleted file mode 100644 index 14404ed30..000000000 --- a/user/glew/mesa-compat.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d6c2c3b9ca52af697088f280c30fe5b27f7a694f Mon Sep 17 00:00:00 2001 -From: Deve <deveee@gmail.com> -Date: Wed, 14 Nov 2018 21:07:29 +0100 -Subject: [PATCH] Fixed compilation with current mesa versions. - -As you can see in -https://cgit.freedesktop.org/mesa/mesa/tree/include/GL/glext.h -now the file uses __gl_glext_h_ instead of __glext_h_ -It's precisely caused by commit f7d42ee7d319256608ad60778f6787c140badada ---- - auto/src/glew_head.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h -index 41e5a262..742f27f5 100644 ---- a/auto/src/glew_head.h -+++ b/auto/src/glew_head.h -@@ -14,7 +14,7 @@ - #if defined(__REGAL_H__) - #error Regal.h included before glew.h - #endif --#if defined(__glext_h_) || defined(__GLEXT_H_) -+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) - #error glext.h included before glew.h - #endif - #if defined(__gl_ATI_h_) -@@ -30,6 +30,7 @@ - #define __X_GL_H - #define __glext_h_ - #define __GLEXT_H_ -+#define __gl_glext_h_ - #define __gl_ATI_h_ - - #if defined(_WIN32) ---- glew-2.1.0/include/GL/glew.h.old 2017-07-31 11:25:39.000000000 +0000 -+++ glew-2.1.0/include/GL/glew.h 2019-03-20 19:05:46.240000000 +0000 -@@ -93,7 +93,7 @@ - #if defined(__REGAL_H__) - #error Regal.h included before glew.h - #endif --#if defined(__glext_h_) || defined(__GLEXT_H_) -+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) - #error glext.h included before glew.h - #endif - #if defined(__gl_ATI_h_) -@@ -109,6 +109,7 @@ - #define __X_GL_H - #define __glext_h_ - #define __GLEXT_H_ -+#define __gl_glext_h_ - #define __gl_ATI_h_ - - #if defined(_WIN32) diff --git a/user/glfw/APKBUILD b/user/glfw/APKBUILD index ab55f9771..7acd66438 100644 --- a/user/glfw/APKBUILD +++ b/user/glfw/APKBUILD @@ -1,22 +1,21 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glfw -pkgver=3.2.1 +pkgver=3.3.2 pkgrel=0 pkgdesc="OpenGL desktop development library" -url="http://www.glfw.org/" +url="https://www.glfw.org/" arch="all" options="!check" # Tests require X11, GL, and manual intervention. license="Zlib" depends="" depends_dev="mesa-dev" makedepends="$depends_dev cmake doxygen libx11-dev libxrandr-dev libxcursor-dev - libxinerama-dev" + libxi-dev libxinerama-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://github.com/glfw/glfw/releases/download/3.2.1/glfw-$pkgver.zip" +source="https://github.com/glfw/glfw/releases/download/$pkgver/glfw-$pkgver.zip" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,24 +24,22 @@ build() { -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_SHARED_LIBS=ON \ -DGLFW_BUILD_TESTS=OFF \ -DGLFW_BUILD_EXAMPLES=OFF \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} \ + . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -D -d "$builddir"/docs/html "$pkgdir"/usr/share/doc/$pkgname/ } -sha512sums="73dd6d4a8d28a2b423f0fb25489659c1a845182b7ef09848d4f442cdc489528aea90f43ac84aeedb9d2301c4487f39782b647ee4959e67e83babb838372b980c glfw-3.2.1.zip" +sha512sums="3084f405f6ecfa182df0841ffb44248b716fc03282afd8e6dc9a1361897fe62a1ce049b95f662d79aaae45aa52208bb552b8c649284f7f6d9c12623ac3728e60 glfw-3.3.2.zip" diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index f0c35dca1..083aee633 100644 --- a/user/glib/APKBUILD +++ b/user/glib/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glib -pkgver=2.62.5 +pkgver=2.62.6 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" @@ -13,6 +13,8 @@ depends_dev="perl python3 attr-dev bzip2-dev libffi-dev util-linux-dev" checkdepends="tzdata shared-mime-info" makedepends="$depends_dev dbus-dev meson ninja pcre-dev xmlto zlib-dev" triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules" +subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev + $pkgname-lang $pkgname-bash-completion:bashcomp:noarch" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 0001-gquark-fix-initialization-with-c-constructors.patch broken-gio-tests.patch @@ -22,7 +24,6 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve ridiculous-strerror-nonconformance.patch meson-sucks-and-i-hate-you-so-much-right-now.patch " -subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp:noarch" # secfixes: # 2.60.4-r0: @@ -75,7 +76,7 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="2f99422ff8245524aabdb52f5d388ef4bde0fc075eab24499b4023f6ca143b80a74e265117b9e7a9de68a347b0c7eaa8655c836d7bbb63d54cad5c6dda630371 glib-2.62.5.tar.xz +sha512sums="8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5 glib-2.62.6.tar.xz 32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch 657d3fdf7f8ac7edd5bae572d00497f2236fbe5a91a577f3cb7ceb2ccf067f2944918b2b90308fc1061f45daf3d4910067b98642383ce8761da2a1faff6e9b4f broken-gio-tests.patch 0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998 fix-spawn.patch diff --git a/user/gnumeric/APKBUILD b/user/gnumeric/APKBUILD index f847f2914..c54a49822 100644 --- a/user/gnumeric/APKBUILD +++ b/user/gnumeric/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnumeric -pkgver=1.12.46 +pkgver=1.12.47 pkgrel=0 pkgdesc="GNOME spreadsheet software" url="http://www.gnumeric.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b3b3befe79f3ec8db6d7d9c80a1eed5293f5c0a9ca1d8dd131320eb031952b296147c51df1c775c6f9a0c466912e5523360373ee0b6e453e928929394ab517ea gnumeric-1.12.46.tar.xz" +sha512sums="f6298fee752b062672acc20e18388d7424719d69ce9586888f33be07ca92bbd7d99e46b98e9ab2a546d1954d3113b59a5105d46c4e8a13e65e1ae9acc38391ab gnumeric-1.12.47.tar.xz" diff --git a/user/gnupg/APKBUILD b/user/gnupg/APKBUILD index 3056c30a3..7f5fe77e4 100644 --- a/user/gnupg/APKBUILD +++ b/user/gnupg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnupg -pkgver=2.2.19 +pkgver=2.2.21 pkgrel=0 pkgdesc="Complete and free implementation of the OpenPGP standard" url="https://www.gnupg.org/" @@ -52,7 +52,7 @@ package() { install -Dm644 "$srcdir"/60-scdaemon.rules "$pkgdir"/lib/udev/rules.d } -sha512sums="d7700136ac9f0a8cf04b33da4023a42427fced648c2f90d76250c92904353b85fe728bdd89a713d847e8d38e5900c98d46075614492fdc3d1421f927a92f49dd gnupg-2.2.19.tar.bz2 +sha512sums="b4eac75253d4a1cac341c8a1ba7bb275e849a88d5377035497777c7bcd49b5a4c91b77000311695eb7d4083856975b2b2d14518f24ab94846027280bd8c301f9 gnupg-2.2.21.tar.bz2 c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch 4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa870a9bb29687330854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402 60-scdaemon.rules" diff --git a/user/gnutls/APKBUILD b/user/gnutls/APKBUILD index 616793f57..e75b1d552 100644 --- a/user/gnutls/APKBUILD +++ b/user/gnutls/APKBUILD @@ -2,12 +2,11 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: pkgname=gnutls -pkgver=3.6.11.1 +pkgver=3.6.14 pkgrel=0 pkgdesc="A TLS protocol implementation" -url="http://www.gnutls.org/" +url="https://www.gnutls.org/" arch="all" -options="!check" # https://gitlab.com/gnutls/gnutls/issues/560 license="LGPL-2.1+" makedepends="libtasn1-dev libunistring-dev nettle-dev p11-kit-dev texinfo unbound-dev cmd:which zlib-dev" @@ -23,11 +22,16 @@ case $pkgver in ;; esac source="https://www.gnupg.org/ftp/gcrypt/gnutls/v${_v}/$pkgname-$pkgver.tar.xz - gnulib-tests-dont-require-gpg-passphrase.patch" + gnulib-tests-dont-require-gpg-passphrase.patch + disable-certtool-test.patch + " # secfixes: # 3.5.13-r0: # - CVE-2017-7507 +# 3.6.14-r0: +# - CVE-2020-11501 +# - CVE-2020-13777 build() { LIBS="-lgmp" ./configure \ @@ -79,5 +83,6 @@ xx() { mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/ } -sha512sums="55fbbf0ebc824fbc91ccd08d1708452c5b1c12af75e332f29414540eb2f81337fa605a693ce9f34319a927e9d71177e6e7ffea5c6747792d341fb740f68c9489 gnutls-3.6.11.1.tar.xz -abc24ee59cc67805fe953535b0bae33080fc8b0bf788304377f6d10ec8c162c4cf203a69c98a4ba3483b4c60ed7a204433cc7db9b8190eddb0d68f6fb6dad52d gnulib-tests-dont-require-gpg-passphrase.patch" +sha512sums="b2d427b5542a4679117c011dffa8efb0e0bffa3ce9cebc319f8998d03f80f4168d08f9fda35df18dbeaaada59e479d325a6c1c77d5ca7f8ce221b44e42bfe604 gnutls-3.6.14.tar.xz +abc24ee59cc67805fe953535b0bae33080fc8b0bf788304377f6d10ec8c162c4cf203a69c98a4ba3483b4c60ed7a204433cc7db9b8190eddb0d68f6fb6dad52d gnulib-tests-dont-require-gpg-passphrase.patch +25400be364c1f27b88451002a471cbf841b9738dd93c42dcbeaf7644c3deea6afc85300b40d5ae32d29dc4d441237e8b311f3e07f0af2fb4788701ee4e240c0f disable-certtool-test.patch" diff --git a/user/gnutls/disable-certtool-test.patch b/user/gnutls/disable-certtool-test.patch new file mode 100644 index 000000000..2ae16a38e --- /dev/null +++ b/user/gnutls/disable-certtool-test.patch @@ -0,0 +1,33 @@ +If GNUTLS_PIN is not available in the environment, the test will fail +because it cannot ask for the password: + +Generating a self signed certificate... +No PIN given. +note: when operating in batch mode, set the GNUTLS_PIN or GNUTLS_SO_PIN environment variables +cert generation failed +FAIL certtool (exit status: 1) + +The comment above this line says "some CI runners need GNUTLS_PIN +(GNUTLS_PIN=${PASS})" (i.e. GNUTLS_PIN=1234). When this is passed +instead, the test fails again because "No password was asked" (it greps +for "Enter password" in the output, but this won't happen because +GNUTLS_PIN is set). + +The folks at Nix believe this is an incompatibility due to musl's +getpass not falling back to stdin/stderr if it cannot connect to a tty, +as glibc does. + +https://gitlab.com/gnutls/gnutls/-/issues/945 + +--- gnutls-3.6.13/tests/cert-tests/certtool 2020-01-01 14:10:19.000000000 -0600 ++++ gnutls-3.6.13/tests/cert-tests/certtool 2020-06-02 20:36:20.380039844 -0500 +@@ -20,6 +20,9 @@ + + #set -e + ++echo 'this test is not compatible with musl' ++exit 77 ++ + srcdir="${srcdir:-.}" + CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" + DIFF="${DIFF:-diff -b -B}" diff --git a/user/goffice/APKBUILD b/user/goffice/APKBUILD index 6a60b2ce1..13ba8b6d4 100644 --- a/user/goffice/APKBUILD +++ b/user/goffice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=goffice -pkgver=0.10.46 +pkgver=0.10.47 pkgrel=0 pkgdesc="Library of document-centric objects and utilities built on top of GLib and Gtk+" url="https://www.gnome.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="23714fef4dabccc76fe96b78d8eba9c9adb01cb9b3e2f1a9768598fb2a82742b2d2060a7d2548279998488c59e313d7a5863a96b2eb380f540b61fb08e0330f3 goffice-0.10.46.tar.xz" +sha512sums="0db26fbd049893ee9274ee492e1dc3f10ae789cf99cc0b9dda3f1c2f106423e4679cc56515eb08bbf752aaf48492212777eee08d43a9fefb0b22048e883f5a76 goffice-0.10.47.tar.xz" diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD index d4973d5ff..0d9df9720 100644 --- a/user/granatier/APKBUILD +++ b/user/granatier/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=granatier -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Clone of the classic Bomberman game" url="https://www.kde.org/applications/games/granatier/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="efdc0c67c9b7539add2c8bcf6816b13087e5eb0712e739d97fc0947ec7667b10c9e33b02856d742e41ae73128bef28da225a0d228e39a747a4f76e74eadf5eb5 granatier-19.12.3.tar.xz" +sha512sums="612395ddca651052a8ffae48a3e977780297c0ef397946705baf735cdf447a0a782c4a0299cab496332592d0aac33000de969978669c4b8122e2353429e17613 granatier-20.04.3.tar.xz" diff --git a/user/graphite2/APKBUILD b/user/graphite2/APKBUILD index 74e5b7032..3b02c91e9 100644 --- a/user/graphite2/APKBUILD +++ b/user/graphite2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=graphite2 _realname=${pkgname%2} -pkgver=1.3.13 +pkgver=1.3.14 pkgrel=0 pkgdesc="Text processing engine for complex languages" url="http://graphite.sil.org/" @@ -39,5 +39,5 @@ package() { make DESTDIR="$pkgdir/" -C build install } -sha512sums="8e2c6047a66b4d8873842de6b9b1909d326512b47a04f483b3a6113b97fd0d47e0da7cf9ecf96e060ca06e5288b49f1300e2fd7165d2d82d6a8eb8cb7d53d33f graphite2-1.3.13.tar.gz +sha512sums="49d127964d3f5c9403c7aecbfb5b18f32f25fe4919a81c49e0534e7123fe845423e16b0b8c8baaae21162b1150ab3e0f1c22c344e07d4364b6b8473c40a0822c graphite2-1.3.14.tar.gz 4ef5414e6d554bb8d6ead435e38d061a073f350c313b7141158bb68332f5f57ca5250385875a387b828bb657964588e974143b96b5e11c2cd314871e7baddb88 graphite2-1.2.0-cmakepath.patch" diff --git a/user/graphviz/APKBUILD b/user/graphviz/APKBUILD index f02cec944..aa9e3e906 100644 --- a/user/graphviz/APKBUILD +++ b/user/graphviz/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=graphviz -pkgver=2.42.3 +pkgver=2.44.0 pkgrel=0 pkgdesc="Graph visualization software" url="http://www.graphviz.org/" @@ -19,7 +19,7 @@ install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/graphviz" subpackages="$pkgname-dev $pkgname-doc guile-$pkgname:guile $pkgname-gtk $pkgname-graphs perl-gv:_pl py3-gv:_py3 tcl-$pkgname:_tcl" -source="https://www2.graphviz.org/Packages/stable/portable_source/graphviz-2.42.3.tar.gz +source="https://www2.graphviz.org/Packages/stable/portable_source/graphviz-$pkgver.tar.gz $pkgname.trigger 0001-clone-nameclash.patch " @@ -106,6 +106,6 @@ _tcl() { _lang tcl "Tcl/Tk" } -sha512sums="e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9 graphviz-2.42.3.tar.gz +sha512sums="9fd54a5c7b0d8cf3e1bf7e80409b57022182b6bfe3f57a06a219d6d29684962ac935fc76d1e7420ba88b1ffc2ab5b967cc4617e56f810818f99801d31981a752 graphviz-2.44.0.tar.gz 50947e6a11929f724759266f7716d52d10923eba6d59704ab39e4bdf18f8471d548c2b11ab051dd4b67cb82742aaf54d6358890d049d5b5982f3383b65f7ae8c graphviz.trigger aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d 0001-clone-nameclash.patch" diff --git a/system/groff/APKBUILD b/user/groff/APKBUILD index 1045af000..1045af000 100644 --- a/system/groff/APKBUILD +++ b/user/groff/APKBUILD diff --git a/user/gsettings-desktop-schemas/APKBUILD b/user/gsettings-desktop-schemas/APKBUILD index eaf6b74a3..46fd83a7e 100644 --- a/user/gsettings-desktop-schemas/APKBUILD +++ b/user/gsettings-desktop-schemas/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gsettings-desktop-schemas -pkgver=3.34.0 +pkgver=3.36.1 pkgrel=0 pkgdesc="GSettings schemas shared by GNOME desktop components" url="https://developer.gnome.org/gio/unstable/GSettings.html" @@ -37,4 +37,4 @@ dev() { } -sha512sums="6cbe59facf77566ed93faabafc6b00ad03fb398a9a4686ba94a08b1c2d0df1d44bd673fb4d51340209a66ebc0aa32095615e7e63b78f4cc4c10d240a7b0a8fa1 gsettings-desktop-schemas-3.34.0.tar.xz" +sha512sums="623a3759fe84cc5ea897043cc7c337a4f83302ebe5cfb9d214210a48e460e22b180518f5d768382ec18396bb2e86f22649dbc9b367a858e56b1ee8d2cab58fa8 gsettings-desktop-schemas-3.36.1.tar.xz" diff --git a/user/gsm/APKBUILD b/user/gsm/APKBUILD index 493eac0a3..a11efa124 100644 --- a/user/gsm/APKBUILD +++ b/user/gsm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=gsm -pkgver=1.0.18 +pkgver=1.0.19 pkgrel=0 _soname=1.0.12 pkgdesc="Shared libraries for GSM speech compressor" @@ -48,6 +48,6 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="c5b597f68d4a270e1d588f480dcde66fda8302564c687d753f2bd4fc41d246109243e567568da61eddce170f5232d869984743ddf1eea7696d673014a1a453b7 gsm-1.0.18.tar.gz +sha512sums="f69b4bf2d918b118b5de90b8ab88fd026008ac7432f07b872b81fe52cdc781f605dca8eedcdaebc8beb974cef388496c618f92a41961c62057009964159f8392 gsm-1.0.19.tar.gz 5b01f6d2fd3ee7cd859da70870463e2ccc6614c5fb1bd5efc88a223a0c5477271221557fef13ba46697e70cc5820c13efff738413f8990d5884b95cc89c30152 gsm-64bit.patch 1d92b7eacf52e5281c9f1a0f08313d10f15c35d22fb2292e5a885ceb3cb766557a5e3a08954db75fb13db59345ef9f6b08939881ba38c9d384e09a1c96b47bc5 gsm-makefile.patch" diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index 1f8b5e082..2b87ed367 100644 --- a/user/gtk+3.0/APKBUILD +++ b/user/gtk+3.0/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gtk+3.0 -pkgver=3.24.13 +pkgver=3.24.21 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -48,4 +48,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="9129d4574cca258b4a517d8d65dad246a746fc3dc574b78e098db9aa9743956ce227efbf963f63e1e0f1a1a09810716150526b2bfe8015a5960bad38b0c88406 gtk+-3.24.13.tar.xz" +sha512sums="97ed88e69d9002279869044772e5aebc1ac4ed6f4a8afc1586a349710a1d414fc735e1257d5f34f6300914a0ca7c7ede073bd9429ee16077aa83f3594784c60e gtk+-3.24.21.tar.xz" diff --git a/user/gucharmap/APKBUILD b/user/gucharmap/APKBUILD index b3575c955..1d2720d7d 100644 --- a/user/gucharmap/APKBUILD +++ b/user/gucharmap/APKBUILD @@ -1,40 +1,36 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=gucharmap -pkgver=12.0.1 -_unicode=12.1.0 +pkgver=13.0.2 +_unicode=13.0.0 pkgrel=0 pkgdesc="Unicode utility for the Gnome desktop environment" url="https://gnome.org" arch="all" license="GPL-3.0+" depends="" -makedepends="desktop-file-utils gobject-introspection-dev gtk+3.0-dev intltool - itstool libxml2-utils unicode-data" +makedepends="desktop-file-utils gobject-introspection-dev gtk+3.0-dev gtk-doc + intltool itstool libxml2-utils meson ninja perl unicode-data vala" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.gnome.org/sources/gucharmap/${pkgver%.*}/gucharmap-$pkgver.tar.xz - unicode-12.1.patch - " +source="https://gitlab.gnome.org/GNOME/gucharmap/-/archive/$pkgver/gucharmap-$pkgver.tar.gz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --with-unicode-data=/usr/share/unicode/$_unicode - make + -Ducd_path=/usr/share/unicode/$_unicode \ + . output + ninja -C output } check() { - make check + ninja -C output test } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C output install } -sha512sums="989034350c73c3f1857167f434aa4a5c140ef7574cb799b874e421a8d0c2bf520dfcee85bc0cf8e52f439fb7d30e0db5172a25c107c80b38ce6da4e703a3ffc2 gucharmap-12.0.1.tar.xz -aac3a9b95985b1fd2122f1a759a0c571116a94cc429c4e9736a4f2a36e257241e7bdc4e6ba7badaeebca79bd8cca275ff66b6e9f933c707342b8872ab78dbe7f unicode-12.1.patch" +sha512sums="66918666607190f6a364b4709fbd51a08ada29986b549ae779452ec98eb4944d0969ad593296ac84cac8dc4791d718dd522add6cf475116765426505647971a9 gucharmap-13.0.2.tar.gz" diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index af6b363ae..4742f1256 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=gvim _pkgreal=vim -pkgver=8.2.0529 +pkgver=8.2.1017 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -71,4 +71,4 @@ package() { ln -s gvim rgvim } -sha512sums="73cd3eb1522189f603c65ef1e80c0d1c860ce7332817967ab289aa8f2fdf376235fc9c30af53a66164cfe83a882b55003b4073b27852061295ca9b5fe203501d vim-8.2.0529.tar.gz" +sha512sums="6fe243c3aeefe2d63d67e1710d5212a4b76b8fd49e037ca588655e25901ca2af4285128cc97146622c42d0df77194e18fb7d5a2bdd74f26c3534f0c2cc0e5d8b vim-8.2.1017.tar.gz" diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD index a9a767f1a..8d017e520 100644 --- a/user/gwenview/APKBUILD +++ b/user/gwenview/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gwenview -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Fast and easy image viewer by KDE" url="https://www.kde.org/applications/graphics/gwenview/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a93cf6a992b76e84d8e33e570aab7bff410404539a8ce4ea55ba86c4487d5d1139dea170c449ac4cfb8755be30bc4fd7903cfa890374231b88d763ae44a29ff0 gwenview-19.12.3.tar.xz" +sha512sums="c670111e75938028713ea77695bbe6fdd8e76d0dea74acc0cff3a20dd5a7ee4c956ef79b67c7ac8e99bb07b9895c16fcf985580d91442005451c6439f19726f1 gwenview-20.04.3.tar.xz" diff --git a/user/harfbuzz/APKBUILD b/user/harfbuzz/APKBUILD index f621148bd..4d525b242 100644 --- a/user/harfbuzz/APKBUILD +++ b/user/harfbuzz/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpinelinux@soeren-tempel.net> # Maintainer: pkgname=harfbuzz -pkgver=2.6.4 +pkgver=2.6.7 pkgrel=0 pkgdesc="Text shaping library" url="https://www.freedesktop.org/wiki/Software/HarfBuzz" @@ -53,4 +53,4 @@ icu() { mv "$pkgdir"/usr/lib/lib*icu.so.* "$subpkgdir"/usr/lib/ } -sha512sums="d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f harfbuzz-2.6.4.tar.xz" +sha512sums="6fdd6e0952a73e1949349aa5416ef8fb3fc351b15c95be4fe1f341b111159fe58113b73a334db2697f4e3aaef5a761bd8f1d8964514406cad40f9862768d59de harfbuzz-2.6.7.tar.xz" diff --git a/user/haveged/APKBUILD b/user/haveged/APKBUILD index c3e631de2..10617286b 100644 --- a/user/haveged/APKBUILD +++ b/user/haveged/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: pkgname=haveged -pkgver=1.9.8c +pkgver=1.9.13 pkgrel=0 pkgdesc="Entropy harvesting daemon using CPU timings" url="http://www.issihosts.com/haveged/" @@ -41,6 +41,6 @@ package() { "$pkgdir"/etc/conf.d/haveged } -sha512sums="24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa haveged-1.9.8c.tar.gz +sha512sums="dff0f4273643ed6b2fea26f1ba5c17be3d655d27ab0b96091bcd23e1cb984fc440cc81e694cc7bcc84a9a667d96f3c04a73675f79ecae525ee56390940cce576 haveged-1.9.13.tar.gz 5d1e4186580951d4e6e01193e9c8827ceddaf3c2e28a981fc9176cb446bed32b059304796a77d9db6fb761a21f8fd27dd3d31e06a0fb7a5985b4ea94978fcd64 haveged.initd 58fa2c513e26291047b60ea6d6355ad837c1cb07750a2dfb2a5ebf90cc504a4b6ebf3573869410a06cac85d9b634b3df988e8b033921394da8a5abeee574c822 haveged.confd" diff --git a/user/highlight/APKBUILD b/user/highlight/APKBUILD index 4670ecd7f..d32b4dc7b 100644 --- a/user/highlight/APKBUILD +++ b/user/highlight/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=highlight -pkgver=3.54 +pkgver=3.57 pkgrel=0 pkgdesc="Fast and flexible source code highlighter" url="http://www.andre-simon.de/doku/highlight/highlight.html" @@ -21,4 +21,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c5a0982e9cd5c48d1ffa3ce2286020c1285eacf32928b08e3718582f4d131b05726920156c4357e595403474d4c389fc70e2aff789e17962963b9d8d23ac6488 highlight-3.54.tar.bz2" +sha512sums="a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99 highlight-3.57.tar.bz2" diff --git a/experimental/horizon/APKBUILD b/user/horizon/APKBUILD index 9c1d39ee7..dcc9d9bf7 100644 --- a/experimental/horizon/APKBUILD +++ b/user/horizon/APKBUILD @@ -1,12 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=horizon -pkgver=0.9.0 +pkgver=0.9.3 pkgrel=0 pkgdesc="Installation tools for Adélie Linux" url="https://horizon.adelielinux.org/" arch="all" -options="!check" # Unpackaged dependency ruby-aruba. +options="!archcheck !check" # Unpackaged dependency ruby-aruba. license="AGPL-3.0+" depends="" checkdepends="ruby-aruba ruby-rspec valgrind" @@ -15,11 +15,9 @@ makedepends="bcnm-dev boost-dev cmake curl-dev eudev-dev libarchive-dev linux-headers parted-dev skalibs-dev util-linux-dev libcap-dev libx11-dev libxkbfile-dev qt5-qtbase-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-image $pkgname-qt5 - $pkgname-tools $pkgname-wizard" -source="https://distfiles.adelielinux.org/source/horizon-$pkgver.tar.xz - noninstall-mount.patch - " +subpackages="$pkgname-image $pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-qt5 + $pkgname-tools $pkgname-wizard $pkgname-boot" +source="https://distfiles.adelielinux.org/source/horizon-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -61,16 +59,22 @@ package() { image() { pkgdesc="Tools for generating images using HorizonScript" + depends="mtools" mkdir -p "$subpkgdir"/usr/bin mkdir -p "$subpkgdir"/usr/lib + mkdir -p "$subpkgdir"/usr/share/horizon mv "$pkgdir"/usr/bin/hscript-image "$subpkgdir"/usr/bin/ mv "$pkgdir"/usr/lib/libhi-backends.so "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/share/horizon/iso "$subpkgdir"/usr/share/horizon/ } qt5() { pkgdesc="Qt 5 installation wizard for Adélie Linux" + depends="horizon" + mkdir -p "$subpkgdir"/etc/horizon mkdir -p "$subpkgdir"/usr/bin + mkdir -p "$subpkgdir"/var/log/horizon for _bin in horizon-ppc64-detect horizon-qt5 horizon-run-qt5; do mv "$pkgdir"/usr/bin/$_bin "$subpkgdir"/usr/bin/ @@ -90,11 +94,56 @@ wizard() { pkgdesc="Wizard to generate a HorizonScript for another computer" make DESTDIR="$subpkgdir" -C "$builddir"/build-wizard install - rm "$subpkgdir"/usr/bin/hscript-printowner rm -r "$subpkgdir"/usr/include rm -r "$subpkgdir"/usr/lib rm -r "$subpkgdir"/usr/share } -sha512sums="a2185744b611154f41ba433399f621c8114147bc981dad03fac581bf7ddd67c46042bc230fd68d4c89188cefa281022d101d7394cf1a0554729da540706e6216 horizon-0.9.0.tar.xz -44a4f022df03a3ac3ec9fe3aea9faa8d98ed6c9b61ff50e3c363f5691a2ed428d328f6d5aa019f25be67811dede8da7195eaf354f1cd3a4a56c77f698d53e7fb noninstall-mount.patch" +boot() { + pkgdesc="Boot to Horizon" + depends="horizon-qt5 horizon kwin qt5ct sddm + netsurf partitionmanager xterm" + + mkdir -p "$subpkgdir"/etc/profile.d + mkdir -p "$subpkgdir"/etc/sddm.conf.d + mkdir -p "$subpkgdir"/etc/xdg/qt5ct + mkdir -p "$subpkgdir"/usr/bin + mkdir -p "$subpkgdir"/usr/share/qt5ct/qss + mkdir -p "$subpkgdir"/usr/share/xsessions + + cat >"$subpkgdir"/etc/profile.d/horizon-qt5.sh <<PROFILE +#!/bin/sh +export QT_QUICK_BACKEND=software +export QT_QPA_PLATFORMTHEME=qt5ct +PROFILE + chmod 755 "$subpkgdir"/etc/profile.d/horizon-qt5.sh + cat >"$subpkgdir"/etc/xdg/kdeglobals <<GLOBALS +[General] +ColorScheme=Steel + +[Icons] +Theme=Papirus + +[WM] +activeBackground=104,0,0 +GLOBALS + + install -D -m644 "$builddir"/boot/horizon.sddm.conf \ + "$subpkgdir"/etc/sddm.conf.d/horizon.conf + + install -D -m755 "$builddir"/boot/start-horizon-qt5 \ + "$subpkgdir"/usr/bin/start-horizon-qt5 + + install -D -m644 "$builddir"/boot/kwinrc \ + "$subpkgdir"/etc/xdg/kwinrc + + install -D -m644 "$builddir"/boot/qt5ct.conf \ + "$subpkgdir"/etc/xdg/qt5ct/qt5ct.conf + install -D -m644 "$builddir"/boot/horizon.qss \ + "$subpkgdir"/usr/share/qt5ct/qss/horizon.qss + + install -D -m644 "$builddir"/boot/horizon-session.desktop \ + "$subpkgdir"/usr/share/xsessions/horizon.desktop +} + +sha512sums="99c1d939abc33c4a072712e75c6c8ada16deb1fe59b9da839dffd695a0d40dbf48499cc00751285300127a7fc701e8e1c434e9f8a222f1981ccbebd6ee72e43e horizon-0.9.3.tar.xz" diff --git a/user/horizon/fix-qt-runner.patch b/user/horizon/fix-qt-runner.patch new file mode 100644 index 000000000..39cab1181 --- /dev/null +++ b/user/horizon/fix-qt-runner.patch @@ -0,0 +1,25 @@ +From 9f737dbab8b9ed9fa57bdf15542cc00a8363d98b Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Thu, 4 Jun 2020 21:29:37 -0500 +Subject: [PATCH] Qt UI: Ensure log is opened when built in release modes + +--- + ui/qt5/runner/executepage.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ui/qt5/runner/executepage.cc b/ui/qt5/runner/executepage.cc +index 999731a..d5788df 100644 +--- a/ui/qt5/runner/executepage.cc ++++ b/ui/qt5/runner/executepage.cc +@@ -48,7 +48,7 @@ ExecutePage::ExecutePage(QWidget *parent) : HorizonWizardPage(parent) { + }); + + log.setFileName("/var/log/horizon/executor.log"); +- Q_ASSERT(log.open(QFile::Append)); ++ log.open(QFile::Append); + + this->current = Prepare; + markRunning(this->current); +-- +2.25.4 + diff --git a/user/http-parser/APKBUILD b/user/http-parser/APKBUILD index af90a5f0e..cc6281b98 100644 --- a/user/http-parser/APKBUILD +++ b/user/http-parser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=http-parser -pkgver=2.9.3 +pkgver=2.9.4 pkgrel=0 pkgdesc="Library for parsing HTTP messages in C" url=" " @@ -11,7 +11,9 @@ depends="" depends_dev="" makedepends="$depends_dev" subpackages="$pkgname-dev" -source="http-parser-$pkgver.tar.gz::https://github.com/nodejs/http-parser/archive/v$pkgver.tar.gz" +source="http-parser-$pkgver.tar.gz::https://github.com/nodejs/http-parser/archive/v$pkgver.tar.gz + remove-bogus-sizeof-test.patch + " build() { make @@ -25,4 +27,5 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install } -sha512sums="d200c52f594192ba80a8d5b59d414404843f8601dac647f29c27845db75ac1f015789031e30e91aaab5b553af1ee6af50b90f9342a444c10c1027e10fdb9a31b http-parser-2.9.3.tar.gz" +sha512sums="b45df7b94d1c51079d44687d0a7f901f44faae51df4e84c7e3fe38f130c2d809d0e7c2a146c57b3723e60732aededc246bf44eadb10a95b710963d641f9fe7cd http-parser-2.9.4.tar.gz +aaf666728ab860a19398a631276d7caaf696d29bfbce39408bbcd65775f23d452e477af481333631b8dd07eacb8ba44fb4c58d1216dc5fb0dfac88062c7f478b remove-bogus-sizeof-test.patch" diff --git a/user/http-parser/remove-bogus-sizeof-test.patch b/user/http-parser/remove-bogus-sizeof-test.patch new file mode 100644 index 000000000..5f912fb5b --- /dev/null +++ b/user/http-parser/remove-bogus-sizeof-test.patch @@ -0,0 +1,14 @@ +Upstream issues: +https://github.com/nodejs/http-parser/issues/507 +https://github.com/nodejs/http-parser/pull/510 + +--- http-parser-2.9.4/test.c 2020-03-24 05:54:06.000000000 -0500 ++++ http-parser-2.9.4/test.c 2020-06-15 22:54:06.020315073 -0500 +@@ -4221,7 +4221,6 @@ main (void) + printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version); + + printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser)); +- assert(sizeof(http_parser) == 4 + 4 + 8 + 2 + 2 + 4 + sizeof(void *)); + + //// API + test_preserve_data(); diff --git a/user/i3wm/APKBUILD b/user/i3wm/APKBUILD index 7cf320dd9..39c7230ad 100644 --- a/user/i3wm/APKBUILD +++ b/user/i3wm/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=i3wm -pkgver=4.17.1 +pkgver=4.18.1 pkgrel=0 pkgdesc="Improved dynamic tiling window manager" url="https://i3wm.org" @@ -41,7 +41,7 @@ package() { install -m644 man/*.1 "$pkgdir"/usr/share/man/man1/ } -sha512sums="af397dc1768ea6530e4b2ce8ef21b20ecff8ab9eebf380df224456173eea4c3bacf28b55c8efcdc70f76f0d66543c163564a94cfd66028221ace481fa3c2913f i3-4.17.1.tar.bz2 +sha512sums="b001f539b1daf78be6dd9335a7c0474d30f8d969f79d131391ebd9ca310a058a1cc1234e4a9e60552efd520fc4983571f3c0b8cbd7be978e45957daaf86b3e90 i3-4.18.1.tar.bz2 6378e3619076c03345b4faa1f9d54cab2e7173068bc4d5f2f2894af9cc0e5792fe45ce95cb06328f5040f0ba6d43f3e49c523968732ac2d2046b698042338caa i3wm-musl-glob-tilde.patch 77224b994397b2e2487ae28dfd5781b3630654191813eb3c685f05ebf446e65c36e53a665ff3cc8323ea67e87f7cf977044025dade0a6ed22cbd84f0e6b4cbc7 i3wm-test-fix-off_t.patch a80384965dff62c51ce77e2baa3cf1b0b6db1df68994ce98383f96554bd296b4b59527fb5b1cb24b08c123699e294ba9b3baaa52afe88d87e7a76f0629194b1f i3wm-test-disable-branch-check.patch" diff --git a/user/icewm/APKBUILD b/user/icewm/APKBUILD index 51804b714..a23bf4866 100644 --- a/user/icewm/APKBUILD +++ b/user/icewm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=icewm -pkgver=1.6.5 +pkgver=1.6.6 pkgrel=0 pkgdesc="A window manager designed for speed, usability, and consistency" url="https://github.com/bbidulock/icewm" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7914031fa2df42ed337aa9c65c04f959746210c255dc799361b636042f1614949e1f9a3b9a2357fe39f469f2ed9a75d4c916c7b4c3e61c7b7ab6dc2cf9d3d9be icewm-1.6.5.tar.lz" +sha512sums="6d9848924253fee5f57be488d2eb0b602767f168ce623b10c768a73197dfc6265daee7e70373d45ff5fae1c15b029d62c77ad13f0f631283bbf13aaaa9c6234d icewm-1.6.6.tar.lz" diff --git a/user/ikona/APKBUILD b/user/ikona/APKBUILD new file mode 100644 index 000000000..c70ad2e59 --- /dev/null +++ b/user/ikona/APKBUILD @@ -0,0 +1,71 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ikona +pkgver=1.0 +pkgrel=0 +pkgdesc="Icon preview utility" +url="https://kde.org/applications/graphics/org.kde.Ikona" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev cmake extra-cmake-modules + kconfigwidgets-dev ki18n-dev kirigami2-dev rust cargo + cairo-dev gdk-pixbuf-dev pango-dev" +subpackages="$pkgname-lang $pkgname-bash-completion:bashcomp:noarch + $pkgname-fish-completion:fishcomp:noarch + $pkgname-zsh-completion:zshcomp:noarch" +source="https://download.kde.org/stable/ikona/$pkgver/ikona-$pkgver.tar.xz + https://download.kde.org/stable/ikona/1.0/ikona-1.0.cargo.vendor.tar.xz + " + +unpack() { + default_unpack + mv "$srcdir"/ikona-1.0.cargo.vendor.tar.xz \ + "$builddir"/ikona.cargo.vendor.tar.xz +} + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +bashcomp() { + pkgdesc="$pkgdesc (Bash completions)" + mkdir -p "$subpkgdir"/etc + mv "$pkgdir"/etc/bash_completion.d "$subpkgdir"/etc/ +} + +fishcomp() { + pkgdesc="$pkgdesc (Fish completions)" + mkdir -p "$subpkgdir"/usr/share + mv "$pkgdir"/usr/share/fish "$subpkgdir"/usr/share/ +} + +zshcomp() { + pkgdesc="$pkgdesc (Z shell completions)" + mkdir -p "$subpkgdir"/usr/share + mv "$pkgdir"/usr/share/zsh "$subpkgdir"/usr/share/ +} + +sha512sums="30bde3f3b062ccf661ee8950c762412a6b9eebff625216641607cbae7f7f8123702c231cbce82acfb666a8b69c863e4b22e8daf79d1541b7c70781189ffee144 ikona-1.0.tar.xz +3bca0c7b66e603e7e06e0ac30c0cdb3d8c3baa812e600f322ef56a0be1692e57cc39348f1c40fdcfe07da6d4b624604cec0003f0d7e1be419462fff5832cd301 ikona-1.0.cargo.vendor.tar.xz" diff --git a/user/iperf3/APKBUILD b/user/iperf3/APKBUILD index f167ef0c3..a3b265ee5 100644 --- a/user/iperf3/APKBUILD +++ b/user/iperf3/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iperf3 _pkgname=iperf -pkgver=3.7 +pkgver=3.8.1 pkgrel=0 pkgdesc="A tool to measure IP bandwidth using UDP or TCP" url="https://software.es.net/iperf/" @@ -28,8 +28,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --disable-profiling + --infodir=/usr/share/info make } @@ -46,7 +45,7 @@ package() { "$pkgdir"/etc/conf.d/$_pkgname } -sha512sums="9b8d1ac6bdebb00e38e196db9a71ae6ff3b8b763cd4b1336d078c31f6d0a5ab53bbe70ba949c601af5efe674dbd032ed5d58a761d5159dae4e50122b68a8f086 iperf3-3.7.tar.gz +sha512sums="0b80849d7705277f63982bbf7a1c159cd9eed65fc89e5f0d443364e8ada7ed0e670c8747a8c5464c3425c134c19ac8bb6b028867f892e70201d4450c7c5a033e iperf3-3.8.1.tar.gz 339fb04b41cce11e8ea8694d95c13af9c88e0d1143356d913ec810c9b11efa27212d585b5dcc49cc2eb860a6d8bc557092c8659d7d5cfe532c5afdb36f8eedf8 iperf.initd fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8 iperf.confd 126043503eebf84bccf26758f18715eaf81131e2fc9ef1fe829e55acb2f14e97db18e9b890b8bf13c230ac80c7537615272af4e072808e25bde8ddd6f326f198 build-fixes.patch" diff --git a/user/iptables/APKBUILD b/user/iptables/APKBUILD index 3c470fda1..4cf764bad 100644 --- a/user/iptables/APKBUILD +++ b/user/iptables/APKBUILD @@ -1,7 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Molly Miller <adelie@m-squa.red> +# Contributor: Molly Miller <adelie@m-squa.red> +# Maintainer: pkgname=iptables -pkgver=1.8.4 +pkgver=1.8.5 pkgrel=0 pkgdesc="Linux kernel firewall, NAT and packet mangling tools" url="https://www.netfilter.org/projects/iptables/index.html" @@ -60,7 +61,7 @@ package() { install -D -m644 "$srcdir"/ip6tables.confd "$pkgdir"/etc/conf.d/ip6tables } -sha512sums="a7faaab58608ffaa51e26e8056551c0e91a49187439d30fcf5cce2800274cc3c0515db6cfba0f4c85613fb80779cf96089b8915db0e89161e9980a6384faebdb iptables-1.8.4.tar.bz2 +sha512sums="6a6baa541bb7aa331b176e0a91894e0766859814b59e77c71351ac34d6ebd337487981db48c70e476a48c67bcf891cfc663221a7582feb1496ad1df56eb28da8 iptables-1.8.5.tar.bz2 726dfa1aa598d9dff802b99347138c861703b3dd28b2721a6b79b12f87d988369d3b4b9daee7cb2f9a930daac8921600de1e5342a347b3eae3791f0b9f0acbeb iptables.initd cb7fecd5cab2c78bd3f215a41f39ec11c37eb360efbe83982378a0e647e0aa9dc0b7ec915a5b5081aa2f7747464787e69404aa15ba15a063c32cb8fb7dd13d1e iptables.confd 0897a7a22f8b700f7f1f5c355ad6cbf39740e44d6c962af99e479978d8a2d556ca7fe4e31f238829046b4a871ce0b5fd52e2544f1361d15dd1ea3e33992646c4 ip6tables.confd" diff --git a/user/iso-codes/APKBUILD b/user/iso-codes/APKBUILD index 896a990a4..81721b787 100644 --- a/user/iso-codes/APKBUILD +++ b/user/iso-codes/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=iso-codes -pkgver=4.4 +pkgver=4.5.0 pkgrel=0 pkgdesc="Lists of country, language, and currency names" url="https://salsa.debian.org/iso-codes-team/iso-codes" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install } -sha512sums="fecb169889e86e87fa90b9ffbbb79d12d4ce4f0ea7b4f699b2ff978f88bdbb790e5b37120d9b696fb13db56845727b6ff102049878e06bbc26b258214eeb3c05 iso-codes-iso-codes-4.4.tar.bz2" +sha512sums="49ad3fad7ab7e489df9fd421a582e09fb116149af7e409d7b592704c95c50e2043880791403f20978f9027c2875ea57dec04c4fe5bdf623c7544edae3f90a084 iso-codes-iso-codes-4.5.0.tar.bz2" diff --git a/user/isync/APKBUILD b/user/isync/APKBUILD index 5b922eb90..51d8a3e6e 100644 --- a/user/isync/APKBUILD +++ b/user/isync/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: pkgname=isync -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=0 pkgdesc="IMAP and MailDir mailbox synchronizer" url="http://isync.sourceforge.net/" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59d702d41d4a4e72f03cb282b414d0bb859593171763e845bc24d116a74f807a79e5be61f1dd1f59a9ece492322bceac156b08958a246cbfbe7f230fab4cdda2 isync-1.3.1.tar.gz" +sha512sums="9b45a7e80dca938329d4bf40996ddbaa008c1fb5a0ac2a7f6277ce78a86fd320083cd96041f6aa8e223b48e17e8b8dd9c5666e989e953a4cd7bc970c84763cba isync-1.3.2.tar.gz" diff --git a/user/jansson/APKBUILD b/user/jansson/APKBUILD index b6f332c62..0d583f27f 100644 --- a/user/jansson/APKBUILD +++ b/user/jansson/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=jansson -pkgver=2.12 +pkgver=2.13.1 pkgrel=0 pkgdesc="C library for encoding, decoding and manipulating JSON data" url="http://www.digip.org/jansson/" # No HTTPS @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb jansson-2.12.tar.gz" +sha512sums="e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192 jansson-2.13.1.tar.gz" diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD index ed6cdf89f..8874668e0 100644 --- a/user/juk/APKBUILD +++ b/user/juk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=juk -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE Jukebox" url="https://juk.kde.org/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kcoreaddons-dev kcompletion-dev kcrash-dev kglobalaccel-dev ki18n-dev kiconthemes-dev kdoctools-dev kio-dev kjobwidgets-dev ktextwidgets-dev knotifications-dev kxmlgui-dev kwallet-dev kwidgetsaddons-dev - kwindowsystem-dev taglib-dev phonon-dev" + kwindowsystem-dev taglib-dev phonon-dev kitemmodels-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/juk-$pkgver.tar.xz" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="39fcfeba4e2616390ac55414bfe9030285765335973fc881b6fc83657ed868e354e0935b00acf669e6bc11e8f6f1daec6c67873d1de71eb14e7f75d1c05ffedb juk-19.12.3.tar.xz" +sha512sums="ae0b998856129548b99abd5d9567fbec79a7760e9898a58c5d0334e2be2c8e54fc2dfb13ebadaf77aeea86ee3cea4677319a7a11f048b84322171580853ec562 juk-20.04.3.tar.xz" diff --git a/user/kactivities-stats/APKBUILD b/user/kactivities-stats/APKBUILD index 5c8cc99c9..28bced096 100644 --- a/user/kactivities-stats/APKBUILD +++ b/user/kactivities-stats/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivities-stats -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Gather statistics about KDE activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="ba4241d0aa0b76639d7d7231ef3cf6f38db710dc6df8d9553242c1faac40839853437710cfcfb1f246c68e7e26a4fe887eb5b058421798e885b43777b0360be9 kactivities-stats-5.68.0.tar.xz" +sha512sums="e3a7d4921a05b3e240f3ab526480d573ee397d0c363513d152e5165372d9841d7797d804bb44dadb3f594dd1a0276f73e6fc8e54745c32f18a076eee6d635f4c kactivities-stats-5.72.0.tar.xz" diff --git a/user/kactivities/APKBUILD b/user/kactivities/APKBUILD index cbe2c27f1..9580aa2c1 100644 --- a/user/kactivities/APKBUILD +++ b/user/kactivities/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivities -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Runtime and library to organize work into separate activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="1490834305965cff0c8ddc4e38be4960a88266f10806478e41cd976f0461a83ae4b6a4e9f3566fd90d5afcf3f38a291609179bea0781b939831ce8f788acc552 kactivities-5.68.0.tar.xz" +sha512sums="cf9642e2d1c9cb932eda588e2d1c32c654b467f5ce17af78b93d951a5a4315427f18ccca4c270cb5141298345eeb47d677333f88cc69df68301922f5db95bb5a kactivities-5.72.0.tar.xz" diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD index 319d4fec1..b83781b70 100644 --- a/user/kalgebra/APKBUILD +++ b/user/kalgebra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalgebra -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Graph calculator and plotter" url="https://www.kde.org/applications/education/kalgebra/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9bc1957f8e851bc0d39a6e8953913d23f245f0bb1338c34e465d1cdddafd144bf80677335f1ae43530754530a2fd75c4bec8f6b3904082fee18bb235011611ab kalgebra-19.12.3.tar.xz" +sha512sums="215218105cb7fe76da3439aabfbdc97c1c5ab396aab21e9dfd8cc8d91c897d2fc94db06e405a44e45710e2d4211049b084306fb85595aaa84443828f8258acb0 kalgebra-20.04.3.tar.xz" diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD index 9d5e3cb16..87fb05861 100644 --- a/user/kalzium/APKBUILD +++ b/user/kalzium/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalzium -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Periodic table of elements (PSE) with calculators" url="https://www.kde.org/applications/education/kalzium/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fb8389937c605cd681295a16a87795caa317c8362c6704406adc3b67adf1c426019b6d52cc08d71248a9c705971248ed1b93e972741db917757bc479bff1af7b kalzium-19.12.3.tar.xz" +sha512sums="fa8f67128d35faa8bdc343cf425aedda8a9370584bdeb69e22ca229c0c1029a5d178f851d4131bd60c635d8d846c8bf1e9104fc030fddb15578ead4c2cba7ea0 kalzium-20.04.3.tar.xz" diff --git a/user/kamera/APKBUILD b/user/kamera/APKBUILD index 649746130..13942f444 100644 --- a/user/kamera/APKBUILD +++ b/user/kamera/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kamera -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Digital camera support for KDE" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9b7783bec9eecaa032adec76452f1a972f03bf97f919c6b354c176c7bf2fb99324e3de9d1928622cd079f4bee089d97d099f201735fa6637188b81dc45a746da kamera-19.12.3.tar.xz" +sha512sums="56393780a07c72c069595188a56eb449873683942a404343336a36c598036b4a339795af8441c073b2a9a5b5145b913ed19d0f7f19933cf999d87886e9aa5592 kamera-20.04.3.tar.xz" diff --git a/user/kamoso/APKBUILD b/user/kamoso/APKBUILD new file mode 100644 index 000000000..e87d3f305 --- /dev/null +++ b/user/kamoso/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kamoso +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE camera software" +url="https://kde.org/applications/multimedia/org.kde.kamoso" +arch="all" +license="GPL-2.0+" +depends="gst-plugins-base qt5-qtgraphicaleffects qt5-qtquickcontrols + qt5-qtquickcontrols2" +makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev cmake extra-cmake-modules + kauth-dev kcodecs-dev kcompletion-dev kconfig-dev kconfigwidgets-dev + kcoreaddons-dev kdoctools-dev ki18n-dev kio-dev kitemviews-dev + kjobwidgets-dev knotifications-dev kservice-dev kwidgetsaddons-dev + kwindowsystem-dev kxmlgui-dev purpose-dev solid-dev gstreamer-dev + gst-plugins-base-dev kirigami2-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kamoso-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="7da5f635cd5744215e7d3c3332729c149786b10a50ecb6c1e63843da8756da2dd2b355b837d24bed670c52990c7f5322b52d703ca61c5c6ec87d89de04458e80 kamoso-20.04.3.tar.xz" diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD index d2d98aa08..43a7ece1d 100644 --- a/user/kanagram/APKBUILD +++ b/user/kanagram/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kanagram -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Letter order (anagram) game" url="https://www.kde.org/applications/education/kanagram/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cf48cc5ff84a033a9fecef0f2d8fc01de12e8fbed4c8055d6c0fc2bac75166d5044889eed61a32e71639413d336dd69e50878785beede40934f77706125fb6b0 kanagram-19.12.3.tar.xz" +sha512sums="e25f5bd4724b8f55ccf6b1fc71ab614ed7cb813c6558abafb0c1cfcc002d04edee856667f361c1a23b1297fc71b70af28069f320bab923403dcd56b48e2143a2 kanagram-20.04.3.tar.xz" diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD index cc65b5056..0837f3941 100644 --- a/user/kapman/APKBUILD +++ b/user/kapman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kapman -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Pac-Man clone" url="https://www.kde.org/applications/games/kapman/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c29f5398bc930d768ba09035a57d51ea0ec53d265c7f30edeb67d887024918627b635433cce897c4b6b701400101b11ffb5b56b66e4f67c07dd6d4318c13ba34 kapman-19.12.3.tar.xz" +sha512sums="1b291f4ab39e5f0fd3e0624bf65afc2fc1fb5990ce73cc90a2737fa8fd420d6d9692a64c75d15b6710d62e81045e41751e14cef5a9907a86b92e00bf93399c8a kapman-20.04.3.tar.xz" diff --git a/user/kapptemplate/APKBUILD b/user/kapptemplate/APKBUILD new file mode 100644 index 000000000..b5cd35203 --- /dev/null +++ b/user/kapptemplate/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kapptemplate +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE application code template generator" +url="https://kde.org/applications/development/org.kde.kapptemplate" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules karchive-dev + kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kdoctools-dev + ki18n-dev kio-dev kjobwidgets-dev kservice-dev solid-dev kauth-dev + kcodecs-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kapptemplate-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="29d5be322cee268e308513c2080eb8b87cec251fa09bc8ff9aaf9705126c69a9bc8a7173fa96397125c5190f6ec8f8a46d460093a666ffeeb7aa5d74be5f041b kapptemplate-20.04.3.tar.xz" diff --git a/user/karchive/APKBUILD b/user/karchive/APKBUILD index 6760b73cf..74bf7a2b8 100644 --- a/user/karchive/APKBUILD +++ b/user/karchive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=karchive -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for manipulating archive files" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c0d14773c4eb27281178d5f00f789256cc44aab057bc20239237a0031750d82765a7afae7cd804b200f713a8f93cd95f5a78828641a748e9b38a6d3c84aff3cc karchive-5.68.0.tar.xz" +sha512sums="d6ac7a618182467975c26ba4a5294c2500e4216e9fa8c6d0be89a5ef0c2ef4573e7ef5dadd3ab01f1e3e378c2a5031fd6bbca39b17aa17baac3fa8892e2c5d32 karchive-5.72.0.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index d9df73288..e55886e1f 100644 --- a/user/kate/APKBUILD +++ b/user/kate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kate -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more" url="https://kate-editor.org/" @@ -85,4 +85,4 @@ kwrite_lang() { done } -sha512sums="aa6a2c44a8c5892e61ac80df676da6059e61dd93f5e2934e0547040d89379f9f3ae90f46b8e043edf463228ef5b0ab3f795b8ab3dd6c488d0ba0c55cf20bd817 kate-19.12.3.tar.xz" +sha512sums="b2c850a94f8d07d4df29156c710d492422a021a75dceae53c9452fc2f569534b627646c39141dc39182d2d8c1d13691240f2c586220f6aa1ba7d1605903f04f9 kate-20.04.3.tar.xz" diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD index 24acd289a..2d1f22e2f 100644 --- a/user/katomic/APKBUILD +++ b/user/katomic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=katomic -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Fun, educational game involving molecular geometry" url="https://games.kde.org/game.php?game=katomic" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32f90755f0e85996a6949a306c8d20e610c049f18c916240750a70006d2f625dcee41b915a93e9bf2ae3ff128df1066124a8a899e980fcf834995c558e3f6411 katomic-19.12.3.tar.xz" +sha512sums="757d63edb5541ad8cf8524b7bfcd9f42c9ee0b5ceb3fd90120442a8ca58c40779ac0c53f0c66f238c46d7917590cdc2d7c18e5a8a8126b8271c5b68b680f3370 katomic-20.04.3.tar.xz" diff --git a/user/kauth/APKBUILD b/user/kauth/APKBUILD index 525a86fd4..fcfb6079a 100644 --- a/user/kauth/APKBUILD +++ b/user/kauth/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kauth -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for allowing software to gain temporary privileges" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="006ed4eb03276546f99525ede235e721ea4092da3b00735afe2f06f35c146d6a75b64e3e1b872feb6f1a986680ae6415f0d4a3dbdf4ecad07d94aaac1061d605 kauth-5.68.0.tar.xz" +sha512sums="e6b3ed0de6aa9537f0fb6630857b2f61fada3643f49fd4797366a6fa2c554fdaf10bb513245bac95dce3d73feabc8728ef01567cea26ff707622a876e8af4d90 kauth-5.72.0.tar.xz" diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD index 1dd52516e..11a1d7779 100644 --- a/user/kblackbox/APKBUILD +++ b/user/kblackbox/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kblackbox -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Hide-and-seek logic game" url="https://www.kde.org/applications/games/kblackbox/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a41aec30b0b193536526f0177a7efae247fa62e100240718e8b86befe7183ca6068b9546aa0f2d7ffc233618b8e8408612c94365ccca7388d18e97687d27fa43 kblackbox-19.12.3.tar.xz" +sha512sums="2b97dab5f04807f03d84fa9a5611b3bbe733db71cc88ef4bb240d67419eb0645cfd5ac7ba46ca25b71d3f8bb5862134b9c5b2d96ca8f763cfc32312a3b4a3399 kblackbox-20.04.3.tar.xz" diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD index e89b067ee..a8e13d581 100644 --- a/user/kblocks/APKBUILD +++ b/user/kblocks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kblocks -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Falling blocks game" url="https://www.kde.org/applications/games/kblocks/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ae38d99354c840b7e9f6e6419be0bd238770103b46cc9eebdd73a60120ac31e9bc268977aad725eec536cc46717278ba948043b2cefa3dbe19ea382b6d7a58d6 kblocks-19.12.3.tar.xz" +sha512sums="9179ef69c21fcbf7e6c1071f34d1ff93045f4fe16f50db42a88a116c49f30acfaa16e7e78b3731be584de76d1907208d050fbef9b246602efdc48038ed8a8671 kblocks-20.04.3.tar.xz" diff --git a/user/kbookmarks/APKBUILD b/user/kbookmarks/APKBUILD index 396ce7df1..0b0790980 100644 --- a/user/kbookmarks/APKBUILD +++ b/user/kbookmarks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbookmarks -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for managing XBEL-format bookmarks" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="56712cd6312d534f33459c18b05f12141546df82a1c1a822a74ddfbde515fc4c67b7d66a6dbd0b7221808d714e2d8c0f72d18f6857ea624bb6a768b9ffffde7e kbookmarks-5.68.0.tar.xz" +sha512sums="67311098678fc670fbadecf0a0f49d97e43d650196600c9d24d3c998785b0bdf72e622ed99d2adc4450ebb6c9df2e3ee25a8d2a3586ef09a119864fac375b431 kbookmarks-5.72.0.tar.xz" diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD index 88d847de4..09a9973bd 100644 --- a/user/kbounce/APKBUILD +++ b/user/kbounce/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbounce -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Puzzle/arcade game to build walls" url="https://games.kde.org/game.php?game=kbounce" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0acae3dfcf082efdf6b79c044685abee9c8b0334a5271ca78bf91ffaafef7c2d2ebe2e7ffbfb78735247b88090a07fb20d11e94e2315b357cba9d9b500764b79 kbounce-19.12.3.tar.xz" +sha512sums="9391502dc08513036fa5dcdb571fd14596f6d143dd72231b1f8c9d23862cc216f3ba9468dbf9cd57cea5ab13af5673557221bb0bf65bb69c65ba43d4f12be140 kbounce-20.04.3.tar.xz" diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD index f416cc759..5e54bf9aa 100644 --- a/user/kbreakout/APKBUILD +++ b/user/kbreakout/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbreakout -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Break-Out like game with a ball and paddle" url="https://games.kde.org/game.php?game=kbreakout" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="983c9c034708c0af0012bdf47788b5b70c36ff1f6b24552f0c6ee8d088f805886ef89d81694750c302e6d254ed13672151f7122c6ba55f68821c62405cf28e9d kbreakout-19.12.3.tar.xz" +sha512sums="70005972ae58e9571dde11f68d4874ab65d934cd905786cf537cd3ac29c19a1bba29d4c5a79963d258a81f51926e2e5de543dd9152cdf5c4758f0003004a7119 kbreakout-20.04.3.tar.xz" diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD index 927ebda72..b4cf2c7cd 100644 --- a/user/kbruch/APKBUILD +++ b/user/kbruch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbruch -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Practice calculating percentages and fractions" url="https://www.kde.org/applications/education/kbruch/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b660706d6132b0b2aa9e91a09a2f132e40de76ae956308926ff83890fab1bf2e171fbd29a8b1b78979929556931b6b1e4f52cacc3fc2db4248d5f95be5af9c61 kbruch-19.12.3.tar.xz" +sha512sums="2cfb9bdac40fc025ddb87429f3bc6d79f8797be699761378bb23067bfe84ecfd5d9f05d51c4afa0e2e962370e2c588ff7b50483fb7e14f6283ec747784f8c6b8 kbruch-20.04.3.tar.xz" diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD index 8c547e6d5..e140c7f41 100644 --- a/user/kcachegrind/APKBUILD +++ b/user/kcachegrind/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcachegrind -pkgver=19.12.3 -pkgrel=0 +pkgver=20.04.3 +pkgrel=1 pkgdesc="Profile data visualisation tool and call graph viewer" url="https://kcachegrind.github.io/html/Home.html" arch="all" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c00474637775a100832d787ddf5d09aafa7dd40bdc58a3d9c596af0215f85011602078fd03d02e5ee3725cb65af1b8aafca390f851caac59bc79b8860f074013 kcachegrind-19.12.3.tar.xz" +sha512sums="d7d6f224293cfea1282d97fea543c22b235386e63633765b6c6431c586d24948f70df11478d2f1bf96b6f1b03585fa20f03461b7f24898435c6d266311d061e9 kcachegrind-20.04.3.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index da3c019b0..42780bcfa 100644 --- a/user/kcalc/APKBUILD +++ b/user/kcalc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalc -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Calculator with many mathematical, scientific, and logic functions" url="https://utils.kde.org/projects/kcalc/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7323acc0e71186a2ce83ab5596a97adc122d6a95a343f5c1f7176330e93b3ee5e23108ab79186f842c7c04a91d31bee592846e44b9dad8ba2e334f244cafe2eb kcalc-19.12.3.tar.xz" +sha512sums="dcc6765a8e0341f833e147015d1f6547adbe21eba6fe2bb7233bb717c29bc97115772001a7d7c654297b884ec7cd08373371d26ff60a50d2c4d527ebc0cf538e kcalc-20.04.3.tar.xz" diff --git a/user/kcalendarcore/APKBUILD b/user/kcalendarcore/APKBUILD index 23cf88fa2..c51eb43b0 100644 --- a/user/kcalendarcore/APKBUILD +++ b/user/kcalendarcore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalendarcore -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Library for managing a calendar of events" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="256bcd4bbc0c3f2d53d05503955de505d937011fcc88006e1c52aaec9b8780e52ec18d229a4ce751df41c7ca2ddac07ba56cb5b743807a034fe7fb3f62dd7d0e kcalendarcore-5.68.0.tar.xz" +sha512sums="a25306ac357282c27a38ecb32ed3687ad259bf814bc67104c66a750fe4c6e76522fdc670e9237b1102f05b38685c8654688ff6a35cb8f8cbb84fc07a3d5cb626 kcalendarcore-5.72.0.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index 4d903a763..b34bb275e 100644 --- a/user/kcharselect/APKBUILD +++ b/user/kcharselect/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcharselect -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Tool to select special characters from all installed fonts" url="https://utils.kde.org/projects/kcharselect/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="85851910deb6c9eab2b02ce7d18fa703c78175f029469500f064e4af86d58b914287da33aeab9372db8919da7a509137849a3038e29e0d03bc125cfae9745006 kcharselect-19.12.3.tar.xz" +sha512sums="f286115802d76d94ec7b42d874cbae750b707fccce00f3292cf861ded72ce32bc905a477c07afd03b24c214e3716ee7db445d1174bb6642fff9692a5046ff998 kcharselect-20.04.3.tar.xz" diff --git a/user/kcmutils/APKBUILD b/user/kcmutils/APKBUILD index 8d3e41c5c..cc68d5c4d 100644 --- a/user/kcmutils/APKBUILD +++ b/user/kcmutils/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcmutils -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for writing System Settings modules" url="https://api.kde.org/frameworks/kcmutils/html/index.html" arch="all" +options="!check" # Test suite requires running X11 session. license="LGPL-2.1-only AND LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev kitemviews-dev kservice-dev @@ -39,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d930874680c489465e72fd4fc7d0d920dfccccbe6e05213c654055d726bea8add2745ffe230ba2a3895dca860c4d93b0039ebe7db6397fb8c53b3c5f6edb7812 kcmutils-5.68.0.tar.xz" +sha512sums="7709e077b93999df5f3abca570a6f75f6866e70ca666dae02220b12daf92f0dfe06fa1f2bd62333e63e45472e6a0094d59df7d8b8b4b69bc37d8d8c4396d34fd kcmutils-5.72.0.tar.xz" diff --git a/user/kcodecs/APKBUILD b/user/kcodecs/APKBUILD index 446bcca99..d54696e0a 100644 --- a/user/kcodecs/APKBUILD +++ b/user/kcodecs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcodecs -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for manipulating strings in differing encodings" url="https://www.kde.org/" @@ -15,7 +15,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcodecs-$pkgver.tar.xz" # secfixes: -# 5.68.0-r0: +# 5.72.0-r0: # - CVE-2013-0779 build() { @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1edf80355d7d986338adfaff3067b0acd80d0fca47c7c81db0c510b1d32acb6ba8dcea33bd577a8ff0da60c4b4e8812c6981948a1eda84ce1acd8a05c87cd67d kcodecs-5.68.0.tar.xz" +sha512sums="39e902a8e0b3485dd0d146f2af0d6b166c8373015ec6c7baed53ceea67285f64d95368eebf302a153e916338f53a1357ea88f9ff3940d90f6953daf9afbbf2f9 kcodecs-5.72.0.tar.xz" diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD index 2dc03be53..3a9036c79 100644 --- a/user/kcolorchooser/APKBUILD +++ b/user/kcolorchooser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcolorchooser -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple application to choose a colour from the screen" url="https://www.kde.org/applications/graphics/kcolorchooser/" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ffffd9a945be3f24813f92fb1f9ec434c045fc3225977de45a4ca6fc9b15926ae3786a573ce05e16acd254e5e3bafd078cae940737517fcf7144302a435605ca kcolorchooser-19.12.3.tar.xz" +sha512sums="21ceff866c4658be0672625e9f3143d47a1ca0afd08e82db4a2648e8369522c4746b762db1e36c9da462ab109d7c55184dcd59c99843b52bc9c6a2f8cd031909 kcolorchooser-20.04.3.tar.xz" diff --git a/user/kcompletion/APKBUILD b/user/kcompletion/APKBUILD index d0363ad66..db9a15b3c 100644 --- a/user/kcompletion/APKBUILD +++ b/user/kcompletion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcompletion -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for implementing automatic completion of input" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="05c434549610404a8a9972fa88dd33245ec9b6e9b402a3602e2081b3ca3692127993307ceb56f8790b91d0a990a2241cf1258a54e316dedef1980b72741cb62e kcompletion-5.68.0.tar.xz" +sha512sums="8273b4130d7d4deb8f92baf1759af8ad3fa25d692d99530a2149c035c578dc6109da9cc6ff5c2860cacf3b2cbcd48710135430a96bcb3a66e4df2ae74bf90337 kcompletion-5.72.0.tar.xz" diff --git a/user/kconfig/APKBUILD b/user/kconfig/APKBUILD index 6e118e487..34b97505b 100644 --- a/user/kconfig/APKBUILD +++ b/user/kconfig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfig -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for managing software configuration" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f839b7a14a6d77060823e7892e4bbda7754ed501f374e4fbb4c10bb9061f182f7c426df55c64678d975e26e123ed3b8e0c791e762ff1077f6b058f214642a670 kconfig-5.68.0.tar.xz" +sha512sums="951e3efb9eb229337cce55a00e9a22688548d448fd65007bfe413eb8af98cf18faa3e825c572d50ae0d0ee760e692532055f5ed018d2f9d9ecff70acf7bf1069 kconfig-5.72.0.tar.xz" diff --git a/user/kconfigwidgets/APKBUILD b/user/kconfigwidgets/APKBUILD index ab6e3b9c8..de6095577 100644 --- a/user/kconfigwidgets/APKBUILD +++ b/user/kconfigwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfigwidgets -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework providing widgets for software configuration" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="db93c37920dd92180cc7e019f1c96d91ba5aaaa9cfd3b1d98d3e5b1b7cc828c204bb27ac83694836234eb41faef3278a0d14d3df974b3228aec631e26cb0e9e6 kconfigwidgets-5.68.0.tar.xz" +sha512sums="07ec3af4df3837549bdda248ee1db217d5423bd823355c09517bb08f2531e6358f08b2a8bdcbdf7f637fc306cd929cf124a56c1a4eef4e0daba3c8be813f3857 kconfigwidgets-5.72.0.tar.xz" diff --git a/user/kcontacts/APKBUILD b/user/kcontacts/APKBUILD index 1fe5bd35c..777362891 100644 --- a/user/kcontacts/APKBUILD +++ b/user/kcontacts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcontacts -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Library for working with contact information" url="https://www.kde.org" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59734f680473ba97bae3406c04f9859997ddb29233d1870865c7f147b7271b7a3dde6ed05bf4cc8ebabd7639c8492bae1f8bab38437c3947495f3bc50190341f kcontacts-5.68.0.tar.xz" +sha512sums="00a6331db40c315ae503dc84ddbf1a14e729925ab69f387d11ffa2669108ffa03d0494513d419f5006d4e99cff244acf519fd7f40311cc3e73995d8d029cd2e9 kcontacts-5.72.0.tar.xz" diff --git a/user/kcoreaddons/APKBUILD b/user/kcoreaddons/APKBUILD index f6c1ce99e..12231fb2a 100644 --- a/user/kcoreaddons/APKBUILD +++ b/user/kcoreaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcoreaddons -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Core KF5 framework" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a76e9f05d2a1fcec509f3a02ac6554b284ece1edf96e201c4f129826d16957fa1c1bd6c1f56debb10614c5222d794b094af1fee0d133a05d17ac9c18249cd1b8 kcoreaddons-5.68.0.tar.xz +sha512sums="ad984361399bd147dc9f67e1abcd5f648e1f2dea29e874fc74a239da4fb9ddc6c05f8a3d224004845f828a2ac60ae67caa36d7ba9c356d3c38873abcbad0c20b kcoreaddons-5.72.0.tar.xz d462866912d9cc9a768477d872142eb67be6b616c044436a27aa71577546efe4aa323b3dac913f9dbb52fc62dbe27d464b30ac3c4cb23c5d7c414d96138e9300 utf8.patch" diff --git a/user/kcrash/APKBUILD b/user/kcrash/APKBUILD index 04bbc7458..ae6d7438a 100644 --- a/user/kcrash/APKBUILD +++ b/user/kcrash/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcrash -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for gracefully handling software errors~" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a26607886537a2d6259c624907e0e5db133f58f0a55ea47845a83e4aa07c86be7f8030a21afddddef58cdac82ca42bed0c288737aaf57d424c6bf67916782811 kcrash-5.68.0.tar.xz" +sha512sums="10e51007f6fa16bcf7e4e34d555c59ef613ca5237447212190e47e5accca598f4f2f0ac7945fc86f0992ec95712446df47399aff39aebfc7f791c9b05c4cd628 kcrash-5.72.0.tar.xz" diff --git a/user/kdbusaddons/APKBUILD b/user/kdbusaddons/APKBUILD index d4d6a1ede..6fcb13e79 100644 --- a/user/kdbusaddons/APKBUILD +++ b/user/kdbusaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdbusaddons -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for coping with D-Bus" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e9d8be0a886037ce4804cbf6a3603350d08f805fac04b5ec5a5007e8ae01300e7cef7161ea13715e87bba544bf32062cc15f77a7890c3ca5699a59b7c5f11bd7 kdbusaddons-5.68.0.tar.xz" +sha512sums="d7183b08a0d35d0ecaddd98bd7fe39924d77af8ebf0040f50090a82097f5e56f8fa5c55f5b2deff05ab040624074eac3fbd71459f79245ee148d705a058f2239 kdbusaddons-5.72.0.tar.xz" diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index dbeb83fc9..668049c39 100644 --- a/user/kde-education/APKBUILD +++ b/user/kde-education/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-education -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Educational software from the KDE Software Collection" url="https://www.kde.org/applications/education/" @@ -9,9 +9,10 @@ arch="noarch" options="!check" # Empty meta package, no point in testing. license="NCSA" # gcompris-qt is removed until it works with gettext-tiny. +# Parley is unavailable because of web engine requirement. depends="artikulate blinken cantor kalgebra kalzium kanagram kbruch - kgeography khangman kig kiten klettres kmplot ktouch kturtle kwordquiz - labplot marble minuet rocs step xdg-utils" + kgeography khangman kig kiten klettres kmplot kstars ktouch kturtle + kwordquiz labplot marble minuet rocs step xdg-utils" makedepends="" source="org.adelie-linux.about-education.desktop" diff --git a/user/kde-games/APKBUILD b/user/kde-games/APKBUILD index 764bea813..877430f84 100644 --- a/user/kde-games/APKBUILD +++ b/user/kde-games/APKBUILD @@ -1,19 +1,19 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-games -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="The KDE games collection" url="https://www.kde.org/applications/games/" arch="noarch" options="!check" # Metapackage, no tests needed. license="NCSA" -depends="bomber bovo granatier kapman katomic kblackbox kblocks kbounce - kbreakout kdiamond kfourinline kgoldrunner kigo killbots kiriki - kjumpingcube klickety klines kmahjongg kmines knavalbattle knetwalk - kolf kollision konquest kpat kreversi kshisen ksirk ksnakeduel - kspaceduel ksquares ksudoku kteatime ktuberling kubrick lskat palapeli - xdg-utils" +depends="blinken bomber bovo granatier kanagram kapman katomic kblackbox + kblocks kbounce kbreakout kdiamond kfourinline kgoldrunner khangman + kigo killbots kiriki kjumpingcube klickety klines kmahjongg kmines + knavalbattle knetwalk kolf kollision konquest kpat kreversi kshisen + ksirk ksnakeduel kspaceduel ksquares ksudoku ktuberling kubrick + lskat palapeli picmi xdg-utils" makedepends="" source="org.adelie-linux.about-games.desktop" diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD index 891f92179..752f4b885 100644 --- a/user/kde-graphics/APKBUILD +++ b/user/kde-graphics/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-graphics -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Graphics software from the KDE Software Collection" url="https://www.kde.org/applications/graphics/" @@ -9,8 +9,7 @@ arch="noarch" options="!check" # Empty meta package, no point in testing. license="NCSA" ### FIXME: add karbon when calligra is packaged -### FIXME: add digikam when it works again -depends="gwenview kcolorchooser kgraphviewer kolourpaint +depends="digikam gwenview ikona kcolorchooser kgraphviewer kolourpaint kphotoalbum krita kruler kxstitch okular skanlite spectacle symboleditor" makedepends="" diff --git a/user/kde-internet/APKBUILD b/user/kde-internet/APKBUILD new file mode 100644 index 000000000..0c0b7826e --- /dev/null +++ b/user/kde-internet/APKBUILD @@ -0,0 +1,21 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kde-internet +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Internet software from the KDE Software Collection" +url="https://www.kde.org/applications/internet/" +arch="noarch" +options="!check" # Empty meta package, no point in testing. +license="NCSA" +# Add Banji when we can package libringqt +depends="choqok kget konversation kopete krdc krfb ktorrent" +makedepends="" +source="org.adelie-linux.about-internet.desktop" + +package() { + mkdir -p "$pkgdir"/usr/share/applications + cp -pr "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/ +} + +sha512sums="fd36955961bf12e394091e236a5110129c6db9e97220f9589938eadaa54e09af4b90921de9c328f893a15bfcd17fd487cbdb7ee3379996402428d47a720983bb org.adelie-linux.about-internet.desktop" diff --git a/user/kde-internet/org.adelie-linux.about-internet.desktop b/user/kde-internet/org.adelie-linux.about-internet.desktop new file mode 100644 index 000000000..0aefb991f --- /dev/null +++ b/user/kde-internet/org.adelie-linux.about-internet.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=About KDE Internet Software +Comment=Learn about KDE Internet software included with Adélie +Icon=dialog-information +Categories=KDE;Network +Exec=xdg-open https://support.adelielinux.org/html/desktop-kde/internet.html diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD index 186b142e1..fa9aa4096 100644 --- a/user/kde-multimedia/APKBUILD +++ b/user/kde-multimedia/APKBUILD @@ -1,14 +1,15 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-multimedia -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Multimedia software from the KDE Software Collection" url="https://www.kde.org/applications/multimedia/" arch="noarch" options="!check" # Empty meta package, no point in testing. license="NCSA" -depends="dragonplayer juk kaffeine kdenlive kmediaplayer kmix kwave" +depends="dragonplayer juk kaffeine kamoso kdenlive kmediaplayer kmix + kwave" makedepends="" source="org.adelie-linux.about-multimedia.desktop" diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD index 9f9c2802b..4aa4bdc4a 100644 --- a/user/kde-system/APKBUILD +++ b/user/kde-system/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-system -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="System utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/system/" diff --git a/user/kde-utilities/APKBUILD b/user/kde-utilities/APKBUILD index 55833148a..e9241812f 100644 --- a/user/kde-utilities/APKBUILD +++ b/user/kde-utilities/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-utilities -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Desktop utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/utilities/" diff --git a/user/kdebugsettings/APKBUILD b/user/kdebugsettings/APKBUILD new file mode 100644 index 000000000..d1b0bb962 --- /dev/null +++ b/user/kdebugsettings/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kdebugsettings +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Set KDE debug settings" +url="https://kde.org/applications/development/org.kde.kdebugsettings" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kcompletion-dev + kconfig-dev kcoreaddons-dev kdbusaddons-dev ki18n-dev kitemviews-dev + kwidgetsaddons-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kdebugsettings-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="af6770415d7f8ba5ff56c13ce7227cc1b22b2db2f24da3ae5ee9d03d3275ced87dd0f73d310f0e4b1eaeb20bbe26df76f40b7c6a258be506529394d044826012 kdebugsettings-20.04.3.tar.xz" diff --git a/user/kdeclarative/APKBUILD b/user/kdeclarative/APKBUILD index b31caeb3c..be5aa701d 100644 --- a/user/kdeclarative/APKBUILD +++ b/user/kdeclarative/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdeclarative -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Frameworks for creating KDE components using QML" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2c3253b1374e66c59436e4c88b8fd296dc60f7a19ef64fa750663afaf86f144b16323cde5af79c0a55d6f5e780085d671deac923d84410d6c31c2b88564ad363 kdeclarative-5.68.0.tar.xz" +sha512sums="93d07dcb5c6d1afd94f08b370ec4c1400156e725d80ea955d21cad48ab511dcb828f95ccf2e301a120c49d22d8f29b94308e0c1fbf3059742701570f2038b988 kdeclarative-5.72.0.tar.xz" diff --git a/user/kded/APKBUILD b/user/kded/APKBUILD index b22a075ac..e125a4d7a 100644 --- a/user/kded/APKBUILD +++ b/user/kded/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kded -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Central KDE workspace daemon" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f0f1073ea2e57ae6fdd615a496c213393881f29193bd0904bdef752eec3d74463ac775c20b9c90c55f03e2aed34a86988833848b78835b52115fa46d99dbe999 kded-5.68.0.tar.xz" +sha512sums="9774fb214b454d699e0ca75f0c2f64ceb89aa030e04fc46a1c793418804bd11542ed21f3b1c812ab15b4e327902b2f8b9bbe767620ed96af027e889299d96bae kded-5.72.0.tar.xz" diff --git a/user/kdegraphics-thumbnailers/APKBUILD b/user/kdegraphics-thumbnailers/APKBUILD index 0cc01f082..f424b235a 100644 --- a/user/kdegraphics-thumbnailers/APKBUILD +++ b/user/kdegraphics-thumbnailers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdegraphics-thumbnailers -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE thumbnailing sofware" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="515703d8a22578f09a6e6105e38fc27c0546ad0e61d9c30a052e40a9068f942d586bc8f6411eed0f057f3da0791b94a49a5e378c04ff1f6af20b8c663a154470 kdegraphics-thumbnailers-19.12.3.tar.xz" +sha512sums="03eebd6dbf39b4d06d4584478158a75ccaa2f5f04c102d542109972a3ce0458080763a4aa60a7a68d35ab822f45c9aa9f1d91cce20557574c2008e768f911c44 kdegraphics-thumbnailers-20.04.3.tar.xz" diff --git a/user/kdelibs4support/APKBUILD b/user/kdelibs4support/APKBUILD index 57d2eb9b4..79c246886 100644 --- a/user/kdelibs4support/APKBUILD +++ b/user/kdelibs4support/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdelibs4support -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Legacy support for KDE 4 software" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9862e320f028e4a80f33db4532b9e865a8b8d642d434e064988fc1f72d9270e3f5883c17caca61f307b86dbf24b4a070bf27ddf12f1777d84a742749d0b8dc42 kdelibs4support-5.68.0.tar.xz" +sha512sums="00011144e62d188b686742b0f22ea8f68ea81dcec7d49b52cf0f9c0b13119f46f30185fda684f2e8e4ce1e8805d3eaf39d7b635915c2255a8a23039cc41b95f6 kdelibs4support-5.72.0.tar.xz" diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index 39c3b74f5..22fcf1c1b 100644 --- a/user/kdenlive/APKBUILD +++ b/user/kdenlive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdenlive -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Libre video editor" url="https://kdenlive.org/" @@ -11,14 +11,14 @@ options="!check" # keyframetest.cpp seems to be broken: # and then abort(3)s with an assertion in QAbstractItemModel # I believe the fakeit/Mock code is subtly broken somewhere. license="GPL-2.0-only" -depends="" +depends="qt5-qtquickcontrols2" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev qt5-qtsvg-dev qt5-qtdeclarative-dev kxmlgui-dev karchive-dev kcrash-dev kbookmarks-dev kcoreaddons-dev kconfig-dev kconfigwidgets-dev mlt-dev kdbusaddons-dev kwidgetsaddons-dev knotifyconfig-dev knewstuff-dev knotifications-dev kguiaddons-dev ktextwidgets-dev kiconthemes-dev kdoctools-dev kfilemetadata-dev qt5-qtwebkit-dev v4l-utils-dev - kdeclarative-dev qt5-qtmultimedia-dev rttr-dev" + kdeclarative-dev qt5-qtmultimedia-dev rttr-dev qt5-qtquickcontrols2-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/kdenlive-$pkgver.tar.xz" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f3e96ec336fdbecfb1c98eef8af87ce98c32ebd16f9810c9d12d1bbe7b23af3c1272396f46799b68d455a243500a3fb0532ad935bde0f25fd5e14e318c3530ad kdenlive-19.12.3.tar.xz" +sha512sums="5a1b37440b212bd7a613fe1de16d8c42771f5bd0dedd80a2bccbab84517adb1a34f7649069b6a686f84114967b42c70278df9447107bfff361ca1a93bb366689 kdenlive-20.04.3.tar.xz" diff --git a/user/kdesignerplugin/APKBUILD b/user/kdesignerplugin/APKBUILD index 755c94066..327e4a51e 100644 --- a/user/kdesignerplugin/APKBUILD +++ b/user/kdesignerplugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdesignerplugin -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt Designer plugin for KDE widgets" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b8d7103e223274377a109a961530ea0c5aa630134467b4baaf3c26b762319aac62f34357512e9a6c0fed9dacf61c1f71521f0a08d947cc5f2b845257a3e5faef kdesignerplugin-5.68.0.tar.xz" +sha512sums="04d92a05353e8358623ae4762f1d5fe2c01ddf24147810c98d7c30ea52b7267953ce9018ad599c25a723eaf6c192fb026d712e0d35e8496455ccab113b0c9e6a kdesignerplugin-5.72.0.tar.xz" diff --git a/user/kdesu/APKBUILD b/user/kdesu/APKBUILD index a0a2c23d2..a34776bf5 100644 --- a/user/kdesu/APKBUILD +++ b/user/kdesu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdesu -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for elevating privileges" url="https://api.kde.org/frameworks/kdesu/html/index.html" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cd31b83be237adb2b13896714ee07af659780b1028149e04ce797edf737d03dd0a7e1f2733c2ae28786c38e382806b558725f1f424910747df13719d35fad5f2 kdesu-5.68.0.tar.xz" +sha512sums="04ee875bf81ce529ef731a4035b3fb94630a9e8223e038aa6b4d708df195d03345c7fe0e57fe3b26312636b80b00a16bff39fe4fc12a4aaf209094cb6e004c50 kdesu-5.72.0.tar.xz" diff --git a/user/kdesvn/APKBUILD b/user/kdesvn/APKBUILD new file mode 100644 index 000000000..2b348f3c2 --- /dev/null +++ b/user/kdesvn/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kdesvn +pkgver=2.1.0_p1 +dlver=$(echo $pkgver | sed s/_p/-/) +pkgrel=0 +pkgdesc="Graphical Subversion version control client" +url="https://kde.org/applications/development/org.kde.kdesvn" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kbookmarks-dev kcodecs-dev + kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kauth-dev + kdbusaddons-dev ki18n-dev kiconthemes-dev kitemviews-dev kjobwidgets-dev + kio-dev knotifications-dev kparts-dev kservice-dev ktextwidgets-dev + kwallet-dev kwidgetsaddons-dev kxmlgui-dev apr-dev subversion-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/kdesvn/${pkgver%_*}/kdesvn-$dlver.tar.xz" +builddir="$srcdir"/kdesvn-${pkgver%_*} + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="7d651abb99420caa368dec8d58bf80fc7cf75113f4f3639035835b2cef250de9e0cffab46f3d8efbdd33220b44cea77aa42f2f2ac54874f1ea6301b4718516ca kdesvn-2.1.0-1.tar.xz" diff --git a/user/kdewebkit/APKBUILD b/user/kdewebkit/APKBUILD index b980489f7..affb0af1e 100644 --- a/user/kdewebkit/APKBUILD +++ b/user/kdewebkit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdewebkit -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="KDE integration with WebKit" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="be885bc7234551adf38faadd03f863fec60588f46bb710558702570bb1a40dff44ea35155c2cf30624c2f9f7ae13dfe57cdc2f088538c35e11157189ba803594 kdewebkit-5.68.0.tar.xz" +sha512sums="35d03459adc4095027900f7b6f911e3a5ed82b40e12365cc89184293b472d92198c29106352b384350ebb5dfd2e49173fe3998fdf5a3fad7d51b16475a411693 kdewebkit-5.72.0.tar.xz" diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD index 214475d1b..1db7b0aae 100644 --- a/user/kdf/APKBUILD +++ b/user/kdf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdf -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="View disk usage information" url="https://utils.kde.org/projects/kdf/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="46639acdaca1f29d215bde691a2844ae24234fe747081a5d6cca1c81a0c09f862b1f6eb066e1d301a8b57345b82096a4c9c7a771a2a29e7bbf21dd1b62d2582a kdf-19.12.3.tar.xz" +sha512sums="df8ebbc258b5ffe9becd8beb4911dc16e0d18a5e0860a8dafb0e9a492997f6aa7741cbe789eff1eb89bfbb52ec4dd9a057d322669f3c9e2b5888bfdd3cede8aa kdf-20.04.3.tar.xz" diff --git a/user/kdiagram/APKBUILD b/user/kdiagram/APKBUILD index 6fbff8e0a..8db99f14d 100644 --- a/user/kdiagram/APKBUILD +++ b/user/kdiagram/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdiagram -pkgver=2.6.2 +pkgver=2.7.0 pkgrel=0 pkgdesc="Charting libraries used by KDE" url="https://www.kde.org/" @@ -10,8 +10,8 @@ options="!check" # Tests require X11 license="LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev" -makedepends="cmake extra-cmake-modules qt5-qtsvg-dev qt5-qttools-dev" -subpackages="$pkgname-dev $pkgname-lang" +makedepends="cmake doxygen extra-cmake-modules qt5-qtsvg-dev qt5-qttools-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kdiagram/$pkgver/kdiagram-$pkgver.tar.xz" build() { @@ -25,6 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_QCH:BOOL=ON \ ${CMAKE_CROSSOPTS} . make } @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="008688e76e30b933576523e2204b029ce2a5f5d232002d481c7c49f4ad2955b3f46cbe4b51a046a771130f3584225127b21df30efc042cddc9440f81ea8f495a kdiagram-2.6.2.tar.xz" +sha512sums="d5004b409bbb79ca858755a02a3673a16a54ffa7c1ed530b9526b8d928bdf0a2ba9730f47fb67203a09ef49d48c0af9b3d933f8f934ca19290376bdb3eefde1d kdiagram-2.7.0.tar.xz" diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD index fe347e5db..9ccb170ce 100644 --- a/user/kdiamond/APKBUILD +++ b/user/kdiamond/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdiamond -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Three-in-a-row game" url="https://games.kde.org/game.php?game=kdiamond" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7ed8b8dacdd5e134bd0b6c292d54423680f5613da9fd934690703bb735b5c531bfd9ded79fb43903094b80c0a266dcebc0848148e12f957afcec3cc327104268 kdiamond-19.12.3.tar.xz" +sha512sums="7b298724f37ca29784e9239716d97041c4219b9a1bff565bb034cbee7af40fc3609056ff019fba83d0c46a8005bc2b51e92130e4b431d427af068f95c5884e72 kdiamond-20.04.3.tar.xz" diff --git a/user/kdiff3/APKBUILD b/user/kdiff3/APKBUILD new file mode 100644 index 000000000..925b10184 --- /dev/null +++ b/user/kdiff3/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kdiff3 +pkgver=1.8.3 +pkgrel=0 +pkgdesc="Diff/Patch frontend for KDE" +url="https://kde.org/applications/development/org.kde.kdiff3" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kauth-dev kcodecs-dev + kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev + kdoctools-dev ki18n-dev kiconthemes-dev kitemviews-dev kjobwidgets-dev + kparts-dev kservice-dev ktextwidgets-dev kwidgetsaddons-dev + kwindowsystem-dev kxmlgui-dev solid-dev sonnet-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/kdiff3/kdiff3-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d kdiff3-1.8.3.tar.xz" diff --git a/user/kdnssd/APKBUILD b/user/kdnssd/APKBUILD index 49398a2b0..3e26dddd7 100644 --- a/user/kdnssd/APKBUILD +++ b/user/kdnssd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdnssd -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for discovering network services using Zeroconf" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ada02627e705fabfa50ccbd7221969d123f0b9bdf51edb390c78a6cfaef545f1237fed91dad868d17800b85d677597df9e4d7906156a0816cb54f744ded89857 kdnssd-5.68.0.tar.xz" +sha512sums="9042e1873b996b9df5ab75f72cf2050035ea1e92af21fa2e47afe65bd3a6e57fd5e783a476494b18be7e2bc3f9c998b3fc0049a99a4579f069c12a901f6d4a7d kdnssd-5.72.0.tar.xz" diff --git a/user/kdoctools/APKBUILD b/user/kdoctools/APKBUILD index ec2771be6..801d04d2f 100644 --- a/user/kdoctools/APKBUILD +++ b/user/kdoctools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdoctools -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Tools to generate user-readable documentation from DocBook XML" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5f39e0193bf8cbad90a579394730e72fce741673ef7a600198b5d05fac0bd25bb785c8edd68ed9d852a4b1b4be856db4fd9d37ec5719a7943177cc19a6ccd34b kdoctools-5.68.0.tar.xz" +sha512sums="a4164b797a47353090725b6c9ee97220ea882aa8a15ff3d4ef143305423684c7fa611b923d458ae739252025d4930f72530c7b02f7f0d6933120c42bfc51e292 kdoctools-5.72.0.tar.xz" diff --git a/user/keepassxc/APKBUILD b/user/keepassxc/APKBUILD index 4aa4ecff3..73329254c 100644 --- a/user/keepassxc/APKBUILD +++ b/user/keepassxc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=keepassxc -pkgver=2.5.3 +pkgver=2.6.0 pkgrel=0 pkgdesc="A community revival of the KeePassX password manager" url="https://keepassxc.org" @@ -10,7 +10,7 @@ license="(GPL-2.0-only OR GPL-3.0-only) AND MIT AND BSD-4-Clause AND ISC AND (LG depends="hicolor-icon-theme" makedepends="argon2-dev cmake libgcrypt-dev libqrencode-dev libsodium-dev libxi-dev libxtst-dev qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev - qt5-qtx11extras-dev xz zlib-dev" + qt5-qtx11extras-dev xz zlib-dev asciidoctor" subpackages="$pkgname-doc" source="https://github.com/keepassxreboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="8b1e3360b4ae5de170be6936291f7b309de09b2462fcd5a48f239c22f1c8b6ffe721aca8d1e9b6ae3881f7b16374850d7f4b809733244fd16d45eed6ad4f60c6 keepassxc-2.5.3-src.tar.xz" +sha512sums="c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17 keepassxc-2.6.0-src.tar.xz" diff --git a/user/kemoticons/APKBUILD b/user/kemoticons/APKBUILD index 89f47bb2c..79e9325be 100644 --- a/user/kemoticons/APKBUILD +++ b/user/kemoticons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kemoticons -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Emoticons to express emotions in KDE" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="44ef3ec99997ae99d90bd0c4318930db0ca2805f812ad8fd18166b801424d940a40a499266bfa20f6f9169cdd4608a42a206069e72af015956e16d95b9b5e731 kemoticons-5.68.0.tar.xz" +sha512sums="c767351a3c3a6a857f3b4240205a92a705c9204394da15b0f5154e6aba2c3b834f403729aaec1774cc8e70be26b8a101185303f610dc752421a43b2908039127 kemoticons-5.72.0.tar.xz" diff --git a/user/keyutils/APKBUILD b/user/keyutils/APKBUILD index 7efd00a7a..66eaa7dbc 100644 --- a/user/keyutils/APKBUILD +++ b/user/keyutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=keyutils -pkgver=1.6.1 +pkgver=1.6.3 pkgrel=0 pkgdesc="Linux key management utilities" url="https://people.redhat.com/~dhowells/keyutils/" @@ -38,4 +38,4 @@ libs() { mv "$pkgdir"/lib "$subpkgdir"/ } -sha512sums="a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2 keyutils-1.6.1.tar.gz" +sha512sums="f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9 keyutils-1.6.3.tar.gz" diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD index 5c5e7374c..9dd12361a 100644 --- a/user/kfilemetadata/APKBUILD +++ b/user/kfilemetadata/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfilemetadata -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="File metadata extraction framework" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a8e10b45b6c2790f1f0e41ea8f0a474d6a6b4e6c6bc73d53d26887b24b06f7c95c1fc3a81fc9096759c8506e64fd30f6b7f822ea6dc238ea787b812ba685f8bf kfilemetadata-5.68.0.tar.xz -17aad7d1e223c5668d7b61b125843d89d7f2598e94173d451e731f96d6322d93ab7b967a9f04dd83020e77cd2f84471c46d81b595b2ea484d2b423af6d1c332b test-mimetype.patch" +sha512sums="6f1c8dad61428b32c3aaabdc6f178fec07c96fd831c9e4b2be92130258241ea6d51c4ff6c0f3e42d22bd29b1b8fbf742e12725e6ec4229b9e59ad18f68e7ce7d kfilemetadata-5.72.0.tar.xz +ddbf9eb485b9f20c87284434bb705f2f401c77f6eaa2e611ee0cb4f15ef585c47c8dd39eb2f38e347f80db5e2bc0362861ed90beb8e09d9882172a899e473bff test-mimetype.patch" diff --git a/user/kfilemetadata/test-mimetype.patch b/user/kfilemetadata/test-mimetype.patch index 87b994920..f76824ac5 100644 --- a/user/kfilemetadata/test-mimetype.patch +++ b/user/kfilemetadata/test-mimetype.patch @@ -2,12 +2,12 @@ Our version of shared-mime-info differs for the AppImage MIME type. --- kfilemetadata-5.65.0/autotests/extractorcoveragetest.cpp.old 2019-12-12 22:37:05.000000000 +0000 +++ kfilemetadata-5.65.0/autotests/extractorcoveragetest.cpp 2019-12-29 15:56:30.981925832 +0000 -@@ -48,7 +48,7 @@ +@@ -36,7 +36,7 @@ m_knownFiles = { { "test.aif", "audio/x-aifc"}, { "test.ape", "audio/x-ape"}, - { "test.AppImage", "application/vnd.appimage"}, + { "test.AppImage", "application/x-iso9660-appimage"}, - { "test_apple_systemprofiler.spx", "application/xml"}, + { "test_apple_systemprofiler.spx", "application/x-apple-systemprofiler+xml"}, // s-m-i < 2.0 would give "application/xml" { "test.dot", "text/vnd.graphviz"}, { "test.eps", "image/x-eps"}, diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index e2da48d02..1eb66211c 100644 --- a/user/kfind/APKBUILD +++ b/user/kfind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfind -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Standalone search utility for KDE" url="https://www.kde.org/applications/utilities/kfind/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a3e0572d12c0ffb4ca60774e91237f82ae2d424558ac91636a83075d1a1c11c2ff8848f1093360a4c3149b3c4d8233dff9bd5ac0914547af873aa9f1bba8dff5 kfind-19.12.3.tar.xz" +sha512sums="cedc192ad1247131a2f708c4ff1266636c57eaf60e46b58f2b5eb9aded61aca63ddbdca936ff8cdc216891569e7c2aca9cf61371f93468df1bca799f8df3117a kfind-20.04.3.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index 0c30fd2cc..a7290cffe 100644 --- a/user/kfloppy/APKBUILD +++ b/user/kfloppy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfloppy -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Utility for formatting floppy diskettes" url="https://utils.kde.org/projects/kfloppy/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="26a3664af62ac5b39bb527c4b1c3b16ea34f68b5e8a28368747dc563bdcfac850aba488c5362616f93e5a60555540aadb2607fe5570341c0eb14f3844cb0aeba kfloppy-19.12.3.tar.xz" +sha512sums="0226a83e4350c10c3a706d2fc82fb64b510cb992b7c20a1d72dc880da3fb82896be8ff5804aa22c5fd47233625e42afed7239c6cc9ab7fa2f25c0fedef03f2ed kfloppy-20.04.3.tar.xz" diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD index 12c8a62f9..8b0450af5 100644 --- a/user/kfourinline/APKBUILD +++ b/user/kfourinline/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfourinline -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Two player board game based on Connect Four" url="https://games.kde.org/game.php?game=kfourinline" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8738836d6f0a850f3fa563f1f6571757ec8b8001b31ac122ced617a4b64a311fa710cb449655bf3ae3fc170ce1c53c0126d023c089a03c94b8b8ef1a6e9097df kfourinline-19.12.3.tar.xz" +sha512sums="895fd642e6407d4b2d7f78dccc72a257585cb9e47986186428b40e8d78ab27926346cd79390911660f9673014b872d679adee815a37eb864a1d6923d662523c7 kfourinline-20.04.3.tar.xz" diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD index a536493d7..3613979e5 100644 --- a/user/kgeography/APKBUILD +++ b/user/kgeography/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgeography -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Geography learning tool and trainer" url="https://www.kde.org/applications/education/kgeography/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fcd99351c80750c79b50ec78bfb0864f5f3fb08d9ec94af5d2fb6907a537c02bae9ff2c70437eb58f22c4a873ecdce4ac7e1ab0d55a8140d2671d6ed89b743d3 kgeography-19.12.3.tar.xz" +sha512sums="b5921fcba4fb2e72a78adad91bc0886818cf473b4c5ebba6d42496205ef76284836a9d71d283514add3cb75a7ce5970b23a62fb08c8444490302368dfe7bf7d5 kgeography-20.04.3.tar.xz" diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD index 033ab8603..10add8da1 100644 --- a/user/kget/APKBUILD +++ b/user/kget/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kget -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Versatile download manager" url="https://www.kde.org/applications/internet/kget/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="67adf59577ab08895d8107b9ae828db34174efe5546d53bcec48cfa273cf4443ae2e2dfc1c189781a48305fdbd0aa1e2d2aedbacd242a6e14d0ac1ad9b3aa887 kget-19.12.3.tar.xz" +sha512sums="55223e8e32392ea46dd50d90e532119fe8908641c6e49a29e62bd2f6a67db29940efc5e6344089c9e090810e9319399ce3dbdde61bb93f737591df03bfdf7f33 kget-20.04.3.tar.xz" diff --git a/user/kglobalaccel/APKBUILD b/user/kglobalaccel/APKBUILD index 03f2be72a..0df19d87e 100644 --- a/user/kglobalaccel/APKBUILD +++ b/user/kglobalaccel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kglobalaccel -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for implementing global shortcuts/accelerators" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="66929e86dd09acca739e71a88dff5818bf6602417fe257b6f195f2a194f1bb030ca44e25b37d9383f4bc4960da95ddcaa7330f3c2cfceb1772be50d80763796e kglobalaccel-5.68.0.tar.xz" +sha512sums="05430b734df4f127b68149e4b08e563fb35ba132f047437eaa41877962fb1e8f82c95880a3573d5f3e91a87c138150db735a996ce54bdad4b26a9269d73a9ed5 kglobalaccel-5.72.0.tar.xz" diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD index e10b5e835..fe2662190 100644 --- a/user/kgoldrunner/APKBUILD +++ b/user/kgoldrunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgoldrunner -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around" url="https://games.kde.org/game.php?game=kgoldrunner" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af90c483e94a335080d4091264213df33c5bfe5b4abbf95336dfb5c0885037caed8fd844371c1b1bcba41a8cc5de88ee8bef9feeb91a22a087c56e44e85abbd3 kgoldrunner-19.12.3.tar.xz" +sha512sums="1c759f7e7fe7f4369f7fe1b1812f8e5a1e7cd5c6588f67c6998849e01c013826f517401d541130be8d03ab152b737176889a70f7f6c8e2a13cfe440fa9ffb91e kgoldrunner-20.04.3.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index c815bf81a..1f93a580b 100644 --- a/user/kgpg/APKBUILD +++ b/user/kgpg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgpg -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple interface for GnuPG, a powerful encryption utility" url="https://utils.kde.org/projects/kgpg/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="465d0b57ed96be41b226bfdc484c5472c0866f293eb0c57816ac3536aef20d81cf320b2244f1d20110d8b86e1014ff578be730dac84331896b41ae9dc7960109 kgpg-19.12.3.tar.xz" +sha512sums="b36ff19ee02a8bbaa64cfece378178fd4d10700a0f62a44e3d911cebeb147564c577336681937e3be795924ab1da522a38b07a32335c95c3c7f711361f0a8a9c kgpg-20.04.3.tar.xz" diff --git a/user/kgraphviewer/APKBUILD b/user/kgraphviewer/APKBUILD index db2f22ca1..fa05a6f27 100644 --- a/user/kgraphviewer/APKBUILD +++ b/user/kgraphviewer/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgraphviewer pkgver=2.4.3 -pkgrel=0 +pkgrel=1 pkgdesc="Graphviz DOT graph viewer" url="https://www.kde.org/applications/graphics/kgraphviewer/" arch="all" diff --git a/user/kguiaddons/APKBUILD b/user/kguiaddons/APKBUILD index 9b0559805..f1778e2a8 100644 --- a/user/kguiaddons/APKBUILD +++ b/user/kguiaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kguiaddons -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for creating high-level user interfaces" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9547c8717f5ea32a46165ddfc5cd9b3d02b0f318a0efd580ed22d6183d7fa3b43b8068e43cefc25aa811a3a7e1f692e33a517055204c8171b6ca569d43683f00 kguiaddons-5.68.0.tar.xz" +sha512sums="03037263d10dc75d7a409856d64b460e078e550841261287a141325a72aca3dc09ff5cb62f6c6a53ae44259380d283c9e76d33edc2a6e777c7ad58e379e64f30 kguiaddons-5.72.0.tar.xz" diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD index 2db471d89..a54197585 100644 --- a/user/khangman/APKBUILD +++ b/user/khangman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khangman -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Hangman word game" url="https://www.kde.org/applications/education/khangman/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d653bc8c48d84a46634ed4c3fb711a80ace9b5e3b12c8ba05cc6d76e71978b98f85f28f1d4454b1960b1edf589dcebf1788c22451383a85a395c2f7e1cd0b526 khangman-19.12.3.tar.xz" +sha512sums="d70def96ffbfed0dfca4e3ac21613639f0344520d8364793d22fe8e90cea376ac7024959007660ffa9e9849fa66158752db83333acd15103e09467a5f5cf5037 khangman-20.04.3.tar.xz" diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD index a332d276c..f5c1c2e00 100644 --- a/user/khelpcenter/APKBUILD +++ b/user/khelpcenter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khelpcenter -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Graphical documentation viewer" url="https://www.kde.org/applications/system/khelpcenter/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d8aef5f562a23a65f807218f5c7746afdd4f97e74de127bfd81037b5bba9d1024337082954752b33fd478896f462e565796ec567f32ebf0d006e2c73de3880c6 khelpcenter-19.12.3.tar.xz" +sha512sums="0859633ea0a9e8b9a304057e3261614e560d6764d60c42eb377c8cd2d1e9ef3c185feb7221276c6b160365c6041c6711891435d8ce23c1b53ef660706ead14c0 khelpcenter-20.04.3.tar.xz" diff --git a/user/kholidays/APKBUILD b/user/kholidays/APKBUILD index f3af735bc..3050c693d 100644 --- a/user/kholidays/APKBUILD +++ b/user/kholidays/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kholidays -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="List of national holidays for many countries" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ad4ab73880862104cc7aa1fff2dd91c5b9fe36f8f8ee0fb1f217a0e159ca4184984767ba5bebbb3ef0bd6a1fd6cbff09a019fe3c26826ab4df5cfabcb80ce9a3 kholidays-5.68.0.tar.xz" +sha512sums="ca97d24de46db1131af391a4a45c38001bae88c04994f377f6b22dd3bbe35a40432adce34d29587dcde2863e96305844f10902f452621e1bca43035c95b021b6 kholidays-5.72.0.tar.xz" diff --git a/user/khtml/APKBUILD b/user/khtml/APKBUILD index 747a25921..ee3bf8575 100644 --- a/user/khtml/APKBUILD +++ b/user/khtml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khtml -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="The KDE HTML library, ancestor of WebKit" url="https://konqueror.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a306f5da7bf03f77111af4f3e4d4a2b21e483861e7e5d4265941e914f788e58079fce11ab2667bb802d512d7c84fa70653a94a16cdb14221ce1aebbe300ce2ee khtml-5.68.0.tar.xz" +sha512sums="f1d5feca1e164d361ec9175277f5646ee39ebdc5bc601556cea2c0f0b859e1bb044043c685ddcb4d5e4d883e14ee5fd6f278838e2b5ddcf9f1fd4cbf982308a5 khtml-5.72.0.tar.xz" diff --git a/user/ki18n/APKBUILD b/user/ki18n/APKBUILD index e2cd6c3b9..41abc7789 100644 --- a/user/ki18n/APKBUILD +++ b/user/ki18n/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ki18n -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for creating multi-lingual software" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2256e06a40761b7f948cd83caf527e8533035afd2ecda266535b67dab9030571154a6eab75744db94da4c13c27bcc67d1d2dcdfb3b9de92e75abcf3f517e52e7 ki18n-5.68.0.tar.xz" +sha512sums="754302680a70e8c8a68ee9b2873b6d42a806c4f473b2daf1d3435f4e70d9e285a5e93d092f8503218d17f8981d87be7cea388c5ca4998fab973c5baf806a582f ki18n-5.72.0.tar.xz" diff --git a/user/kiconthemes/APKBUILD b/user/kiconthemes/APKBUILD index 126088b51..2cccfa3e8 100644 --- a/user/kiconthemes/APKBUILD +++ b/user/kiconthemes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiconthemes -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for icon theming" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9088164a379a49bdf86fb8558ad1c95555c18985012c9c03e95d6e043b983e871afa594d40cc0c6f13b9261a2a19b2a0355f4a6a75d85e49a1675ef5be34724b kiconthemes-5.68.0.tar.xz" +sha512sums="55184ee31084ae56d47a1f618b2484c2994c2d022cd19e7eae75850f4affb25b7e90c4510c3e3d1a6bb81c5b4fd60e780819ade7947ab62f4c778606cc342acc kiconthemes-5.72.0.tar.xz" diff --git a/user/kidentitymanagement/APKBUILD b/user/kidentitymanagement/APKBUILD new file mode 100644 index 000000000..4c8cb0a59 --- /dev/null +++ b/user/kidentitymanagement/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kidentitymanagement +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Identity management library for KDE" +url="https://kde.org/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kauth-dev kcodecs-dev + kconfig-dev kcoreaddons-dev kiconthemes-dev kio-dev kjobwidgets-dev + kpimtextedit-dev kservice-dev ktextwidgets-dev kxmlgui-dev solid-dev + sonnet-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kidentitymanagement-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="df5507c67fb151953b8e1ab98580d77e297a13fdede2ee5b484262768932335b8289ebfbb83ffa8eaf8a3e85c25f61b13ffd73823aa210fe9d940f3361a33f80 kidentitymanagement-20.04.3.tar.xz" diff --git a/user/kidletime/APKBUILD b/user/kidletime/APKBUILD index f7769d45d..8088dbc3f 100644 --- a/user/kidletime/APKBUILD +++ b/user/kidletime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kidletime -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for determining a user's idle time" url="https://api.kde.org/frameworks/kidletime/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c803de25cf6f26b2d320ec7e35ba598f134e75575dd8f1c06b41461975c99a6b46e7d60bb34b09ed2d799837cf7682bc3d09ba720b2b7dbb1b1bee668fdb1b01 kidletime-5.68.0.tar.xz" +sha512sums="3a5fd03eabfbe99368b670fe78c985a65d354cd38eb3f4e5bc6fa25d71c36bfe48f14c8cbc64035d286ec9f29780fa168febc1e1284af9f1fac30cb7f94608cf kidletime-5.72.0.tar.xz" diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD index 707245af9..0f0c32039 100644 --- a/user/kig/APKBUILD +++ b/user/kig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kig -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Interactive geometry learning and exploration tool" url="https://www.kde.org/applications/education/kig/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="554b70c1ec7e62b52bdfb736cf17d685df68ffee00ebd4253e838f753e274c275a5df774f37240b2cb4778bfdc16b28c37f087772e61c82409397e92982e4109 kig-19.12.3.tar.xz" +sha512sums="64d806c901387dfeaf799ededa22ffd6a2471025d6e3f91940e1f70c3619b86b8427aa1dd97bd59780083173d6e8951205cd8385714682131d45724d72efd963 kig-20.04.3.tar.xz" diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD index b458397ef..ef83f27e1 100644 --- a/user/kigo/APKBUILD +++ b/user/kigo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kigo -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Go or Igo game for KDE" url="https://www.kde.org/applications/games/kigo/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ebb8b7fd3da4b47c1a26642b894e57d174a0046fce7123cd222d1a527a2158cf1cca42a7e54ab029a11d2419f0c8cb69f3f8343fa07454593d293f7d84d252ce kigo-19.12.3.tar.xz" +sha512sums="26d1bd6d282e5cd535408148be13ab468831ef7ff2c6e75052a65804123fb4440ba54a0fa1d280834ce83400d8f897825bfd34cc02751800660e953762779981 kigo-20.04.3.tar.xz" diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD index 706c3efe2..7e0c2afb9 100644 --- a/user/killbots/APKBUILD +++ b/user/killbots/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=killbots -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple game of evading killer robots" url="https://www.kde.org/applications/games/killbots/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7e5554f03f91210ceb25429bd6f4917100bcf9246db563058c31f10a2ed2cd5b095898320f742db021b2f8d3ee211a9271364544fbad1cdc3de9f39fd2827514 killbots-19.12.3.tar.xz" +sha512sums="0336667db017881a2bff454c2cfd2c5e80ee19d4567b89c517f072f190544616cce29664bd8471de517a9df3e1a7d7bdc726b564f3904965e03ba9464391441f killbots-20.04.3.tar.xz" diff --git a/user/kinit/APKBUILD b/user/kinit/APKBUILD index b80261ce0..191f08215 100644 --- a/user/kinit/APKBUILD +++ b/user/kinit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kinit -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="KDE initialisation routines" url="https://www.kde.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="66d39c7bb330e7237ba4334938451ba5d1faad3f38e1c577036061cd75e2770c858c897317543222b208f8a694e29c30eb142483f4617e30954a34813e941530 kinit-5.68.0.tar.xz" +sha512sums="a18ca2d8395964284b78fe662b2eac9141df9451e8de47a4a0d80f64226e8228d45382dd4bdaf4b29bbb6ae79f549fb5405a7206fd4fe266f4a6cc7643e51c39 kinit-5.72.0.tar.xz" diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index 8fdc83304..597696c56 100644 --- a/user/kio-extras/APKBUILD +++ b/user/kio-extras/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio-extras -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -17,9 +17,7 @@ depends_dev="qt5-qtbase-dev qt5-qtsvg-dev karchive-dev kconfig-dev kio-dev kactivities-stats-dev" makedepends="$depends_dev cmake extra-cmake-modules shared-mime-info" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/kio-extras-$pkgver.tar.xz - D17205-nfs-tirpc.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/kio-extras-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -44,5 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="289d4336e563ee38be20f40c146172111ebeb3893edd15c76ad42435b8b1b0967864d8764519cd5c0aaa2580c56b76283076a3598917876b5e22acdf75ba9da7 kio-extras-19.12.3.tar.xz -dbc58b5d8a7783d5697a24fe6232f0aa3d6222cf15eeb8ce94f0ea99c81dce067ab1ef20261f77107cc9f75ecae506458a828a5ad3437b589ca00b93ad52b1e2 D17205-nfs-tirpc.patch" +sha512sums="25de00a7e34ce9dce36a0935544a5f4684f31db6b73e191dd0e781cc3f3f0c761d504a8d85ce8fa1fbdb827f0adccb0f4fbb09c7295456074835ffb23e114ba3 kio-extras-20.04.3.tar.xz" diff --git a/user/kio-extras/D17205-nfs-tirpc.patch b/user/kio-extras/D17205-nfs-tirpc.patch deleted file mode 100644 index b12c0a2c5..000000000 --- a/user/kio-extras/D17205-nfs-tirpc.patch +++ /dev/null @@ -1,143 +0,0 @@ -Subject: Build kio_nfs against standalone libtirpc -From: asturmlechner -Date: Wed 28 Nov 07:41:00 UTC 2018 - -Summary - -Since glibc-2.26, cmake skipped over nfs when standalone tirpc -was installed in tirpc subdir (as done by Debian, Fedora, Arch, Gentoo...) - -Use FindTIRPC and make kio_nfs optional that way -FindTIRPC taken from https://phabricator.kde.org/D12761 - -Test Plan - -Built with libtirpc successfully. - -https://phabricator.kde.org/D17205 - -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -132,6 +132,11 @@ - set_package_properties(KF5KHtml PROPERTIES TYPE OPTIONAL - PURPOSE "Needed to build the man kioslave" - ) -+ -+ find_package(TIRPC) -+ set_package_properties(TIRPC PROPERTIES TYPE OPTIONAL -+ PURPOSE "Needed to build the NFS kioslave" -+ ) - else() - # FIXME: on windows we ignore support until trash gets integrated - endif() -@@ -174,9 +179,7 @@ - if(Gperf_FOUND AND KF5KHtml_FOUND) - add_subdirectory( man ) - endif() -- check_include_files(rpc/rpc.h HAVE_RPC_RPC_H) -- add_feature_info("NFS kioslave" HAVE_RPC_RPC_H "The RPC library is needed to build the NFS kioslave") -- if(HAVE_RPC_RPC_H) -+ if(TIRPC_FOUND) - add_subdirectory( nfs ) - endif() - endif() -diff --git a/cmake/FindTIRPC.cmake b/cmake/FindTIRPC.cmake -new file mode 100644 ---- /dev/null -+++ b/cmake/FindTIRPC.cmake -@@ -0,0 +1,60 @@ -+# - Try to find TI-RPC -+# -+# The following variables will be available once found : -+# -+# TIRPC_INCLUDE_DIRS - The TI-RPC headers location -+# TIRPC_LIBRARIES - Link these to use TI-RPC -+# TIRPC_VERSION - The TIRPC version -+# -+#============================================================================= -+# Copyright (c) 2017 Christophe Giboudeaux <christophe@krop.fr> -+# -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions -+# are met: -+# -+# 1. Redistributions of source code must retain the copyright -+# notice, this list of conditions and the following disclaimer. -+# 2. Redistributions in binary form must reproduce the copyright -+# notice, this list of conditions and the following disclaimer in the -+# documentation and/or other materials provided with the distribution. -+# 3. The name of the author may not be used to endorse or promote products -+# derived from this software without specific prior written permission. -+# -+# 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. -+#============================================================================= -+ -+find_package(PkgConfig QUIET) -+pkg_check_modules(PC_TIRPC libtirpc) -+ -+find_path(TIRPC_INCLUDE_DIRS -+ NAMES netconfig.h -+ PATH_SUFFIXES tirpc -+ HINTS ${PC_TIRPC_INCLUDE_DIRS} -+) -+ -+find_library(TIRPC_LIBRARIES -+ NAMES tirpc -+ HINTS ${PC_TIRPC_LIBRARY_DIRS} -+) -+ -+set(TIRPC_VERSION ${PC_TIRPC_VERSION}) -+ -+include(FindPackageHandleStandardArgs) -+ -+find_package_handle_standard_args(TIRPC -+ REQUIRED_VARS TIRPC_LIBRARIES TIRPC_INCLUDE_DIRS -+ VERSION_VAR TIRPC_VERSION -+) -+ -+mark_as_advanced(TIRPC_INCLUDE_DIRS TIRPC_LIBRARIES) -diff --git a/nfs/CMakeLists.txt b/nfs/CMakeLists.txt ---- a/nfs/CMakeLists.txt -+++ b/nfs/CMakeLists.txt -@@ -1,10 +1,12 @@ - ## Check for XDR functions --include(CheckFunctionExists) -+include(CheckSymbolExists) - --CHECK_FUNCTION_EXISTS(xdr_u_int64_t HAVE_XDR_U_INT64_T) --CHECK_FUNCTION_EXISTS(xdr_uint64_t HAVE_XDR_UINT64_T) --CHECK_FUNCTION_EXISTS(xdr_u_hyper HAVE_XDR_U_HYPER) --CHECK_FUNCTION_EXISTS(xdr_u_longlong_t HAVE_XDR_U_LONGLONG_T) -+set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${TIRPC_LIBRARIES}) -+set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${TIRPC_INCLUDE_DIRS}) -+check_symbol_exists(xdr_u_int64_t "rpc/xdr.h" HAVE_XDR_U_INT64_T) -+check_symbol_exists(xdr_uint64_t "rpc/xdr.h" HAVE_XDR_UINT64_T) -+check_symbol_exists(xdr_u_hyper "rpc/xdr.h" HAVE_XDR_U_HYPER) -+check_symbol_exists(xdr_u_longlong_t "rpc/xdr.h" HAVE_XDR_U_LONGLONG_T) - - if (NOT HAVE_XDR_U_INT64_T AND NOT HAVE_XDR_UINT64_T AND NOT HAVE_XDR_U_HYPER AND NOT HAVE_XDR_U_LONGLONG_T) - message(FATAL_ERROR "Could not find 64-bit XDR datatype functions!") -@@ -24,9 +26,10 @@ - endif (HAVE_XDR_U_LONGLONG_T) - - add_definitions(-DTRANSLATION_DOMAIN=\"kio5_nfs\") -+include_directories(${TIRPC_INCLUDE_DIRS}) - - add_library(kio_nfs MODULE kio_nfs.cpp nfsv2.cpp nfsv3.cpp rpc_nfs3_prot_xdr.c rpc_nfs2_prot_xdr.c) --target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network) -+target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network ${TIRPC_LIBRARIES}) - set_target_properties(kio_nfs PROPERTIES OUTPUT_NAME "nfs") - - install(TARGETS kio_nfs DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kio) - diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD index 8f56f536e..c10d2ecc7 100644 --- a/user/kio/APKBUILD +++ b/user/kio/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for data and file management" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f962631383719a7265a9b300881c812d00eda566198c1f68ad134a21407717245b49fd383901440a13d403245a0b9b3bab98432ec31c22e3dbe78b09240840e7 kio-5.68.0.tar.xz +sha512sums="2e89d38a70274d34d2d5c45abcf75c35cf93bbf9987b4b590e351620fa9b2ecf360e24cc8d2f79e3ef2ada6e2a5f364ee16d6062f77f01a1b285b2527618529c kio-5.72.0.tar.xz a21e700948317e460f273276aee36359b5bba8a69da1e43714169002ca4bf4538f1cc3663e823be30a0fa838d61103769afb7445caa6e8ceba29830f8532b6db strcpy-ppc.patch" diff --git a/user/kirigami-gallery/APKBUILD b/user/kirigami-gallery/APKBUILD new file mode 100644 index 000000000..348814521 --- /dev/null +++ b/user/kirigami-gallery/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kirigami-gallery +pkgver=20.04.3 +pkgrel=0 +pkgdesc="View examples of Kirigami components" +url="https://kde.org/applications/development/org.kde.kirigami2.gallery" +arch="all" +license="GPL-2.0-only" +depends="qt5-qtquickcontrols2 qt5-qtgraphicaleffects kirigami2" +makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev cmake extra-cmake-modules + kirigami2-dev qt5-qttools-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kirigami-gallery-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + -Bbuild . + make -C build +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test +} + +package() { + make DESTDIR="$pkgdir" -C build install +} + +sha512sums="860e4a09bdbf6a201ec3107b94a0cfcb6f956b26a93f9b01b89bc1ac9b67e13a798ced51d3d836ff7638ee352900eb4ae9085d266d0c3c07de407329713b4bd2 kirigami-gallery-20.04.3.tar.xz" diff --git a/user/kirigami2/APKBUILD b/user/kirigami2/APKBUILD index 4c0ec71dc..8c87980ba 100644 --- a/user/kirigami2/APKBUILD +++ b/user/kirigami2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kirigami2 -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for rapidly designing usable interfaces" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f9f84893dec3298066e7dd3f283a118a488403d23895992875b9229d26d3b3ad14ff14bdd7a5afc79591d96ac431556ea15fcb65dffe23c42a3144f1fbe88f21 kirigami2-5.68.0.tar.xz" +sha512sums="1de45469e5804af015dc9bed531dfbb739163e10226e71c0b6d9b5ca3a2b193dc0b75c543775c9795e27d7bef5f4351ab4e312c212d2fcf47966e614946e26e9 kirigami2-5.72.0.tar.xz" diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD index 8c1a5bbc1..d204153e9 100644 --- a/user/kiriki/APKBUILD +++ b/user/kiriki/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiriki -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Yahtzee-like dice game for one or more players" url="https://games.kde.org/game.php?game=kiriki" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1f225e0761b4e57141731ba7ae093fcc74f0c435fcf7f812c713652fd47115f93e89a3b6275509a8d90de3abf8755c9c3078b7f4510724420921c207a84f0ece kiriki-19.12.3.tar.xz" +sha512sums="5f4d6eff93c3432d5606644ac4a30b37d37fdadbb0f2a05b5fb115fa99d5f226078dce16aca0ab6549d82f77131c802e7bd97d4fa67dd739b7ce3945030c54a7 kiriki-20.04.3.tar.xz" diff --git a/user/kitemmodels/APKBUILD b/user/kitemmodels/APKBUILD index b329016d1..eff622e7c 100644 --- a/user/kitemmodels/APKBUILD +++ b/user/kitemmodels/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kitemmodels -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for sorting and searching objects" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dcdb8ad9783f84b8838d7c87516f4813b0a257eca4af83cbb2225d4d5f5d17eb21b25ce35afb7a4e5dc1471f56ffd8e2c5598d797cf21eb4baf613e5b132c421 kitemmodels-5.68.0.tar.xz" +sha512sums="ea296038c0e4e5fe2ee665d28320668616c5ffb94683b081f4bde8e04748a1312e447987ba16406271ba2a67487b2a5590a88b186de0c5149dfb96e80a773bb3 kitemmodels-5.72.0.tar.xz" diff --git a/user/kitemviews/APKBUILD b/user/kitemviews/APKBUILD index 1c340843c..feed1c343 100644 --- a/user/kitemviews/APKBUILD +++ b/user/kitemviews/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kitemviews -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for displaying collections of items" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59d744473ddb697e89adc54cd74c4b5688b7244b0ddb17bb26cb6bc762faf8b39018b4d4498c89a9c8df05e241d75bffe00d01c02bb0d70a8f9b1f64b7d9c313 kitemviews-5.68.0.tar.xz" +sha512sums="bb44a6dd41b1ccd8504458d7f28c3e0a8558d647aeea659158e27a051db86eb404b6f6b4ba080323266caa57ed0dc83d1d26ee99e47d305c7c215f2518854fab kitemviews-5.72.0.tar.xz" diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD index ed9df5a20..45f75c14e 100644 --- a/user/kiten/APKBUILD +++ b/user/kiten/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiten -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Japanese reference and study tool" url="https://www.kde.org/applications/education/kiten/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="74481a65c0823d2da598544fef6b5a8b7c5788adaf8804af29a0d4092767e67ff788a0a294f910ea63bc1ee7ceedb3ccf25fe8e929cc453e5ee85307fe851526 kiten-19.12.3.tar.xz" +sha512sums="7d2a11354ee2070ca02b733a2945530f0baaba0138b66973b1efac5bb9475a0bcead6951404af02d1e18d676c125c6e17f367f0d41e2b5e86bec874c44eddad6 kiten-20.04.3.tar.xz" diff --git a/user/kjobwidgets/APKBUILD b/user/kjobwidgets/APKBUILD index f1d68af28..737c56cc2 100644 --- a/user/kjobwidgets/APKBUILD +++ b/user/kjobwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjobwidgets -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework providing widgets that show job progress" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e1db735d465b3df1081bdde0eeefecbe6c86d20e520ef18842375f7c583abdfd8ee9017688de2ec193b220712f4c9742b379492612b55bc3495aea3996fed015 kjobwidgets-5.68.0.tar.xz" +sha512sums="c6382fe45243abb5fdf5d58052f519bfef79f7bb59c1ca2b5420e449364d6ac722a56a3cc66c03b3bd6be723cd1be1c0db7bab15ec0fd7c05a6074cf456b3efd kjobwidgets-5.72.0.tar.xz" diff --git a/user/kjs/APKBUILD b/user/kjs/APKBUILD index ff7755686..e01438a8c 100644 --- a/user/kjs/APKBUILD +++ b/user/kjs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjs -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Independent, free JavaScript engine" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0daf43ef5fb1c50114e3df6cdff19d162fb8d53b13188a201250c3e7fe1e1b72691389ae73ffaa5b2880343492f5f7efdd3f85245673edf2d6cf9b12b34e27f4 kjs-5.68.0.tar.xz" +sha512sums="e926c5251954186c7ce8568b64a921cf6e7a7c379e8b481aeca5e4ce6d9fa4d1bba11109305e41832d8a167905462d63c43765c73df4bd5ae3067696ab56f6b2 kjs-5.72.0.tar.xz" diff --git a/user/kjsembed/APKBUILD b/user/kjsembed/APKBUILD index 2e3c29afd..572aefdf0 100644 --- a/user/kjsembed/APKBUILD +++ b/user/kjsembed/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjsembed -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="JavaScript bindings for QObject" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2fcab72f43bf66f69f8b5a2463ca50baaacf239d84f9d99ba75f8e9661b30303cb8e2601d53280b54743436481a32d9294b97d3b4a9eaceb401274d0169bf1c0 kjsembed-5.68.0.tar.xz" +sha512sums="80761776f8ecc54a16d81749989b047cd3b088c0e26c1685a5de31d16f056f18407939055e88e7fd49a24f64e685b304eb42903f1a9c0c4f0eae8ba21664a6df kjsembed-5.72.0.tar.xz" diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD index 76e54d98d..eb25d2357 100644 --- a/user/kjumpingcube/APKBUILD +++ b/user/kjumpingcube/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjumpingcube -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Dice-driven tactical game" url="https://games.kde.org/game.php?game=kjumpingcube" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e2ca3330a6775393f7512b17ae3072b6586109450ae07689bcb4db00bc90c77e0d2c53406cfef766aabacae04a2c3d3fc989b382e8b45cf0daf22fd8a3a8f5ca kjumpingcube-19.12.3.tar.xz" +sha512sums="63a37453020c2305efd8833cc223f5709f08f0f0ef3ea1a5dc8e5b0aab763ec9180199b249c7e28119bc5c8db16d525fe25d606a5b6c5c057c8fa889ad5b3e45 kjumpingcube-20.04.3.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index ecfead943..b75d88a78 100644 --- a/user/kleopatra/APKBUILD +++ b/user/kleopatra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kleopatra -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e217a7a05d4ab22ba520c02a3a09abbcf3711de1ad2f42c79f3d375580fafbc3aa33a3cab05a5b6c201fb11c0b0b92a655a9566043dd0c400acbe3ead913f85a kleopatra-19.12.3.tar.xz" +sha512sums="b72ffb37b3116525d8a531c056a0457e6fb3257081d639fc1c175c8dd4566e4f3c0989cfc696c43c92b630b43dcad90f667a9f3496fede0121065553041c554a kleopatra-20.04.3.tar.xz" diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD index eb1357a8c..d407cf4ac 100644 --- a/user/klettres/APKBUILD +++ b/user/klettres/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klettres -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Learn alphabets for multiple languages" url="https://www.kde.org/applications/education/klettres/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1b26f5d4e3424e3870f8165736d21abcbf22cddd6d122cff8c0fa4fade58d1345052bfb4bd14bc8215bcd62fa490b92945f0c25b147fdd7facbabcb33e7cf8f3 klettres-19.12.3.tar.xz" +sha512sums="e8fedb9dbbb0f7d19cf7fe2f0687d56371eb716d8e40da762eef7798f40e462da137430497cc13331766c87652c9b32e65c839a0d7b5279e6ef36a59b0fc1ae4 klettres-20.04.3.tar.xz" diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD index 70c9f3b30..c59e7bd1a 100644 --- a/user/klickety/APKBUILD +++ b/user/klickety/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klickety -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Fun, simple colour matching game" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d1b4f59e3fd4ebaaf5f36fc4f3e4f7385fdc126df9fb3e1cb38104ed886a447995fed3e286c3e706318affcbb3572f41ea118d5b7a08afab6c571b6fa04110b0 klickety-19.12.3.tar.xz" +sha512sums="617b8d4d4a43a3056a36d29a36ff7c9948311f206567b4d8dba35ee55cf69059653e10de99820f2ea663e07e0427450a3a43c1a7146bdbc8c98dc269e7c6a870 klickety-20.04.3.tar.xz" diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD index 1f0f4c0ff..46d6187f0 100644 --- a/user/klines/APKBUILD +++ b/user/klines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klines -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple yet addictive single-player game" url="https://games.kde.org/game.php?game=klines" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2e272cbdffa530cefffa74726a46cc937b5d09307b69e98477a07d1eb61889d5b280a72a0ef129fb192733b284f86fe1e86f7128f15ca2f79f320633b4f7bcbf klines-19.12.3.tar.xz" +sha512sums="ccdb8191589ae8cbe3cd74d117acbb39828eb4e9c197e31af169f2acd824086f4e96adba59dd6bbc6051b78992899c234316a2ded5fcf5930cf83045fffbeb30 klines-20.04.3.tar.xz" diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index f2637de08..ac91f47b5 100644 --- a/user/kmag/APKBUILD +++ b/user/kmag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmag -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6f3dc983be2efe249e77b30429d4fb01f7b9c28552c56db27c1906de0312f1071658b9bc5fa9c5b5de35df54d7d50e9f1f540eec13cb40255b1ea9441db5afe3 kmag-19.12.3.tar.xz" +sha512sums="44806fa8130bc2fc96fbd7484da157c0a75e2f2a00c8f4b1193dd755f13f23a4f23dbb89aa51099011628a96e5126e5bdcf99f3344d0903ccf351b62e52b1909 kmag-20.04.3.tar.xz" diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD index 33970e576..115de67fc 100644 --- a/user/kmahjongg/APKBUILD +++ b/user/kmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmahjongg -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Mah Jongg desktop game" url="https://games.kde.org/game.php?game=kmahjongg" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5f62a61b221ff6059a95c781a04364e60023bcf3a450648b9cb831f29d545973d171422d9f26c2ea6a6765bbdbdeb78ce9f60f412c7d1e2564d91d285bfb77c5 kmahjongg-19.12.3.tar.xz" +sha512sums="4a59ce38dc083981ba619e1ed039159a8655884dd515cacd095a1ac1ab16f35bddee202eaf6cd41b56237f0ce6bf0e5a0f0ee853d80ba169e0bacbd4f57d3aa5 kmahjongg-20.04.3.tar.xz" diff --git a/user/kmailtransport/APKBUILD b/user/kmailtransport/APKBUILD new file mode 100644 index 000000000..1f862bce4 --- /dev/null +++ b/user/kmailtransport/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kmailtransport +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE email transport library" +url="https://kde.org/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kcmutils-dev kmime-dev + kwallet-dev akonadi-dev akonadi-mime-dev ksmtp-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kmailtransport-$pkgver.tar.xz + degoogled.patch + " + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + # Akonadi tests require D-Bus. + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'akonadi-*' +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="c49b5d5a4f58aab8bcf7a7a5bdc10df38d91caa61b05501cc57530e09a68046d527cd2bfe2fc634d64fde7fb24f41fb2ae657a9eb3bbb4b2dea2fede0ccadf93 kmailtransport-20.04.3.tar.xz +f775ef03389421b1818d5f781c65d45d4154ebcb28c3114164d698db7b7149ef56f7f5bd222ce49de143f06a8eb23b63ba69809791a010144075df42d4783385 degoogled.patch" diff --git a/user/kmailtransport/degoogled.patch b/user/kmailtransport/degoogled.patch new file mode 100644 index 000000000..1bb7086c5 --- /dev/null +++ b/user/kmailtransport/degoogled.patch @@ -0,0 +1,222 @@ +diff -Naur kmailtransport-20.04.3/CMakeLists.txt kmailtransport-degoogled/CMakeLists.txt +--- kmailtransport-20.04.3/CMakeLists.txt 2020-07-18 22:38:18.572259714 +0000 ++++ kmailtransport-degoogled/CMakeLists.txt 2020-07-18 22:38:06.963507959 +0000 +@@ -29,7 +29,6 @@ + set(AKONADI_LIB_VERSION "5.14.3") + set(AKONADIMIME_LIB_VERSION "5.14.3") + set(KSMTP_LIB_VERSION "5.14.3") +-set(KGAPI_LIB_VERSION "5.14.3") + + set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailTransport") + +@@ -43,7 +42,6 @@ + find_package(KF5Akonadi ${AKONADI_LIB_VERSION} CONFIG REQUIRED) + find_package(KF5AkonadiMime ${AKONADIMIME_LIB_VERSION} CONFIG REQUIRED) + find_package(KPimSMTP ${KSMTP_LIB_VERSION} CONFIG REQUIRED) +-find_package(KPimGAPI ${KGAPI_LIB_VERSION} CONFIG REQUIRED) + + option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE) + if (EXISTS "${CMAKE_SOURCE_DIR}/.git") +diff -Naur kmailtransport-20.04.3/src/kmailtransport/mailtransport.kcfg kmailtransport-degoogled/src/kmailtransport/mailtransport.kcfg +--- kmailtransport-20.04.3/src/kmailtransport/mailtransport.kcfg 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/mailtransport.kcfg 2020-07-18 22:35:49.028339597 +0000 +@@ -79,7 +79,6 @@ + <choice name="APOP" /> + <choice name="CLEAR" /> + <choice name="ANONYMOUS" /> +- <choice name="XOAUTH2" /> + </choices> + <default>PLAIN</default> + </entry> +diff -Naur kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/CMakeLists.txt kmailtransport-degoogled/src/kmailtransport/plugins/smtp/CMakeLists.txt +--- kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/CMakeLists.txt 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/plugins/smtp/CMakeLists.txt 2020-07-18 22:37:43.696009823 +0000 +@@ -27,5 +27,4 @@ + KF5::ConfigWidgets + KF5::KIOWidgets + KPim::SMTP +- KPim::GAPICore + ) +diff -Naur kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/autotests/CMakeLists.txt kmailtransport-degoogled/src/kmailtransport/plugins/smtp/autotests/CMakeLists.txt +--- kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/autotests/CMakeLists.txt 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/plugins/smtp/autotests/CMakeLists.txt 2020-07-18 22:37:50.785247545 +0000 +@@ -15,6 +15,5 @@ + KF5::ConfigWidgets + KF5::KIOWidgets + KPim::SMTP +- KPim::GAPICore + TEST_NAME smtpjobtest + ) +diff -Naur kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/smtpconfigwidget.cpp kmailtransport-degoogled/src/kmailtransport/plugins/smtp/smtpconfigwidget.cpp +--- kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/smtpconfigwidget.cpp 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/plugins/smtp/smtpconfigwidget.cpp 2020-07-18 22:37:12.009416961 +0000 +@@ -70,8 +70,7 @@ + << Transport::EnumAuthenticationType::CRAM_MD5 + << Transport::EnumAuthenticationType::DIGEST_MD5 + << Transport::EnumAuthenticationType::NTLM +- << Transport::EnumAuthenticationType::GSSAPI +- << Transport::EnumAuthenticationType::XOAUTH2; ++ << Transport::EnumAuthenticationType::GSSAPI; + sslCapa = tlsCapa = noEncCapa; + updateAuthCapbilities(); + } +diff -Naur kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/smtpjob.cpp kmailtransport-degoogled/src/kmailtransport/plugins/smtp/smtpjob.cpp +--- kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/smtpjob.cpp 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/plugins/smtp/smtpjob.cpp 2020-07-18 22:37:25.447971965 +0000 +@@ -38,13 +38,6 @@ + #include <KSMTP/LoginJob> + #include <KSMTP/SendJob> + +-#include <KGAPI/Account> +-#include <KGAPI/AuthJob> +-#include <KGAPI/AccountManager> +- +-#define GOOGLE_API_KEY QStringLiteral("554041944266.apps.googleusercontent.com") +-#define GOOGLE_API_SECRET QStringLiteral("mdT1DjzohxN3npUUzkENT0gO") +- + using namespace MailTransport; + + class SessionPool +@@ -196,50 +189,9 @@ + return; + } + +- if (transport()->authenticationType() == TransportBase::EnumAuthenticationType::XOAUTH2) { +- auto promise = KGAPI2::AccountManager::instance()->findAccount( +- GOOGLE_API_KEY, transport()->userName(), { KGAPI2::Account::mailScopeUrl() }); +- connect(promise, &KGAPI2::AccountPromise::finished, +- this, [forceRefresh, this](KGAPI2::AccountPromise *promise) { +- if (promise->account()) { +- if (forceRefresh) { +- promise = KGAPI2::AccountManager::instance()->refreshTokens( +- GOOGLE_API_KEY, GOOGLE_API_SECRET, transport()->userName()); +- } else { +- onTokenRequestFinished(promise); +- return; +- } +- } else { +- promise = KGAPI2::AccountManager::instance()->getAccount( +- GOOGLE_API_KEY, GOOGLE_API_SECRET, transport()->userName(), +- { KGAPI2::Account::mailScopeUrl() }); +- } +- connect(promise, &KGAPI2::AccountPromise::finished, +- this, &SmtpJob::onTokenRequestFinished); +- }); +- } else { +- startLoginJob(); +- } +-} +- +-void SmtpJob::onTokenRequestFinished(KGAPI2::AccountPromise *promise) +-{ +- if (promise->hasError()) { +- qCWarning(MAILTRANSPORT_SMTP_LOG) << "Error obtaining XOAUTH2 token:" << promise->errorText(); +- setError(KJob::UserDefinedError); +- setErrorText(promise->errorText()); +- emitResult(); +- return; +- } +- +- const auto account = promise->account(); +- const QString tokens = QStringLiteral("%1\001%2").arg(account->accessToken(), +- account->refreshToken()); +- transport()->setPassword(tokens); + startLoginJob(); + } + +- + void SmtpJob::startLoginJob() + { + if (!transport()->requiresAuthentication()) { +@@ -281,11 +233,7 @@ + } + } + +- if (transport()->authenticationType() == Transport::EnumAuthenticationType::XOAUTH2) { +- passwd = passwd.left(passwd.indexOf(QLatin1Char('\001'))); +- } else { +- passwd = transport()->password(); +- } ++ passwd = transport()->password(); + login->setUserName(transport()->userName()); + login->setPassword(passwd); + switch (transport()->authenticationType()) { +@@ -298,9 +246,6 @@ + case TransportBase::EnumAuthenticationType::CRAM_MD5: + login->setPreferedAuthMode(KSmtp::LoginJob::CramMD5); + break; +- case TransportBase::EnumAuthenticationType::XOAUTH2: +- login->setPreferedAuthMode(KSmtp::LoginJob::XOAuth2); +- break; + case TransportBase::EnumAuthenticationType::DIGEST_MD5: + login->setPreferedAuthMode(KSmtp::LoginJob::DigestMD5); + break; +diff -Naur kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/smtpjob.h kmailtransport-degoogled/src/kmailtransport/plugins/smtp/smtpjob.h +--- kmailtransport-20.04.3/src/kmailtransport/plugins/smtp/smtpjob.h 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/plugins/smtp/smtpjob.h 2020-07-18 22:37:38.056616206 +0000 +@@ -31,10 +31,6 @@ + class Slave; + } + +-namespace KGAPI2 { +-class AccountPromise; +-} +- + class SmtpJobPrivate; + + namespace MailTransport { +@@ -74,7 +70,6 @@ + + private: + void startPasswordRetrieval(bool forceRefresh = false); +- void onTokenRequestFinished(KGAPI2::AccountPromise *result); + void startSmtpJob(); + void startLoginJob(); + void startSendJob(); +diff -Naur kmailtransport-20.04.3/src/kmailtransport/servertest.cpp kmailtransport-degoogled/src/kmailtransport/servertest.cpp +--- kmailtransport-20.04.3/src/kmailtransport/servertest.cpp 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/servertest.cpp 2020-07-18 22:36:05.166604311 +0000 +@@ -80,10 +80,6 @@ + bool handleNntpConversation(MailTransport::Socket *socket, int type, int *stage, const QString &response, bool *shouldStartTLS); + QVector<int> parseAuthenticationList(const QStringList &authentications); + +- inline bool isGmail(const QString &server) const { +- return server.endsWith(QLatin1String("gmail.com")) || server.endsWith(QLatin1String("googlemail.com")); +- } +- + // slots + void slotNormalPossible(); + void slotNormalNotPossible(); +@@ -156,10 +152,6 @@ + result << Transport::EnumAuthenticationType::GSSAPI; + } else if (current == QLatin1String("ANONYMOUS")) { + result << Transport::EnumAuthenticationType::ANONYMOUS; +- } else if (current == QLatin1String("XOAUTH2")) { +- if (isGmail(server)) { +- result << Transport::EnumAuthenticationType::XOAUTH2; +- } + } + // APOP is handled by handlePopConversation() + } +@@ -183,9 +175,6 @@ + } + + QStringList protocols; +- if (isGmail(server)) { +- protocols << QStringLiteral("XOAUTH2"); +- } + + protocols << QStringLiteral("LOGIN") + << QStringLiteral("PLAIN") << QStringLiteral("CRAM-MD5") +diff -Naur kmailtransport-20.04.3/src/kmailtransport/transport.cpp kmailtransport-degoogled/src/kmailtransport/transport.cpp +--- kmailtransport-20.04.3/src/kmailtransport/transport.cpp 2020-06-18 06:30:31.000000000 +0000 ++++ kmailtransport-degoogled/src/kmailtransport/transport.cpp 2020-07-18 22:35:40.749229818 +0000 +@@ -142,8 +142,6 @@ + return QStringLiteral("APOP"); + case EnumAuthenticationType::ANONYMOUS: + return i18nc("Authentication method", "Anonymous"); +- case EnumAuthenticationType::XOAUTH2: +- return QStringLiteral("XOAUTH2"); + } + Q_ASSERT(false); + return QString(); diff --git a/user/kmediaplayer/APKBUILD b/user/kmediaplayer/APKBUILD index 4d5566cf1..ec0ed1dec 100644 --- a/user/kmediaplayer/APKBUILD +++ b/user/kmediaplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmediaplayer -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Media player framework for KDE 5" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ca3cb02ed23492495d2c5e2f8e75d542daae61542fa9dcc3f632b421be82cf4373d01afcba47512c029f03bb0418c09625da56b7090d84e5d3d763cf650652a6 kmediaplayer-5.68.0.tar.xz" +sha512sums="faa511b885eaaa0ba403911baa50c7c09519326d8c1f75d835be4c7cdfa2ddfd313a8e5293a1579b52b8abf91c06c0660f56ff45fb2c7db43348ea9b34c629f8 kmediaplayer-5.72.0.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index bd4858607..6a1e2be50 100644 --- a/user/kmime/APKBUILD +++ b/user/kmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmime -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ff150d983432cf8fff336f5dc24e02b798a26d51f0fb86ded1a04899bde529c1fde11f46202961b88f357aa311819fc876de5500f0d4cc29b43e28d048c15cb5 kmime-19.12.3.tar.xz" +sha512sums="2f97616a576f02e81ad0ae2386c4ba4570a1b068e6221837ac34552810e51aa75407a0b55078c0f104ac149720d2bfc61efe73cf045548a3f435b7028b186ddb kmime-20.04.3.tar.xz" diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD index 34c37429d..9781d28c6 100644 --- a/user/kmines/APKBUILD +++ b/user/kmines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmines -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Classic Minesweeper game" url="https://games.kde.org/game.php?game=kmines" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a0ab3ea04071887d6778caa846ecdd6bfbd16b54d1da8e4629bfe446261a7adfe0366255f8ff96364722db50b5a7fffd838537e6e4947bee7ab38c60bb39871b kmines-19.12.3.tar.xz" +sha512sums="cb13f8fcaae9134941d942c2b9457849fef0397bbada55387f47a3f0a147bd33e308cf41c78124ab4abbb249db0ece6fbbdb8e23e47a250895b2f4f10e9bc7c0 kmines-20.04.3.tar.xz" diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD index 664764ae1..e657b3061 100644 --- a/user/kmix/APKBUILD +++ b/user/kmix/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmix -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE sound mixer" url="https://www.kde.org/applications/multimedia/kmix/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bcf2cfabfd6832bab153c7c05ca3811dc6109629af524820f5ca0ffdc779d6dbbe1ddd4457ad289987bd97bcdebf59d55cd47d94e9af75c1cea89d62b233b5e2 kmix-19.12.3.tar.xz" +sha512sums="80387a63fb8a9155448ae0c78fbf214a471e148561609e20af61830fed5172f203585d7502ca2dc1ade404eb0e9259d81a84039ba99342a2e3bb9d5ed6ba3b78 kmix-20.04.3.tar.xz" diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index b483246a6..16cdc2214 100644 --- a/user/kmousetool/APKBUILD +++ b/user/kmousetool/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmousetool -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Tool to assist with clicking the mouse button" url="https://userbase.kde.org/KMouseTool" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bf453675ffa67c8be5e8d5da1ed99b4b803f7b34da483055442468b1fa55ebc0a5910813c2bb1654653807c637f43fd313a769448de85d5e16d3be7d066a9f00 kmousetool-19.12.3.tar.xz" +sha512sums="d949c5c54a3bbfdc1ae6ab1795efaa7d2f08a18310a528c196ebba97467894a32417be18c555bdbbf5e485012b4a5492451d4aba00e9cf1847e31a27abfa0f56 kmousetool-20.04.3.tar.xz" diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD index 71ed030d8..4f514d012 100644 --- a/user/kmplot/APKBUILD +++ b/user/kmplot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmplot -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Mathematical function plotter" url="https://www.kde.org/applications/education/kmplot/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="33a72a15d2b6045bd95d75dd70d44b75b2e045b55dacf787dbc4427e9ee26918b2dcce2a45ef98a9ff1d4ae2c1faf6fd69bcd21b18d3fac302687ac1872c9d95 kmplot-19.12.3.tar.xz" +sha512sums="06cb19924e6d460b52f419d29e028ab4cb13cab6ab14f1a27216d3d0ecd467676d337ec04d2c3fcc2b081853d3e0858ce2f2cc46279efc8fe692b8ab6a4ee5ff kmplot-20.04.3.tar.xz" diff --git a/user/knavalbattle/APKBUILD b/user/knavalbattle/APKBUILD index ca553dc8a..9e68ccbef 100644 --- a/user/knavalbattle/APKBUILD +++ b/user/knavalbattle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knavalbattle -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Ship sinking game from KDE" url="https://www.kde.org/applications/games/knavalbattle/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="01475c680c012324767f69c95582b14f913cd5f61d4e1bd4d05099949031ec396c5bc5904cc1d690ade4bf982f3d0c246c2859dfaefc6a6d93e7bda263703100 knavalbattle-19.12.3.tar.xz" +sha512sums="a4300f137f45adc62d1741239712e27e8033581f26c16feb8a32097b214c84e0e81602a27f7cfe078cf2c3d27896bd5f8b3a508e8fd8632c378c72c176ae4de4 knavalbattle-20.04.3.tar.xz" diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD index e40238805..459c1850d 100644 --- a/user/knetwalk/APKBUILD +++ b/user/knetwalk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knetwalk -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Build up a computer network by placing the wires correctly" url="https://www.kde.org/applications/games/knetwalk/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7b7d74d18f32d613ea32fb4bdd36d3b9c8523a6d93d88fff9ec34ea3eeef4bccd17922e177eee25720a0886b93cf1ffbab3a663a6a9c217181b180766504040e knetwalk-19.12.3.tar.xz" +sha512sums="b1466213ff25b5e8352669e4fbc82da444897934faa21e27b758b15d65e12c59384c5edac6400700c57b52a59a67a9452687f834000694a93503887b576296f3 knetwalk-20.04.3.tar.xz" diff --git a/user/knewstuff/APKBUILD b/user/knewstuff/APKBUILD index ec88617c9..38205c34d 100644 --- a/user/knewstuff/APKBUILD +++ b/user/knewstuff/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knewstuff -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for discovering and downloading plugins, themes, and more" url="https://www.kde.org/" @@ -12,7 +12,7 @@ depends_dev="qt5-qtbase-dev attica-dev kconfig-dev kservice-dev kxmlgui-dev openssl-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz qt5-qttools-dev karchive-dev kcompletion-dev kcoreaddons-dev kio-dev - ki18n-dev kiconthemes-dev kirigami2-dev kitemviews-dev + ki18n-dev kiconthemes-dev kirigami2-dev kitemviews-dev kpackage-dev ktextwidgets-dev kwidgetsaddons-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/knewstuff-$pkgver.tar.xz" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="37e4aabd22eddb1ad216bc07d275006215008845af7979ee5aed9123b7fc2b8742cd07259294876b03c04706a417f1f648f26ef6355f8937d8d9b927e9ce6e5d knewstuff-5.68.0.tar.xz" +sha512sums="dc2b89b7be62bd5cecce0b250ed1afd85f9c7a69715eda39e20ba25b6fd296d8fb7c50d29e9f885e24a986a4cd6fb3e16691194ee235ec4ec697350e6bf7f7d3 knewstuff-5.72.0.tar.xz" diff --git a/user/knotifications/APKBUILD b/user/knotifications/APKBUILD index 5952a53f6..38801651f 100644 --- a/user/knotifications/APKBUILD +++ b/user/knotifications/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knotifications -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for sending notifications to users" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="301b300a6da4631d49c1e0004938872091c857bfbf312ab85aaa8f0ce3ce28425cbcdfa380a7ed46211d6e95776ea91cf9fd2a5521add05d5956de5e97f3958e knotifications-5.68.0.tar.xz" +sha512sums="dfdbad7b477c03ce478da6452b0f7208364715240ff64ede5808e9ca87671e11c184cd3d134f58485551752e48cddd613403d00e3ba929110d6d9bd44a3b47bb knotifications-5.72.0.tar.xz" diff --git a/user/knotifyconfig/APKBUILD b/user/knotifyconfig/APKBUILD index 88bb47763..9c261cc79 100644 --- a/user/knotifyconfig/APKBUILD +++ b/user/knotifyconfig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knotifyconfig -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for configuring notifications" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de9269b4654fec05b7b87aaf91c35158b9fcc7a9afb18d42f7810c493dfdbe6ff82ed6fa044d369186b8fb087d524d6a5597365c3f967e95d93be54a03b13568 knotifyconfig-5.68.0.tar.xz" +sha512sums="c9bc7c2c2e4baf8ab06cdc9f7c419f7bff31eddfc2ab0208a79ad2b25903b76c952c73514fe30466c2cccd3f9226e5f4f288b313521b9acdedb726e46daed24f knotifyconfig-5.72.0.tar.xz" diff --git a/user/kolf/APKBUILD b/user/kolf/APKBUILD index 44e8fee1b..99a7f2219 100644 --- a/user/kolf/APKBUILD +++ b/user/kolf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolf -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="2D miniature golf game from KDE" url="https://www.kde.org/applications/games/kolf/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="447f8b8966bb8549802fbb5129f5178e182b12b546731c2cb7abf95a8777eb1ba7148cb155fe2428d5df3a47134b3dc695fb9b8bd60af5fba0dcdaeb483031ee kolf-19.12.3.tar.xz" +sha512sums="a1f5a1502a609f7e3ab9efefd22506a660d3d5b331fe7890ad52d3ef26372daf7d511ebe251aeb961343f54f04884d204fb2c675d5ee5b482152b8db46c32b37 kolf-20.04.3.tar.xz" diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD index 9585e0db6..516270fbc 100644 --- a/user/kollision/APKBUILD +++ b/user/kollision/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kollision -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple ball dodging game" url="https://games.kde.org/game.php?game=kollision" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ee37178bdae73db5f0b854dc892100306d9e53afaff8b631555ee50dfd198dee948bac68ad3839c4372055ac1cbf4a6c7610b62fdf511aa9ad5ded47bfdc8141 kollision-19.12.3.tar.xz" +sha512sums="42458c1308d785c06019da797bb1948066a82da5de2607878299e17766b2ab3279efdc2382276b4afca24dc3d922fa17837a93fca12e0879a3306b0fd68ce155 kollision-20.04.3.tar.xz" diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD index 0b1c2f4b6..d0a913d46 100644 --- a/user/kolourpaint/APKBUILD +++ b/user/kolourpaint/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolourpaint -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple painting program for KDE" url="http://kolourpaint.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8697ada6f407426bb48e8f62dcc9337630631a0aed17d5efd3390dfedd7039c3c7a9f7c88e46dfe2475fea5f25f73387a4dd40b624c8811fdb019e1e5f6e85bf kolourpaint-19.12.3.tar.xz" +sha512sums="fdefd7de9cbb65f791b1cd243d60a3ed81994b6ae4243a76efe024d7259e64f214f5bb6d67e6dfdc7339dd6dec93bb2498d0b4a3e80104b89022bd881ad0a1a1 kolourpaint-20.04.3.tar.xz" diff --git a/user/kompare/APKBUILD b/user/kompare/APKBUILD new file mode 100644 index 000000000..d1ea99957 --- /dev/null +++ b/user/kompare/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kompare +pkgver=20.04.3 +pkgrel=0 +pkgdesc="View and merge differences between files" +url="https://kde.org/applications/development/org.kde.kompare" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kauth-dev kcodecs-dev + kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev + kdoctools-dev kiconthemes-dev kitemviews-dev kjobwidgets-dev kparts-dev + kservice-dev ktexteditor-dev kwidgetsaddons-dev kwindowsystem-dev + kxmlgui-dev libkomparediff2-dev solid-dev sonnet-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kompare-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="5eb80a8e6aaa4bc05b24297f86ef5bb018f078a62d7eb99345ba49b0d95fe637eef75df0c5caf469c75f0b32c5d8afa6b40f10e3f3c9f2730a71469ead446ba2 kompare-20.04.3.tar.xz" diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD index d91dd1e03..b32e790bb 100644 --- a/user/konquest/APKBUILD +++ b/user/konquest/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=konquest -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Galactic strategy game" url="https://games.kde.org/game.php?game=konquest" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0be29664cc43f647caf0c4dea5f92e1f38bf708bb67923b8ff916a0e0aacb1e8896cb2c38279f803b368ff09ab253ec67e785964ccb23d32fac9bc4af5af4dd7 konquest-19.12.3.tar.xz" +sha512sums="df78794926668a2f58434df50a24d3093d2f60e2c29906d46b98b3323d5f766a774431bf4ae20740a8e55bc2a13047582f8607165d75f06c57b7942f1bb06e71 konquest-20.04.3.tar.xz" diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD index 5b700fe16..416e3729c 100644 --- a/user/konsole/APKBUILD +++ b/user/konsole/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=konsole -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Terminal emulator for Qt/KDE" url="https://konsole.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="980a7eab4efb219acdda8873318980ba14cf7d3fc4f78ac171f8ed1e11400b3028150140aac192820771a0ac8e596fc0f6497c4a44d74bbd1c421f72a39da289 konsole-19.12.3.tar.xz" +sha512sums="37607f7aab099b48478179eeb7e40e25a75c3c0b1b20496ae34ccd883d6f30644206d7ee95ebd56e9620b88b80700a03157671dfecf538767e6cad476632d813 konsole-20.04.3.tar.xz" diff --git a/user/kopete/APKBUILD b/user/kopete/APKBUILD new file mode 100644 index 000000000..8eb618417 --- /dev/null +++ b/user/kopete/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kopete +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE Instant Messenger (IM) client" +url="https://kde.org/applications/internet/org.kde.kopete" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules phonon-dev kcmutils-dev + kconfig-dev kcontacts-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev + kdelibs4support-dev kdoctools-dev kemoticons-dev khtml-dev ki18n-dev + knotifyconfig-dev kparts-dev ktexteditor-dev kwallet-dev libkleo-dev + kidentitymanagement-dev kpimtextedit-dev kdnssd-dev v4l-utils-dev + glib-dev alsa-lib-dev qca-dev speex-dev gpgme-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kopete-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="979f84c986f78aaab9bd23fb9e0df265ea8734d855b8370c93adbe037d6dfeb4271658dbd27c2b315b363731976a62750e2ed5dace45bc69e72c0645a533b5a0 kopete-20.04.3.tar.xz" diff --git a/user/kpackage/APKBUILD b/user/kpackage/APKBUILD index 29ad6f8da..c325648be 100644 --- a/user/kpackage/APKBUILD +++ b/user/kpackage/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpackage -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Frameworks for managing KDE data packages" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b77c8656c34a40962eed49e67a8368dcb43a842ad4009505778fefc90be96de2baed382c693eaf3ebf499b6f9e6117584cea839993e14ba94290a2c4f67f70ef kpackage-5.68.0.tar.xz" +sha512sums="dcf424964b2a1db2f94121a9aac687b70520d263883f8dc236e6143d9c54a7d055e6889ef468637a0c9f51740586723d080f0b1be67dce96404ab5b54da035a5 kpackage-5.72.0.tar.xz" diff --git a/user/kparts/APKBUILD b/user/kparts/APKBUILD index 37a314abc..389eab534 100644 --- a/user/kparts/APKBUILD +++ b/user/kparts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kparts -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for user interface components" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7fa0575ab194e8921b22f54f80f3aa85aa0ec608364d920e0202295f142ee7919fce0f79e1de840be5cc3fa6a2dc99e47e6cb94d95df5c7f151b76dcb713d20b kparts-5.68.0.tar.xz" +sha512sums="497cfb1d210d2947c3ef5212640ab918058a128f62815fa8f778c3525952584c9d4e2012269d5e9910379ca8e63a14e7388b8591b256323db87bd93bacd333e9 kparts-5.72.0.tar.xz" diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD index 7205b2642..895c4ac91 100644 --- a/user/kpat/APKBUILD +++ b/user/kpat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpat -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Collection of card games for KDE" url="https://games.kde.org/game.php?game=kpat" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c19651e717b7c99ccf533c72876ee9d848cfed04680b2e580f0e61028045bc1aecdf8d449d5f40a5e4f0d2de29207cb6d1344874126fa831462805c64b6b24c7 kpat-19.12.3.tar.xz" +sha512sums="d178a1360b37acdbba9fa33de56929b51c19b81ff6ee01d3f8780fe507800d9c9c1155bd0ae4e2f8b6baff5410133020c113aa6ed3f86aee2238f448216ce7ad kpat-20.04.3.tar.xz" diff --git a/user/kpeople/APKBUILD b/user/kpeople/APKBUILD index 5ac60fc11..79a5a68e5 100644 --- a/user/kpeople/APKBUILD +++ b/user/kpeople/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpeople -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Provides access to all contacts and groups them by physical person" url="https://api.kde.org/frameworks/kpeople/html/index.html" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9f249fa3cc21a378824d13050919554dec6058277e9c737730bedbc2651d1191833dd7f5ecbfb74158c78808504a300861b5463e23058fef522e1ae3f21aa8e1 kpeople-5.68.0.tar.xz +sha512sums="3310188ef1ab1d1023f8997314481228f9e875a40ef4f40dc517f578c53ba84866accfdac70b0d79167eba8dc1a6d55d60117ba78279d9ced04e554ecba17842 kpeople-5.72.0.tar.xz 77df2aefcdfb8e5b9c2fef7a6bfd79066819b0c6958b9e2f8fe94860155aaae9c284a110a15a189cd5b423dc7aa017b952196370f60a4fb382ed7eb77f15abd9 dont-crash-test.patch" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index 40a274b58..269d4bdbc 100644 --- a/user/kpimtextedit/APKBUILD +++ b/user/kpimtextedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpimtextedit -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Text editor for Personal Information Managers (PIMs)" url="https://pim.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="116d54e99f89e064acd6a699155b395327a4e64b8e63087f83cad8e652cbc8f7fa6a892f607f21bc7d6a998e5e7ba8e472a95ddfc490534602198930bac30a6a kpimtextedit-19.12.3.tar.xz" +sha512sums="0d7e0d84d9c25dbeb28413350e7f17f45c643e5335cd26fac28fb5e4e2bc2797d223f9137cbfc2f9fe2f13806ab321ba2a058b7dc40c02762707170285336abe kpimtextedit-20.04.3.tar.xz" diff --git a/user/kplotting/APKBUILD b/user/kplotting/APKBUILD index 1661cf6f1..ec59bf26e 100644 --- a/user/kplotting/APKBUILD +++ b/user/kplotting/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kplotting -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for data plotting functions" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f4b5158afc2eb4d38278618a475dbc26482682cc77d7ae0e3bb799b25a43f156946791156f73a1fd030b7602fb691364e491bef4686d36bc4f955ac2b8033e1b kplotting-5.68.0.tar.xz" +sha512sums="cea99437675f47021573fb7bf4ec493b76a231c387bb88b198ceb2d543e87ebe414ab8c33bc43d1e0f658e86936b363f06af8012f17a3ace3aa684c45d110580 kplotting-5.72.0.tar.xz" diff --git a/user/kpty/APKBUILD b/user/kpty/APKBUILD index e71c433e1..d2a55162d 100644 --- a/user/kpty/APKBUILD +++ b/user/kpty/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpty -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for implementing terminal emulation" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9ea1452994e66d92a99595f4cbf53f94abe3af4d35f7adb57deb1a2ae7ab6d95524a7e8bd82af90ca7ade39644f6af9002ebbfee751a0395a705e38b1e8b4e23 kpty-5.68.0.tar.xz" +sha512sums="1c80aed7b5ded81434734eebeb297eaddefe4411e5470a98363b43a7ecf89429048dcb56031c553004f5a96ac76c243fdc98f1446608ecbbb295e2c060ebfd4b kpty-5.72.0.tar.xz" diff --git a/user/kquickcharts/APKBUILD b/user/kquickcharts/APKBUILD index 7adaa073f..7bc3c5281 100644 --- a/user/kquickcharts/APKBUILD +++ b/user/kquickcharts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kquickcharts -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="A QtQuick plugin providing high-performance charts" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="90d50f5aa211d97656e3b8c1dcc0c069675e432ebaf0c33b0fa956e69319d670feaaedd38d24e587f3188b8cf8816d1d0fbdb33010447b3c4c1175ab9062f5c7 kquickcharts-5.68.0.tar.xz" +sha512sums="170ef5c5928e0949584dc4905a86893a477a6922f85eccb6d5d70938b8808bfc67a534eb88a712ef7e4e7b64a65790ac0eb08035b9cb2dc833f5b458bb3ab44f kquickcharts-5.72.0.tar.xz" diff --git a/user/krb5/APKBUILD b/user/krb5/APKBUILD index 24269bd32..731bc7c08 100644 --- a/user/krb5/APKBUILD +++ b/user/krb5/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krb5 -pkgver=1.17 +pkgver=1.18.2 pkgrel=0 case $pkgver in *.*.*) _ver=${pkgver%.*};; @@ -87,7 +87,7 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="7462a578b936bd17f155a362dbb5d388e157a80a096549028be6c55400b11361c7f8a28e424fd5674801873651df4e694d536cae66728b7ae5e840e532358c52 krb5-1.17.tar.gz +sha512sums="7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c krb5-1.18.2.tar.gz 5a3782ff17b383f8cd0415fd13538ab56afd788130d6ad640e9f2682b7deaae7f25713ce358058ed771091040dccf62a3bc87e6fd473d505ec189a95debcc801 mit-krb5_krb5-config_LDFLAGS.patch 43b9885b7eb8d0d60920def688de482f2b1701288f9acb1bb21dc76b2395428ff304961959eb04ba5eafd0412bae35668d6d2c8223424b9337bc051eadf51682 krb5kadmind.initd ede15f15bbbc9d0227235067abe15245bb9713aea260d397379c63275ce74aea0db6c91c15d599e40c6e89612d76f3a0f8fdd21cbafa3f30d426d4310d3e2cec krb5kdc.initd diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD index 603f52565..b84f7999d 100644 --- a/user/krdc/APKBUILD +++ b/user/krdc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krdc -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="View and control remote desktops (RDP and VNC)" url="https://www.kde.org/applications/internet/krdc/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f752180980eebc9aaee92180d3bbc9e4db723ef0ed637b3ec66a5944e30eba3c224972d4e8f543ee1c32a4e62a0d90d37c4f82f575e94a3ac8d9dbe5feb63474 krdc-19.12.3.tar.xz" +sha512sums="f7ff9be6ffa612e8da0766309f812e7041393eb9b5ff4b1cb58385f1f754c0851357a4509bff7eea76e0e035bcefac9580415710561f1369dab1dd4e9f86a4ff krdc-20.04.3.tar.xz" diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD index b2e8a65a9..cb3c0246d 100644 --- a/user/kreversi/APKBUILD +++ b/user/kreversi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kreversi -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Reversi game" url="https://games.kde.org/game.php?game=kreversi" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="244edb7cc223f8882b4f2ce77318f91de79d360ccace318fc3f441fde30aad2438e672693f449fcf7a27da72736d50aef26889ac13823a3b9c5517b015c5cda0 kreversi-19.12.3.tar.xz" +sha512sums="fe211d107b0ba1ce7b3edd0c108be13cbfc7d6a3257c62e5536a248cfae6953e10c7ac0ce47d021bd7dc3e1c6d77799919939285e5d73fc466fcfec6d887fbc5 kreversi-20.04.3.tar.xz" diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD index 1c606cb71..c968718d9 100644 --- a/user/krfb/APKBUILD +++ b/user/krfb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krfb -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Share your screen with others for remote watching or assistance" url="https://www.kde.org/applications/system/krfb/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d4cd5957034a42164756e226c8596816bcb19aca72f3b4b1af6967c4ab9881aaeed50c396630dd434dd9234fc3f8ddfd0783926f5e7f72a7de101a0c98ad4f36 krfb-19.12.3.tar.xz" +sha512sums="91a8281fb6e9756de262fcc02f98863b1ec74a30a2ed6e2a51a73808e293680ac3dbee555af4dd007f9c3ecfd6163c7328cabf4f6cc31fa55932b7db56cad65e krfb-20.04.3.tar.xz" diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD index 0150420b8..8148d50fd 100644 --- a/user/krita/APKBUILD +++ b/user/krita/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krita -pkgver=4.2.8.2 +pkgver=4.3.0 pkgrel=0 pkgdesc="Digital painting program by KDE" url="https://krita.org/" @@ -17,7 +17,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev kio-dev eigen-dev exiv2-dev lcms2-dev poppler-qt5-dev gsl-dev libxi-dev libraw-dev quazip-dev giflib-dev poppler-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/krita/4.2.8/krita-$pkgver.tar.gz +source="https://download.kde.org/stable/krita/4.3.0/krita-$pkgver.tar.gz fix-nullptr-deref.patch " @@ -47,5 +47,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="aab4096bef81a7205a04e3a4080d95ccbd1ba84a0cdb959fca8a0e6e7e8183f79857bde0b301dd9db642bd71042ef43b99768dbb7cd91d32e93df3da391d1a4b krita-4.2.8.2.tar.gz +sha512sums="2f60d407a9e143aac289b16ba442619660d3ec56492c5a85095004d724378a682661d4594a0c3aec9b10cc225c45058d7890be3d05ce4460fa807eca59020509 krita-4.3.0.tar.gz fd43f21da937c29f550e24d459e83ad9714befe82fe0cae493b28cad6526b11f80a5e3d350be1fa910a62c07284774a6f5fac4bbf4801be378987fbfaef61254 fix-nullptr-deref.patch" diff --git a/user/kross/APKBUILD b/user/kross/APKBUILD index f9aa5ceca..150e97f4d 100644 --- a/user/kross/APKBUILD +++ b/user/kross/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kross -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for scripting KDE applications" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3e610248a2f6328b805d59fe8007bba02bd7af02edc93756626f5b3449a494207ed73c27ff504b85aa2d03c70f1a78b8a60289f39cdd6afdfe53c5386e429f23 kross-5.68.0.tar.xz" +sha512sums="812680b9cb7fccb8056bc32e0fc0b46910a24979cce9f25ab9ae87c5302086ea7b8bbc2758cfd888406b368f385b35fe5389c2f33b7b95c751a0dfb707dea83b kross-5.72.0.tar.xz" diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD index b87df305b..f41e6fdc7 100644 --- a/user/kruler/APKBUILD +++ b/user/kruler/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kruler -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Screen ruler" url="https://www.kde.org/applications/graphics/kruler/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="34f9cd2c9076594f8984428eac971ceed91798011f6aeb7ec2ba8c8fbec1829a29da8e603a5a66a0e41e423bc81d181c549c43d2529aa23cb421f0267b5d80c0 kruler-19.12.3.tar.xz" +sha512sums="c6b683dfab8ee15d84723af481c0ea031f96266b321135a932f6442081a97f9d016392e57c789fc2ca1c0585286bdac230ae9d1cfa4cd18c4a898d7e92754396 kruler-20.04.3.tar.xz" diff --git a/user/krunner/APKBUILD b/user/krunner/APKBUILD index 9d291a1f2..52f97afc4 100644 --- a/user/krunner/APKBUILD +++ b/user/krunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krunner -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Parallel query system" url="https://api.kde.org/frameworks/krunner/html/index.html" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f3c7bb4afbd1b30405d9ab5265804b62e2928249d4334bbbcd1094cf28c8d9c587995182008f0c8fb4eab8a7a0ace5a18b9aa518139481b786cd54e5f081b47 krunner-5.68.0.tar.xz" +sha512sums="60102796a301d839ee29724111f1ef22a0b6b1bf7bf11d5952d219106ef38dd4278dbadd05043814c3d2d5b619c68252d9de46631a9bb6577cfd0a2e8ada2547 krunner-5.72.0.tar.xz" diff --git a/user/kservice/APKBUILD b/user/kservice/APKBUILD index d8a092326..7d5e0e5c6 100644 --- a/user/kservice/APKBUILD +++ b/user/kservice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kservice -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for implementing plugins and services" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="3581b7ec51317a0b2b63fac7e0491e89da8ba03cd90ba0ef745fc84792af4cd247c80eeec0396069a26f8bc73b971f8444e80ac7749d05b379c29138df6725ec kservice-5.68.0.tar.xz" +sha512sums="b6e7d819dcc1747d6ddaa1936cb52f910b7f0e4fa6db792420bd35c8c0afb6cc670375c4618a6703ca046cb440fa9c45b860b6eaa2905c0a264b9c7ed622c7e3 kservice-5.72.0.tar.xz" diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD index 9015a6e74..8f8c031b9 100644 --- a/user/kshisen/APKBUILD +++ b/user/kshisen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kshisen -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Mixture of Solitaire and Mah Jongg" url="https://games.kde.org/game.php?game=kshisen" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32e842b7c9de58ac8d9715c1f947295a73d88b940727990a8c5d7981b807171849eb95d68a623ec6c1819525cd0271777f283a40672a97b80278d4a6074557eb kshisen-19.12.3.tar.xz" +sha512sums="15ab1702a08b9616d9fd84f9707cf4344d327410283e785bb47eb9f9126319c0e00f5f480830198bb6db426e1abc75d92e5c142aec37ec01b072c840d3c735c4 kshisen-20.04.3.tar.xz" diff --git a/user/ksirk/APKBUILD b/user/ksirk/APKBUILD index 0319102ea..bdb1416a2 100644 --- a/user/ksirk/APKBUILD +++ b/user/ksirk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksirk -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Strategy game from KDE" url="https://www.kde.org/applications/games/ksirk/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="105442d9c3229cda57d4bafa5f77b5fbf639d6488eabfe405ee82ce0365781efc17526a3dc903a1c730617474c61f037fd81059b72227575920769fba7bff8bb ksirk-19.12.3.tar.xz" +sha512sums="a0f7e1bd3e3b9acf0927bb15b65a9d9cc8f4b9411ecf22c6f17f75402e991526d97defd64f5d98dda4a4f41690c0ff1835e0fef0805c5074b029d47b03b38edc ksirk-20.04.3.tar.xz" diff --git a/user/ksmtp/APKBUILD b/user/ksmtp/APKBUILD new file mode 100644 index 000000000..3ca2dcbc2 --- /dev/null +++ b/user/ksmtp/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ksmtp +pkgver=20.04.3 +pkgrel=0 +pkgdesc="SMTP library for KDE" +url="https://kde.org/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kauth-dev kcodecs-dev + kcoreaddons-dev ki18n-dev kio-dev kjobwidgets-dev kservice-dev + solid-dev cyrus-sasl-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/ksmtp-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="c9794ca8dd93e25c79dd22fab38f71a421da1612658830ffe87cc8e751db9624a3d1924edd52d6fdaa97044e4d1accef5b6807f9461f857bedccc00f4d54f109 ksmtp-20.04.3.tar.xz" diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD index c8340b11f..867a3b7e3 100644 --- a/user/ksnakeduel/APKBUILD +++ b/user/ksnakeduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksnakeduel -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Tron-like game" url="https://www.kde.org/applications/games/ksnakeduel/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d3923b4614a9134595aeca0d831f473b39ea94651bd2a997b3cafc98feda141991dec273becc1dfaa9cf8651fc2a7bd13fea31b84529ca0d4966a6dd84d30da6 ksnakeduel-19.12.3.tar.xz" +sha512sums="43e336c8eb8a7fb7390d257f176b8f451fc940126fda75a2daaebbbc5fa18cfb0bdb4b7221fb919486575aff7d5fcb7d8efd4812ce6b4065f318554b5461eb6a ksnakeduel-20.04.3.tar.xz" diff --git a/user/kspaceduel/APKBUILD b/user/kspaceduel/APKBUILD index 5405515bb..0723fda19 100644 --- a/user/kspaceduel/APKBUILD +++ b/user/kspaceduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kspaceduel -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Space arcade game from KDE" url="https://www.kde.org/applications/games/kspaceduel/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a7965b55fd521bb5aba8c9aa9dfaa1e86c3d88fddbd76176dd4fcb52db1e76fd1bf4c44aa255a46568c812729efb76e4becc532b48761adcec91f834cb610ca1 kspaceduel-19.12.3.tar.xz" +sha512sums="c62b03feb0b91e2e061d0e5b4a342f9f5e6f79f8336c04bf72ea6dc83ec9b5f6908a95aefaeff9583b26e7138f296147c79024baa6b3a5e7d6445c516bbe255b kspaceduel-20.04.3.tar.xz" diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD index 847a5a2ab..7078222d4 100644 --- a/user/ksquares/APKBUILD +++ b/user/ksquares/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksquares -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Fun and exciting game of Dots and Boxes" url="https://games.kde.org/game.php?game=ksquares" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c0b4fd109f2873da18a9ae5df837eb0574419ae8cac0e885bcc5c3ac577a0bd2dc57105147aab46e58fab7ee66dd19e68ea1d1686f06fb8dc69d6e4e1afd6760 ksquares-19.12.3.tar.xz" +sha512sums="a334f0b990edecbe03441a9595242b057d26ff837014a82dfb8b61491b563c9a0821d7f08b40fd5c667ea1afb755c47f01a5ff3b47ec1c16fa3798bfa3e8f3d5 ksquares-20.04.3.tar.xz" diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD index 3792a7b3b..df4488d3d 100644 --- a/user/kstars/APKBUILD +++ b/user/kstars/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kstars -pkgver=3.4.1 +pkgver=3.4.2 pkgrel=0 pkgdesc="Desktop planetarium" url="https://www.kde.org/applications/education/kstars/" arch="all" +options="!check" # Requires FITS library. license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev @@ -27,6 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_TESTING:BOOL=OFF \ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ ${CMAKE_CROSSOPTS} \ -Bbuild @@ -41,4 +43,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f6380ad578d1fd39bf1cb115fb47dd519fe7ba3067e55ec9296d01559cba529f0f6a3aba363c2c107f3c0648db0d733d34de8c7b196c748f409b8d006ebe26af kstars-3.4.1.tar.xz" +sha512sums="10e806c82b0704c6185c852c74035e7f74ef29d921df3bcde07cb161d86257e7deb4b13941294b699ed46ae5c8197a2f76dcd45599f0222139c584a626881304 kstars-3.4.2.tar.xz" diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD index e6b2ab920..3b8168ebf 100644 --- a/user/ksudoku/APKBUILD +++ b/user/ksudoku/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksudoku -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Desktop Sudoku (symbol placement / logic) game" url="https://games.kde.org/game.php?game=ksudoku" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f9bd802525ce6a3215f92c142322143532d37a82dff8f4502eb848280ee74e712fe540ad40f477e99854a23fecde777dd5de7f6b5185a277b21908703b88f64 ksudoku-19.12.3.tar.xz" +sha512sums="39002ce3aefcee4d1f166dd5178dc961df2530643b95db53c4eca8a8335c4d4a233524d725bbebc376d93f1326de164b423ecd4b5a84b3dbe50e421a57eb1abd ksudoku-20.04.3.tar.xz" diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD index e6616b810..bd8442053 100644 --- a/user/ksystemlog/APKBUILD +++ b/user/ksystemlog/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksystemlog -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Friendly, powerful system log viewer tool" url="https://www.kde.org/applications/system/ksystemlog/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="88b12d12210b628d6470b1a73f28f0f01946158c3bb35be6bda14cfe5d3b75990149d2bf7f2077d030f5bc34df0dfea1192161c27128927d62d11d2bde8de530 ksystemlog-19.12.3.tar.xz" +sha512sums="05a358eac885d1ca2ca8ea0f2a49fc98b6310ff17c9e830f2a931e5c20ba38bbbf0b7597029549ff4ee9a2bd7e769da5b3bb7ed57b9a304be9202ebea20eca2e ksystemlog-20.04.3.tar.xz" diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD index 9e99e9e6a..707e52353 100644 --- a/user/kteatime/APKBUILD +++ b/user/kteatime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kteatime -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Steep responsibly" url="https://www.kde.org/applications/games/kteatime/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e35cacc4c4fa2c1a37915134687a43225701933f15683916ae094a0cc5fa033da6dc3f34e6116490c0d6d1532755dc7ee16046e8e2e0b853529cb4626a89df77 kteatime-19.12.3.tar.xz" +sha512sums="1b9f9ffdc2e3b2d1fb1c63459073067af2afd9feed6e437efcd593a61fd6c9dd8054dc4c4e8d40a356abefdae5288d68465fd5e584b0e5f0770b5d4de98d94f7 kteatime-20.04.3.tar.xz" diff --git a/user/ktexteditor/APKBUILD b/user/ktexteditor/APKBUILD index c1f2a264c..ef5e75a1e 100644 --- a/user/ktexteditor/APKBUILD +++ b/user/ktexteditor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktexteditor -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Reusable, programmable text editor widget" url="https://www.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="88cf4826cd0d0811a1f1d9193fb505e1fd6221192b22b14cca1d491f923dbad1816b9c29d540ff733c2f165c3ac456ac3b425c318a45b9aefd506a2b36e6fb43 ktexteditor-5.68.0.tar.xz" +sha512sums="8dca328976699af3cb726f28a78caa11986056b2018a6c5e6d614e63ad0c247d69543aff72766cb000b7cf3fa30505889c95af7fde1b11fdd87bb21d69591521 ktexteditor-5.72.0.tar.xz" diff --git a/user/ktextwidgets/APKBUILD b/user/ktextwidgets/APKBUILD index a9d90c430..af590223e 100644 --- a/user/ktextwidgets/APKBUILD +++ b/user/ktextwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktextwidgets -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework providing widgets for text manipulation" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="75bcf0f0f3ff55770768a95eb3376cf97f6f56cf97dd0223d5615c29bbdf98692db4a1179c802a848a88aeb65a3f1ba2cad0599cf983351cdcf2be555c32bbef ktextwidgets-5.68.0.tar.xz" +sha512sums="7ec2e3624aff5cc8e9d806f884eb98478e8e44c814e7a4912f14fffb3f4ccfb212ce6c40a66e923b038b10b1a66b8b322876960f330209e508ee839be0e3e3a1 ktextwidgets-5.72.0.tar.xz" diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index 30d577ba8..cc802e222 100644 --- a/user/ktimer/APKBUILD +++ b/user/ktimer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktimer -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Tool to execute programs after some time" url="https://www.kde.org/applications/utilities/ktimer/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="da075774292f911cdfbc28d3ce76b53cf6e9c3a91ff42c8b18334e8c680a87d08e3f22faf9b646342a7318c7096ed14de740e9e3558a71aed6ca7449b6d11358 ktimer-19.12.3.tar.xz" +sha512sums="313ff9e8627cb0553c6e4a9b60349a842c016f9f20f952bcf1347c2500641242f095226e85eb66330a6d6d5292de8d0b26ef74127ac17e226337324e3f517eb6 ktimer-20.04.3.tar.xz" diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD index d64205f64..7f0c2af1a 100644 --- a/user/ktorrent/APKBUILD +++ b/user/ktorrent/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktorrent -pkgver=5.1.2 +pkgver=5.2.0 pkgrel=0 pkgdesc="BitTorrent client by KDE" url="https://www.kde.org/applications/internet/ktorrent/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621 ktorrent-5.1.2.tar.xz" +sha512sums="141976612cfe6bf4bd06e96842d7bc51ced7a3ab8e13c25446a00c031054698f851fbb1a31f3425dda5a428408bb1ceb51a4a420eaf2e79193b17a0cc7d7a387 ktorrent-5.2.0.tar.xz" diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD index f54a8937b..232a289d1 100644 --- a/user/ktouch/APKBUILD +++ b/user/ktouch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktouch -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Touch typing tutor" url="https://www.kde.org/applications/education/ktouch/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1a3dc798e5e5c8d63419fbc2d9a70e3f872f00527575dd04cd5a8770fce0412a5445cd57c8716b9a6d613a360895f1f1e269acd963fcb3ccc99161b4efb412c6 ktouch-19.12.3.tar.xz" +sha512sums="3ae31fc5bcb439ae0ac6fdf736fd79858e6aa24841d76f348efa12d085744594f6965608e01309b704a5500fdf91cc3b121de418a921c021f1bf4eeba42cb124 ktouch-20.04.3.tar.xz" diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD index abf428ce8..b87bb3d68 100644 --- a/user/ktuberling/APKBUILD +++ b/user/ktuberling/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktuberling -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Simple constructor game" url="https://games.kde.org/game.php?game=ktuberling" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="35d9038db7ca568d4666c126421f20eb24ff5a84c790892d1bf772f14a346cebb4761979772f5a62be4e3777698f0c866d3057dd23a24f7acf6d4a14063e818f ktuberling-19.12.3.tar.xz" +sha512sums="12ebc06af1eef962fd2ce2e578ebed4512a2d5d829daaaa6027e85bb779f61305a29d0d12caa0aad6fac7ecb555c1d58b2a09d6ea1cb6724149c3d3793f12c6f ktuberling-20.04.3.tar.xz" diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD index 8720725d7..140336d51 100644 --- a/user/kturtle/APKBUILD +++ b/user/kturtle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kturtle -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Educational programming environment" url="https://www.kde.org/applications/education/kturtle/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dbf30fab10d9b49b03941309013f29f1481bf4ac8db1f9d5ad10fbaddd6ec6cf3adfd5a59c35163b47cdc3fd0526050434e2f44a05e903ae3b42968bd358151a kturtle-19.12.3.tar.xz" +sha512sums="4e6948dc9fb2b9d14bb823d2f25651352ab7630e82d0d883fcdcd90b7a159920bbd0795873cb8f987775e5319d08f34de61b1d17c1522b887ce6228bd44bb91f kturtle-20.04.3.tar.xz" diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD index f8630b026..287034f55 100644 --- a/user/kubrick/APKBUILD +++ b/user/kubrick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kubrick -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="3D cube puzzle solving game" url="https://www.kde.org/applications/games/kubrick/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ce6c6163f8dbc36900b02126636219c0e1c0cd150deace706b7d622786e72ee2b77e8f1764e490d3a809c293f8fa81a13783153b79fa84293a69f1e85e94a3a9 kubrick-19.12.3.tar.xz" +sha512sums="aa0c6b0003643fcd38b5e9953be373ecf5957458c73b77d0722c553f5fc806daa1102aee5b31664e459ef98e461efbde7dfdcfbe59f2d7b24236398f6ceb703d kubrick-20.04.3.tar.xz" diff --git a/user/kunitconversion/APKBUILD b/user/kunitconversion/APKBUILD index 5994321cd..559ad0d87 100644 --- a/user/kunitconversion/APKBUILD +++ b/user/kunitconversion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kunitconversion -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Convert between metric and imperial" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="38e26fc71d9080e876db1f458d0f76d4a102cb40d506c721e4f1fd53dcf7a5fe1de963b3c2aeb16e51c903208c976d6455b34787670032e33c88f30a9e5a15b9 kunitconversion-5.68.0.tar.xz" +sha512sums="c4516d1560e65418545af14a2380e72e82ffd08977a94f7453edec74b6ab55d2c43646d7f9ac614feb3a1368cfa780e5d7e9641dc7333cc4db558c96bab6ac88 kunitconversion-5.72.0.tar.xz" diff --git a/user/kwallet/APKBUILD b/user/kwallet/APKBUILD index 3c1b192f7..fcd069e39 100644 --- a/user/kwallet/APKBUILD +++ b/user/kwallet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwallet -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Secure storage system for passwords built atop Qt" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a0a410a9040cb8f157ff01cfbc976f49dac90d0fda0b4dbc8e760cb0549073ed9be5d442bde03b4f6bf27aa16a397671a1a0285c179aea3760bbf441e22cf004 kwallet-5.68.0.tar.xz -edca12963a5db9db05b3b4d581c1b970569f3b96dc672422e561c189c9024b69710732281f054514ce3d596688a5b0ba512766f4fd768eea8e00a18dcfd59179 kwallet-5.22.0-blowfish-endianness.patch" +sha512sums="b7f76434fac04ef188bb032cd515db970ec38c8be782ab6a959bbdd30e41d61ab062f3ff20529da55e0dd757078964ebaba4c0df8cc38bafe83bfc3257cc2a0e kwallet-5.72.0.tar.xz +229e001354c00832d15442b6ee2cd6062e759a560d67e9ded024735e5012aeec022f8e12ed346e090bbe2967c3bd335e5dd73b3fe5b7da93b89f1a7842411e3e kwallet-5.22.0-blowfish-endianness.patch" diff --git a/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch b/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch index 9d76cc25c..81c475c28 100644 --- a/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch +++ b/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch @@ -1,6 +1,6 @@ --- kwallet-5.29.0/src/runtime/kwalletd/backend/blowfish.cc.old 2016-12-03 21:12:17.000000000 +0000 +++ kwallet-5.29.0/src/runtime/kwalletd/backend/blowfish.cc 2017-01-29 18:02:10.193293280 +0000 -@@ -31,9 +31,7 @@ +@@ -31,12 +31,7 @@ #include "blowfishtables.h" @@ -8,6 +8,9 @@ -// We need to live with -Wundef until someone really figures out the problem. -//#include <QtCore/qglobal.h> // for Q_BYTE_ORDER and friends +#include <QtGlobal> // for Q_BYTE_ORDER and friends +-// Workaround for -Wundef +-#define Q_BIG_ENDIAN 1 +-#define Q_BYTE_ORDER Q_BIG_ENDIAN BlowFish::BlowFish() { diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index ddee7952f..ef25ed3a2 100644 --- a/user/kwalletmanager/APKBUILD +++ b/user/kwalletmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwalletmanager -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Manage KDE wallets" url="https://www.kde.org/applications/system/kwalletmanager5" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32cf7765c68a7cd4c44e4ce081ddd02de238fafc3644c1c45c7cdca4fd7a658f34bd7473e5bcad42ca6944069a805a1b9499ce949b3c42533ad71ed566678b4e kwalletmanager-19.12.3.tar.xz" +sha512sums="aa6dfcec025d73d4a1139321436ae122e16e4ce3d57cd624c95003df395ca7d4273191b480ea6cf6849e0d630fd6044b833dae9674dcb8bdec43592f2b8f8a0d kwalletmanager-20.04.3.tar.xz" diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD index 89664524c..07d601e6e 100644 --- a/user/kwave/APKBUILD +++ b/user/kwave/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwave -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Sound editor built for KDE" url="http://kwave.sourceforge.net/" @@ -44,6 +44,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="33c045e85aebc4e7ef599a801ebeaf413ce4335fafce109a542cd8af5f83f3748d603698aab48586824cb12a573c6325d7ee20e78d6492a990e7a6650c67e9ba kwave-19.12.3.tar.xz +sha512sums="f57712472ba19695c77904a804c7dd599cc762e7018fed1d16398746156c25832795215d71aa54b143671342db6a1e442f79bfaed491e16657b820e14ac1306d kwave-20.04.3.tar.xz 63afd083727fd28436c2a8071429ba95fe4342c11669a4e27afc30b8a088b981f284fcff13861d5ef01a6f97152b25eec1fbeb303c9bdd76707e44ff5978dab8 es-doc-fix.patch 43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch" diff --git a/user/kwayland/APKBUILD b/user/kwayland/APKBUILD index d8df26b71..655539980 100644 --- a/user/kwayland/APKBUILD +++ b/user/kwayland/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwayland -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt wrapper libraries for Wayland" url="https://www.kde.org/" @@ -11,7 +11,8 @@ license="LGPL-2.1-only OR LGPL-3.0-only" depends="" depends_dev="qt5-qtbase-dev wayland-dev" makedepends="$depends_dev cmake extra-cmake-modules doxygen graphviz - qt5-qttools-dev wayland-protocols" + qt5-qttools-dev qt5-qtwayland qt5-qtwayland-dev qt5-qtwayland-tools + wayland-protocols" subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kwayland-$pkgver.tar.xz" @@ -39,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="384628349c53a92925aa072941821ff153208415ff08fd9d32523a3e0b362d4fbf6539ebc0b3790112a570c70782989daa4cf1bf0ece26621cc8cc2d499654c8 kwayland-5.68.0.tar.xz" +sha512sums="5a0c2ac98fc90d0d2b0ed9f7c8837a81814bd5f4657dff57a4e84b5e93dfd7a74d0585e753152e3c9c073a706caffad5988b047ea0f319f13ab00f13907617bb kwayland-5.72.0.tar.xz" diff --git a/user/kwidgetsaddons/APKBUILD b/user/kwidgetsaddons/APKBUILD index a1ce477e6..07ee62917 100644 --- a/user/kwidgetsaddons/APKBUILD +++ b/user/kwidgetsaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwidgetsaddons -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework containing ready-made widgets for common tasks" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="64556563d0d45cbffa68b4eecc3c7c31d3597a598a63e713ac29377cf544354c25232cda78973bc15999d3e0b305810b480556a06fba45e811b8b0fe7c97cf23 kwidgetsaddons-5.68.0.tar.xz" +sha512sums="53d5e7dfbb12b427bf73ac6c09e27ea7497b460f6e4716a8fe61e2de3aed5885334e2d4292bbf3ce5661a86207135e3afb662dea93489b64ae4ffc3da998bb4c kwidgetsaddons-5.72.0.tar.xz" diff --git a/user/kwindowsystem/APKBUILD b/user/kwindowsystem/APKBUILD index 80a107032..f5dfe3aa4 100644 --- a/user/kwindowsystem/APKBUILD +++ b/user/kwindowsystem/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwindowsystem -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for introspecting the running X11 window manager" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1c7abbdcd3d4b32c4e04eecabafe319f6b7d40d8634e769db4ec3871cfb68030ed6d402ea78ab5de1c873ec710aedff2a80fce6a56135ee57dd81c69c32a03f9 kwindowsystem-5.68.0.tar.xz" +sha512sums="a13357a40b1d4364579b405ae467071414f4a775f0c79765a3867adb40c259a0e5b35cc5e6298e4310e1c54397c269f7b277d02a7adf2194614c44be6888ba68 kwindowsystem-5.72.0.tar.xz" diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD index 0d096c2ea..93482e1d2 100644 --- a/user/kwordquiz/APKBUILD +++ b/user/kwordquiz/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwordquiz -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Flash card trainer for KDE" url="https://www.kde.org/applications/education/kwordquiz/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cfdf267585a6bfc5de06da3a0de6372cb2beec7c6abe7482551f28356b464d4b67f092998a251991b4678131b47a6278745c409f0c4203c457fed8a38081baf6 kwordquiz-19.12.3.tar.xz" +sha512sums="3c69549a37266f7228e851b60d2afb13e65087f54373e80f933dbaf21641cf9a2dde491e57afa9c4a767edbc8cd3d8892b04ba51f044861f1637691259c69167 kwordquiz-20.04.3.tar.xz" diff --git a/user/kxmlgui/APKBUILD b/user/kxmlgui/APKBUILD index 55c6b6ac2..9101596b1 100644 --- a/user/kxmlgui/APKBUILD +++ b/user/kxmlgui/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kxmlgui -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for creating user interfaces using XML" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de98fab8c9a878b24081ec0676fef35da39f44391689ce7087c367d8e54c3122f13214cac8fda3fa9bf59c1515a1328bc704b550bf0c0cc1ca11dc898a01d430 kxmlgui-5.68.0.tar.xz" +sha512sums="368e48c046441f525695f1c22cec13a893bb0ef8190d41c862aefbcdc45583268127de4c2deecff2eb0e1a82788c7ca677537a3e07d82879f11f8e5498165b12 kxmlgui-5.72.0.tar.xz" diff --git a/user/kxmlrpcclient/APKBUILD b/user/kxmlrpcclient/APKBUILD index 0586cc70d..dab02be61 100644 --- a/user/kxmlrpcclient/APKBUILD +++ b/user/kxmlrpcclient/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kxmlrpcclient -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt library for writing XML-RPC clients" url="https://www.kde.org/" @@ -12,7 +12,7 @@ depends_dev="qt5-qtbase-dev ki18n-dev kio-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz qt5-qttools-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kxmlrpcclient-$pkgver.tar.xz" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kxmlrpcclient-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="89350795c4c3601fca751fc80cf4c331bd4e692d85f672c50bdd1871cfb72809004d4ec0bc0826020c42a21c38d18962481477ac3f95ecbf219f4b88aa586aad kxmlrpcclient-5.68.0.tar.xz" +sha512sums="cd25199689fffcbe5db628a04f3acf4007be32b664c30533882445175f46624622185d5e0888acb19ea725b2d56da943aa14dfd41ee4a9c94ee80f5ca270cee7 kxmlrpcclient-5.72.0.tar.xz" diff --git a/user/lcms2/APKBUILD b/user/lcms2/APKBUILD index c1df9d6d2..d096b78cc 100644 --- a/user/lcms2/APKBUILD +++ b/user/lcms2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lcms2 -pkgver=2.9 +pkgver=2.11 pkgrel=0 pkgdesc="Colour management engine using ICC standard" url="http://www.littlecms.com/" @@ -14,6 +14,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" source="http://www.littlecms.com/lcms2-$pkgver.tar.gz" # secfixes: +# 2.11-r0: +# - CVE-2018-16435 # 2.8-r1: # - CVE-2016-10165 @@ -48,4 +50,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="70b1c51fa8d137d5072425e580745ff1fbf49c6e8bb1da0a8adb0647d3b7c095208793cb02de1e8d1a01363b8575fa60c61bedbff99bbec57a44228239cb00e5 lcms2-2.9.tar.gz" +sha512sums="96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e lcms2-2.11.tar.gz" diff --git a/user/libaacs/APKBUILD b/user/libaacs/APKBUILD index 11bb90c18..b4243813f 100644 --- a/user/libaacs/APKBUILD +++ b/user/libaacs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libaacs -pkgver=0.9.0 +pkgver=0.10.0 pkgrel=0 pkgdesc="Library to decrypt Advanced Access Content System content" url="https://www.videolan.org/developers/libaacs.html" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6 libaacs-0.9.0.tar.bz2" +sha512sums="4527749c3c78fd270012b3b36e916356a4aeb8f90169e781a00739f01f190121691042607209864e9b676ede9741f614c6003a7dfbb350dc020e1fa94cd6d66e libaacs-0.10.0.tar.bz2" diff --git a/user/libblockdev/APKBUILD b/user/libblockdev/APKBUILD index 934c901f8..b10b69d05 100644 --- a/user/libblockdev/APKBUILD +++ b/user/libblockdev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libblockdev -pkgver=2.23 +pkgver=2.24 pkgrel=0 pkgdesc="Library for manipulating block devices" url="http://storaged.org/libblockdev/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3 libblockdev-2.23.tar.gz" +sha512sums="92b7d734ea2cefbb67e626bef369d6785ba2a4bbbf09a4f59345febe977bc32319fb44f38b3c3177b8652abbc1f87b6cc76d41fdd2d70783c1c168049bdcb1d6 libblockdev-2.24.tar.gz" diff --git a/user/libbluray/APKBUILD b/user/libbluray/APKBUILD index 4357d589c..dc548d86c 100644 --- a/user/libbluray/APKBUILD +++ b/user/libbluray/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libbluray -pkgver=1.1.2 +pkgver=1.2.0 pkgrel=0 pkgdesc="Library for Blu-Ray disc playback" url="https://www.videolan.org/developers/libbluray.html" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7 libbluray-1.1.2.tar.bz2" +sha512sums="d10413b6b86ff2d2e7c4b0103546f2142727cc5209ddb7b227aa74e27384f2e0b9abee37bf8ccc5b0cdfcaeebfb0669cf20903a247df278a8ad6dbd27469d324 libbluray-1.2.0.tar.bz2" diff --git a/user/libbytesize/APKBUILD b/user/libbytesize/APKBUILD index 3c91d3cb2..cb97a469d 100644 --- a/user/libbytesize/APKBUILD +++ b/user/libbytesize/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libbytesize -pkgver=2.2 +pkgver=2.3 pkgrel=0 pkgdesc="Library for working with sizes in bytes" url="https://github.com/storaged-project/libbytesize/" @@ -23,9 +23,6 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --without-python2 - # XXX We do not have a msgfilter app in gettext-tiny. - # This would be required to ship a Serbian translation. - rm po/sr* make } @@ -44,5 +41,5 @@ py() { mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } -sha512sums="4538ac3499a24023c21fe07f527e400f99509921e377248970ac2da0eaf1655ddb261f432eed46a59ef69a1275ba7d1e5b0cc488d64eeea936b6cfa54c552ac1 libbytesize-2.2.tar.gz +sha512sums="23720b90f4dbf7880a640ec04e910c4c1f34637dd3621900772187cb2e1d04ec34d4900ce3c9b4083ac462b411d5a409a644f62ed76b2c57ef1f11432c58be8a libbytesize-2.3.tar.gz 5f8b46c257553672b7c2501bae99ff44594b91bfcf3f1ee209a390a8cdda693616e8207a99cea2e1263093324807a307dac9e643d1482e14f9ba604f51a05d6d no-msgcat.patch" diff --git a/user/libdaemon/APKBUILD b/user/libdaemon/APKBUILD new file mode 100644 index 000000000..de0a34ad8 --- /dev/null +++ b/user/libdaemon/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libdaemon +pkgver=0.14 +pkgrel=0 +pkgdesc="Library for creating Unix daemons" +url="http://0pointer.de/lennart/projects/libdaemon/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="doxygen lynx" +subpackages="$pkgname-dev $pkgname-doc" +source="http://0pointer.de/lennart/projects/libdaemon/libdaemon-$pkgver.tar.gz" + +prepare() { + update_config_guess + update_config_sub + default_prepare +} + +build() { + ./configure \ + --prefix=/usr \ + --disable-static \ + --disable-examples + make + make -C doc doxygen +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install + mv doc/reference/man/man3/_*libdaemon_.3 doc/reference/man/man3/libdaemon.3 + install -v -D -m644 doc/reference/html/* -t "$pkgdir"/usr/share/doc/libdaemon-0.14/reference/html/ + install -v -D -m644 doc/reference/man/man3/* -t "$pkgdir"/usr/share/man/man3/ +} + +sha512sums="a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2 libdaemon-0.14.tar.gz" diff --git a/user/libdrm/APKBUILD b/user/libdrm/APKBUILD index 99534d596..cc0811c9b 100644 --- a/user/libdrm/APKBUILD +++ b/user/libdrm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libdrm -pkgver=2.4.101 +pkgver=2.4.102 pkgrel=0 pkgdesc="Userspace interface to kernel DRM services" url="https://dri.freedesktop.org/" @@ -42,4 +42,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="658cfc6f478b674b77b4613e1af9ce8f4fd2ace8a18e75729de254d14b7c1f5d67d4bfdb58744aea74abca0f6521326225f4156bd5cbeeed79ca3e025f657e8c libdrm-2.4.101.tar.xz" +sha512sums="386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c libdrm-2.4.102.tar.xz" diff --git a/user/libdvdnav/APKBUILD b/user/libdvdnav/APKBUILD index 832270be3..f2527b2bf 100644 --- a/user/libdvdnav/APKBUILD +++ b/user/libdvdnav/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libdvdnav -pkgver=6.0.1 +pkgver=6.1.0 pkgrel=0 pkgdesc="Library for sophisticated DVD navigation features" url="http://dvdnav.mplayerhq.hu/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f libdvdnav-6.0.1.tar.bz2" +sha512sums="40ea50d818067a3178b4b09e4b95b0cc67d5ff88dbff2cbeee943d086c5f59a71a7aecc425ba35d7dbe5285d8b1ea099a439c0c80c5dca280687ac0cbdc57c71 libdvdnav-6.1.0.tar.bz2" diff --git a/user/libdvdread/APKBUILD b/user/libdvdread/APKBUILD index 295c93920..4642a04c6 100644 --- a/user/libdvdread/APKBUILD +++ b/user/libdvdread/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libdvdread -pkgver=6.0.2 +pkgver=6.1.1 pkgrel=0 pkgdesc="Library for reading DVD video discs" url="http://dvdnav.mplayerhq.hu/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c libdvdread-6.0.2.tar.bz2" +sha512sums="f02c2d33ec3e79a4efd0b4ed9172935b092c9f827eb6810ed354328c34b5206ee4ffd646239ce50b9401cab1758f1a746113e004461b20df4f44bc7fa6bc2278 libdvdread-6.1.1.tar.bz2" diff --git a/user/libevdev/APKBUILD b/user/libevdev/APKBUILD index 8e9083d17..281501cc0 100644 --- a/user/libevdev/APKBUILD +++ b/user/libevdev/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libevdev -pkgver=1.8.0 +pkgver=1.9.0 pkgrel=0 pkgdesc="Wrapper library for kernel event devices" url="https://www.freedesktop.org/wiki/Software/libevdev" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4 libevdev-1.8.0.tar.xz" +sha512sums="6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a libevdev-1.9.0.tar.xz" diff --git a/user/libevent/APKBUILD b/user/libevent/APKBUILD index 3e864cc4f..999ca10ac 100644 --- a/user/libevent/APKBUILD +++ b/user/libevent/APKBUILD @@ -4,7 +4,7 @@ pkgname=libevent pkgver=2.1.11 pkgrel=0 pkgdesc="An event notification library" -url="http://libevent.org/" +url="https://libevent.org/" arch="all" license="BSD-3-Clause" depends="" diff --git a/user/libexif/APKBUILD b/user/libexif/APKBUILD index 06e1e832a..320b87492 100644 --- a/user/libexif/APKBUILD +++ b/user/libexif/APKBUILD @@ -1,19 +1,17 @@ # Maintainer: pkgname=libexif -pkgver=0.6.21 -pkgrel=4 +pkgver=0.6.22 +_pkgver=$(printf '%s' "$pkgver" | tr . _) +pkgrel=0 pkgdesc="Library to parse EXIF metadata" -url="https://sourceforge.net/projects/libexif" +url="https://libexif.github.io/" arch="all" license="LGPL-2.0+" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends="" makedepends="" -source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - CVE-2016-6328.patch - CVE-2017-7544.patch - CVE-2018-20030.patch - CVE-2019-9278.patch +source="https://github.com/libexif/libexif/releases/download/libexif-$_pkgver-release/libexif-$pkgver.tar.xz + CVE-2020-0198.patch " # secfixes: @@ -23,6 +21,14 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 # 0.6.21-r4: # - CVE-2016-6328 # - CVE-2019-9278 +# 0.6.22-r0: +# - CVE-2020-0093 +# - CVE-2020-0182 +# - CVE-2020-0198 +# - CVE-2020-12767 +# - CVE-2020-13112 +# - CVE-2020-13113 +# - CVE-2020-13114 prepare() { default_prepare @@ -45,8 +51,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35 libexif-0.6.21.tar.bz2 -c0d4c74207993efc373615ef2c797d720162a2ee6fd7ad026edf2ced4198d9b1165b88790c2af3194f6bb7c2de88d4672c041c2cff8a82c8914700633332b8c5 CVE-2016-6328.patch -d529c6c5bd26dc21c0946702574184e1f61c2bfd4fb95b41e314f486a0dd55571963ff2cad566d2fb0804de3c0799bcd956c15a3dc10a520ce207728edad4e2d CVE-2017-7544.patch -0d6123bd275ace338ad9cebb31a2e714de0141b91860f07394b281686a5393566c3f4159679d4ba689ae7ea69ae2e412b158c3deb451c40c210b5817f6888bbc CVE-2018-20030.patch -c30c03fefea94d175b94c9f0c4d60cbb3aa0ad78b0d29008975fbbb15c17f2907a16fd50970e5fa18d533d0ce291a5ee9b62934210cb40b0f463693460607738 CVE-2019-9278.patch" +sha512sums="0a9e7bf0258ed98a794b667d45e8fc65299101a2a2d2e39c358715b20b003beff258782f0736cd5b53978428a2f878a989f303bee249a978850a065f33c534af libexif-0.6.22.tar.xz +7df084f9acdc09bd05fadfb66332956d8587fcaac9d693000f47fadeba17b3c49eafa402d1e2c9b7d394e697feccd1f760bab8b64378deaea1777c5a3b90c3b2 CVE-2020-0198.patch" diff --git a/user/libexif/CVE-2016-6328.patch b/user/libexif/CVE-2016-6328.patch deleted file mode 100644 index 0568f27d2..000000000 --- a/user/libexif/CVE-2016-6328.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 41bd04234b104312f54d25822f68738ba8d7133d Mon Sep 17 00:00:00 2001 -From: Marcus Meissner <marcus@jet.franken.de> -Date: Tue, 25 Jul 2017 23:44:44 +0200 -Subject: [PATCH] fixes some (not all) buffer overreads during decoding pentax - makernote entries. - -This should fix: -https://sourceforge.net/p/libexif/bugs/125/ CVE-2016-6328 ---- - libexif/pentax/mnote-pentax-entry.c | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c -index d03d159..ea0429a 100644 ---- a/libexif/pentax/mnote-pentax-entry.c -+++ b/libexif/pentax/mnote-pentax-entry.c -@@ -425,24 +425,34 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, - case EXIF_FORMAT_SHORT: - { - const unsigned char *data = entry->data; -- size_t k, len = strlen(val); -+ size_t k, len = strlen(val), sizeleft; -+ -+ sizeleft = entry->size; - for(k=0; k<entry->components; k++) { -+ if (sizeleft < 2) -+ break; - vs = exif_get_short (data, entry->order); - snprintf (val+len, maxlen-len, "%i ", vs); - len = strlen(val); - data += 2; -+ sizeleft -= 2; - } - } - break; - case EXIF_FORMAT_LONG: - { - const unsigned char *data = entry->data; -- size_t k, len = strlen(val); -+ size_t k, len = strlen(val), sizeleft; -+ -+ sizeleft = entry->size; - for(k=0; k<entry->components; k++) { -+ if (sizeleft < 4) -+ break; - vl = exif_get_long (data, entry->order); - snprintf (val+len, maxlen-len, "%li", (long int) vl); - len = strlen(val); - data += 4; -+ sizeleft -= 4; - } - } - break; -@@ -455,5 +465,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, - break; - } - -- return (val); -+ return val; - } diff --git a/user/libexif/CVE-2017-7544.patch b/user/libexif/CVE-2017-7544.patch deleted file mode 100644 index 534817417..000000000 --- a/user/libexif/CVE-2017-7544.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c39acd1692023b26290778a02a9232c873f9d71a Mon Sep 17 00:00:00 2001 -From: Marcus Meissner <marcus@jet.franken.de> -Date: Tue, 25 Jul 2017 23:38:56 +0200 -Subject: [PATCH] On saving makernotes, make sure the makernote container tags - has a type with 1 byte components. - -Fixes (at least): - https://sourceforge.net/p/libexif/bugs/130 - https://sourceforge.net/p/libexif/bugs/129 ---- - libexif/exif-data.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index 67df4db..91f4c33 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -255,6 +255,12 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e, - exif_mnote_data_set_offset (data->priv->md, *ds - 6); - exif_mnote_data_save (data->priv->md, &e->data, &e->size); - e->components = e->size; -+ if (exif_format_get_size (e->format) != 1) { -+ /* e->format is taken from input code, -+ * but we need to make sure it is a 1 byte -+ * entity due to the multiplication below. */ -+ e->format = EXIF_FORMAT_UNDEFINED; -+ } - } - } - diff --git a/user/libexif/CVE-2018-20030.patch b/user/libexif/CVE-2018-20030.patch deleted file mode 100644 index 837d003d7..000000000 --- a/user/libexif/CVE-2018-20030.patch +++ /dev/null @@ -1,115 +0,0 @@ -Edited slightly to backport to stable - -From 6aa11df549114ebda520dde4cdaea2f9357b2c89 Mon Sep 17 00:00:00 2001 -From: Dan Fandrich <dan@coneharvesters.com> -Date: Fri, 12 Oct 2018 16:01:45 +0200 -Subject: [PATCH] Improve deep recursion detection in - exif_data_load_data_content. - -The existing detection was still vulnerable to pathological cases -causing DoS by wasting CPU. The new algorithm takes the number of tags -into account to make it harder to abuse by cases using shallow recursion -but with a very large number of tags. This improves on commit 5d28011c -which wasn't sufficient to counter this kind of case. - -The limitation in the previous fix was discovered by Laurent Delosieres, -Secunia Research at Flexera (Secunia Advisory SA84652) and is assigned -the identifier CVE-2018-20030. ---- - libexif/exif-data.c | 45 +++++++++++++++++++++++++++++++++++++-------- - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index e35403d..a6f9c94 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -35,6 +35,7 @@ - #include <libexif/olympus/exif-mnote-data-olympus.h> - #include <libexif/pentax/exif-mnote-data-pentax.h> - -+#include <math.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -350,6 +351,20 @@ if (data->ifd[(i)]->count) { \ - break; \ - } - -+/*! Calculate the recursion cost added by one level of IFD loading. -+ * -+ * The work performed is related to the cost in the exponential relation -+ * work=1.1**cost -+ */ -+static unsigned int -+level_cost(unsigned int n) -+{ -+ static const double log_1_1 = 0.09531017980432493; -+ -+ /* Adding 0.1 protects against the case where n==1 */ -+ return ceil(log(n + 0.1)/log_1_1); -+} -+ - /*! Load data for an IFD. - * - * \param[in,out] data #ExifData -@@ -357,13 +372,13 @@ if (data->ifd[(i)]->count) { \ - * \param[in] d pointer to buffer containing raw IFD data - * \param[in] ds size of raw data in buffer at \c d - * \param[in] offset offset into buffer at \c d at which IFD starts -- * \param[in] recursion_depth number of times this function has been -- * recursively called without returning -+ * \param[in] recursion_cost factor indicating how expensive this recursive -+ * call could be - */ - static void - exif_data_load_data_content (ExifData *data, ExifIfd ifd, - const unsigned char *d, -- unsigned int ds, unsigned int offset, unsigned int recursion_depth) -+ unsigned int ds, unsigned int offset, unsigned int recursion_cost) - { - ExifLong o, thumbnail_offset = 0, thumbnail_length = 0; - ExifShort n; -@@ -378,9 +393,20 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, - if ((((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT)) - return; - -- if (recursion_depth > 30) { -+ if (recursion_cost > 170) { -+ /* -+ * recursion_cost is a logarithmic-scale indicator of how expensive this -+ * recursive call might end up being. It is an indicator of the depth of -+ * recursion as well as the potential for worst-case future recursive -+ * calls. Since it's difficult to tell ahead of time how often recursion -+ * will occur, this assumes the worst by assuming every tag could end up -+ * causing recursion. -+ * The value of 170 was chosen to limit typical EXIF structures to a -+ * recursive depth of about 6, but pathological ones (those with very -+ * many tags) to only 2. -+ */ - exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", -- "Deep recursion detected!"); -+ "Deep/expensive recursion detected!"); - return; - } - -@@ -422,15 +448,18 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, - switch (tag) { - case EXIF_TAG_EXIF_IFD_POINTER: - CHECK_REC (EXIF_IFD_EXIF); -- exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_GPS_INFO_IFD_POINTER: - CHECK_REC (EXIF_IFD_GPS); -- exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_INTEROPERABILITY_IFD_POINTER: - CHECK_REC (EXIF_IFD_INTEROPERABILITY); -- exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_JPEG_INTERCHANGE_FORMAT: - thumbnail_offset = o; diff --git a/user/libexif/CVE-2019-9278.patch b/user/libexif/CVE-2019-9278.patch deleted file mode 100644 index bd15e8d13..000000000 --- a/user/libexif/CVE-2019-9278.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 75aa73267fdb1e0ebfbc00369e7312bac43d0566 Mon Sep 17 00:00:00 2001 -From: Marcus Meissner <meissner@suse.de> -Date: Sat, 18 Jan 2020 09:29:42 +0100 -Subject: [PATCH] fix CVE-2019-9278 - -avoid the use of unsafe integer overflow checking constructs (unsigned integer operations cannot overflow, so "u1 + u2 > u1" can be optimized away) - -check for the actual sizes, which should also handle the overflows -document other places google patched, but do not seem relevant due to other restrictions - -fixes https://github.com/libexif/libexif/issues/26 ---- - libexif/exif-data.c | 28 ++++++++++++++++++---------- - 1 file changed, 18 insertions(+), 10 deletions(-) - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index a6f9c94..6332cd1 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -192,9 +192,15 @@ exif_data_load_data_entry (ExifData *data, ExifEntry *entry, - doff = offset + 8; - - /* Sanity checks */ -- if ((doff + s < doff) || (doff + s < s) || (doff + s > size)) { -+ if (doff >= size) { - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", -- "Tag data past end of buffer (%u > %u)", doff+s, size); -+ "Tag starts past end of buffer (%u > %u)", doff, size); -+ return 0; -+ } -+ -+ if (s > size - doff) { -+ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", -+ "Tag data goes past end of buffer (%u > %u)", doff+s, size); - return 0; - } - -@@ -315,13 +321,14 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, - unsigned int ds, ExifLong o, ExifLong s) - { - /* Sanity checks */ -- if ((o + s < o) || (o + s < s) || (o + s > ds) || (o > ds)) { -- exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", -- "Bogus thumbnail offset (%u) or size (%u).", -- o, s); -+ if (o >= ds) { -+ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o); -+ return; -+ } -+ if (s > ds - o) { -+ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o); - return; - } -- - if (data->data) - exif_mem_free (data->priv->mem, data->data); - if (!(data->data = exif_data_alloc (data, s))) { -@@ -947,7 +954,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", - "IFD 0 at %i.", (int) offset); - -- /* Sanity check the offset, being careful about overflow */ -+ /* ds is restricted to 16 bit above, so offset is restricted too, and offset+8 should not overflow. */ - if (offset > ds || offset + 6 + 2 > ds) - return; - -@@ -956,6 +963,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, - - /* IFD 1 offset */ - n = exif_get_short (d + 6 + offset, data->priv->order); -+ /* offset < 2<<16, n is 16 bit at most, so this op will not overflow */ - if (offset + 6 + 2 + 12 * n + 4 > ds) - return; - -@@ -964,8 +972,8 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", - "IFD 1 at %i.", (int) offset); - -- /* Sanity check. */ -- if (offset > ds || offset + 6 > ds) { -+ /* Sanity check. ds is ensured to be above 6 above, offset is 16bit */ -+ if (offset > ds - 6) { - exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, - "ExifData", "Bogus offset of IFD1."); - } else { diff --git a/user/libexif/CVE-2020-0198.patch b/user/libexif/CVE-2020-0198.patch new file mode 100644 index 000000000..e0358c220 --- /dev/null +++ b/user/libexif/CVE-2020-0198.patch @@ -0,0 +1,58 @@ +From ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c Mon Sep 17 00:00:00 2001 +From: Marcus Meissner <marcus@jet.franken.de> +Date: Mon, 8 Jun 2020 17:27:06 +0200 +Subject: [PATCH] fixed another unsigned integer overflow + +first fixed by google in android fork, +https://android.googlesource.com/platform/external/libexif/+/1e187b62682ffab5003c702657d6d725b4278f16%5E%21/#F0 + +(use a more generic overflow check method, also check second overflow instance.) + +https://security-tracker.debian.org/tracker/CVE-2020-0198 +--- + libexif/exif-data.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/libexif/exif-data.c b/libexif/exif-data.c +index 8b280d3..b495726 100644 +--- a/libexif/exif-data.c ++++ b/libexif/exif-data.c +@@ -47,6 +47,8 @@ + #undef JPEG_MARKER_APP1 + #define JPEG_MARKER_APP1 0xe1 + ++#define CHECKOVERFLOW(offset,datasize,structsize) (( offset >= datasize) || (structsize > datasize) || (offset > datasize - structsize )) ++ + static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00}; + + struct _ExifDataPrivate +@@ -327,7 +329,7 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o); + return; + } +- if (s > ds - o) { ++ if (CHECKOVERFLOW(o,ds,s)) { + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o); + return; + } +@@ -420,9 +422,9 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + } + + /* Read the number of entries */ +- if ((offset + 2 < offset) || (offset + 2 < 2) || (offset + 2 > ds)) { ++ if (CHECKOVERFLOW(offset, ds, 2)) { + exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", +- "Tag data past end of buffer (%u > %u)", offset+2, ds); ++ "Tag data past end of buffer (%u+2 > %u)", offset, ds); + return; + } + n = exif_get_short (d + offset, data->priv->order); +@@ -431,7 +433,7 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + offset += 2; + + /* Check if we have enough data. */ +- if (offset + 12 * n > ds) { ++ if (CHECKOVERFLOW(offset, ds, 12*n)) { + n = (ds - offset) / 12; + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", + "Short data; only loading %hu entries...", n); diff --git a/user/libfm-qt/APKBUILD b/user/libfm-qt/APKBUILD index 62110c28a..674621204 100644 --- a/user/libfm-qt/APKBUILD +++ b/user/libfm-qt/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libfm-qt -pkgver=0.14.1 +pkgver=0.15.1 pkgrel=0 pkgdesc="Qt library for file management and bindings for libfm" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" depends_dev="libfm-dev menu-cache-dev libexif-dev" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qttools-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 qt5-qttools-dev qt5-qtx11extras-dev $depends_dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/libfm-qt/releases/download/$pkgver/libfm-qt-$pkgver.tar.xz" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7 libfm-qt-0.14.1.tar.xz" +sha512sums="9bd3f61d830e4f7ba3e72d84e3ff1a07544f6f461d6eea7ecf2b31056020e08d47d83ef920b6e1a481a470dadfb995a6b3e3b57a13574d6abca617a84c71bdf5 libfm-qt-0.15.1.tar.xz" diff --git a/user/libgit2/APKBUILD b/user/libgit2/APKBUILD index bfa1a39b3..246642192 100644 --- a/user/libgit2/APKBUILD +++ b/user/libgit2/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Pierre-Gilas MILLON <pgmillon@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgit2 -pkgver=0.28.4 +pkgver=0.28.5 pkgrel=0 pkgdesc="Pure C re-entrant library for custom Git applications" url="https://libgit2.org/" @@ -37,11 +37,12 @@ build() { } check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # Don't run online tests by default. + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E online } package() { make DESTDIR="$pkgdir" install } -sha512sums="b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15 libgit2-0.28.4.tar.gz" +sha512sums="abfea885f46444b0304ae57c32c06f4252afb0093c924da5e1ba10aaed952824d1b84036adb79b5b8ad8bea56a6331a51c62f3b9839aead16c7b26cb4554b53a libgit2-0.28.5.tar.gz" diff --git a/user/libgnt/APKBUILD b/user/libgnt/APKBUILD new file mode 100644 index 000000000..bd4b921c4 --- /dev/null +++ b/user/libgnt/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libgnt +pkgver=2.14.0 +pkgrel=0 +pkgdesc="Glib Ncurses Toolkit" +url="https://pidgin.im/" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="glib-dev gtk-doc meson ncurses-dev ninja" +subpackages="$pkgname-dev $pkgname-doc" +source="https://downloads.sourceforge.net/pidgin/libgnt-$pkgver.tar.xz + tinfo.patch + " + +build() { + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + . output + ninja -C output +} + +check() { + ninja -C output test +} + +package() { + DESTDIR="$pkgdir" ninja -C output install +} + +sha512sums="0d9c5550374696a0e6ede5246cda3c372d7055d21b9ffaf10be88d6a469bdf18c7dd1113ec612acf4889c0e5686ea87bb0e8348ca8985fd5ff8913afc5813b38 libgnt-2.14.0.tar.xz +56ce8dab03e74714ecfe0cb7dd274c5fce996d84793fff5e247ee329b1c5bebf2d933b96cc6fe916dafb4f402269d3b1b8cacda07deff4c149869d509ee5c416 tinfo.patch" diff --git a/user/libgnt/tinfo.patch b/user/libgnt/tinfo.patch new file mode 100644 index 000000000..1e4ab4902 --- /dev/null +++ b/user/libgnt/tinfo.patch @@ -0,0 +1,18 @@ +--- libgnt-2.14.0/meson.build ++++ libgnt-2.14.0/meson.build +@@ -72,6 +72,7 @@ + ncurses_available = true + ncurses_inc = [] + ncurses_libs = [ ++ compiler.find_library('tinfow', required : false), + compiler.find_library('ncursesw', required : false), + compiler.find_library('panelw', required : false) + ] +@@ -113,6 +114,7 @@ + else + # ncursesw was not found. Look for plain old ncurses + ncurses_libs = [ ++ compiler.find_library('tinfo', required : false), + compiler.find_library('ncurses', required : false), + compiler.find_library('panel', required : false) + ] diff --git a/user/libgphoto2/APKBUILD b/user/libgphoto2/APKBUILD index aee8693b1..e152d5e7b 100644 --- a/user/libgphoto2/APKBUILD +++ b/user/libgphoto2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libgphoto2 -pkgver=2.5.23 -pkgrel=1 +pkgver=2.5.25 +pkgrel=0 pkgdesc="Digital camera library" url="http://www.gphoto.org" arch="all" @@ -42,4 +42,4 @@ package() { "$pkgdir/lib/udev/rules.d/54-gphoto.rules" } -sha512sums="f5f8f33e934989e6f832952c6c7c2c9e37c436652a08191e8ccced293447a090cb596fff80b9b0ad52c99c0ffc08a1207ca7ef2b630dc52f4c6d7f86e4cbc95a libgphoto2-2.5.23.tar.bz2" +sha512sums="ee3b9c36d41eb1271faad7a172b0c58134debf8c1104396868fa2c1032d69b4e8821117825f952049a6c36078461aabb7f87712c8563573fa69d1e9383b87845 libgphoto2-2.5.25.tar.bz2" diff --git a/user/libgsf/APKBUILD b/user/libgsf/APKBUILD index cd5faf416..5ad06e158 100644 --- a/user/libgsf/APKBUILD +++ b/user/libgsf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libgsf -pkgver=1.14.46 +pkgver=1.14.47 pkgrel=0 pkgdesc="Library for manipulating structured files" url="https://www.gnome.org/" @@ -42,4 +42,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1 } -sha512sums="130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0 libgsf-1.14.46.tar.xz" +sha512sums="143d48eb02be8202b9eb97e29e5909061a0e1a562b86e4bb4b2eac3fb0a42b139ead131ed1ffa4dfe304b65527089777823122223a74ebbc9df94c17d013f97b libgsf-1.14.47.tar.xz" diff --git a/user/libical/APKBUILD b/user/libical/APKBUILD index 0adc3e92f..3a3fd1858 100644 --- a/user/libical/APKBUILD +++ b/user/libical/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libical -pkgver=3.0.7 +pkgver=3.0.8 pkgrel=0 pkgdesc="Reference implementation of the iCalendar format" url="https://libical.github.io/libical/" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4e1df3fad9c9df795da441243471d05168287519b6155b148b5aa28092ecac687626fa92713b280864a41f6ffc0c7fb43d2770fb1821396cb838e96e76d8d9d8 libical-3.0.7.tar.gz" +sha512sums="ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b libical-3.0.8.tar.gz" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 1e2c6d670..b5562874e 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput -pkgver=1.15.4 +pkgver=1.15.6 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" @@ -32,4 +32,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80 libinput-1.15.4.tar.xz" +sha512sums="90459e5a1f22fd42ffcbab157b461e4514c30803bcebdaced76c65c05cccfa6f259640a50497055fe7ed0b376a6979f6d1d01227ae447fe60ba88fa81142b969 libinput-1.15.6.tar.xz" diff --git a/user/libjpeg-turbo/APKBUILD b/user/libjpeg-turbo/APKBUILD index ad4a4076a..cbecdd1a4 100644 --- a/user/libjpeg-turbo/APKBUILD +++ b/user/libjpeg-turbo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libjpeg-turbo pkgver=2.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="Accelerated JPEG compression and decompression library" url="https://libjpeg-turbo.org/" arch="all" @@ -10,7 +10,9 @@ license="IJG AND BSD-3-Clause AND Zlib" depends="" makedepends="cmake" subpackages="$pkgname-doc $pkgname-dev $pkgname-utils" -source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz" +source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz + CVE-2020-13790.patch + " case "$CTARGET_ARCH" in pmmx | x86 | x86_64) makedepends="$makedepends nasm" ;; @@ -19,11 +21,20 @@ esac # secfixes: # 2.0.3-r0: # - CVE-2019-2201 +# 2.0.4-r1: +# - CVE-2020-13790 build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi + + # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/344 + # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428 + case "$CARCH" in + ppc) _floattest=64bit;; + esac + cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib \ @@ -32,6 +43,7 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -DENABLE_STATIC=OFF \ -DWITH_JPEG8=ON \ + ${_floattest:+-DFLOATTEST="$_floattest"} \ ${CMAKE_CROSSOPTS} . make } @@ -51,4 +63,5 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 libjpeg-turbo-2.0.4.tar.gz" +sha512sums="708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 libjpeg-turbo-2.0.4.tar.gz +83752558d0cf60508a9ccd55505b91f4faa22277537916629a045b2aaa0cb3649e2f90b0df26d389687dc4aba78bdf76e64fc5e5eb324a65026ec86cd95dbe6a CVE-2020-13790.patch" diff --git a/user/libjpeg-turbo/CVE-2020-13790.patch b/user/libjpeg-turbo/CVE-2020-13790.patch new file mode 100644 index 000000000..aaeec0c9c --- /dev/null +++ b/user/libjpeg-turbo/CVE-2020-13790.patch @@ -0,0 +1,35 @@ +From 3de15e0c344d11d4b90f4a47136467053eb2d09a Mon Sep 17 00:00:00 2001 +From: DRC <information@libjpeg-turbo.org> +Date: Tue, 2 Jun 2020 14:15:37 -0500 +Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM + +This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to +include binary PPM files with maximum values < 255, thus preventing a +malformed binary PPM input file with those specifications from +triggering an overrun of the rescale array and potentially crashing +cjpeg, TJBench, or any program that uses the tjLoadImage() function. + +Fixes #433 + +diff --git a/rdppm.c b/rdppm.c +index 87bc33090..a8507b902 100644 +--- a/rdppm.c ++++ b/rdppm.c +@@ -5,7 +5,7 @@ + * Copyright (C) 1991-1997, Thomas G. Lane. + * Modified 2009 by Bill Allombert, Guido Vollbeding. + * libjpeg-turbo Modifications: +- * Copyright (C) 2015-2017, D. R. Commander. ++ * Copyright (C) 2015-2017, 2020, D. R. Commander. + * For conditions of distribution and use, see the accompanying README.ijg + * file. + * +@@ -720,7 +720,7 @@ start_input_ppm(j_compress_ptr cinfo, cjpeg_source_ptr sinfo) + /* On 16-bit-int machines we have to be careful of maxval = 65535 */ + source->rescale = (JSAMPLE *) + (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, +- (size_t)(((long)maxval + 1L) * ++ (size_t)(((long)MAX(maxval, 255) + 1L) * + sizeof(JSAMPLE))); + half_maxval = maxval / 2; + for (val = 0; val <= (long)maxval; val++) { diff --git a/user/libkdcraw/APKBUILD b/user/libkdcraw/APKBUILD index 982cb008a..e855609c2 100644 --- a/user/libkdcraw/APKBUILD +++ b/user/libkdcraw/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdcraw -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="RAW image file format support for KDE" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9a2df5e98adedb6ca79804530b0560d606c7c79aa7e4d432c97c06acd0643ea0a138bc2f30fd586ae3a7db42aaa56bf2b05f3512614a167dae42628cad87720d libkdcraw-19.12.3.tar.xz" +sha512sums="b2ceae6785c356f7f169e2efd8b47d920663dfc187d7e5abbf7ffbec934deb78bbfa096e2417f712c2e298e720bd11c1a8883372ef151826a8573df65e772aa7 libkdcraw-20.04.3.tar.xz" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index 1d1243c7a..a33e9d83e 100644 --- a/user/libkdegames/APKBUILD +++ b/user/libkdegames/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdegames -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Library for common routines shared between KDE games" url="https://www.kde.org/applications/games/" @@ -60,4 +60,4 @@ carddecks() { mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/ } -sha512sums="4ef533dd126e5fe43c96749cc08ff7faee761d9f00876be5639416b02c52b7304c37dbbf31aa1cd42c737d7f2b2dcfd5d3b800c54b267e4c59ce1e08d033dd3b libkdegames-19.12.3.tar.xz" +sha512sums="4681b4b37a78796eecd0daf00d231909391510122de4ad2ecb0c50ba7309c3119895c3490e727425ef0088a84e76cae26bc595730f4a673f7cfdf9aa559f0a74 libkdegames-20.04.3.tar.xz" diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD index 2dde5afba..c1e55793c 100644 --- a/user/libkeduvocdocument/APKBUILD +++ b/user/libkeduvocdocument/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkeduvocdocument -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Library for manipulating KVTML files" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f8cc3a90767710f7a93f7549257831998c6faec274e3a66ef1a40fbf9efe1234a09147c85a7f37be1cf18fa38453682a4be1b72c8631ba949ed69329b2c6d063 libkeduvocdocument-19.12.3.tar.xz" +sha512sums="ab6d63394302eca90c3f430753daa9535b30a5883ef899b21e4ba3d90fb5faec5990a7593d3c21cd78916238a9b14ac3fb24ee062171035e3afacaeb99ba3d7e libkeduvocdocument-20.04.3.tar.xz" diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD index 094839e20..40e3f3dc2 100644 --- a/user/libkexiv2/APKBUILD +++ b/user/libkexiv2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkexiv2 -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE integration with Exiv2 EXIF data library" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="243dad5ebab2384567e3ff09d7bf49525abfc126169fcf0d20bdf42fe88b3df9c9f40f7d36c1db3c69d37be54fc633a4a44eb1a75bc5c2fe3e6cc339f5ea8644 libkexiv2-19.12.3.tar.xz" +sha512sums="88846e87b64e2b0b213afc2765af69e4fb034caa6708f73db3f6180bb52e34a1e6ea14f06416f939ef66ed16cf0e1a43b03d6452eabe0cb24c40faddf39376a9 libkexiv2-20.04.3.tar.xz" diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD index 67b24bc4f..6c946d53a 100644 --- a/user/libkipi/APKBUILD +++ b/user/libkipi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkipi -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE Image Plugin Interface library" url="https://www.digikam.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="09e624aef5fc3de085820d8803dd5a579d2b3f5c72f8b4fba0633c9725ccfe6ff0ed552ee16dfea233c20c8b85e477272734c6c1fb4cc1e6037c725be956bac9 libkipi-19.12.3.tar.xz" +sha512sums="0cd89507fcebacf64c69665e7d2e1c780f478c1234e714b4db0823aced184bc274ed363f78983e44c6e28e4654dbf8ba6792aec0225065e516749b381a8fed28 libkipi-20.04.3.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index 594c36564..5ac0da36b 100644 --- a/user/libkleo/APKBUILD +++ b/user/libkleo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkleo -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="88dfb85673dda645c4ca9c40527907e0bdcff83be353643826c8f5e4ab113a7e93c69bca95939879fd9ec352cef4ae07795a063bd1bd927b6d915b5a566fe45e libkleo-19.12.3.tar.xz" +sha512sums="a318ba0517e193e69969427e8edb69c8a127deea9ae7e8ebf6ad0a6766ee237cedcf67322c47e3fb6d65aef94e7f54bc2d6d444743aa9753e0daa422ad23e1fb libkleo-20.04.3.tar.xz" diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD index b8645ac60..d4a5a0cac 100644 --- a/user/libkmahjongg/APKBUILD +++ b/user/libkmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkmahjongg -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Library with Mah Jongg logic" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="90491bda908453aca3f5a438fbcfbbb8efbbfb5a5a625b2df84fd26b20ba2a8dfd0ee47400727b3087f435bb7d91e85cb847db708521942b931355d3b49dcc09 libkmahjongg-19.12.3.tar.xz" +sha512sums="8ad55d17a0b6e06cf1abdec265abb55bcd5dd5aa80c2d9f9a3ef7331875d89c5a0dfb6bfad3e8e23d34ba7e6e5a20a6499ed0391f8c5ddd7e356aaee7dfd9010 libkmahjongg-20.04.3.tar.xz" diff --git a/user/libkomparediff2/APKBUILD b/user/libkomparediff2/APKBUILD new file mode 100644 index 000000000..99124c04e --- /dev/null +++ b/user/libkomparediff2/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libkomparediff2 +pkgver=20.04.3 +pkgrel=0 +pkgdesc="KDE diff library" +url="https://kde.org/applications/development/org.kde.kompare" +arch="all" +license="GPL-2.0+ AND GPL-2.0-only AND LGPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev cmake extra-cmake-modules kauth-dev kcodecs-dev + kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev ki18n-dev + kio-dev kitemviews-dev kjobwidgets-dev kservice-dev kwidgetsaddons-dev + kwindowsystem-dev kxmlgui-dev solid-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/libkomparediff2-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="880b8ed7d8e3df82f82509ef42f0c951340ed5c735e19af067381c9b0613afd43af97695bd42c8b60febda5605f22c6fb215ff2acbc5f6754e7c0076455e891f libkomparediff2-20.04.3.tar.xz" diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD index 0430b4e9b..31a6c5b04 100644 --- a/user/libksane/APKBUILD +++ b/user/libksane/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libksane -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="KDE scanning library" url="https://www.kde.org" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="83c397edcce693e0f9d82a36c16aff771d33015a78af308c00d0c815ee878c9decf558217dcc57c062aaf7bdb15fdcbf610fc3eb9a71e4710ec3208ac3696121 libksane-19.12.3.tar.xz" +sha512sums="6c38f8978149bd3b823d94822996dd2bbed2542a23960a3b8e399eb0fedeee5536e65ab27760941ad037101dbc27ffadf51a4103d0323c4e674f25d5fa12481e libksane-20.04.3.tar.xz" diff --git a/user/libktorrent/APKBUILD b/user/libktorrent/APKBUILD index 1ab72541a..b801a4063 100644 --- a/user/libktorrent/APKBUILD +++ b/user/libktorrent/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libktorrent -pkgver=2.1.1 +pkgver=2.2.0 pkgrel=0 pkgdesc="Torrent handling library for KDE" url="https://www.kde.org/" @@ -13,7 +13,7 @@ depends_dev="qt5-qtbase-dev karchive-dev kcrash-dev kio-dev solid-dev gmp-dev boost-dev qca-dev libgcrypt-dev" makedepends="cmake extra-cmake-modules $depends_dev doxygen ki18n-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/ktorrent/5.1.2/libktorrent-$pkgver.tar.xz" +source="https://download.kde.org/stable/ktorrent/5.2.0/libktorrent-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37 libktorrent-2.1.1.tar.xz" +sha512sums="2edcb3a230f4fa3a55a6b774c819f4964fe8f2f5447b723ba81cdb0c187dc0268b6e78566d710fa364abe2cc40cd618d1874ecb1637e872fbad0ea8c340abc1a libktorrent-2.2.0.tar.xz" diff --git a/user/liblxqt/APKBUILD b/user/liblxqt/APKBUILD index 020e173ee..24ff091bf 100644 --- a/user/liblxqt/APKBUILD +++ b/user/liblxqt/APKBUILD @@ -1,17 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=liblxqt -pkgver=0.14.1 +pkgver=0.15.1 pkgrel=0 pkgdesc="Core LXQt library" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev - qt5-qttools-dev libxscrnsaver-dev libqtxdg-dev>=3.3.1 - kwindowsystem-dev polkit-qt-1-dev lxqt-build-tools>=0.6.0" + qt5-qttools-dev libxscrnsaver-dev libqtxdg-dev>=3.5.0 + kwindowsystem-dev polkit-qt-1-dev lxqt-build-tools>=0.7.0" subpackages="$pkgname-dev" source="https://github.com/lxqt/liblxqt/releases/download/$pkgver/liblxqt-$pkgver.tar.xz" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="28ce5e924d136f9907f84e40d4823c412df071009a9d5da4e061ce969d7575b21210d5178103f9bfc73baa87ccafc87dcb6e29a737467ca1a459c1fd3c1071ba liblxqt-0.14.1.tar.xz" +sha512sums="a0eb00ca5b228ef32d1a3952d3cb4702273dda16c9e70cc75046bfe1f51e5a7849d5306cca9d616ff82bd91715d97d703c458d406ba9e2425aa3fd26f155493c liblxqt-0.15.1.tar.xz" diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD index 2456f0522..80bdb5e5b 100644 --- a/user/libnftnl/APKBUILD +++ b/user/libnftnl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Molly Miller <sysvinit@adelielinux.org> +# Maintainer: pkgname=libnftnl -pkgver=1.1.6 +pkgver=1.1.7 pkgrel=0 pkgdesc="Netfilter library providing interface to the nf_tables subsystem" url="https://netfilter.org/projects/libnftnl" @@ -33,5 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3de13cb667060f0942c8dd9e139ee8c7aff1854c544793774a827c01d06e432a4ce05d54846e1062aa620b5e54533da09daa9588467866c82c9119ef4cfbb57d libnftnl-1.1.6.tar.bz2 -" +sha512sums="80fd09147b1e2c1533cc2c8347d35137ff94f14118d5ba7bf3c1fbd0a226f6443560d5eca03273129e091b3442f820cd24455e72e917a8b7fedc8f3c9b6dc407 libnftnl-1.1.7.tar.bz2" diff --git a/user/libnice/APKBUILD b/user/libnice/APKBUILD index cd7579a03..d50182820 100644 --- a/user/libnice/APKBUILD +++ b/user/libnice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libnice -pkgver=0.1.16 +pkgver=0.1.17 pkgrel=0 pkgdesc="GLib-based Interactive Connectivity Establishment (ICE) library" url="https://nice.freedesktop.org/wiki/" @@ -36,5 +36,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8fdf0f9fcf43c0fdffbdcb61988a7f9e14bd13bb1bc561d2b9faf493deb18151da14d484740571a302fa203ec7109d45c361ea791e81a2b29932a26220ce902c libnice-0.1.16.tar.gz +sha512sums="177ee47712233af379f422cbe24befaa1b744444241723a6575f17db30f7032aa8a34b1c6e160f6f406545fc42c1e7e3ca36c274bea5adb169b02434712c908e libnice-0.1.17.tar.gz c81aff0f8a674315997f2ecc1f0cbc501b54d49c142949aee68af42aaccf2a2f61d5eb46ce8c123b05fb98c2cd5ef5751b9228783e5e221b12be06b805da0ad3 dont-error-on-socket-close.patch" diff --git a/user/libqtxdg/APKBUILD b/user/libqtxdg/APKBUILD index 60f967c06..7b0e70656 100644 --- a/user/libqtxdg/APKBUILD +++ b/user/libqtxdg/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libqtxdg -pkgver=3.4.0 +pkgver=3.5.0 pkgrel=0 pkgdesc="Qt5-based library implementing the XDG spec" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # Test suite requires X11. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qtbase-dev qt5-qtsvg-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 qt5-qtbase-dev qt5-qtsvg-dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/libqtxdg/releases/download/$pkgver/libqtxdg-$pkgver.tar.xz" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="9bd52ae3aa32f8c7de48e562ada1ff2413892c7ac58d5f7a06c0c512a4a6c03e9c5c44930f7781930c9c701894ea38a450a61a3c26afc047c76313ada0a890e6 libqtxdg-3.4.0.tar.xz" +sha512sums="014407a3dc869dd324c3840d54c0aa4565a2f69f147b172548458dee69d33474d9c2ebf50112d1ef7e36ed0aea0fb055f8e03901314230a6c55a84808bd52653 libqtxdg-3.5.0.tar.xz" diff --git a/user/libquotient/APKBUILD b/user/libquotient/APKBUILD index 003f53e3f..4eb2070be 100644 --- a/user/libquotient/APKBUILD +++ b/user/libquotient/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libquotient -pkgver=0.5.2 +pkgver=0.5.3.2 pkgrel=0 pkgdesc="Library to interface with Matrix chat systems using Qt 5" url="https://matrix.org/docs/projects/sdks/#lib-q-matrix-client" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d1037139d62c41e35cd415e85ec8b7d3577af193e19a4307bcd65f83f43a54e015e4a888a0c26a266e41df613a329edd985e8935a9ea9d54f19662fdbfe55577 libquotient-0.5.2.tar.gz" +sha512sums="b887432ba7fb2b89c72ae5342fbd11b0066770851e8d0ea85ae4d6375bca726a5ee601c4f3d35a11fa1f2ef679ad5436917c08139e114f91516ccb370321e428 libquotient-0.5.3.2.tar.gz" diff --git a/user/librdkafka/APKBUILD b/user/librdkafka/APKBUILD index d03f54449..793f43392 100644 --- a/user/librdkafka/APKBUILD +++ b/user/librdkafka/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alyx Wolcott <alyx@leuhta.com> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=librdkafka -pkgver=1.3.0 +pkgver=1.4.4 pkgrel=0 pkgdesc="The Apache Kafka C/C++ library" url="https://github.com/edenhill/librdkafka" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="94b6202a83d54dfa181466a7ea4e0b492cd695e2bc08e7e46e60efb9c1dacc912fc891cb2bb50d189dc6d0fd6c7553266196dded460957ba0f569d3e08090669 librdkafka-1.3.0.tar.gz" +sha512sums="478d17f56efd39b312ea774695bc31d22a83aae3a94913fb0dd07e7f04f3f2a6e3f3610dc7501864dbacbcf4a3207603c6e1d5eebac4e5246ee868cde398021d librdkafka-1.4.4.tar.gz" diff --git a/user/libsass/APKBUILD b/user/libsass/APKBUILD index c466b1750..e6a0e891a 100644 --- a/user/libsass/APKBUILD +++ b/user/libsass/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libsass -pkgver=3.6.3 +pkgver=3.6.4 pkgrel=0 pkgdesc="Library for preprocessing CSS" url="https://sass-lang.com/libsass" @@ -24,4 +24,4 @@ package() { make BUILD="shared" PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="e290f2045784ba1cf84e87e5bd33129b5452fec1d25da657b084b3561ec76df195a75595248a493dbd85c6a1215ed600332477945922309c021d9e416ebb29ee libsass-3.6.3.tar.gz" +sha512sums="1f79553be31949d45adf440dcbcf4b828a7e4f71c6f63f288f99451fccc490ebf0c68c58d91deabede37962e35a8cf9af8b0d60d89349fd0adea1ac061c8c2c8 libsass-3.6.4.tar.gz" diff --git a/user/libsecret/APKBUILD b/user/libsecret/APKBUILD index cf4630962..23846af80 100644 --- a/user/libsecret/APKBUILD +++ b/user/libsecret/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libsecret -pkgver=0.20.2 +pkgver=0.20.3 pkgrel=0 pkgdesc="Library for storing and retrieving passphrases" url="https://wiki.gnome.org/Projects/Libsecret" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="89143c8ccc8f6fa0cda2c98baef92e8cbf9b319a984826a09c527125e14712023ee65cada42a2c9232524528da8c1c3d2235ecbcb93e2f06e94121a601c22857 libsecret-0.20.2.tar.xz" +sha512sums="020e1954e0965f33ee15f35e1f439b6c1650322a9112078f7a3e265cee83ad99d217ae3b363fbadc06c5cb0941f7e544d91da72e5be1c6b96992c071e6170c22 libsecret-0.20.3.tar.xz" diff --git a/user/libshout/APKBUILD b/user/libshout/APKBUILD index 1672399d8..a4624bb2c 100644 --- a/user/libshout/APKBUILD +++ b/user/libshout/APKBUILD @@ -4,7 +4,7 @@ pkgname=libshout pkgver=2.4.3 pkgrel=0 pkgdesc="Library for accessing a Icecast server" -url="http://www.icecast.org/" +url="https://www.icecast.org/" arch="all" options="!check" # No test suite. license="LGPL-2.0+" diff --git a/user/libsysstat/APKBUILD b/user/libsysstat/APKBUILD index 92acda745..6c4e0ffc4 100644 --- a/user/libsysstat/APKBUILD +++ b/user/libsysstat/APKBUILD @@ -1,15 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=libsysstat -pkgver=0.4.2 +pkgver=0.4.3 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Library for querying system information & statistics" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools qt5-qtbase-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build + qt5-qtbase-dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/libsysstat/releases/download/$pkgver/libsysstat-$pkgver.tar.xz" @@ -32,4 +34,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="9059b9d20edbb7ecd89e722b48c6603b8042030ffad06d3eac167bb518691c2733d314649dc4c42a839d4812c7b65dcd043a13a6bd5b56678da112a8065717df libsysstat-0.4.2.tar.xz" +sha512sums="a34511e4f9fe1ed977ffc65b11948459922760f9a22b225d48d1c7cae9fc6c94b315c1394768f4c7b94ffc28c1267410c21ba55ff89e54976526ea1e5e4d7a56 libsysstat-0.4.3.tar.xz" diff --git a/user/libtirpc/APKBUILD b/user/libtirpc/APKBUILD index e7322c37b..7ed91e7b7 100644 --- a/user/libtirpc/APKBUILD +++ b/user/libtirpc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libtirpc -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=0 pkgdesc="Transport Independent RPC library (SunRPC replacement)" url="https://sourceforge.net/projects/libtirpc/" @@ -13,7 +13,6 @@ makedepends="$depends_dev autoconf automake libtool linux-headers" subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg" source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 bsd-types.patch - endian-header.patch " build() { @@ -29,6 +28,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002 libtirpc-1.2.5.tar.bz2 -237fd46e13bfce733023e425d561a43ef0a5dfd7f6fcdf1dd44d81a75cb08a7e2a4f80db313d145b45adf0f7f096cb7817786c5f73c0982b6ba34b3021b80d7c bsd-types.patch -0a7a21a3d08bb0ff0110b993b8f8ddca41513ddaa0a468028a53eac9732a2a2e5070abe7da0a3ecff265b3800490c82f08810bd34e9d0af2e75345c86ef7d638 endian-header.patch" +sha512sums="bcb6b5c062c1301aa1246ec93ae0a5c1d221b8421126d020863517cb814b43ed038fb6c0c2faf4e68ff133b69abefe4f4d42bfc870671da6c27ca941a30b155a libtirpc-1.2.6.tar.bz2 +237fd46e13bfce733023e425d561a43ef0a5dfd7f6fcdf1dd44d81a75cb08a7e2a4f80db313d145b45adf0f7f096cb7817786c5f73c0982b6ba34b3021b80d7c bsd-types.patch" diff --git a/user/libtirpc/endian-header.patch b/user/libtirpc/endian-header.patch deleted file mode 100644 index 9f9523305..000000000 --- a/user/libtirpc/endian-header.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix location of endian.h. Yay for POSIX next. - ---- libtirpc-1.2.5/src/xdr_float.c.old 2019-12-19 18:55:48.000000000 +0000 -+++ libtirpc-1.2.5/src/xdr_float.c 2019-12-29 18:54:28.408092748 +0000 -@@ -83,7 +83,7 @@ - }; - #else - --#include <bits/endian.h> -+#include <endian.h> - #define IEEEFP - - #endif /* vax */ diff --git a/user/libuninameslist/APKBUILD b/user/libuninameslist/APKBUILD index 73d53a4e1..a3b80b05a 100644 --- a/user/libuninameslist/APKBUILD +++ b/user/libuninameslist/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libuninameslist -pkgver=20200313 +pkgver=20200413 pkgrel=0 pkgdesc="Library of Unicode names and annotation data" url=" " @@ -38,4 +38,4 @@ py3() { python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="7f42d839b251859d94cca44d4f8a789aeed0554ce86bbdba38f25da2c2ce0626d95801679a1ce3c9f691ceb4988960c56f1268478e55175d94744a969e1bd6c3 libuninameslist-dist-20200313.tar.gz" +sha512sums="88befff4bf7efed149b4e3a5d58a733b2cb6477e103ec34529ff02a88f8c72a6fc9d7b0be9e97cd539a75c8ebe5e4127cdf03a568da2f219157174b9b585b2a3 libuninameslist-dist-20200413.tar.gz" diff --git a/user/libva/APKBUILD b/user/libva/APKBUILD index d42e22efa..8e5efebfe 100644 --- a/user/libva/APKBUILD +++ b/user/libva/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libva -pkgver=2.6.1 +pkgver=2.7.1 pkgrel=0 pkgdesc="Video Acceleration (VA) API for Linux" url="https://github.com/intel/libva" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d libva-2.6.1.tar.bz2" +sha512sums="f4b88ca0216f0ea4d934edcd322b8f741833b5a50ee2f34a3ecf60d635082b29e2dd032734c2f9d2a680e3b9c98e61a8b9432ea639a9fd5389761e04782c1126 libva-2.7.1.tar.bz2" diff --git a/user/libvdpau/APKBUILD b/user/libvdpau/APKBUILD index 2c8b32cb0..00208172d 100644 --- a/user/libvdpau/APKBUILD +++ b/user/libvdpau/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvdpau -pkgver=1.3 +pkgver=1.4 pkgrel=0 pkgdesc="Hardware-accelerated video playback library" url="https://cgit.freedesktop.org/~aplattner/libvdpau" @@ -10,7 +10,7 @@ license="MIT" depends="" makedepends="libx11-dev libxext-dev meson ninja xorgproto-dev" subpackages="$pkgname-dev" -source="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/1.3/libvdpau-$pkgver.tar.bz2" +source="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/$pkgver/libvdpau-$pkgver.tar.bz2" build() { meson -Dprefix=/usr \ @@ -26,4 +26,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330 libvdpau-1.3.tar.bz2" +sha512sums="68f502f53f4a95c9af571bd5a3f5048dd1afe30d7576f7e80751c7f29450ef8cb226c1281562b616079d6c177830ec67391d0fae33348a4627ca8c113990cd01 libvdpau-1.4.tar.bz2" diff --git a/user/libvncserver/APKBUILD b/user/libvncserver/APKBUILD index 7058ad208..8992096b8 100644 --- a/user/libvncserver/APKBUILD +++ b/user/libvncserver/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvncserver -pkgver=0.9.12 -pkgrel=1 +pkgver=0.9.13 +pkgrel=0 pkgdesc="Library to make writing a vnc server easy" url="https://libvnc.github.io/" arch="all" @@ -14,11 +14,7 @@ depends_dev="libgcrypt-dev libjpeg-turbo-dev gnutls-dev libpng-dev libxi-dev libxinerama-dev libxrandr-dev libxtst-dev" makedepends="$depends_dev cmake" subpackages="$pkgname-dev" -source="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$pkgver.tar.gz - CVE-2018-15127.patch - CVE-2019-15681.patch - CVE-2019-15690.patch - " +source="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$pkgver.tar.gz" builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver # secfixes: @@ -30,6 +26,9 @@ builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver # 0.9.12-r1: # - CVE-2019-15681 # - CVE-2019-15690 +# 0.9.13-r0: +# - CVE-2019-20788 +# - CVE-2020-14401 build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,6 +36,7 @@ build() { fi cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ @@ -54,7 +54,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8 LibVNCServer-0.9.12.tar.gz -8b5b6742e6c3a181c60652484b15ec42cc0a3acc1e82cef38e82b61f43f1de456d09731976f4e5dfab44abf3e551e22aaf4300cb8418cd8e136d705fcb2a7dbe CVE-2018-15127.patch -5ecb5a26813f3f07440ef6c54eebaca4e9b4f7c1cf2ba13375e3b23b950a9b818d068d4eef5532d7ea4d7ae084c4356af7257c45426101ff51afe2b7da338a1f CVE-2019-15681.patch -52f62a65c3e91b7c7a11b5ad6e1432d697e1314bf6c938b5cb0c9cc8bdffbf1c25612c33e05282c11d59c6523e208b882f963fca8bcd34a5c72dd476427e7542 CVE-2019-15690.patch" +sha512sums="18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643 LibVNCServer-0.9.13.tar.gz" diff --git a/user/libvncserver/CVE-2018-15127.patch b/user/libvncserver/CVE-2018-15127.patch deleted file mode 100644 index 146243670..000000000 --- a/user/libvncserver/CVE-2018-15127.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 09e8fc02f59f16e2583b34fe1a270c238bd9ffec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> -Date: Mon, 7 Jan 2019 10:40:01 +0100 -Subject: [PATCH] Limit lenght to INT_MAX bytes in - rfbProcessFileTransferReadBuffer() - -This ammends 15bb719c03cc70f14c36a843dcb16ed69b405707 fix for a heap -out-of-bound write access in rfbProcessFileTransferReadBuffer() when -reading a transfered file content in a server. The former fix did not -work on platforms with a 32-bit int type (expected by rfbReadExact()). - -CVE-2018-15127 -<https://github.com/LibVNC/libvncserver/issues/243> -<https://github.com/LibVNC/libvncserver/issues/273> ---- - libvncserver/rfbserver.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c -index 7af84906..f2edbeea 100644 ---- a/libvncserver/rfbserver.c -+++ b/libvncserver/rfbserver.c -@@ -88,6 +88,8 @@ - #include <errno.h> - /* strftime() */ - #include <time.h> -+/* INT_MAX */ -+#include <limits.h> - - #ifdef LIBVNCSERVER_WITH_WEBSOCKETS - #include "rfbssl.h" -@@ -1472,8 +1474,11 @@ char *rfbProcessFileTransferReadBuffer(rfbClientPtr cl, uint32_t length) - 0XFFFFFFFF, i.e. SIZE_MAX for 32-bit systems. On 64-bit systems, a length of 0XFFFFFFFF - will safely be allocated since this check will never trigger and malloc() can digest length+1 - without problems as length is a uint32_t. -+ We also later pass length to rfbReadExact() that expects a signed int type and -+ that might wrap on platforms with a 32-bit int type if length is bigger -+ than 0X7FFFFFFF. - */ -- if(length == SIZE_MAX) { -+ if(length == SIZE_MAX || length > INT_MAX) { - rfbErr("rfbProcessFileTransferReadBuffer: too big file transfer length requested: %u", (unsigned int)length); - rfbCloseClient(cl); - return NULL; diff --git a/user/libvncserver/CVE-2019-15681.patch b/user/libvncserver/CVE-2019-15681.patch deleted file mode 100644 index e328d8792..000000000 --- a/user/libvncserver/CVE-2019-15681.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a Mon Sep 17 00:00:00 2001 -From: Christian Beier <dontmind@freeshell.org> -Date: Mon, 19 Aug 2019 22:32:25 +0200 -Subject: [PATCH] rfbserver: don't leak stack memory to the remote - -Thanks go to Pavel Cheremushkin of Kaspersky for reporting. ---- - libvncserver/rfbserver.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c -index 3bacc891..310e5487 100644 ---- a/libvncserver/rfbserver.c -+++ b/libvncserver/rfbserver.c -@@ -3724,6 +3724,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len) - rfbServerCutTextMsg sct; - rfbClientIteratorPtr iterator; - -+ memset((char *)&sct, 0, sizeof(sct)); -+ - iterator = rfbGetClientIterator(rfbScreen); - while ((cl = rfbClientIteratorNext(iterator)) != NULL) { - sct.type = rfbServerCutText; diff --git a/user/libvncserver/CVE-2019-15690.patch b/user/libvncserver/CVE-2019-15690.patch deleted file mode 100644 index 7fe36e454..000000000 --- a/user/libvncserver/CVE-2019-15690.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 54220248886b5001fbbb9fa73c4e1a2cb9413fed Mon Sep 17 00:00:00 2001 -From: Christian Beier <dontmind@freeshell.org> -Date: Sun, 17 Nov 2019 17:18:35 +0100 -Subject: [PATCH] libvncclient/cursor: limit width/height input values - -Avoids a possible heap overflow reported by Pavel Cheremushkin -<Pavel.Cheremushkin@kaspersky.com>. - -re #275 ---- - libvncclient/cursor.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libvncclient/cursor.c b/libvncclient/cursor.c -index 67f45726..40ffb3b0 100644 ---- a/libvncclient/cursor.c -+++ b/libvncclient/cursor.c -@@ -28,6 +28,8 @@ - #define OPER_SAVE 0 - #define OPER_RESTORE 1 - -+#define MAX_CURSOR_SIZE 1024 -+ - #define RGB24_TO_PIXEL(bpp,r,g,b) \ - ((((uint##bpp##_t)(r) & 0xFF) * client->format.redMax + 127) / 255 \ - << client->format.redShift | \ -@@ -54,6 +56,9 @@ rfbBool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width, int h - if (width * height == 0) - return TRUE; - -+ if (width >= MAX_CURSOR_SIZE || height >= MAX_CURSOR_SIZE) -+ return FALSE; -+ - /* Allocate memory for pixel data and temporary mask data. */ - if(client->rcSource) - free(client->rcSource); diff --git a/user/libxdg-basedir/APKBUILD b/user/libxdg-basedir/APKBUILD index 70fe0d512..acfc75c69 100644 --- a/user/libxdg-basedir/APKBUILD +++ b/user/libxdg-basedir/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=libxdg-basedir -pkgver=1.2.0 +pkgver=1.2.2 pkgrel=0 pkgdesc="library for XDG base dir specification" url=" " # No URL. @@ -11,7 +11,7 @@ license="MIT" depends="" makedepends="autoconf automake libtool" subpackages="$pkgname-dev" -source="http://ponce.cc/slackware/sources/repo/libxdg-basedir-1.2.0.tar.xz" +source="https://github.com/davmac314/libxdg-basedir/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz" prepare() { default_prepare @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f1766cd94dd66fcba9211427910ef02c7f203c7bf655e74b903566a68521d1c156c9687cd89eca73428098c0a78a1458cada2057dd9268b6f6b48229c80b5d2e libxdg-basedir-1.2.0.tar.xz" +sha512sums="5817aea613be592d3d392401702ecd40ec949ee170365d720085919d773dc998daff65bde53d36429453dfe3944ff8666729553381c7b9ce410b009e7a5d5af5 libxdg-basedir-1.2.2.tar.xz" diff --git a/user/live-media/APKBUILD b/user/live-media/APKBUILD index 128b7ad39..fead388fb 100644 --- a/user/live-media/APKBUILD +++ b/user/live-media/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=live-media -pkgver=2019.12.30 +pkgver=2020.07.09 pkgrel=0 pkgdesc="Libraries for multimedia streaming" url="http://live555.com/liveMedia" @@ -51,4 +51,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="223ce65751099e5f84767939e75cefa19f10780d7e894991b4f7164c4bafa4ed8942713f237df74933caa0e1f0ead83bf69c95f232f84f7220082613cc84bc83 live.2019.12.30.tar.gz" +sha512sums="9734235d7ad36d044da7296ccb39e173df0153013ff817381c9727e65b1ec5f00f3447e8ba9d7af8a2ab04843c0b0a8e98756255b3a578b8770a7e16eca84314 live.2020.07.09.tar.gz" diff --git a/user/llvm8/APKBUILD b/user/llvm8/APKBUILD index 0e09db7af..065576966 100644 --- a/user/llvm8/APKBUILD +++ b/user/llvm8/APKBUILD @@ -6,7 +6,7 @@ _pkgname=llvm pkgver=8.0.1 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver -pkgrel=0 +pkgrel=1 pkgdesc="Low Level Virtual Machine compiler system, version $_majorver" arch="all" options="!checkroot !dbg" @@ -25,6 +25,7 @@ source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/l more-secure-plt.patch even-more-secure-plt.patch python3-test.patch + scc-insertion.patch " builddir="$srcdir/$_pkgname-$pkgver.src" @@ -233,4 +234,5 @@ caeec8e4dbd92f5f74940780b69075f3879a267a8623822cbdc193fd14706eb089071e3a5a20d60c e5ddbc4b6c4928e79846dc3c022eb7928aaa8fed40515c78f5f03b8ab8264f34f1eb8aa8bfc0f436450932f4917e54ad261603032092ea271d9590f11a37cf1e musl-ppc64-elfv2.patch 7ba7f5b396e1afb49ea53fdc16729f0709fbba88de433cc8a8e2f751d13733011d4121318f68d7f8a16a6c57c3a1bee727cc3e0da0f5c6cae38eff70d3a539cf more-secure-plt.patch deb71762721ebc73bfdf23143b582f40c70eddcef3e337ed14499e8e336bee2906292d38d64fe98fa633430c1bcb66cf6a2e067258c8fbe6e931f99f6d10a6f7 even-more-secure-plt.patch -53cc0d13dd871e9b775bb4e7567de4f9a97d91b8246cd7ce74607fd88d6e3e2ab9455f5b4195bc7f9dbdedbc77d659d43e98ec0b7cd78cd395aaea6919510287 python3-test.patch" +53cc0d13dd871e9b775bb4e7567de4f9a97d91b8246cd7ce74607fd88d6e3e2ab9455f5b4195bc7f9dbdedbc77d659d43e98ec0b7cd78cd395aaea6919510287 python3-test.patch +4422a83ea953a6b30cb447a448d246956abd6b0cbd2451247e5f2c41318b2c0d18c7b6781155ea40a5558bbd66e9e1482cec0875d95776545fd0d87356b5e4bd scc-insertion.patch" diff --git a/user/llvm8/scc-insertion.patch b/user/llvm8/scc-insertion.patch new file mode 100644 index 000000000..b2d7d511a --- /dev/null +++ b/user/llvm8/scc-insertion.patch @@ -0,0 +1,33 @@ +From f7e9f4f4c50245d10ca9869a9f8f3d431dfb6948 Mon Sep 17 00:00:00 2001 +From: Warren Ristow <warren_ristow@playstation.sony.com> +Date: Tue, 14 Jan 2020 10:30:24 -0800 +Subject: [PATCH] SCC: Allow ReplaceNode to safely support insertion + +If scc_iterator::ReplaceNode is inserting a new entry in the map, +rather than replacing an existing entry, the possibility of growing +the map could cause a failure. This change safely implements the +insertion. + +Reviewed By: probinson + +Differential Revision: https://reviews.llvm.org/D72469 +--- + include/llvm/ADT/SCCIterator.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/include/llvm/ADT/SCCIterator.h b/include/llvm/ADT/SCCIterator.h +index eb1a5d0938cf..1e642b9f75d3 100644 +--- a/include/llvm/ADT/SCCIterator.h ++++ b/include/llvm/ADT/SCCIterator.h +@@ -134,7 +134,10 @@ class scc_iterator : public iterator_facade_base< + /// has been deleted, and \c New is to be used in its place. + void ReplaceNode(NodeRef Old, NodeRef New) { + assert(nodeVisitNumbers.count(Old) && "Old not in scc_iterator?"); +- nodeVisitNumbers[New] = nodeVisitNumbers[Old]; ++ // Do the assignment in two steps, in case 'New' is not yet in the map, and ++ // inserting it causes the map to grow. ++ auto tempVal = nodeVisitNumbers[Old]; ++ nodeVisitNumbers[New] = tempVal; + nodeVisitNumbers.erase(Old); + } + }; diff --git a/user/lmdb/APKBUILD b/user/lmdb/APKBUILD index f862931fa..eb7e1a1e6 100644 --- a/user/lmdb/APKBUILD +++ b/user/lmdb/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Olivier Mauras <olivier@mauras.ch> # Maintainer: pkgname=lmdb -pkgver=0.9.24 +pkgver=0.9.25 pkgrel=0 pkgdesc="Lightning Memory-Mapped Database" url="http://symas.com/mdb/" arch="all" license="OLDAP-2.8" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="https://github.com/LMDB/lmdb/archive/LMDB_$pkgver.tar.gz - lmdb_make.patch" -builddir="$srcdir/$pkgname-LMDB_$pkgver/libraries/liblmdb" +source="https://git.openldap.org/openldap/openldap/-/archive/LMDB_$pkgver/openldap-LMDB_$pkgver.tar.bz2 + lmdb_make.patch + " +builddir="$srcdir/openldap-LMDB_$pkgver/libraries/liblmdb" build() { make @@ -29,5 +30,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="c3a96c27f13c072ef5861bcea045d82f0a220dbd938579411ea6c38ac0696b3620c71f1e2cc56d31db5105f3533da95aba1ac34653d8bdcfa4f2f1fb831cccb1 LMDB_0.9.24.tar.gz +sha512sums="8ee369f77b6acc75d5330ccfdb0531c543642a27a434551d7e800bcaf737ab16afc688a15ba30c0398702d4da54d347cf57f388e1c9525d0334a2677ea3d751e openldap-LMDB_0.9.25.tar.bz2 151022cad94d2138146e3cd36622171f07fb03cc66d116ac9ce766c61a8b1aa65b521bfda88b27456204f53ecd430bdeddb4d7786956a12ed0cd53f8323ffd03 lmdb_make.patch" diff --git a/user/lokalize/APKBUILD b/user/lokalize/APKBUILD new file mode 100644 index 000000000..b48609fd4 --- /dev/null +++ b/user/lokalize/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=lokalize +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Computer-aided translation system" +url="https://kde.org/applications/development/org.kde.lokalize" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev qt5-qtscript-dev cmake extra-cmake-modules kauth-dev + kcodecs-dev kcompletion-dev kconfig-dev kconfigwidgets-dev + kcoreaddons-dev kcrash-dev kdbusaddons-dev kdoctools-dev + ki18n-dev kiconthemes-dev kio-dev kitemviews-dev kjobwidgets-dev + knotifications-dev kparts-dev kross-dev kservice-dev ktextwidgets-dev + kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev solid-dev sonnet-dev + hunspell-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/lokalize-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="becc88705957386a1012378e28c025eb4087f46e2f0953eaa3d8f8d6625cce3be1d23bf1a92ef38f02793a0f175115141839e360bce7f9adcf6ccd494b17b65c lokalize-20.04.3.tar.xz" diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD index 8e6681499..47b2c741f 100644 --- a/user/lskat/APKBUILD +++ b/user/lskat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lskat -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Lieutenant Skat, an interactive two-player card game" url="https://games.kde.org/game.php?game=lskat" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="84aebdbdbc3e7a85799cd4495c12c7f746a2745a353eeef48eca69242557762619fdd117fcf6581811e51700b5cde3b5c3b0cd1fbedceae529c2e925f0cc5fed lskat-19.12.3.tar.xz" +sha512sums="2a3efc2843ed8749ba145d7d633915489fb3924ec91c7b12a218732fb705a716bf48bc79cced2e4dbd85db5a6576687a2b171a4834daa74e8190074abda0d0e6 lskat-20.04.3.tar.xz" diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD index 11e166311..c4449467b 100644 --- a/user/lua-filesystem/APKBUILD +++ b/user/lua-filesystem/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lua-filesystem _pkgname=luafilesystem -pkgver=1.7.0.2 +pkgver=1.8.0 _pkgver=$(printf '%s' "$pkgver" | tr . _) _rockver=${pkgver%.*}-${pkgver##*.} -pkgrel=1 +pkgrel=0 pkgdesc="Filesystem functions for Lua" url="http://keplerproject.github.io/luafilesystem/" arch="all" @@ -30,4 +30,4 @@ package() { echo 'rock_manifest = {}' > "$rockdir"/rock_manifest } -sha512sums="a1d4d077776e57cd878dbcd21656da141ea3686c587b5420a2b039aeaf086b7e7d05d531ee1cc2bbd7d06660d1315b09593e52143f6711f033ce8eecdc550511 luafilesystem-1.7.0.2.tar.gz" +sha512sums="79d964f13ae43716281dc8521d2f128b22f2261234c443e242b857cfdf621e208bdf4512f8ba710baa113e9b3b71e2544609de65e2c483f569c243a5cf058247 luafilesystem-1.8.0.tar.gz" diff --git a/user/lximage-qt/APKBUILD b/user/lximage-qt/APKBUILD index b5a76d86d..1dce23e0f 100644 --- a/user/lximage-qt/APKBUILD +++ b/user/lximage-qt/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lximage-qt -pkgver=0.14.1 +pkgver=0.15.0 pkgrel=0 pkgdesc="Image viewer and screenshot tool for LXQt" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 libexif-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 libexif-dev libfm-qt-dev>=${pkgver%.*}.0 qt5-qtx11extras-dev qt5-qttools-dev qt5-qtsvg-dev kwindowsystem-dev" source="https://github.com/lxqt/lximage-qt/releases/download/$pkgver/lximage-qt-$pkgver.tar.xz" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd lximage-qt-0.14.1.tar.xz" +sha512sums="980fc401b31c5d937877ef35211892984def150a6db6072d9752fa78588ea8ca0827beb5880d46775092c42e93358d3e494e045a50756931129402ded4ecab23 lximage-qt-0.15.0.tar.xz" diff --git a/user/lxmenu-data/APKBUILD b/user/lxmenu-data/APKBUILD index a8d4d4b92..903ec3079 100644 --- a/user/lxmenu-data/APKBUILD +++ b/user/lxmenu-data/APKBUILD @@ -4,7 +4,7 @@ pkgname=lxmenu-data pkgver=0.1.5 pkgrel=1 pkgdesc="Menu definition files for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="noarch" options="!check" # No test suite. license="LGPL-2.1+" diff --git a/user/lxqt-about/APKBUILD b/user/lxqt-about/APKBUILD index 767194b42..799843b1c 100644 --- a/user/lxqt-about/APKBUILD +++ b/user/lxqt-about/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-about -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Dialog window providing information about LXQt and the running system" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev - lxqt-build-tools>=0.6.0 liblxqt-dev>=${pkgver%.*}.0" + lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0" source="https://github.com/lxqt/lxqt-about/releases/download/$pkgver/lxqt-about-$pkgver.tar.xz" build() { @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="09cbb4c6c331b16b551d1b63ad4643f424fbaa35cfa9e2d4c70393fae499d403bf8a70c8105d258bd84200d06862033bfe0a082500e794b0db10df38d27b407a lxqt-about-0.14.1.tar.xz" +sha512sums="0572db83f7f11abe2b17c69ba3d1bcefc5daa011a3c474aa8217f2cf8cc1db54a5de1db4a0678381c4d37caf1d1ebbe4026ed63e17e2fbbaa4133d1e781c6e44 lxqt-about-0.15.0.tar.xz" diff --git a/user/lxqt-admin/APKBUILD b/user/lxqt-admin/APKBUILD index a464f20d0..5267f2663 100644 --- a/user/lxqt-admin/APKBUILD +++ b/user/lxqt-admin/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-admin -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Administrative tools for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="lxqt-policykit" makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev - lxqt-build-tools>=0.6.0 liblxqt-dev>=${pkgver%.*}.0 polkit-qt-1-dev" + lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 polkit-qt-1-dev" source="https://github.com/lxqt/lxqt-admin/releases/download/$pkgver/lxqt-admin-$pkgver.tar.xz" build() { @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="bd6272a3042a71e9e00b2ba10be2575649c2d2750a4e00a6e11adaae6b91ccab5e3cf79a8ceb7bfbe808ec80c139b93e02cd96990f80b68a77a974c063e6a373 lxqt-admin-0.14.1.tar.xz" +sha512sums="830de1f3f65913b939b286adeeddfdfc22318bf09ea0ff7b705521c5c06f8edefa189b08bd4f6281116a12fc3255ace68a35ee56f3f7bec0e0f1cceea3b47c22 lxqt-admin-0.15.0.tar.xz" diff --git a/user/lxqt-archiver/APKBUILD b/user/lxqt-archiver/APKBUILD new file mode 100644 index 000000000..b3a23905a --- /dev/null +++ b/user/lxqt-archiver/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +pkgname=lxqt-archiver +pkgver=0.2.0 +_lxqt=0.15.0 +_lxqt_build=0.7.0 +pkgrel=0 +pkgdesc="Archive management utility for the LXQt desktop" +url="https://lxqt.github.io/" +arch="all" +options="!check" # No test suite +license="GPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules json-glib-dev libfm-qt-dev>=$_lxqt + lxqt-build-tools>=$_lxqt_build qt5-qttools-dev qt5-qtx11extras-dev" +source="https://github.com/lxqt/lxqt-archiver/releases/download/$pkgver/lxqt-archiver-$pkgver.tar.xz" +builddir="$srcdir/$pkgname-$pkgver/build" + +prepare() { + mkdir -p "$builddir" && cd "$builddir"/.. + default_prepare +} + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + .. + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest .. +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="478a04d0e6e4601dc342ae260c5db4178b01191cae263154dbe400b394e5cd4cb9cd8a6bab7e7c59af57d6bf20c47a5ad2663a85d0eab5f71fbaf584f7588fd7 lxqt-archiver-0.2.0.tar.xz" diff --git a/user/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD index a2ffa3160..3439629fe 100644 --- a/user/lxqt-build-tools/APKBUILD +++ b/user/lxqt-build-tools/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-build-tools -pkgver=0.6.0 +pkgver=0.7.0 pkgrel=0 pkgdesc="Toolchain for building and packaging LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="noarch" # no tests to run; this package just provides a common base for scaffolding. options="!check" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="701b2f239daeb72dd94e2d72920e85e161daeb35de24023d81bb271c3abf36916d83b4b47b046e400e865e71ee236cbfc0a7047f9b0a3529cd9b8363279fb88a lxqt-build-tools-0.6.0.tar.gz" +sha512sums="4dc169a743f7ed549929cc2d3286098f94c851b8c2c2f689956bb123565940cfe142eaee006c1d50204943b59a45c1228ade042ce2491df9813e168b54c72ac7 lxqt-build-tools-0.7.0.tar.gz" diff --git a/user/lxqt-config/APKBUILD b/user/lxqt-config/APKBUILD index 5f64da9ce..9f7b280df 100644 --- a/user/lxqt-config/APKBUILD +++ b/user/lxqt-config/APKBUILD @@ -1,17 +1,19 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-config -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Collection of tools for configuring LXQt and the underlying system" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qtsvg-dev qt5-qttools-dev - liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=0.6.0 libxcursor-dev eudev-dev - kwindowsystem-dev libkscreen-dev xf86-input-libinput-dev libxi-dev" + liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=$_lxqt_build + libxcursor-dev eudev-dev kwindowsystem-dev libkscreen-dev + xf86-input-libinput-dev libxi-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-config/releases/download/$pkgver/lxqt-config-$pkgver.tar.xz" @@ -37,4 +39,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f lxqt-config-0.14.1.tar.xz" +sha512sums="68dc8ecc38033a7a93167fb0afbe45b3e14eb1132c3faf3395ebed1fc96b5836e8db003ecffde0417dfaf9e73b70fcc69a06523319f1f858cd2020eb61113a0d lxqt-config-0.15.0.tar.xz" diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD index 6ad593a75..af52254f2 100644 --- a/user/lxqt-desktop/APKBUILD +++ b/user/lxqt-desktop/APKBUILD @@ -1,18 +1,19 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-desktop -pkgver=0.13.0 -pkgrel=1 +pkgver=0.15.0 +pkgrel=0 arch="noarch" pkgdesc="Complete LXQt desktop" -url="https://lxqt.org" +url="https://lxqt.github.io/" license="NCSA" options="!check" # meta package, no tests needed. depends="breeze breeze-icons oxygen ttf-liberation xorg-server dbus-x11 openbox lxqt-panel lxqt-runner lxqt-qtplugin qterminal pcmanfm-qt lxqt-sudo lxqt-session lxqt-powermanagement lxqt-policykit lxqt-openssh-askpass lxqt-notificationd lxqt-globalkeys lxqt-config lxqt-admin lxqt-about - lximage-qt lxqt-themes pavucontrol-qt qt5ct obconf-qt qps screengrab" + lximage-qt lxqt-themes pavucontrol-qt qt5ct obconf-qt qps screengrab + lxqt-archiver" makedepends="" subpackages="$pkgname-doc" source="org.adelie-linux.about-lxqt.desktop startlxqt startlxqt.1" diff --git a/user/lxqt-globalkeys/APKBUILD b/user/lxqt-globalkeys/APKBUILD index da75788ad..5e8f3d607 100644 --- a/user/lxqt-globalkeys/APKBUILD +++ b/user/lxqt-globalkeys/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-globalkeys -pkgver=0.14.3 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Daemon and configuration utility for global shortcuts in LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/lxqt-globalkeys/releases/download/$pkgver/lxqt-globalkeys-$pkgver.tar.xz" @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="205496c6be8fcefc4b0c7fc1beeac2a5ef996e1580d7662da6271149b3d26819b4db21260699bdd99db6a3e2874c7ac2670a6579c46985dcf6223ca6c98c125c lxqt-globalkeys-0.14.3.tar.xz" +sha512sums="95beba4ce6c2324582d93a6f3f56d57681ec7d992db80a8d9fae34a637ba1612260932944e3865c3c749982e6aa111b3495558bc5d36e8b4c8e21027775e346e lxqt-globalkeys-0.15.0.tar.xz" diff --git a/user/lxqt-l10n/APKBUILD b/user/lxqt-l10n/APKBUILD index b13843f75..8b670254e 100644 --- a/user/lxqt-l10n/APKBUILD +++ b/user/lxqt-l10n/APKBUILD @@ -4,7 +4,7 @@ pkgname=lxqt-l10n pkgver=0.13.0 pkgrel=1 pkgdesc="Localization files for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="noarch" options="!check" # No test suite. license="LGPL-2.1+" diff --git a/user/lxqt-notificationd/APKBUILD b/user/lxqt-notificationd/APKBUILD index 137b19cf8..186659ef6 100644 --- a/user/lxqt-notificationd/APKBUILD +++ b/user/lxqt-notificationd/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-notificationd -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Daemon for notifications in LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=${pkgver%.*}.0 - lxqt-build-tools>=0.6.0 kwindowsystem-dev" + lxqt-build-tools>=$_lxqt_build kwindowsystem-dev" source="https://github.com/lxqt/lxqt-notificationd/releases/download/$pkgver/lxqt-notificationd-$pkgver.tar.xz" build() { @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="dcd1892ff66d6beb5c8953c6731f798a59272365fb7439277732b145cc9e6479314415481d9e8aae9fd670d779011c3d7bb3874b05a67cfad2a722f467866795 lxqt-notificationd-0.14.1.tar.xz" +sha512sums="0febe3ff61caaf4303e3853df6bc494ce8eb4a931e6d8600a2e38c07317ecadbe3d7060ac234d139326a726c43ac555153dde6b2d4d05e95ab357873457c9632 lxqt-notificationd-0.15.0.tar.xz" diff --git a/user/lxqt-openssh-askpass/APKBUILD b/user/lxqt-openssh-askpass/APKBUILD index 0778adc3d..522c95b77 100644 --- a/user/lxqt-openssh-askpass/APKBUILD +++ b/user/lxqt-openssh-askpass/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-openssh-askpass -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Graphical LXQt utility for inputting passwords for SSH agents" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules qt5-qttools-dev lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules qt5-qttools-dev lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxde/lxqt-openssh-askpass/releases/download/$pkgver/lxqt-openssh-askpass-$pkgver.tar.xz" @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="ab35cd719d4a31a495bed68a30cad5bf85701d223ee7306f0dad40717d0c2821af53e07a929b5855fb0cd680684fb790a638b59a1ea3ef288e0f656ab490b5bf lxqt-openssh-askpass-0.14.1.tar.xz" +sha512sums="e9dd41dd75892be234e6381670fa0b836bf040b00b7c59c7f23cadc9a916e8c646c4d44645a49183a305c6b755a01e6b8e6a3c0f84aa7c374cdb3ddd577e2f44 lxqt-openssh-askpass-0.15.0.tar.xz" diff --git a/user/lxqt-panel/APKBUILD b/user/lxqt-panel/APKBUILD index 8f8a38643..612652a82 100644 --- a/user/lxqt-panel/APKBUILD +++ b/user/lxqt-panel/APKBUILD @@ -1,19 +1,21 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-panel -pkgver=0.14.1 +pkgver=0.15.1 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Panel for LXQt desktop" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 kguiaddons-dev - libdbusmenu-qt-dev kwindowsystem-dev solid-dev menu-cache-dev - lxmenu-data liblxqt-dev>=${pkgver%.*}.0 alsa-lib-dev pulseaudio-dev - lxqt-globalkeys-dev>=${pkgver%.*}.0 lm_sensors-dev libstatgrab-dev - libsysstat-dev qt5-qttools-dev libxkbcommon-dev libxcomposite-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build + kguiaddons-dev libdbusmenu-qt-dev kwindowsystem-dev solid-dev + menu-cache-dev lxmenu-data liblxqt-dev>=${pkgver%.*}.0 alsa-lib-dev + pulseaudio-dev lxqt-globalkeys-dev>=${pkgver%.*}.0 lm_sensors-dev + libstatgrab-dev libsysstat-dev qt5-qttools-dev libxkbcommon-dev + libxcomposite-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-panel/releases/download/$pkgver/lxqt-panel-$pkgver.tar.xz" @@ -40,4 +42,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687 lxqt-panel-0.14.1.tar.xz" +sha512sums="8eb9856faa2ce56c56df7514772d3ae6d31339a10d16e1ed659be0a2affc57fd16e01e05cb67c4205dfb773234ca9b8a69f414f742ccc30495bf4e2acfa0513f lxqt-panel-0.15.1.tar.xz" diff --git a/user/lxqt-policykit/APKBUILD b/user/lxqt-policykit/APKBUILD index 7b677a646..c1944f330 100644 --- a/user/lxqt-policykit/APKBUILD +++ b/user/lxqt-policykit/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-policykit -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="PolicyKit agent for LXQT" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qttools-dev polkit-qt-1-dev - liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=0.6.0 qt5-qttools-dev + liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=$_lxqt_build qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-policykit/releases/download/$pkgver/lxqt-policykit-$pkgver.tar.xz" @@ -38,4 +39,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="c3df41a45ef4d04eba9ce0c9f29d4c9b68a192302e85e192a26ae73617b87d0ad70ec64135f500485d4c10095754e36935bf9790ffd83d0197b1bb784971a940 lxqt-policykit-0.14.1.tar.xz" +sha512sums="2dbbe6d626ef5da816f080354caf564a1aa58270ae299483b9a4ce35d5f1bdb3c652dcb5f12d2668a0ea82556414b00320d2bd88fcadb37fbbdbf724a17e3c41 lxqt-policykit-0.15.0.tar.xz" diff --git a/user/lxqt-powermanagement/APKBUILD b/user/lxqt-powermanagement/APKBUILD index 0b3097cdd..775735e4c 100644 --- a/user/lxqt-powermanagement/APKBUILD +++ b/user/lxqt-powermanagement/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-powermanagement -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Power management utilities for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 upower-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build upower-dev liblxqt-dev>=${pkgver%.*}.0 kidletime-dev qt5-qtsvg-dev qt5-qttools-dev solid-dev kwindowsystem-dev" source="https://github.com/lxqt/lxqt-powermanagement/releases/download/$pkgver/lxqt-powermanagement-$pkgver.tar.xz" @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="04c72e8f73fff647f0a1d987db2879dffaeba7accfa320bc3b101befdb041ce391debd5f6de12cd2614f9ddc9bf07644d778bb33611a3a4690fe818f7bc81d10 lxqt-powermanagement-0.14.1.tar.xz" +sha512sums="8ea0765bad3885e6a8e574b382d6bea0bd5065b760241b5fa641e17096fffb43c5472577729365c36918caa4ca0d058fa1a24538dfe157e32ac519d94a4db039 lxqt-powermanagement-0.15.0.tar.xz" diff --git a/user/lxqt-qtplugin/APKBUILD b/user/lxqt-qtplugin/APKBUILD index 9d237c3f6..e9b2485d8 100644 --- a/user/lxqt-qtplugin/APKBUILD +++ b/user/lxqt-qtplugin/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-qtplugin -pkgver=0.14.0 +pkgver=0.15.1 pkgrel=0 pkgdesc="Qt plugin for platform integration with LXQt" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qttools-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 qt5-qttools-dev libfm-qt-dev>=${pkgver%.*}.0 liblxqt-dev>=${pkgver%.*}.0 libdbusmenu-qt-dev" source="https://github.com/lxqt/lxqt-qtplugin/releases/download/$pkgver/lxqt-qtplugin-$pkgver.tar.xz" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="33188bc03ee48a9b6e3cc5823cdcb5c96dba0cda65da511fe603d952c5de24e292cb02208cf357b04718df90f98d53bf48eaf6793d70d043214e429f57ccf53c lxqt-qtplugin-0.14.0.tar.xz" +sha512sums="6fc19cf5f763d7879e5a052c5638b5b396f659f4e199493c8b87cdb661c910921ecda865de2900a047c96dd63c3ef6dbfa486d1dbe0257c26984a25a139dce2f lxqt-qtplugin-0.15.1.tar.xz" diff --git a/user/lxqt-runner/APKBUILD b/user/lxqt-runner/APKBUILD index 7acd62c9b..865c21555 100644 --- a/user/lxqt-runner/APKBUILD +++ b/user/lxqt-runner/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-runner -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt-based application launcher for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 lxqt-globalkeys-dev>=${pkgver%.*}.0 muparser-dev kwindowsystem-dev menu-cache-dev qt5-qttools-dev qt5-qtsvg-dev" @@ -39,4 +40,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="62d196d37e87bc9154fa2cd9abcb8671277bffdb8673a6531bcb93161944cb8a31298587f8323d79a290292fc73765ea15990106828335879b87029ff1aba28c lxqt-runner-0.14.1.tar.xz" +sha512sums="559a5ef627f311ee4894891445a7f1bf70349d7f89ec3eb1d5550f8e87486d695d03fb70a8ec936b074e83c82c29ff26c07ee3edeebbbf8dade2d9a5f4dacdba lxqt-runner-0.15.0.tar.xz" diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD index d6cc987a0..a10f61174 100644 --- a/user/lxqt-session/APKBUILD +++ b/user/lxqt-session/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-session -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Session management utilities for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="xdg-user-dirs" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 eudev-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build eudev-dev liblxqt-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$pkgver.tar.xz" @@ -39,4 +40,4 @@ package() { rm "$pkgdir"/usr/share/man/man1/start* } -sha512sums="9274564f3eabe33744bbe8555b1177d8ff6f241f5849bef29f0bb344f506e590e1deab87bf2fdeb867872ebaa0262cda0400f16179951fd66fbcb4d9f7358c4c lxqt-session-0.14.1.tar.xz" +sha512sums="96ef9e58ca25303ac0213f1cb5faee5efddb61ac3705484ac55b39db56c9302ff646e317dbc753b213a5e2ea38818b247244a2be5219fbe6db9e419b8c638591 lxqt-session-0.15.0.tar.xz" diff --git a/user/lxqt-sudo/APKBUILD b/user/lxqt-sudo/APKBUILD index c65fe652c..8014d2bd9 100644 --- a/user/lxqt-sudo/APKBUILD +++ b/user/lxqt-sudo/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-sudo -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Graphical LXQt utility for sudo/su" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="sudo" -makedepends="cmake extra-cmake-modules qt5-qtbase-dev lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules qt5-qtbase-dev lxqt-build-tools>=$_lxqt_build liblxqt-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-sudo/releases/download/$pkgver/lxqt-sudo-$pkgver.tar.xz" @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="b2741ead9c03c2dddf878b7658316ad0ce170068aca413b48b2f614e6ee09e7494e9907f7bf46de09c84e50b75cd523b059d47f9a0d2be11b340824475ca9222 lxqt-sudo-0.14.1.tar.xz" +sha512sums="94c96a1eac5d1ec6e84c99ecbd08e7ecb8184d4e1ada0bce137c2c8d9508cd840b56dae38e3f418cb208a3eae5b3420bf33e0b9a1bb96969f2bd4d207e89304c lxqt-sudo-0.15.0.tar.xz" diff --git a/user/lxqt-themes/APKBUILD b/user/lxqt-themes/APKBUILD index 6881e5a4d..63ff10079 100644 --- a/user/lxqt-themes/APKBUILD +++ b/user/lxqt-themes/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=lxqt-themes -pkgver=0.14.0 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Core themes for LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="noarch" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake lxqt-build-tools>=0.6.0" +makedepends="cmake lxqt-build-tools>=$_lxqt_build" source="https://github.com/lxde/lxqt-themes/releases/download/$pkgver/lxqt-themes-$pkgver.tar.xz" build() { @@ -31,4 +32,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="622449df60f5f50d59ab308a7aaae35114e91bda48e112fb2abb2c394bfdfc5794d2bf0c6ce63689a29081a31bdde191e3c8cb7217f833d76a407f9970eb1fb2 lxqt-themes-0.14.0.tar.xz" +sha512sums="7ef0c5af9945ef450d78e4991e482781728867e7d4f6793832c822135a47288b0c08d883d207ee7f275585fa7ae17f2e6bdbdaf01295ae2810e01c43330f2f9d lxqt-themes-0.15.0.tar.xz" diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index 214373d24..1d895ffdd 100644 --- a/user/marble/APKBUILD +++ b/user/marble/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=marble -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Free, open-source map and virtual globe" url="https://marble.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e6b693b15be53f590bbfbd97648113bad696339544350640699e890bc4f891c4a06215ee09f21cf4968dc8d2cb104c06f43380470145397fc5abc7daa0e02639 marble-19.12.3.tar.xz" +sha512sums="5c29b0a25164b50f197c826258d8de8b4e1a386d91fa7a6f67eb3da64197b2cefef31b0759c3bd19e9a5b0f0c639adc779d71a7ef1d7b51fca4e58cc3c8530cd marble-20.04.3.tar.xz" diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD index 815a44faa..5deb6eb83 100644 --- a/user/mariadb/APKBUILD +++ b/user/mariadb/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mariadb -pkgver=10.4.12 +pkgver=10.4.13 pkgrel=0 pkgdesc="Open source database server" url="https://mariadb.org/" @@ -22,7 +22,7 @@ makedepends="$depends_dev bison cmake curl-dev libaio-dev libarchive-dev _mytopdeps="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket perl-term-readkey" subpackages="$pkgname-client $pkgname-server $pkgname-libs $pkgname-embedded - $pkgname-common::noarch $pkgname-backup mytop::noarch $pkgname-openrc + $pkgname-common $pkgname-backup mytop::noarch $pkgname-openrc $pkgname-doc $pkgname-dev" source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz crc32-power.patch @@ -265,7 +265,7 @@ doc() { default_doc } -sha512sums="518dae18c04a1f7fcc6fd4d2dfbfbfbdf5e83e72ca41e66e1074328df8d92ab41b458e6a9973771419ac09a7348f264f158916cd198c335085d6e823e707bbc6 mariadb-10.4.12.tar.gz +sha512sums="68919ceffb3d4afdd0d94daa77439a954c82ce4e08fbe06044fc397940eeb88a39ec75932cbd08ff26ef3cf7636fdb779947cda5b2764aa1fd888be19c44b566 mariadb-10.4.13.tar.gz 03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0 crc32-power.patch 15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3 gcc_builtins_ppc.h 0cb265173923cb85517a1144cfa904dafe059c1f859e13b4415442cabbb414db5904f2dcee0e865914b0f9c181d1d61d220834cb187b14f8538a0d2552025a9d ppchax.patch diff --git a/user/mednafen/APKBUILD b/user/mednafen/APKBUILD index 64559ad16..a994a5491 100644 --- a/user/mednafen/APKBUILD +++ b/user/mednafen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Horst Burkhardt <horst@adelielinux.org> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=mednafen -pkgver=1.22.2 +pkgver=1.24.3 pkgrel=0 pkgdesc="Portable multi-system emulator" url="https://mednafen.github.io/" @@ -32,6 +32,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e094a9134115344bf857eb7edce67f146fd43b83432db69271d5924ab5ec7dae11cdb7272c0d3c697a654902ce73cb42165f5e1256758f05e41167007e8f3a2d mednafen-1.22.2.tar.xz -264b22be3af9db57d0e8676d77b57338308764c79a5eae1c7bd3bb211c5e190ec0797e34a952039175395c0b8819e6285f2ac5f652ee0d5b9d1e0eaf43eca6e9 ppc.patch +sha512sums="6ed719a0cd247fb0d61fa0174fbd6e2dc9fa94343479aef98be0083268e18cf77a9f9b6a88e2231a7f14b152083e0683658d328d348ef2a1b55032f7c9e9d448 mednafen-1.24.3.tar.xz +04dd9085c65f0af2be3569b98c0af8a546ba03f6d08a2ba9e817fbed00030cb22aedde102e539573678e8f3bf178adda7caad3778cfa8576e8865eeb69fae7be ppc.patch 84cbff76b16960ec67fec785fc6e8d541db342e9567fb6f4d42c84ced3fc0f0dfe702a8a7fd7af4f84835f8efe289e7cb9cf18766e4196525686eaa23b02537c ppc64.patch" diff --git a/user/mednafen/ppc.patch b/user/mednafen/ppc.patch index 0f795f169..3642e401a 100644 --- a/user/mednafen/ppc.patch +++ b/user/mednafen/ppc.patch @@ -1,10 +1,10 @@ ---- mednafen/configure.ac.old 2019-01-28 06:52:37.000000000 +0000 -+++ mednafen/configure.ac 2019-03-24 22:30:31.180000000 +0000 -@@ -765,7 +765,7 @@ +--- mednafen/configure.ac.old 2020-05-04 05:35:56.000000000 +0000 ++++ mednafen/configure.ac 2020-07-08 18:14:09.005569259 +0000 +@@ -860,7 +860,7 @@ AM_CONDITIONAL(ARCH_X86_32, true) ;; -- powerpc) +- powerpc*) + powerpc*|ppc*) AC_DEFINE([ARCH_POWERPC], [1], [Define if we are compiling for PPC architectures.]) AM_CONDITIONAL(ARCH_POWERPC, true) diff --git a/user/mesa-demos/APKBUILD b/user/mesa-demos/APKBUILD index 7a79aa829..31c298de0 100644 --- a/user/mesa-demos/APKBUILD +++ b/user/mesa-demos/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mesa-demos pkgver=8.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mesa demos and utils" url="https://mesa3d.org" arch="all" diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD index 2cc6eb4d7..193c03ed5 100644 --- a/user/minuet/APKBUILD +++ b/user/minuet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=minuet -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Music education software" url="https://minuet.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="545e4ef25965d8d614644b4d897382edd65a92f835b6f4a461c1dec819388608e05dbe1000f26b37430e91fd4d3949d3ff39ed92cc8f8a36d77391e01c0d0fb0 minuet-19.12.3.tar.xz" +sha512sums="5353e7c2461b5d53ed119d1ecdd27e2561068347ac244e17a9eda961d269fd0b4ce41a3c61ecdc0f8c48a8f7cca40f4bd3e0dcaa49fb800b598e8809d3c25073 minuet-20.04.3.tar.xz" diff --git a/user/mksh/APKBUILD b/user/mksh/APKBUILD index 192101edb..695fdc5c2 100644 --- a/user/mksh/APKBUILD +++ b/user/mksh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Marek Benc <dusxmt@gmx.com> # Maintainer: Marek Benc <dusxmt@gmx.com> pkgname=mksh -pkgver=57 +pkgver=59b pkgrel=0 pkgdesc="MirBSD Korn Shell, a free Korn Shell interpreter" url="http://mirbsd.de/mksh" @@ -47,4 +47,4 @@ package() { install -m 644 dot.mkshrc "$pkgdir"/usr/share/doc/mksh/examples/ } -sha512sums="7d7fa557c17da4f1f62f82877a136439efb6d4f9fde52b2df39214db09868982e756df6e4fe83498f9013cbcf3252dc383b00ddfafaa4c9f143ffded7cd255b3 mksh-R57.tgz" +sha512sums="4ae330a79a09d2dd989116b1a836ab7f179d920eb34c97ea5da7d1434361911a93ba77ca47c5e473e5a5ce1877f2a2e919a807bb6139ec6c89c87969054d021d mksh-R59b.tgz" diff --git a/user/modemmanager-qt/APKBUILD b/user/modemmanager-qt/APKBUILD index 0b84de2ea..e47c0db32 100644 --- a/user/modemmanager-qt/APKBUILD +++ b/user/modemmanager-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=modemmanager-qt -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt framework for ModemManager" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6314130e61e11d2a916e55630df4173ecf60a2c58bbca9b05b865505b916f783deec32fd3cd310bfe6a1171c9723ce84d4428f94c29aaa0aa033901909a4e19b modemmanager-qt-5.68.0.tar.xz" +sha512sums="9ec1985c5edc3fc08f1dfbe989c49f32e78dc19462a83991a67bc153f0416ad1e4e0680b528a6fb0d2d45cec1d138433b3d25761ef3fa1921cc002fff8f6e1d4 modemmanager-qt-5.72.0.tar.xz" diff --git a/user/mosquitto/APKBUILD b/user/mosquitto/APKBUILD index 67ec942a1..71e1fb99c 100644 --- a/user/mosquitto/APKBUILD +++ b/user/mosquitto/APKBUILD @@ -2,12 +2,11 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=mosquitto -pkgver=1.6.9 +pkgver=1.6.10 pkgrel=0 pkgdesc="An Open Source MQTT Broker" url="https://mosquitto.org/" arch="all" -options="!check" # "Connection refused" during testing. license="EPL-1.0 AND EDL-1.0 AND MIT AND BSD-3-Clause" depends="" checkdepends="python3" @@ -74,7 +73,7 @@ clients() { mv "$pkgdir"/usr/bin/mosquitto_[ps]ub "$subpkgdir"/usr/bin/ } -sha512sums="f78228a1e8305e4d89b34250981ed2c5fe5317636003636dc90f6fa2b1e3ca3c8fadb705ee7301f5252456cb093a6547bd46a255ca3d9fb5cdced697738d6eb7 mosquitto-1.6.9.tar.gz +sha512sums="2050a7a7af864057a177728f1cab9f6db70d6d1ea609d90c637723c2c9cfc9716429739302abd6742bde932716fae340854fff35956693dfee4ef31ce7b04a25 mosquitto-1.6.10.tar.gz 681fddc737b3ef3e6c052f0c854a730df290352640a18a63e23ef83d14c425558aff87805d1eb95e44de101b5df48872173af9f5414464ffa8cf727ea2c0491e mosquitto.initd -3886171e36f759a717aa6626d5b8dbd392963c737d5de28b4d52b81359008927b99ff7a0ca82f56a0e5deaed4585571759ba9216336a664fd346845837c2bc18 disable-flaky-test.patch +daaae48d49e49a9911f152dfc80f67f2371ad62647d3324b360eb83f816c0898469c135209ddb69e80a29b313bbe3b6ee11463955c97a44584921c13832a07be disable-flaky-test.patch b07f9bec2751ab32c43f53e74d8fca18dbf2d7ce7f8fab562dbcf75de19609ba6219d735ac504697404e0ed36613a14074e3a19e735297195877798f778d337a openrc-conf.patch" diff --git a/user/mosquitto/disable-flaky-test.patch b/user/mosquitto/disable-flaky-test.patch index 8fd51c403..1dade3cd4 100644 --- a/user/mosquitto/disable-flaky-test.patch +++ b/user/mosquitto/disable-flaky-test.patch @@ -9,3 +9,17 @@ ./11-persistent-subscription.py ./11-persistent-subscription-v5.py ./11-persistent-subscription-no-local.py + +Upstream issue: https://github.com/eclipse/mosquitto/issues/1659 + +--- mosquitto-1.6.10/test/lib/Makefile 2020-05-25 22:49:59.000000000 +0000 ++++ mosquitto-1.6.10/test/lib/Makefile 2020-06-20 01:41:00.350012338 +0000 +@@ -33,7 +33,7 @@ c : test-compile + ./02-subscribe-qos0.py $@/02-subscribe-qos0.test + ./02-subscribe-qos1.py $@/02-subscribe-qos1.test + ./02-subscribe-qos1.py $@/02-subscribe-qos1-async1.test +- ./02-subscribe-qos1.py $@/02-subscribe-qos1-async2.test ++ #./02-subscribe-qos1.py $@/02-subscribe-qos1-async2.test + ./02-subscribe-qos2.py $@/02-subscribe-qos2.test + ./02-unsubscribe-multiple-v5.py $@/02-unsubscribe-multiple-v5.test + ./02-unsubscribe-v5.py $@/02-unsubscribe-v5.test diff --git a/user/mpg123/APKBUILD b/user/mpg123/APKBUILD index 7c75ee723..df47b061d 100644 --- a/user/mpg123/APKBUILD +++ b/user/mpg123/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mpg123 -pkgver=1.25.13 +pkgver=1.26.2 pkgrel=0 pkgdesc="Real time MPEG Audio player for Layers 1, 2 and 3" url="https://www.mpg123.org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39 mpg123-1.25.13.tar.bz2" +sha512sums="aa63fcb08b243a1e09f7701b3d84a19d7412a87253d54d49f014fdb9e75bbc81d152a41ed750fccde901453929b2a001585a7645351b41845ad205c17a73dcc9 mpg123-1.26.2.tar.bz2" diff --git a/user/mplayer/APKBUILD b/user/mplayer/APKBUILD index 8f703f637..4324b3565 100644 --- a/user/mplayer/APKBUILD +++ b/user/mplayer/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=mplayer pkgver=1.4 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source media player and ripper" url="https://mplayerhq.hu" arch="all" @@ -21,15 +21,24 @@ makedepends="yasm ncurses-dev openssl-dev freetype-dev fribidi-dev cdparanoia-dev libbluray-dev a52dec-dev " subpackages="$pkgname-doc" -source="http://mplayerhq.hu/MPlayer/releases/MPlayer-$pkgver.tar.xz" +source="http://mplayerhq.hu/MPlayer/releases/MPlayer-$pkgver.tar.xz + ldt.patch + " builddir="$srcdir/MPlayer-$pkgver" build() { + _extra_conf="" + case $CTARGET_ARCH in + pmmx) _extra_conf="--disable-sse2 --disable-sse4 --disable-qtx";; + esac + ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ --confdir=/etc/mplayer \ - --disable-ffmpeg_a + --disable-ffmpeg_a \ + --enable-debug=3 \ + $_extra_conf make } @@ -38,4 +47,5 @@ package() { rm -r "$pkgdir/etc" } -sha512sums="8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34 MPlayer-1.4.tar.xz" +sha512sums="8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34 MPlayer-1.4.tar.xz +07efeaf1294fb3f0a4d8dd9885641ee919c17e93e1ada505c825645e1f04d18f615fbd0318e0cc09231b67881b18847e853b434f5d8164bd3178ab220c4523df ldt.patch" diff --git a/user/mplayer/ldt.patch b/user/mplayer/ldt.patch new file mode 100644 index 000000000..6ae5456bc --- /dev/null +++ b/user/mplayer/ldt.patch @@ -0,0 +1,11 @@ +--- MPlayer-1.4/loader/ldt_keeper.c.old 2013-03-23 14:48:22.000000000 +0000 ++++ MPlayer-1.4/loader/ldt_keeper.c 2020-07-06 21:22:30.344206427 +0000 +@@ -214,7 +214,7 @@ + array.limit_in_pages=0; + #ifdef __linux__ + //ret=LDT_Modify(0x1, &array, sizeof(struct modify_ldt_ldt_s)); +- ret=modify_ldt(0x1, &array, sizeof(struct modify_ldt_ldt_s)); ++ ret=syscall(__NR_modify_ldt, 0x1, &array, sizeof(struct modify_ldt_ldt_s)); + if(ret<0) + { + perror("install_fs"); diff --git a/user/mtools/APKBUILD b/user/mtools/APKBUILD new file mode 100644 index 000000000..34b0b8730 --- /dev/null +++ b/user/mtools/APKBUILD @@ -0,0 +1,32 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=mtools +pkgver=4.0.24 +pkgrel=0 +pkgdesc="Utilities to access MS-DOS disks without mounting them" +url="https://www.gnu.org/software/mtools/" +arch="all" +options="!check" # No test suite. +license="GPL-3.0+" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="https://ftp.gnu.org/gnu/mtools/mtools-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + make DESTDIR="$pkgdir" install + install -Dm644 -t "$pkgdir"/etc mtools.conf + sed -i -e 's/^SAMPLE FILE$/#&/' "$pkgdir"/etc/mtools.conf +} + +sha512sums="b74becc4f696315cfabc016d1746e744b43e366de73bf1bffeec4fbab1e4815967594de8acb4af01f89d36a925f93672efbac205b89540161bd53ab7edebcf04 mtools-4.0.24.tar.bz2" diff --git a/user/muparser/APKBUILD b/user/muparser/APKBUILD index 7f3dd35c1..5e5ebbd46 100644 --- a/user/muparser/APKBUILD +++ b/user/muparser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=muparser -pkgver=2.2.6.1 +pkgver=2.3.2 pkgrel=0 pkgdesc="Fast math parser library" url="https://beltoforion.de/article.php?a=muparser" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496 muparser-2.2.6.1.tar.gz" +sha512sums="8ef5c8b3834da3995a782b7364a4eb4197fb706bee4cadabe5511d2a9cf2912c3db6de422a91eff7f9690f8c9c355b9900335e940749d5c243cb732ac1992aef muparser-2.3.2.tar.gz" diff --git a/user/mutt/APKBUILD b/user/mutt/APKBUILD index 09b0f49d3..be726b5cf 100644 --- a/user/mutt/APKBUILD +++ b/user/mutt/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=mutt -pkgver=1.13.4 +pkgver=1.14.5 pkgrel=0 pkgdesc="Small but very powerful text-mode email client" url="http://www.mutt.org" # No HTTPS @@ -16,6 +16,10 @@ makedepends="cyrus-sasl-dev gdbm-dev gettext-tiny gpgme-dev subpackages="$pkgname-doc $pkgname-lang" source="https://bitbucket.org/$pkgname/$pkgname/downloads/$pkgname-$pkgver.tar.gz" +# secfixes: +# 1.14.4-r0: +# - CVE-2020-14093 + build() { ISPELL=/usr/bin/hunspell \ ./configure \ @@ -35,7 +39,6 @@ build() { --with-curses \ --with-mailpath=/var/spool/mail \ --with-docdir=/usr/share/doc/$pkgname \ - --without-included-gettext \ --with-ssl \ --with-sasl make @@ -57,4 +60,4 @@ package() { "$pkgdir"/etc/Muttrc.gpg.dist } -sha512sums="59ae13d7cef052818f38f6d52e2cb42251f393ecf622eae113bfa29218b541195471de822efbdb072c6f74a4dc385bb94fe27c37b44c62eac7e2a0a4e0c6adc3 mutt-1.13.4.tar.gz" +sha512sums="950c8df3bdc552b41ba6209aed8d5ade6fff80fe4018a75856d0fdbcd6389bd995a6dee69e7badd05a9b40d2e2293ada9a9f9a96632e88af36b61162f226e2b9 mutt-1.14.5.tar.gz" diff --git a/user/nano/APKBUILD b/user/nano/APKBUILD index 9ff07764a..c88b4cf0a 100644 --- a/user/nano/APKBUILD +++ b/user/nano/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=nano -pkgver=4.8 +pkgver=4.9.3 pkgrel=0 pkgdesc="Enhanced clone of the Pico text editor" url="https://www.nano-editor.org" @@ -10,7 +10,7 @@ license="GPL-3.0+" depends="" makedepends="file-dev ncurses-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://www.nano-editor.org/dist/v${pkgver%.*}/$pkgname-$pkgver.tar.xz" +source="https://www.nano-editor.org/dist/v${pkgver%.*.*}/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -40,4 +40,4 @@ package() { rm -rf "$pkgdir"/usr/lib/charset.alias } -sha512sums="9799d93f322ac12d95784b6ecc7f7f9037f0a395be0cafe238b9e0ae2d8d93181a8a114a11ccccb20bcf07375ddaf842f49f7d23372f0d330ce67a66d0318ae8 nano-4.8.tar.xz" +sha512sums="eefb88d7141f0c542a2d9b34fc8a079a92e512df0e9dbadcb3d780008ae19faf10296213ecdbf370fa8b81f5f3e81e2d419f5f76e62d669e61997d199a96ba18 nano-4.9.3.tar.xz" diff --git a/user/nasm/APKBUILD b/user/nasm/APKBUILD index 4e73db97e..6f26ad851 100644 --- a/user/nasm/APKBUILD +++ b/user/nasm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=nasm -pkgver=2.14.02 +pkgver=2.15.02 pkgrel=0 pkgdesc="80x86 assembler designed for portability and modularity" url="https://www.nasm.us/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="71e3d44736493b1a56d4230bc2e5519e858aaadde5d89a692f1472fad6755084460e36b42852707f4c862eff75d3f2c232aedcc4e61e9d9ffcc8c9ca6498292b nasm-2.14.02.tar.bz2" +sha512sums="d5a3fd148f1a29af9ae46a543c05d420087eaae61ae4c3fa258ddd3b97a4f929f417234fc124e2c12f24e65aa9828e96a7cac1ffa54f8b8a3bcffc75074cbe10 nasm-2.15.02.tar.bz2" diff --git a/user/net-snmp/APKBUILD b/user/net-snmp/APKBUILD index 3fc1bceb4..8dea420b2 100644 --- a/user/net-snmp/APKBUILD +++ b/user/net-snmp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=net-snmp pkgver=5.8 -pkgrel=0 +pkgrel=1 pkgdesc="Simple Network Management Protocol" url="http://www.net-snmp.org/" arch="all" @@ -74,7 +74,7 @@ package() { install -m644 -D "$srcdir"/snmpd.confd "$pkgdir"/etc/conf.d/snmpd install -m644 -D "$srcdir"/snmptrapd.confd \ "$pkgdir"/etc/conf.d/snmptrapd - install -m644 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf + install -m600 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf echo "authCommunity log,execute,net public" > "$pkgdir"/etc/snmp/snmptrapd.conf mkdir -p "$pkgdir"/var/lib/net-snmp find "$pkgdir" -name perllocal.pod -delete diff --git a/user/netqmail/0005-CVE-2005-1513.patch b/user/netqmail/0005-CVE-2005-1513.patch new file mode 100644 index 000000000..3b3876cb3 --- /dev/null +++ b/user/netqmail/0005-CVE-2005-1513.patch @@ -0,0 +1,19 @@ +diff -rNU3 netqmail-1.06.old/alloc.c netqmail-1.06/alloc.c +--- netqmail-1.06.old/alloc.c 1998-06-15 10:53:16.000000000 +0000 ++++ netqmail-1.06/alloc.c 2020-05-21 11:33:24.689739728 +0000 +@@ -1,3 +1,4 @@ ++#include <limits.h> + #include "alloc.h" + #include "error.h" + extern char *malloc(); +@@ -15,6 +16,10 @@ + unsigned int n; + { + char *x; ++ if (n >= (INT_MAX >> 3)) { ++ errno = error_nomem; ++ return 0; ++ } + n = ALIGNMENT + n - (n & (ALIGNMENT - 1)); /* XXX: could overflow */ + if (n <= avail) { avail -= n; return space + avail; } + x = malloc(n); diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD index 551895f83..9be7d7c68 100644 --- a/user/netqmail/APKBUILD +++ b/user/netqmail/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=netqmail pkgver=1.06 -pkgrel=6 +pkgrel=7 pkgdesc="The qmail mail transfer agent (community version)" url="http://www.netqmail.org/" arch="all" license="Public-Domain" options="suid !check" # suid programs (qmail-queue); no test suite depends="execline s6 s6-networking" -makedepends="utmps-dev" +makedepends="groff utmps-dev" subpackages="$pkgname-doc $pkgname-openrc" provider_priority=1 provides="sendmail" @@ -19,6 +19,7 @@ source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz 0002-qbiffutmpx-20170820.patch 0003-qmailremote-20170716.patch 0004-notifyfd.patch + 0005-CVE-2005-1513.patch qmail.run smtpd.run smtpsd.run @@ -106,6 +107,7 @@ ad126cad5c0d35351919ad87022fd94b910519d91cf82f38c158f423bbfc1b82455844a791ba0c69 b3af9c29e6d46daa2a1b9f677c6f32892d5f8c9b8d5c2bdd6f34b106dd5ad41394c05a5ebe145c6e29b4ced4482f08b2d09e7818fd309123c0d087600500e336 0002-qbiffutmpx-20170820.patch cbebdc72c7cc5c437531c9277534ae552c6d044a83b36e3f3ce60ab5563c55eb814d6c543cc0997abab73075d1b517cc0929dd65674d468d517b0ca38196e2b4 0003-qmailremote-20170716.patch b32a8a36c8ab8872abd4f1a117482f064a6d631a6bb2ba75cafe61743bef09f923d26935d9514eec33a7dec5aeb3d0b517d677e55924859d2db5233bc11f9f11 0004-notifyfd.patch +ac8406c1d16ce2e55e47bc83ca6e095833a54de73cecee222cad3fcececa518386b95a11cb0c9c2dcc6851bae28aa539b11069305aa887a291177bf177ee7b01 0005-CVE-2005-1513.patch 954a905bac5e3bc49f180dc0de7f6ee4c4ae8f94dd400ee4b06d3c944f1ff1cfc44bddccb07ae439f2523ad06fcb89023e57d091737da88f836013757794e931 qmail.run c0cd244af4d8186305c51b0e93960bdb1ea6ce40f1adf20c4f72419aa7498e35649590919ebd16547a0313676bf9171c9efea2ff8ac3a5c773b18473a972a977 smtpd.run 719c4ce5ad93cddeafbb734cffeec3fd959d3f374e44e1f34e9a25d638303dd97df41642d3df5c7a069a8db47d1e31c32a16ecd2d04b72860c4e00bbba0c9fcf smtpsd.run diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD index 0c9fc7e8b..8b95a338e 100644 --- a/user/netsurf/APKBUILD +++ b/user/netsurf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=netsurf -pkgver=3.9 +pkgver=3.10 pkgrel=0 pkgdesc="Modern, lightweight GTK-based browser" url="http://www.netsurf-browser.org/" @@ -10,25 +10,21 @@ options="!check" # No tests license="MIT AND GPL-2.0-only WITH openssl-exception" depends="" makedepends="curl-dev zlib-dev bison flex libjpeg-turbo-dev libpng-dev - openssl-dev expat-dev gperf gtk+2.0-dev librsvg-dev - perl-html-parser" + openssl-dev expat-dev gperf gtk+3.0-dev librsvg-dev libwebp-dev + perl-html-parser vim" source="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$pkgver.tar.gz - Makefile.config + netsurf.desktop " builddir="$srcdir/netsurf-all-$pkgver" -prepare() { - default_prepare - cp "$srcdir"/Makefile.config "$builddir"/netsurf -} - build() { - make PREFIX=/usr NETSURF_USE_VIDEO=YES + make TARGET=gtk3 PREFIX=/usr NETSURF_USE_VIDEO=NO } package() { - make PREFIX=/usr DESTDIR="$pkgdir" install + make TARGET=gtk3 PREFIX=/usr DESTDIR="$pkgdir" install + install -D -m644 "$srcdir"/netsurf.desktop "$pkgdir"/usr/share/applications/netsurf.desktop } -sha512sums="3223b0a3bc9721ea1a5a81bbabdda11e1d0f63850074a5dea3ea8999e53c92f07228f58befbf10359c028965131426888a8b9595d6c3cd7a5cde33ca256cf987 netsurf-all-3.9.tar.gz -cb5f7ca711c4a015a49acc25882b9b95e151d69e68a21d1df068f107b2372dc7493a25c0dfc1ef0cf42ceb16ba47ceb1002f6d37c2424512b183b508ee41357e Makefile.config" +sha512sums="fc4c300eef07c540a7e07f8034db25b7e5fb731b5956029af2220f8638802aa38c055ad54b5683c14501aef9c22fb781b96613c16ae9a6996c3833ceede6f9bf netsurf-all-3.10.tar.gz +81cce213162cc49ea6a85b81c143c480ed202e2d2d06bb79d2eea803d7e8361b063d29c74904451cc2ba4e31cdad3524098344eb140cd5080f83beaf43aa8dbd netsurf.desktop" diff --git a/user/netsurf/Makefile.config b/user/netsurf/Makefile.config deleted file mode 100644 index 0e58d6e7d..000000000 --- a/user/netsurf/Makefile.config +++ /dev/null @@ -1 +0,0 @@ -override NETSURF_USE_VIDEO := NO diff --git a/user/netsurf/netsurf.desktop b/user/netsurf/netsurf.desktop new file mode 100644 index 000000000..c899cbbaa --- /dev/null +++ b/user/netsurf/netsurf.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Version=3.10 +Name=NetSurf +Comment=A minimalist web browser +Icon=web-browser +Categories=Internet +Exec=netsurf-gtk3 diff --git a/user/networkmanager-qt/APKBUILD b/user/networkmanager-qt/APKBUILD index 22d4d65d0..d307db266 100644 --- a/user/networkmanager-qt/APKBUILD +++ b/user/networkmanager-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=networkmanager-qt -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt framework for NetworkManager" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e9b81c9720db55c4d403df06b6d56e7003adb08a437b9869a7e18fd1d3621fd24e73c254f957d41ee428b4449eb5484a06add15486a79bb901c2234d2db36f8f networkmanager-qt-5.68.0.tar.xz" +sha512sums="b2763a89de911b2f1bc9704302e3d6874cd8f93fb8497743be33a66e0bd72aa1d140f595392617d952ff6c332f7b54c84c9f54b4c9bd0d8974e6dff81be34675 networkmanager-qt-5.72.0.tar.xz" diff --git a/user/networkmanager/APKBUILD b/user/networkmanager/APKBUILD index a86436b13..4c6a4e690 100644 --- a/user/networkmanager/APKBUILD +++ b/user/networkmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=networkmanager -pkgver=1.22.10 +pkgver=1.22.14 pkgrel=0 pkgdesc="Network management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" @@ -90,7 +90,7 @@ openrc() { "$subpkgdir"/etc/NetworkManager/dispatcher.d/ } -sha512sums="342d0c8db2c94992f8f53b13dc4432fe566637e03e1d65cdc44ebf51a4f70d4ec804ebc48ed9cbe010c61abc665f1bb1be22f9364de991d6e5ffc5212b9efd23 NetworkManager-1.22.10.tar.xz +sha512sums="81ccb634c3583406d52c159d1b0903f98c2732f9cd6962f3d6d71940d05cba32e262219de4f09c0cc687beff57bd7ba425f06d9a9c1bfa60aef11d427e91f453 NetworkManager-1.22.14.tar.xz ecd9cb920a125e0e3c4b8c96048ca3ac24490fdd453f0525ecaccf688687692e7a5feaf87eeaf97a2dfb405b2e0db8743114510e30f00f7ae119dc9b9551e7d7 editline.patch b0b85294c19510893ba30cf3d0e1984430c451273d4eb545760de52c69866a5ed0385f9c14a9bc180da01daad7d1c0da221101e7a826bc5be53c2724c9990d95 errno.patch 7b3cfbea8b80f832862d79fce9f89f604b457744324a8ae6b428cf3cb42ec2536d3c5784303d140d50c5a2cd8caf91d04f5096ef420a57a761e412bf2256bd5a musl.patch diff --git a/user/nextcloud-client/APKBUILD b/user/nextcloud-client/APKBUILD index b9b3064d6..b4d265440 100644 --- a/user/nextcloud-client/APKBUILD +++ b/user/nextcloud-client/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=nextcloud-client -pkgver=2.6.3 +pkgver=2.6.4 pkgrel=0 pkgdesc="Nextcloud desktop client" url="https://github.com/nextcloud/desktop" @@ -42,6 +42,6 @@ package() { EOF } -sha512sums="ddeb8a32e0208bc415bf421cb3ce05713adb617fa78c0b5cb4d894c9e8d3499dcc495c115de3ea7abb0c402eef4bc64ede8c59a7f056acda47779096fedc8025 nextcloud-client-2.6.3.tar.gz +sha512sums="849bf9bfa6a50342f6b58e805dc72ef342cb5f3e2e27d8f45d6a48759b1956dec194fb376b9a6b760df724f01eec3a22aadaa439f03e5166b1b2afb5454e40f1 nextcloud-client-2.6.4.tar.gz 38dd89ca2bf67294187bb4d5c59cdf725ec3b502f23bf4a60210e85c66f6a7e00da0e0b41775bc138159bed300dc60a1f179d1d6ad3b7a27e1aadf4f0576f348 no-webengine.patch c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f test-fix-include.patch" diff --git a/user/nftables/APKBUILD b/user/nftables/APKBUILD index bc96a18f1..40eaa5a7f 100644 --- a/user/nftables/APKBUILD +++ b/user/nftables/APKBUILD @@ -2,9 +2,9 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Molly Miller <sysvinit@adelielinux.org> +# Maintainer: pkgname=nftables -pkgver=0.9.4 +pkgver=0.9.6 pkgrel=0 pkgdesc="Netfilter tables userspace tools" url="https://netfilter.org/projects/nftables" @@ -47,7 +47,7 @@ package() { install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -sha512sums="cef5b5f26f3a2893a3eb1323f1f0ecfd6e2865e0eb040e9b7da5824e5be2274b888e661abe96e828add9e951f47303e30cb7c9238d267a031c0f99b5f3b6e2c0 nftables-0.9.4.tar.bz2 +sha512sums="ca6524ff1cb1e79d636afeb96f54e4699773e1cbda8e9a3ec5728f4d5b764c0df16b195cdcc0e304ae5643c8761b6b5a6685c737965a7415aec07aeb9f3dc5df nftables-0.9.6.tar.bz2 f7b18945f0ab8be2a8725fa902cb2499de0a886076ae4cc337ebd845b3ae08f05a75b1680b428075d42558e7953014a227405e748741e6ebc3a7ac84bbf4beaa asciidoctor.patch 4eb1adf003dfcaad65c91af6ca88d91b7904c471aefae67e7d3c2f8e053e1ac196d3437a45d1fed5a855b876a0f1fc58a724e381d2acf1164d9120cadee73eef nftables.confd 58daafb012b7cd0248a7db6e10f6a667e683347aaea7eaa78cb88780272f334e00913cea3fd39a22a4a72acc27fabd101944b40916f4b534ddeb509bd0232017 nftables.initd" diff --git a/user/nghttp2/APKBUILD b/user/nghttp2/APKBUILD index 41dd0bc58..063bc9b0f 100644 --- a/user/nghttp2/APKBUILD +++ b/user/nghttp2/APKBUILD @@ -1,17 +1,22 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=nghttp2 -pkgver=1.40.0 +pkgver=1.41.0 pkgrel=0 pkgdesc="Experimental HTTP/2 client, server and proxy" url="https://nghttp2.org/" arch="all" +options="!check" # Requires cunit, which we don't currently ship license="MIT" depends="" makedepends="c-ares-dev libev-dev libxml2-dev openssl-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://github.com/tatsuhiro-t/$pkgname/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz" +# secfixes: +# 1.41.0-r0: +# - CVE-2020-11080 + build() { ./configure \ --build=$CBUILD \ @@ -37,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3f9b989c4bd9571b11bb9d59fe2dfd5596ba3962babfc836587d5047e780400a6cf46e43c602caa25ca83c03b84a1629953140d45223099b193df54a719745ce nghttp2-1.40.0.tar.xz" +sha512sums="c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d nghttp2-1.41.0.tar.xz" diff --git a/user/node/APKBUILD b/user/node/APKBUILD index d60a359af..c74516b71 100644 --- a/user/node/APKBUILD +++ b/user/node/APKBUILD @@ -1,15 +1,16 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=node -pkgver=10.19.0 +pkgver=10.21.0 pkgrel=0 pkgdesc="JavaScript runtime" url="https://nodejs.org/" arch="all" -license="MIT AND ICU AND BSD-3-Clause AND BSD-2-Clause AND ISC AND OpenSSL AND Public-Domain AND Zlib AND Artistic-2.0 AND Apache-2.0 AND CC0-1.0" +options="net" # Required in check() +license="MIT AND ICU AND BSD-3-Clause AND BSD-2-Clause AND ISC AND Public-Domain AND Zlib AND Artistic-2.0 AND Apache-2.0 AND CC0-1.0" depends="" makedepends="c-ares-dev http-parser-dev icu-dev libexecinfo-dev libuv-dev - nghttp2-dev python3 zlib-dev" + nghttp2-dev>=1.41 openssl-dev python3 zlib-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://nodejs.org/download/release/v$pkgver/node-v$pkgver.tar.xz https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz @@ -30,11 +31,15 @@ builddir="$srcdir/$pkgname-v$pkgver" # - CVE-2019-9516 # - CVE-2019-9517 # - CVE-2019-9518 +# 10.21.0-r0: +# - CVE-2020-7598 +# - CVE-2020-8174 unpack() { default_unpack [ -z $SKIP_PYTHON ] || return 0 + # TODO: when bumping to 12.x, python3 should be usable msg "Killing all remaining hope for humanity and building Python 2..." cd "$srcdir/Python-2.7.15" [ -d ../python ] && rm -r ../python @@ -47,7 +52,6 @@ unpack() { build() { export PATH="$srcdir/python/bin:$PATH" - # We can't use --shared-openssl until 1.1 is available. python ./configure.py \ --prefix=/usr \ --with-intl=system-icu \ @@ -55,15 +59,24 @@ build() { --shared-http-parser \ --shared-libuv \ --shared-nghttp2 \ - --openssl-no-asm \ + --shared-openssl \ + --openssl-use-def-ca-store \ --shared-zlib # keep DESTDIR set, to avoid a full rebuild in package() make DESTDIR="$pkgdir" } check() { + case "$CARCH" in + pmmx) + # https://bts.adelielinux.org/show_bug.cgi?id=306 + _skip="parallel/test-http-invalid-te,parallel/test-worker-stdio" + ;; + esac + export PATH="$srcdir/python/bin:$PATH" - make DESTDIR="$pkgdir" test-only + make DESTDIR="$pkgdir" test-only \ + ${_skip:+CI_SKIP_TESTS="$_skip"} } package() { @@ -71,7 +84,7 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="512efc58415ed789938c434af131d76bdd51772cac9f7e380afaa79d83cc9c433a979068fc7272adba6ba6551d195267978e1fc819236926b0d1fd6cf91c5eee node-v10.19.0.tar.xz +sha512sums="613d3c1bca79ea5f127dc6793de2b5cfdfa056c01ec092e3b7ee79205894b21ca5ec4a367265122641dd1d360c675cfb36a4f7892894194ddd18abd1b2206544 node-v10.21.0.tar.xz 27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6 Python-2.7.15.tar.xz 8f64922d586bce9d82c83042a989739cc55ecc5e015778cdfbda21c257aa50527ddb18740985bcb2068e4a749b71eb8a135d9a8152b374d361589df7f33c9b60 libatomic.patch 6d37794c7c78ef92ebb845852af780e22dc8c14653b63a8609c21ab6860877b9dffc5cf856a8516b7978ec704f312c0627075c6440ace55d039f95bdc4c85add ppc32.patch diff --git a/user/nsd/APKBUILD b/user/nsd/APKBUILD index 518fe3501..a119fd0d4 100644 --- a/user/nsd/APKBUILD +++ b/user/nsd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=nsd -pkgver=4.2.4 +pkgver=4.3.1 pkgrel=0 pkgdesc="An authoritative only name server" url="https://www.nlnetlabs.nl/projects/nsd/about/" @@ -51,6 +51,6 @@ openrc() { install -Dm644 "$srcdir/nsd.confd" "$subpkgdir/etc/conf.d/nsd" } -sha512sums="5d4f546a2a4484b182c65d3337d44596e935bca074c0eda2947b9d128a56db08a00240c6ec9ce22bc9a436e009c00c3283c4a5cbd1163ca4a429eaa92ec54208 nsd-4.2.4.tar.gz +sha512sums="58b6e964795d6c796b547e1134cef954e5f4adf4e976db830ff7900892327154dab2a607ceadbb99072d6e5495d62c808c8fb8c94359ae93f636d11925c0d261 nsd-4.3.1.tar.gz f0ef1d3427e92650239d9d91402810c045fc9223e3f42ce86986422bf2039a0bcc02dffdfe1153d54de5c76c8f2bdc3e34fe341c65b41f2d333b02c00b5b0eae nsd.confd 139e52dec98792173f06d298574db0d0e6966a06af8a0a3069487beb01fd570c09d22322569b54bacdc43232dbfb99a8c497d4417d2bbfee88bcdd9d1b4d22f7 nsd.initd" diff --git a/user/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD index 08ad8f475..5c24d7987 100644 --- a/user/obconf-qt/APKBUILD +++ b/user/obconf-qt/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=obconf-qt -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt5-based Openbox configuration tool" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 openbox-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build openbox-dev liblxqt-dev qt5-qttools-dev" source="https://github.com/lxqt/obconf-qt/releases/download/$pkgver/obconf-qt-$pkgver.tar.xz" @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed obconf-qt-0.14.1.tar.xz" +sha512sums="a723dcd3b409afc7b16572d293cbf0543e00a7177a9819e2374632c00c765de74896429f6e19a54fcee83e20ce2e0876f857447c374db2f4f925dec92be71279 obconf-qt-0.15.0.tar.xz" diff --git a/user/ode/APKBUILD b/user/ode/APKBUILD index 9e1f520d1..32ee727fb 100644 --- a/user/ode/APKBUILD +++ b/user/ode/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ode -pkgver=0.16 +pkgver=0.16.1 pkgrel=0 pkgdesc="High performance library for simulating rigid body dynamics" url="https://ode.org/" @@ -41,6 +41,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="302e6f689851acb9ba0db23e13ab59ae0acbbd8dbdfa7e277b57d870c0d3435274e64da16134fb4b7053f951489c138e485165d79664d11764a88b3437d703d3 ode-0.16.tar.gz +sha512sums="65aa7b6baf98bab9aa721a119246371e31e070d97770a8cdaea882de3cd5e2dfde7ca1b4258186b397853cc0dc3b2f7b6b7aef3ac86b48a72a3011d5ae536672 ode-0.16.1.tar.gz 8630d5d059fd0f623db6af4000666868358002a42ba84817117b1fb5e01c776bb23cbf1c8c43181d7bf40a0d71b640f9d2f9785461d8a77877dcbdadd775792e fix-test-link.patch 0d618cec0afdab86279687275bf476594897d1dfd7b5619fe6bc05343f22f6292c9598a73ff6f2967d5f39e071abcf282fc673c0ffe33f7efd9bbe56ca674dae stdint.patch" diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD index 4e9567438..9c75fa6d2 100644 --- a/user/okular/APKBUILD +++ b/user/okular/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okular -pkgver=19.12.3 -pkgrel=1 +pkgver=20.04.3 +pkgrel=0 pkgdesc="Universal document reader developed by KDE" url="https://okular.kde.org/" arch="all" @@ -18,7 +18,6 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/okular-$pkgver.tar.xz es-doc-fix.patch - CVE-2020-9359.patch " # secfixes: @@ -49,6 +48,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ccc3c357fefe04691bba7bc803321789c3a1fdad4cfc610e9c425b2373efd94340fa2ceb2e357569ad14f1c0c69ef0db8079d9bc082a6d5708ccbfb3b65d8b3d okular-19.12.3.tar.xz -de32eabda7ee84c4d894b02c56c7d66d8e2332688c726ad95e1b61c1e730035081ff7721275c7b7a9884aabc268ee0115d9ab8e5f52ae8838e1c09c471c81932 es-doc-fix.patch -02b27bd206006dbbafbe74e60665ad5159ef6ea32b8bf1526b9c655c046cb6de08630f28d64c9935e73d5707a30d0835f2ab8cd4521740e5236cefc3d3057d29 CVE-2020-9359.patch" +sha512sums="1d6a02590a4d1b7ab6dbf63b370f3cceb0e35c763310b54d5aeac3cc5122c2041f2cf0206a7e32ad18c494c7fd0caf51d50e457ae8ca54daa8494e4302110c01 okular-20.04.3.tar.xz +de32eabda7ee84c4d894b02c56c7d66d8e2332688c726ad95e1b61c1e730035081ff7721275c7b7a9884aabc268ee0115d9ab8e5f52ae8838e1c09c471c81932 es-doc-fix.patch" diff --git a/user/okular/CVE-2020-9359.patch b/user/okular/CVE-2020-9359.patch deleted file mode 100644 index 34ff3e2ce..000000000 --- a/user/okular/CVE-2020-9359.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6a93a033b4f9248b3cd4d04689b8391df754e244 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Tue, 10 Mar 2020 23:07:24 +0100 -Subject: [PATCH] Document::processAction: If the url points to a binary, don't - run it - ---- - core/document.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/core/document.cpp b/core/document.cpp -index 3215a1abc..0aa5b6980 100644 ---- a/core/document.cpp -+++ b/core/document.cpp -@@ -4388,7 +4388,8 @@ void Document::processAction( const Action * action ) - { - const QUrl realUrl = KIO::upUrl(d->m_url).resolved(url); - // KRun autodeletes -- new KRun( realUrl, d->m_widget ); -+ KRun *r = new KRun( realUrl, d->m_widget ); -+ r->setRunExecutables(false); - } - } - } break; --- -2.25.2 - diff --git a/user/oniguruma/192.patch b/user/oniguruma/192.patch new file mode 100644 index 000000000..d027757d7 --- /dev/null +++ b/user/oniguruma/192.patch @@ -0,0 +1,25 @@ +From 47af49af70a717ac31c54ae55ad242a27f213def Mon Sep 17 00:00:00 2001 +From: "K.Kosako" <kkosako0@gmail.com> +Date: Wed, 22 Apr 2020 14:47:09 +0900 +Subject: [PATCH] fix #192: Unexpected regex match + +--- + src/regcomp.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/regcomp.c b/src/regcomp.c +index 4d5b78f..b3193c5 100644 +--- a/src/regcomp.c ++++ b/src/regcomp.c +@@ -3567,6 +3567,11 @@ check_node_in_look_behind(Node* node, int not, int* used) + + if (IS_NOT_NULL(NODE_BODY(node))) + r = check_node_in_look_behind(NODE_BODY(node), not, used); ++ ++ /* Issue 192 ++ escape removing node in tune_look_behind() ++ */ ++ *used = TRUE; + break; + + case NODE_GIMMICK: diff --git a/user/oniguruma/APKBUILD b/user/oniguruma/APKBUILD index c4399f782..e95c5229e 100644 --- a/user/oniguruma/APKBUILD +++ b/user/oniguruma/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=oniguruma -pkgver=6.9.4 +pkgver=6.9.5 pkgrel=0 pkgdesc="A regular expression library" url="https://github.com/kkos/oniguruma" @@ -11,7 +11,9 @@ license="BSD-2-Clause" depends="" makedepends="" subpackages="$pkgname-dev" -source="https://github.com/kkos/$pkgname/releases/download/v$pkgver/onig-$pkgver.tar.gz" +source="https://github.com/kkos/$pkgname/releases/download/v$pkgver/onig-$pkgver.tar.gz + 192.patch + " builddir="$srcdir/onig-$pkgver" # secfixes: @@ -39,4 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b onig-6.9.4.tar.gz" +sha512sums="2bdb24914e7069c6df9ab8a3d0190ddb58440d94b13860cdc36d259062ae0bc2aa85d564a4209ec596fc7ee47b0823d1b817d4f7ffcc3ea60e9870da84491dc1 onig-6.9.5.tar.gz +b2e9926e0b9a22b2036bb43297e24726439938b8cf349f55ab09bf47d16a4862bb3bbdec8b425c7d174524121e49c4d6e567e26168894d7c564b7645d5a1bff5 192.patch" diff --git a/user/opal-utils/APKBUILD b/user/opal-utils/APKBUILD index 7bdcc5597..94e1d0b89 100644 --- a/user/opal-utils/APKBUILD +++ b/user/opal-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=opal-utils -pkgver=6.5.2 +pkgver=6.6.2 pkgrel=0 pkgdesc="Tools for IBM FSP and OpenPOWER systems" url="https://lists.ozlabs.org/listinfo/skiboot" @@ -39,6 +39,6 @@ package() { done } -sha512sums="765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091 skiboot-6.5.2.tar.gz +sha512sums="a864e4120ffac4065b89d5da7c959ac20643be42e83f4186a778355f3ea0b36cbd1e02c91b1460b6fa6550fceec9034cce096b89f840b4051d65c7f0ab70dc27 skiboot-6.6.2.tar.gz e7480f16b6eb41fd65b40ea1f20031118030f24681b7b8afcfdebb8cde7625e45902683cfb5fe0af3259060fb1b92b9c2f5d62354de356e7706a7f08ad9f772e musl.patch 692206f60727041c070c7f75eb66325607d00261e8dd7f47111fd59c7495c744ac356b0c94c6139c76bacbe403f1e9e6819f8bce2d13ac10d1cacc6e351cc25e opal-prd.patch" diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD index 4ad8f07a0..313812683 100644 --- a/user/openjdk8/APKBUILD +++ b/user/openjdk8/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openjdk8 -_icedteaver=3.11.0 +_icedteaver=3.16.0 # pkgver is <JDK version>.<JDK update>.<JDK build> # Check https://icedtea.classpath.org/wiki/Main_Page when updating -pkgver=8.201.08 +pkgver=8.252.09 pkgrel=0 pkgdesc="Libre Java development kit for Java 8" url="https://icedtea.classpath.org/" @@ -13,7 +13,7 @@ license="GPL-2.0-only" depends="$pkgname-jre java-cacerts" makedepends="bash findutils libarchive-tools zip file util-linux libxslt autoconf automake linux-headers sed xz coreutils - openjdk7 ca-certificates libjpeg-turbo-dev cmd:which + $pkgname-bootstrap ca-certificates libjpeg-turbo-dev cmd:which nss-dev nss-static cups-dev giflib-dev libpng-dev libxt-dev lcms2-dev libxp-dev libxtst-dev libxinerama-dev zlib-dev libxrender-dev alsa-lib-dev freetype-dev fontconfig-dev @@ -29,7 +29,7 @@ ppc64) _jarch=ppc64 *) _jarch="$CARCH";; esac -_bootstrap_java_home="/usr/lib/jvm/java-1.7-openjdk" +_bootstrap_java_home="/usr/lib/jvm/java-1.8-openjdk" _java_home="/usr/lib/jvm/java-1.8-openjdk" _jrelib="$_java_home/jre/lib/$_jarch" @@ -38,6 +38,8 @@ _jrelib="$_java_home/jre/lib/$_jarch" ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli" sonameprefix="$pkgname:" +provides="$pkgname-bootstrap=$pkgver-r$pkgrel" + subpackages="$pkgname-dbg $pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-jre-base:jrebase $pkgname-doc $pkgname-demos" @@ -62,14 +64,58 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.x icedtea-jdk-fix-libjvm-load.patch icedtea-jdk-musl.patch icedtea-jdk-includes.patch - icedtea-jdk-getmntent-buffer.patch icedtea-autoconf-config.patch - icedtea-jdk-tls-nist-curves.patch remove-gawk.patch " builddir="$srcdir/icedtea-$_icedteaver" # secfixes: +# 8.252.09-r0: +# - CVE-2019-2602 +# - CVE-2019-2684 +# - CVE-2019-2698 +# - CVE-2019-2745 +# - CVE-2019-2762 +# - CVE-2019-2766 +# - CVE-2019-2769 +# - CVE-2019-2786 +# - CVE-2019-2816 +# - CVE-2019-2842 +# - CVE-2019-2894 +# - CVE-2019-2933 +# - CVE-2019-2945 +# - CVE-2019-2949 +# - CVE-2019-2958 +# - CVE-2019-2962 +# - CVE-2019-2964 +# - CVE-2019-2973 +# - CVE-2019-2975 +# - CVE-2019-2978 +# - CVE-2019-2981 +# - CVE-2019-2983 +# - CVE-2019-2987 +# - CVE-2019-2988 +# - CVE-2019-2989 +# - CVE-2019-2992 +# - CVE-2019-2999 +# - CVE-2019-7317 +# - CVE-2020-2583 +# - CVE-2020-2590 +# - CVE-2020-2593 +# - CVE-2020-2601 +# - CVE-2020-2604 +# - CVE-2020-2654 +# - CVE-2020-2659 +# - CVE-2020-2754 +# - CVE-2020-2755 +# - CVE-2020-2756 +# - CVE-2020-2757 +# - CVE-2020-2773 +# - CVE-2020-2781 +# - CVE-2020-2800 +# - CVE-2020-2803 +# - CVE-2020-2805 +# - CVE-2020-2830 # 8.201.08-r0: # - CVE-2019-2422 # - CVE-2019-2426 @@ -102,22 +148,22 @@ unpack() { } prepare() { - ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)" - ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)" - [ "${pkgver#*.}" = "$ver_u.$ver_b" ] \ - || die "Version mismatch, source is 8.$ver_u.$ver_b, but abuild defines $pkgver!" + _ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)" + _ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)" + [ "${pkgver#*.}" = "$_ver_u.$_ver_b" ] \ + || die "Version mismatch, source is 8.$_ver_u.$_ver_b, but abuild defines $pkgver!" # Busybox sha256 does not support longopts. sed -e "s/--check/-c/g" -i Makefile.am - for patch in $source; do - case $patch in + for _patch in $source; do + case $_patch in icedtea-*.patch) - cp ../$patch patches + cp ../$_patch patches ;; *.patch) - msg "Applying patch $patch" - patch -p1 -i "$srcdir"/$patch + msg "Applying patch $_patch" + patch -p1 -i "$srcdir"/$_patch ;; esac done @@ -134,10 +180,10 @@ build() { fi DISTRIBUTION_PATCHES="" - for patch in $source; do - case $patch in + for _patch in $source; do + case $_patch in icedtea-*.patch) - DISTRIBUTION_PATCHES="$DISTRIBUTION_PATCHES patches/$patch" + DISTRIBUTION_PATCHES="$DISTRIBUTION_PATCHES patches/$_patch" ;; esac done @@ -200,7 +246,7 @@ jrelib() { pkgdesc="OpenJDK 8 Java Runtime (class libraries)" depends="" - for file in jre/lib/images \ + for _file in jre/lib/images \ jre/lib/*.jar \ jre/lib/security \ jre/lib/ext/*.jar \ @@ -209,9 +255,9 @@ jrelib() { jre/THIRD_PARTY_README \ jre/LICENSE; do - dir=${file%/*} - mkdir -p "$subpkgdir"/$_java_home/$dir - mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir + _dir=${_file%/*} + mkdir -p "$subpkgdir"/$_java_home/$_dir + mv "$pkgdir"/$_java_home/$_file "$subpkgdir"/$_java_home/$_dir done } @@ -219,7 +265,7 @@ jre() { pkgdesc="OpenJDK 8 Java Runtime" mkdir -p "$subpkgdir" - for file in jre/bin/policytool \ + for _file in jre/bin/policytool \ bin/appletviewer \ bin/policytool \ jre/lib/$_jarch/libawt_xawt.so \ @@ -228,9 +274,9 @@ jre() { jre/lib/$_jarch/libjsoundalsa.so \ jre/lib/$_jarch/libsplashscreen.so; do - dir=${file%/*} - mkdir -p "$subpkgdir"/$_java_home/$dir - mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir + _dir=${_file%/*} + mkdir -p "$subpkgdir"/$_java_home/$_dir + mv "$pkgdir"/$_java_home/$_file "$subpkgdir"/$_java_home/$_dir done } @@ -244,9 +290,9 @@ jrebase() { mv "$pkgdir"/$_java_home/lib/$_jarch/jli \ "$subpkgdir"/$_java_home/lib/$_jarch/ - for file in java orbd rmid servertool unpack200 keytool \ + for _file in java orbd rmid servertool unpack200 keytool \ pack200 rmiregistry tnameserv; do - mv "$pkgdir"/$_java_home/bin/$file "$subpkgdir"/$_java_home/bin/ + mv "$pkgdir"/$_java_home/bin/$_file "$subpkgdir"/$_java_home/bin/ done # Rest of the jre subdir (which were not taken by -jre subpkg). @@ -269,24 +315,22 @@ demos() { "$subpkgdir"/$_java_home/ } -sha512sums="a71c9318d49077f8ae27f5c3e0b61df0709eded241f557c886f6b93aa98c13ad78f713d1286da286989bf62866dfff7538ad783eb804a705a160cbc096dea851 icedtea-3.11.0.tar.xz -fc3faa7d7b9531f10c40241d89c36854043921f6f1a0851f284bcab36fc54fb0bb8cf8365dd4b2fb22b3ee8ddb8ed4a79e0807f79cb95b4b00f164993f1acc0b openjdk-3.11.0.tar.xz -9b8a44dda0bbfba8dc0d659e0fabf22e84b9931518e4b199a238faa103cbc4ed814c97f0f38f0aed263846b46fc7eab4500ba9759503373083e12cb8b5b364b5 corba-3.11.0.tar.xz -9eba0f6ada2ae8adc1791a91ceb4fba9bd06aee0626cd1b4310ff16c7c8006045fed5fb7f109e490395b70695be4e6bfd6f1f5cbcdb095fb17abf123012a03de jaxp-3.11.0.tar.xz -ce5f0c2aced1af59f002dc9dc6cba4b9332167e9e019a3040267901ef7f325e05b8c99ed1f276b88ddb4e43cdd1b0c456e0c4dc2222ae6b3800c0502ffa840de jaxws-3.11.0.tar.xz -411508ed91f14ae1c51ea54de72a943db222ff572f3991631fe1a1fa97f9bb42da1e01ca98893f7236b4b44bae2917fc3f8622d7f94a085be30d437451acd272 jdk-3.11.0.tar.xz -363c376848870c6c28415967561c4b151f1256c38a315fabc69c90425f5255224182045349a00c9433db52c416b7ebffedaa4825c980460541a3f9338adbaa5e langtools-3.11.0.tar.xz -13fa35f4a4fe01b3da4efb8476c0cb3482a36596eb422f2ad958a4c51efc286962ac3123a75853e84c4db477ac064a0fd3ee5e03f1ea0ec4f7e2c8ac07aa2d0e hotspot-3.11.0.tar.xz -2b46a8599d530a351522420cae8ac780cd2e64a6d7adbff87397a178f12f0a992bccd0f56435582dbd10be2157d4a4540c41b3dca488566162eed680102e58a9 nashorn-3.11.0.tar.xz -c0776ff52e11a353fee29419319cd9e1fc4e5bb922832547616e8499fd52852a935a6a6fb93b49a67ab7b3fd2f7a63320f917e354cc7123220139e80694a7b5a icedtea-hotspot-musl.patch +sha512sums="67964f283b5a220ded7c86141ac359fc51f41077686d3e68568a9f303d2e5e6d62472bef2d6f5f9d53897a55589c84d3212983194607b9a6704192752f8ad2ac icedtea-3.16.0.tar.xz +76b32457958c2cdbb0006629bb41652286a1a9bfbda862665eddf822d4653d4858f9f2565e849b0e49f031b7667be73be8fe8c71abc65e1795eb570a96d1fd1e openjdk-3.16.0.tar.xz +bf90c95f401d4628e32b9a7ea78b7d43944f82882818a81d2ff368f09e49148091bf823d78ed56c343c175fe6d25492d9b78e25b725f218592ea94c4ae285e56 corba-3.16.0.tar.xz +86e8c18741c1f4baca27d784b068765e404a5c2ee6ecb172c826fc1d6192b5776133f103b749839c39154fcaec87a0df95e8fd5bcb56b1e9b811711b296a4836 jaxp-3.16.0.tar.xz +824ef15aa70ec629406fd9b98a69e5699fe8f6a8ab06be00ac546bcda1daf485b20de6ea0310064e000efbaf35b1cebee25bf69033634fdce8434efb3bb16f1d jaxws-3.16.0.tar.xz +9202f88b360637ad474920d8a6f85740e6a425679617ef713efd67778b4c7ca0b3eba7e4fc9d33de0bbd5dacda4862c8a9b63a13880204388b01af29d5fb6a55 jdk-3.16.0.tar.xz +1858bb3b7dd37edd817a52c67a878b48bc9b790623e77d9a6107f54b141638cb101ae3b8df560e3352c9ca2925aa5d493b4924e36a238be5a9628c714cc23642 langtools-3.16.0.tar.xz +19490ccc377fde5dc3d4396425e945f32e121ad0cc4be394b07f8698a7e3805b16fc41e427bab5fa290cb84efc7edb62acf8ca98072176343f5584d692592d2d hotspot-3.16.0.tar.xz +4bf87e7441ac747f133612e1fba5c06946c6731bae76132ffc614b41fcb689fda9d9ceb1e1fee3765765c6109894c85cf0f6e6fa9eb301f9a2d640ea6cd1c16c nashorn-3.16.0.tar.xz +bfbeccc931b9eab04fca94167b7569af26195297130e2effd9175d33b74dec3dc5727fea6e0cbf3cce21ba09641ddd868179544d3fabe8b128baaaccb9c2711c icedtea-hotspot-musl.patch e5cf4d70f96fc1e72ae8b97a887adb96092ff36584711cbb8de9d9fa9e859cb8731d638838de0d9591239fc44ffe5c74422d1842bd9f10a0c00dff1627bdeeef icedtea-hotspot-musl-ppc.patch 19459dbb922f5a71cd15b53199481498626a783c24f91d2544d55b7dddd2cdb34a64bbf0226b99548612dd1743af01b3f9ff32c30abbbc90ce727ca2dbbbd1f9 icedtea-hotspot-noagent-musl.patch f6365cfafafa008bd6c1bf0ccec01a63f8a39bd1a8bc87baa492a27234d47793ba02d455e5667a873ef50148df3baaf6a8421e2da0b15faac675867da714dd5f icedtea-jdk-execinfo.patch 48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774 icedtea-jdk-fix-ipv6-init.patch b135991c76b0db8fa7c363e0903624668e11eda7b54a943035c214aa4d7fc8c3e8110ed200edcec82792f3c9393150a9bd628625ddf7f3e55720ff163fbbb471 icedtea-jdk-fix-libjvm-load.patch -1fbc32ddc528c7c0099dbc1e48f88d29dccf55e7b8997793aa1d3d8408003a1223d898cca4248e1a12d343d3feec5144f875e6cdac8460d763c73ab3ad7e49f9 icedtea-jdk-musl.patch -e8d9f1b867bf4fc84aa00d1237b264bcf503b1ed5f34735e14b0b747a728953fe0051a5af69ed058d377fbf65d8be1ed9e38fe5fc6edb2d50b31f34bf3ba91dc icedtea-jdk-includes.patch -7e6fa46b10c630517bfa46943858aea1d032c12d32ba3fcb7a2143ae1e896c34fa4cb8f925af80cb19f8e29149b835aa054adfd30ebb00539f6c78588d6f5211 icedtea-jdk-getmntent-buffer.patch +17c78db081a85e37721c23e0c0e7cab85e2201a0969bd4858cb90375b97d1703c9bf867f8ac02f6b33f9775b78bae41e38223b7a887918d4a6c9f29b75f3de28 icedtea-jdk-musl.patch +974fb54532b7e7d738f4278187fc6bd9f9b2d99866b94f68a617ee4911c89a3b8cc41ecfdcaefecf9157492d006b1844b6b0b41ac4209d84f9e8d13c9e485dd3 icedtea-jdk-includes.patch 662d662d0a7a84be2978e921317589f212f3ba3b7629527ba0f1140b5ac4c1024893e0ed176211688ed1a4505968c4befc841ed57ffcdbb9d355c2cb0571b167 icedtea-autoconf-config.patch -9ea7ac942baf29cc619bc2e1acd59201b9f6d38f39a517b495d7613aec746459200c81afb57c5fcdcb856f6bc8b33f7566c8593fed07e5c73f43e08f1072d458 icedtea-jdk-tls-nist-curves.patch b0f6d07c6a949acdc8b4a25bf924f134f468e162f01dd440fd4ca80769fb84a0a54210f93efbe88012404fe3db6701aad31cdbc772bc054ad69021c37db5538c remove-gawk.patch" diff --git a/user/openjdk8/icedtea-hotspot-musl.patch b/user/openjdk8/icedtea-hotspot-musl.patch index 6cfb3e606..5d6f688a1 100644 --- a/user/openjdk8/icedtea-hotspot-musl.patch +++ b/user/openjdk8/icedtea-hotspot-musl.patch @@ -82,8 +82,8 @@ index d2c10e0..20f657f 100644 -# include <fpu_control.h> +# include <linux/types.h> /* provides __u64 */ - #ifdef BUILTIN_SIM - #define REG_SP REG_RSP + #define REG_FP 29 + diff --git openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp index 38388cb..2505ba8 100644 --- openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp diff --git a/user/openjdk8/icedtea-jdk-getmntent-buffer.patch b/user/openjdk8/icedtea-jdk-getmntent-buffer.patch deleted file mode 100644 index 075a9d423..000000000 --- a/user/openjdk8/icedtea-jdk-getmntent-buffer.patch +++ /dev/null @@ -1,88 +0,0 @@ -Give a much bigger buffer to getmntent_r. - -https://bugs.alpinelinux.org/issues/7093 - -diff --git a/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c b/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c -index c8500db..d0b85d6 100644 ---- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c -+++ openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c -@@ -33,6 +33,7 @@ - #include <dlfcn.h> - #include <errno.h> - #include <mntent.h> -+#include <limits.h> - - #include "sun_nio_fs_LinuxNativeDispatcher.h" - -@@ -173,8 +174,8 @@ Java_sun_nio_fs_LinuxNativeDispatcher_getmntent(JNIEnv* env, jclass this, - jlong value, jobject entry) - { - struct mntent ent; -- char buf[1024]; -- int buflen = sizeof(buf); -+ char *buf = NULL; -+ const size_t buflen = PATH_MAX * 4; - struct mntent* m; - FILE* fp = jlong_to_ptr(value); - jsize len; -@@ -183,10 +184,17 @@ Java_sun_nio_fs_LinuxNativeDispatcher_getmntent(JNIEnv* env, jclass this, - char* dir; - char* fstype; - char* options; -+ jint res = -1; - -- m = getmntent_r(fp, &ent, (char*)&buf, buflen); -- if (m == NULL) -+ buf = malloc(buflen); -+ if (buf == NULL) { -+ JNU_ThrowOutOfMemoryError(env, "native heap"); - return -1; -+ } -+ m = getmntent_r(fp, &ent, buf, buflen); -+ if (m == NULL) -+ goto out; -+ - name = m->mnt_fsname; - dir = m->mnt_dir; - fstype = m->mnt_type; -@@ -195,32 +203,35 @@ Java_sun_nio_fs_LinuxNativeDispatcher_getmntent(JNIEnv* env, jclass this, - len = strlen(name); - bytes = (*env)->NewByteArray(env, len); - if (bytes == NULL) -- return -1; -+ goto out; - (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)name); - (*env)->SetObjectField(env, entry, entry_name, bytes); - - len = strlen(dir); - bytes = (*env)->NewByteArray(env, len); - if (bytes == NULL) -- return -1; -+ goto out; - (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)dir); - (*env)->SetObjectField(env, entry, entry_dir, bytes); - - len = strlen(fstype); - bytes = (*env)->NewByteArray(env, len); - if (bytes == NULL) -- return -1; -+ goto out; - (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)fstype); - (*env)->SetObjectField(env, entry, entry_fstype, bytes); - - len = strlen(options); - bytes = (*env)->NewByteArray(env, len); - if (bytes == NULL) -- return -1; -+ goto out; - (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte*)options); - (*env)->SetObjectField(env, entry, entry_options, bytes); - -- return 0; -+ res = 0; -+out: -+ free(buf); -+ return res; - } - - JNIEXPORT void JNICALL diff --git a/user/openjdk8/icedtea-jdk-includes.patch b/user/openjdk8/icedtea-jdk-includes.patch index 6443a1973..5acbb9efb 100644 --- a/user/openjdk8/icedtea-jdk-includes.patch +++ b/user/openjdk8/icedtea-jdk-includes.patch @@ -53,17 +53,6 @@ /* O Flags */ ---- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c -+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c -@@ -28,7 +28,7 @@ - #include <sys/types.h> - #include <sys/socket.h> - #if defined(__linux__) && !defined(USE_SELECT) --#include <sys/poll.h> -+#include <poll.h> - #endif - #include <netinet/tcp.h> /* Defines TCP_NODELAY, needed for 2.6 */ - #include <netinet/in.h> --- openjdk.orig/jdk/src/solaris/native/java/net/bsd_close.c +++ openjdk/jdk/src/solaris/native/java/net/bsd_close.c @@ -36,7 +36,7 @@ @@ -88,14 +77,14 @@ * Stack allocated by thread when doing blocking operation --- openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.h +++ openjdk/jdk/src/solaris/native/java/net/net_util_md.h -@@ -33,7 +33,7 @@ - #include <unistd.h> - - #ifndef USE_SELECT +@@ -27,7 +27,7 @@ + #define NET_UTILS_MD_H + + #include <netdb.h> -#include <sys/poll.h> +#include <poll.h> - #endif - + #include <sys/socket.h> + int NET_Timeout(int s, long timeout); --- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c +++ openjdk/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c diff --git a/user/openjdk8/icedtea-jdk-musl.patch b/user/openjdk8/icedtea-jdk-musl.patch index 97946ba42..7dbd6872c 100644 --- a/user/openjdk8/icedtea-jdk-musl.patch +++ b/user/openjdk8/icedtea-jdk-musl.patch @@ -47,32 +47,10 @@ diff -ru openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c openjdk #define HAS_GLIBC_GETHOSTBY_R 1 #endif -diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c ---- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2017-01-25 04:22:03.000000000 +0000 -+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2017-02-06 11:23:47.047832009 +0000 -@@ -41,7 +41,6 @@ - #endif - #ifdef __linux__ - #include <unistd.h> --#include <sys/sysctl.h> - #include <sys/utsname.h> - #include <netinet/ip.h> - -diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c ---- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2017-01-25 04:22:03.000000000 +0000 -+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2017-02-06 11:23:47.047832009 +0000 -@@ -43,7 +43,6 @@ - #endif - #ifdef __linux__ - #include <unistd.h> --#include <sys/sysctl.h> - #endif - - #include "jvm.h" diff -ru openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/src/solaris/native/java/net/linux_close.c ---- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c 2017-01-25 04:22:03.000000000 +0000 -+++ openjdk/jdk/src/solaris/native/java/net/linux_close.c 2017-02-06 11:23:47.047832009 +0000 -@@ -56,7 +56,7 @@ +--- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c 2020-04-29 12:33:10.000000000 +0000 ++++ openjdk/jdk/src/solaris/native/java/net/linux_close.c 2020-05-02 19:35:51.590000000 +0000 +@@ -58,7 +58,7 @@ typedef struct { /* * Signal to unblock thread */ @@ -80,8 +58,8 @@ diff -ru openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/ +static int sigWakeup; /* - * The fd table and the number of file descriptors -@@ -95,6 +95,9 @@ + * fdTable holds one entry per file descriptor, up to a certain +@@ -147,6 +147,9 @@ static void __attribute((constructor)) i /* * Setup the signal handler */ diff --git a/user/openjdk8/icedtea-jdk-tls-nist-curves.patch b/user/openjdk8/icedtea-jdk-tls-nist-curves.patch deleted file mode 100644 index 75fb3af8c..000000000 --- a/user/openjdk8/icedtea-jdk-tls-nist-curves.patch +++ /dev/null @@ -1,47 +0,0 @@ -Bug #7404 TLS negotiation error in OpenJDK 8 u131 - -Fixes an OpenJDK 8 regression discovered in docker-library/openjdk#115 -on Alpine Linux 3.5 (u121) and 3.6 (u131) that causes TLS negotiation -errors for some clients. - -Root cause appears to be OpenJDK announcing support for NIST curves the -underlying NSS library does doesn't. This patch limits OpenJDK's -announcement to elliptic curves 23 (secp256r1), 24 (secp384r1), and 25 -(secp521r1). - -Related issues: - -* https://github.com/docker-library/openjdk/issues/115 -* https://bugs.alpinelinux.org/issues/7404 -* https://access.redhat.com/discussions/2339811 -* https://bugzilla.redhat.com/show_bug.cgi?id=1022017 -* https://bugzilla.redhat.com/show_bug.cgi?id=1348525 - ---- openjdk.orig/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java 2017-05-08 20:03:50.000000000 -0700 -+++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java 2017-06-14 13:37:00.000000000 -0700 -@@ -168,21 +168,10 @@ - "contains no supported elliptic curves"); - } - } else { // default curves -- int[] ids; -- if (requireFips) { -- ids = new int[] { -- // only NIST curves in FIPS mode -- 23, 24, 25, 9, 10, 11, 12, 13, 14, -- }; -- } else { -- ids = new int[] { -- // NIST curves first -- 23, 24, 25, 9, 10, 11, 12, 13, 14, -- // non-NIST curves -- 22, -- }; -- } -- -+ int[] ids = new int[] { -+ // NSS currently only supports these three NIST curves -+ 23, 24, 25 -+ }; - idList = new ArrayList<>(ids.length); - for (int curveId : ids) { - if (isAvailableCurve(curveId)) { diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD index 30f2059ff..1743a4e6d 100644 --- a/user/openldap/APKBUILD +++ b/user/openldap/APKBUILD @@ -1,6 +1,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> # # secfixes: +# 2.4.50-r0: +# - CVE-2020-12243 # 2.4.48-r0: # - CVE-2019-13057 # - CVE-2019-13565 @@ -11,7 +13,7 @@ # - CVE-2017-9287 # pkgname=openldap -pkgver=2.4.49 +pkgver=2.4.50 pkgrel=0 pkgdesc="LDAP Server" url="https://www.openldap.org/" @@ -29,7 +31,7 @@ subpackages="$pkgname-dev $pkgname-doc libldap $pkgname-openrc pkgusers="ldap" pkggroups="ldap" install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade" -source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz +source="https://www.$pkgname.org/software/download/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz openldap-2.4-ppolicy.patch openldap-2.4.11-libldap_r.patch fix-manpages.patch @@ -60,7 +62,6 @@ done prepare() { default_prepare - update_config_sub sed -i '/^STRIP/s,-s,,g' build/top.mk libtoolize --force && aclocal && autoconf @@ -198,7 +199,7 @@ _submv() { done } -sha512sums="99d1943d126b06e62865e31e5825fcff2cb15415f7f85ae4962fa0e7425bc3b58db5b9639150d7b09e3642c80257724c745e47c25ab4fcb1bba0ba771011dd49 openldap-2.4.49.tgz +sha512sums="f528043ff9de36f7b65d8816c9a9c24f0ac400041b2969965178ee6eae62c92a11af33a0a883e4954e5fff98a0738a9f9aa2faf5b385d21974754e045aab31ae openldap-2.4.50.tgz 5d34d49eabe7cb66cf8284cc3bd9730fa23df4932df68549e242d250ee50d40c434ae074ebc720d5fbcd9d16587c9333c5598d30a5f1177caa61461ab7771f38 openldap-2.4-ppolicy.patch 44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357 openldap-2.4.11-libldap_r.patch 8c4244d316a05870dd1147b2ab7ddbcfd7626b5dce2f5a0e72f066dc635c2edb4f1ea3be88c6fec2d5ab016001be16bedef70f2ce0695c3cd96f69e1614ff177 fix-manpages.patch diff --git a/user/openttd/APKBUILD b/user/openttd/APKBUILD index 44417d5a2..3831b7b86 100644 --- a/user/openttd/APKBUILD +++ b/user/openttd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openttd -pkgver=1.10.0 +pkgver=1.10.2 pkgrel=0 pkgdesc="Simulation game based on Transport Tycoon Deluxe" url="https://www.openttd.org/en/" @@ -28,4 +28,4 @@ package() { make install } -sha512sums="f1727b81a059aa04bea1fb6a9a89ae0619942d6406a77f99e642a60ea9416daa215bbd0cbd183747c2df5f6dea81766b7e04493a52211e55522e8b2642db701a openttd-1.10.0-source.tar.xz" +sha512sums="03de85449a458c76c07d8a28c34f72bc95ab0652c666e5925da43746cdd4e95b0d66360b6e214d1df33f11b5346da2e3b9ca6832ac6628c7d6e5e0a791881683 openttd-1.10.2-source.tar.xz" diff --git a/user/opus/APKBUILD b/user/opus/APKBUILD index 5251ec8b0..1fbcc5e17 100644 --- a/user/opus/APKBUILD +++ b/user/opus/APKBUILD @@ -4,7 +4,7 @@ pkgname=opus pkgver=1.3.1 pkgrel=0 pkgdesc="Codec designed for speech and audio transmission" -url="http://www.opus-codec.org/" +url="https://www.opus-codec.org/" arch="all" license="BSD-3-Clause" depends="" diff --git a/user/opusfile/APKBUILD b/user/opusfile/APKBUILD index c0208b12d..030d83d39 100644 --- a/user/opusfile/APKBUILD +++ b/user/opusfile/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: pkgname=opusfile -pkgver=0.11 +pkgver=0.12 pkgrel=0 pkgdesc="High-level API for decoding and seeking within .opus files" -url="http://www.opus-codec.org/" +url="https://www.opus-codec.org/" arch="all" license="BSD-3-Clause" depends="" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349 opusfile-0.11.tar.gz" +sha512sums="e25e6968a3183ac0628ce1000840fd6f9f636e92ba984d6a72b76fb2a98ec632d2de4c66a8e4c05ef30655c2a4a13ab35f89606fa7d79a54cfa8506543ca57af opusfile-0.12.tar.gz" diff --git a/user/oxygen-icons5/APKBUILD b/user/oxygen-icons5/APKBUILD index 397e87ce7..a3338be79 100644 --- a/user/oxygen-icons5/APKBUILD +++ b/user/oxygen-icons5/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=oxygen-icons5 -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="The KDE Oxygen icon set" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d7ba6906823b0e4c6a724b98b587808d8136e29a7f3bdf6fdb8309cbb9bfd43bc903a79cf5629c5f5cbf15510de3526332728f538d8ff624c52c021488b4ca6c oxygen-icons5-5.68.0.tar.xz" +sha512sums="bcc61669105dc03526bb20ea890c29de6c9caab88f588e96fcc01cb94c3404e0cd198ea4e3f828eebbcf6ddaa01ecef35d3d193a16ee9286db85016911bcaf70 oxygen-icons5-5.72.0.tar.xz" diff --git a/user/p11-kit/APKBUILD b/user/p11-kit/APKBUILD index b42538c03..2cd5b0de4 100644 --- a/user/p11-kit/APKBUILD +++ b/user/p11-kit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: pkgname=p11-kit -pkgver=0.23.18.1 +pkgver=0.23.20 pkgrel=0 pkgdesc="Library for loading and sharing PKCS#11 modules" url="https://p11-glue.github.io/p11-glue/p11-kit.html" @@ -10,7 +10,7 @@ license="BSD-3-Clause" depends="" makedepends="libffi-dev libtasn1-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-trust" -source="https://github.com/p11-glue/p11-kit/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" +source="https://github.com/p11-glue/p11-kit/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -42,4 +42,4 @@ trust() { "$subpkgdir"/usr/lib/pkcs11/ } -sha512sums="941996aea75025dad5dfc6f9b4609bc92bc0888d5b2b58de0d498d6cf75d059421405d9c3bad51122108b6ad1e41e434609ead23404efe635cdb806836ccadbd p11-kit-0.23.18.1.tar.gz" +sha512sums="1eb88773fdd49dd48c7e089744e9dbbf6c1033a4863f3bfe75a68d842804baa3c373cb1b28ee625dd69a6e16c89df4ac755e0928495dccf38c007c530f6cfa57 p11-kit-0.23.20.tar.xz" diff --git a/user/palapeli/APKBUILD b/user/palapeli/APKBUILD index 793560380..31bb41211 100644 --- a/user/palapeli/APKBUILD +++ b/user/palapeli/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=palapeli -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Jigsaw puzzle game by KDE" url="https://www.kde.org/applications/games/palapeli/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4ffda823a8046f36ae2e43e556c9c780e565c98c395cf54e4ff175acce8fa96b5ffa0fc0bab06f6fa8cd533ffaa1714c5a536f4d7ce0ef898cfd638c2e655676 palapeli-19.12.3.tar.xz" +sha512sums="e1048ed8ad2b00170eb1079146b18549ac579804d9f7abcaf7f3479ce1bfa9fb4d406b93e3ea889084cd9aa936dc6b7db884992af379a382eb2a147f7f6010bd palapeli-20.04.3.tar.xz" diff --git a/user/papirus-icons/APKBUILD b/user/papirus-icons/APKBUILD index c3201a64d..761ce14e6 100644 --- a/user/papirus-icons/APKBUILD +++ b/user/papirus-icons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=papirus-icons -pkgver=20200301 +pkgver=20200702 pkgrel=0 pkgdesc="Material, flat style icon theme" url="https://store.kde.org/p/1166289/" @@ -39,4 +39,4 @@ epapirus() { mv "$pkgdir"/usr/share/icons/ePapirus "$subpkgdir"/usr/share/icons/ } -sha512sums="8b9f0a9b0fdb676365d6b30af8ba8dee71ff433a4c4317151899f09614da3fc9764e5e9c48743cdf7c8fde6eea53a1d3ab37eb890f1486fc54ce328e6af9b348 papirus-icons-20200301.tar.gz" +sha512sums="ff2aa30bb70361f2952be203b3e3d00aae248726b5413a3a8e9ad7d6e7d0759e9bfd156cc65520175aba0e5436e9e58453ae0058d7d639d5c9a818e7f158761c papirus-icons-20200702.tar.gz" diff --git a/user/pavucontrol-qt/APKBUILD b/user/pavucontrol-qt/APKBUILD index e8254c58e..5b81f0c88 100644 --- a/user/pavucontrol-qt/APKBUILD +++ b/user/pavucontrol-qt/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=pavucontrol-qt -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt port of pavucontrol, a PulseAudio mixer" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="cmake pulseaudio-dev qt5-qtbase-dev liblxqt-dev qt5-qttools-dev - lxqt-build-tools>=0.6.0" + lxqt-build-tools>=$_lxqt_build" source="https://github.com/lxqt/pavucontrol-qt/releases/download/$pkgver/pavucontrol-qt-$pkgver.tar.xz" build() { @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="55a8bceb31e07ceac7ab1fbb5f20101dfb087e58578039a238677e77f858e0564dca46efee2d5513a247c0be474f24d31e3afa9cf3cea0734feb0e56c33d5494 pavucontrol-qt-0.14.1.tar.xz" +sha512sums="c77b0c7403c24df7839598aa46a6076e9ce84a102866a8917c6b8535f1a2b15baacd63e9ddf6bf0b7e914e7c681f0e10bbe378a641bc71144c1b22bc918e4600 pavucontrol-qt-0.15.0.tar.xz" diff --git a/user/pciutils/APKBUILD b/user/pciutils/APKBUILD index 45924bda1..75cac244f 100644 --- a/user/pciutils/APKBUILD +++ b/user/pciutils/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: pkgname=pciutils -pkgver=3.6.2 -pkgrel=2 +pkgver=3.7.0 +pkgrel=0 pkgdesc="PCI bus configuration space access library and tools" url="http://mj.ucw.cz/pciutils.html" arch="all" @@ -44,6 +44,6 @@ package() { rm -r "$pkgdir"/usr/share/hwdata } -sha512sums="a9332f07755ab8af6ba99a5fa3cf739b0f3688276902673b9fe981955c4fa732c3d0ccaa150942ecaf4b263a10c2653f5454aa87492cac1dd805f33500fac489 pciutils-3.6.2.tar.gz +sha512sums="37c01619264d299ac1e367a022637d60ab2bf6e5533fe9d37b2d37fdc5070563b78bfedc200b6bcb9192ce43fdec09ff350080c3e3ba504b90766d004398efc5 pciutils-3.7.0.tar.gz 520b39602078e4325d7dac2d460547b360f7b52c668d88cf3d776c59246c8cfcb537b7b4f50575da9d2fcea1e207b3e99626ce4f23df890d2565b7dac1db2d94 fix-linking-pci-malloc-Makefile.patch aa1d3272500180256929b39a5fc4ea38ddb6a9fad090d732832ded9cc396303cf56efc91cfdeb76edbcfefc9a7c8eb058562c3c2b09a9090a59d3e68c27cec62 pread.patch" diff --git a/user/pcmanfm-qt/APKBUILD b/user/pcmanfm-qt/APKBUILD index a48274c4f..a72c1e6ea 100644 --- a/user/pcmanfm-qt/APKBUILD +++ b/user/pcmanfm-qt/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=pcmanfm-qt -pkgver=0.14.1 +pkgver=0.15.1 pkgrel=0 pkgdesc="File manager and desktop icon manager for LXQt" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.7.0 liblxqt-dev>=${pkgver%.*}.0 libfm-qt-dev>=${pkgver%.*}.0 qt5-qtx11extras-dev qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e pcmanfm-qt-0.14.1.tar.xz" +sha512sums="db0d3cc683b5c94cabab5a8c68b3ae8bf5938735b34989a420692e933bb54d53ebb15da9af4a59039bfd101de0cc00c521c08207e81bfad9d80315e2d94bc559 pcmanfm-qt-0.15.1.tar.xz" diff --git a/user/pcsc-lite/APKBUILD b/user/pcsc-lite/APKBUILD index d4e0355a6..22742c197 100644 --- a/user/pcsc-lite/APKBUILD +++ b/user/pcsc-lite/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=pcsc-lite -pkgver=1.8.25 -pkgrel=1 +pkgver=1.8.26 +pkgrel=0 pkgdesc="Middleware to access a smart card using SCard API (PC/SC)" url="https://pcsclite.apdu.fr/" arch="all" @@ -61,5 +61,5 @@ dev() { mv "$subpkgdir"/usr/lib/libpcsclite.so "$pkgdir"/usr/lib/libpcsclite.so } -sha512sums="0da63cefd70d9524b2afabd62c5f404758c805b84bbe9ef64fb801ef91a8934c38495513022565ea31bd8550b23bc95b9e9b098ddc76930e3d0643c1fbfb5deb pcsc-lite-1.8.25.tar.bz2 +sha512sums="23f9f41e08f6a5ff1840bec621ee37d6eb268e4ced58df516eb7e32cb6a84998a1d04bafcec36e6524926963e6730a25301301d364b6bd4dda8da1caaa76f037 pcsc-lite-1.8.26.tar.bz2 6810ab357b5bcf07bf1ad76ed17ebb8e92be4599303a4e697b87a05d43b8d2bec5d3c29d44d8ddb5d031910ea62ca52a9868e6de9a255227eaeb29d1a7ee0041 pcscd.initd" diff --git a/user/perl-array-intspan/APKBUILD b/user/perl-array-intspan/APKBUILD index b36cd9c62..40301129a 100644 --- a/user/perl-array-intspan/APKBUILD +++ b/user/perl-array-intspan/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Array-IntSpan _author=DDUMONT _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.003 +pkgver=2.004 pkgrel=0 pkgdesc="Perl modules for interacting with arrays via integers" url="https://metacpan.org/pod/Array::IntSpan" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="f55e39f7cccc3db56be07442e8b5f62d1afbf798ba3cf4008134ace8a30a6387cd7876f534e6bccfb24eb05213cc56961c7a28f73902c06105c80612a7c000a4 Array-IntSpan-2.003.tar.gz" +sha512sums="52f210e3beec0c1839baa51d68456c6aafbf9764e938f366317895ec26a6101bd4c83b738cf80326bdf975d68e01a796c1fc6ca3c9584ec50aaa45b3e8d7c7ba Array-IntSpan-2.004.tar.gz" diff --git a/user/perl-common-sense/APKBUILD b/user/perl-common-sense/APKBUILD index 43a250151..13e9e65d3 100644 --- a/user/perl-common-sense/APKBUILD +++ b/user/perl-common-sense/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=common-sense _author=MLEHMANN _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=3.74 +pkgver=3.75 pkgrel=0 pkgdesc="Implements some (in)sane defaults for Perl programs" url="https://metacpan.org/pod/common::sense" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="658ad70a2d1bbd0b26f91c4ea5d69b4cc0b632ede9532b88282987002a5e280f0475d63ee846b7bd2d38ef82f2680e20c2093803e4b62a984750ed447f318d60 common-sense-3.74.tar.gz" +sha512sums="cb6034d9ff721a4122e0215db8ad5279ec4b189c3364593d427d70a1e84a1583a0e1447e276aa9a4fcaeb2f9d47a465a5bc4c0f842c803d3ddf91755311f4af4 common-sense-3.75.tar.gz" diff --git a/user/perl-data-uuid/APKBUILD b/user/perl-data-uuid/APKBUILD index 17e97b05f..9a56e43a0 100644 --- a/user/perl-data-uuid/APKBUILD +++ b/user/perl-data-uuid/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Data-UUID _author=RJBS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.224 +pkgver=1.226 pkgrel=0 pkgdesc="Perl module for working with UUIDs" url="https://metacpan.org/pod/Data::UUID" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="897ab26e83600214110167b86fc63848281b7bdf3818dcfedb713bf2eb64a06c48cc7cee43bfa4130c6fdb912fb77863bd31ffe08c95ec85e6660a9b369b7970 Data-UUID-1.224.tar.gz" +sha512sums="61c13b1aab3263d7bf94ecfde758acbdd986879144adbc436d32e5f5e03d70c8475984458681ab1d73d71bf5169b368c1f21a576ce996e225b6d74b5afd061fe Data-UUID-1.226.tar.gz" diff --git a/user/perl-datetime-locale/APKBUILD b/user/perl-datetime-locale/APKBUILD index 06bef0c08..351e655e5 100644 --- a/user/perl-datetime-locale/APKBUILD +++ b/user/perl-datetime-locale/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=DateTime-Locale _author=DROLSKY _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.25 +pkgver=1.26 pkgrel=0 pkgdesc="Locale support for Perl DateTime" url="https://metacpan.org/release/DateTime-Locale" @@ -35,4 +35,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="31fb6c2a4d38350dea0160dc816c21ed2b97f11510fe9f545fe52530d00260b7bb64b1cab3a7e30531a1337aac2dd2983d0b3af09d24da0c4451498729d8777a DateTime-Locale-1.25.tar.gz" +sha512sums="2b664f931abf4c81b6ff80752b3eb03c7d71aa6cd11da0e925a157ea0838234bc1ccb243ddd129d65f7f47e5e739176591bfe1c7ed2ec4d1476e56bdbe66c1b1 DateTime-Locale-1.26.tar.gz" diff --git a/user/perl-datetime-timezone/APKBUILD b/user/perl-datetime-timezone/APKBUILD index 6e14ed90e..c9c60ee88 100644 --- a/user/perl-datetime-timezone/APKBUILD +++ b/user/perl-datetime-timezone/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=DateTime-TimeZone _author=DROLSKY _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.38 +pkgver=2.39 pkgrel=0 pkgdesc="Time zone object class and factory for Perl" url="https://metacpan.org/release/DateTime-TimeZone" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="984a3bf8e30bae0085be51d67288230ffd8d2834b066b275720ab3658df6cc0607316cb22b2ca28ec8c9c1be7f6cbb8509eee52d4906aedf6175bf36a413b643 DateTime-TimeZone-2.38.tar.gz" +sha512sums="6f7580aa873a66d1892cd9201b5b2efd088842ffc2696e94c59c5532935be7eecea067fa979465046e0eeb35ca34e73bc49006e176445eaed91ac179beacc13b DateTime-TimeZone-2.39.tar.gz" diff --git a/user/perl-datetime/APKBUILD b/user/perl-datetime/APKBUILD index c1157189e..42e1494df 100644 --- a/user/perl-datetime/APKBUILD +++ b/user/perl-datetime/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=DateTime _author=DROLSKY _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.51 +pkgver=1.52 pkgrel=0 pkgdesc="Date and time object for Perl" url="https://metacpan.org/release/DateTime" @@ -34,4 +34,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="d94d673ecefb7ed8bd485f7be9f3c2c0e9a07c402793f14f5af3bc026cc875d7d2a151f72f1c1d3518e08af133eab247796400215f4304f785d17d84e53caded DateTime-1.51.tar.gz" +sha512sums="c2e359f480396e0da16afbec362cb744f201f6c777fa916228f0adfd26a848b9451535feeda4e1531e5afb40a286e3b11a44e95dc0947dc4e2ba714973bb5ac4 DateTime-1.52.tar.gz" diff --git a/user/perl-devel-hide/APKBUILD b/user/perl-devel-hide/APKBUILD index 55a62f12a..2c41fb4d3 100644 --- a/user/perl-devel-hide/APKBUILD +++ b/user/perl-devel-hide/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Devel-Hide _author=DCANTRELL _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.0011 +pkgver=0.0013 pkgrel=0 pkgdesc="Perl module for forcing the unavailability of modules for testing" url="https://metacpan.org/pod/Devel::Hide" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="8034ced8a126b88f3724780a40adbc13e662c794901ac103061416627b328f598e742e1353e15d6e89f648d9ac6e5804e9b41ced79bd7c600386fa874dc17042 Devel-Hide-0.0011.tar.gz" +sha512sums="acaa190dcc046ddc6c5bfb300ab2042b87bc43e67d1766cde07a83380ea3989461cec9527e0f7c1881ae7e9ac4aeb75b6255cdda287c280dabb2d5b7b9b785d6 Devel-Hide-0.0013.tar.gz" diff --git a/user/perl-email-mime-contenttype/APKBUILD b/user/perl-email-mime-contenttype/APKBUILD index a124048ce..33880b115 100644 --- a/user/perl-email-mime-contenttype/APKBUILD +++ b/user/perl-email-mime-contenttype/APKBUILD @@ -5,13 +5,13 @@ _pkgreal=Email-MIME-ContentType _author=RJBS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.022 +pkgver=1.024 pkgrel=0 pkgdesc="Parse MIME Content-Type/Disposition headers in Perl" url="https://metacpan.org/release/Email-MIME-ContentType" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" -depends="perl" +depends="perl perl-text-unidecode" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="38561922e0dbc180ac24003a3b64ef39e25a5607bbedc75a3e4580490ab84e02bfd5165225eff4884112cf1f82ec46ee62f31c047acea6b9a3cca390deb965be Email-MIME-ContentType-1.022.tar.gz" +sha512sums="054d81ff9c4aa095e05a1bba287a26d4f7e8de3cec4d47b6cf7314acb04bb08270fac9c58d2b85e3ee5a02afa78d5f364717ff2b5793a1fe7ea1f2fef2812cfd Email-MIME-ContentType-1.024.tar.gz" diff --git a/user/perl-email-mime/APKBUILD b/user/perl-email-mime/APKBUILD index f4549e334..1992b6c0e 100644 --- a/user/perl-email-mime/APKBUILD +++ b/user/perl-email-mime/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Email-MIME _author=RJBS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.946 +pkgver=1.949 pkgrel=0 pkgdesc="Easy MIME message handling for Perl" url="https://metacpan.org/release/Email-MIME" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="335a8fd032cca0bb1cdb230899c53fc72037939bd11653d08e66a9ffa6fc5f87aefa2ce28f14b1cbb1a0bacd778b5459445d2829835bedc4f6276ae2ef2d6caa Email-MIME-1.946.tar.gz" +sha512sums="2cd8653a4efe8195d574827ad15883ff7f82d92325197c0458f1ddfd4c50ed275068e8a2df5ed5110b37b5b904aaf4234855eefec9cfc0d70987e678df2732ea Email-MIME-1.949.tar.gz" diff --git a/user/perl-exporter-tiny/APKBUILD b/user/perl-exporter-tiny/APKBUILD index b91680ef4..d0c70bac1 100644 --- a/user/perl-exporter-tiny/APKBUILD +++ b/user/perl-exporter-tiny/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Exporter-Tiny _author=TOBYINK _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.002001 +pkgver=1.002002 pkgrel=0 pkgdesc="Light-weight exporter with the features of Sub::Exporter" url="https://metacpan.org/release/Exporter-Tiny" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="b247e7785e02c3346f231736a430c2d54e5ac93c175892090c40121c86eb255ce4d138c65e31836fd2970b45fb71dc7e68ea3c45a06a9e9c4135b45df48621d8 Exporter-Tiny-1.002001.tar.gz" +sha512sums="b6d39ba1824f6c9d68cf75e7f28fd896c2c475e419f0b1aadec58d4e7e5c8d3fd7bf85d841758772055470de56ad7a3ad6787cfd9d6c5d61d8449cf8f40bda8d Exporter-Tiny-1.002002.tar.gz" diff --git a/user/perl-file-slurp/APKBUILD b/user/perl-file-slurp/APKBUILD index 46f78e1d9..8e3a89fc1 100644 --- a/user/perl-file-slurp/APKBUILD +++ b/user/perl-file-slurp/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=File-Slurp _author=CAPOEIRAB _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=9999.29 +pkgver=9999.32 pkgrel=0 pkgdesc="Simple and efficient file manipulation in Perl" url="https://metacpan.org/release/File-Slurp" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="f98f83ceb17eef1e79ba9a9222106b0cc00bffe671b91046bcabda8aeb85a3d4f3ee7d64048a916c9486602326819ebfb4ede274e39435aacbda4e35d30cdd5c File-Slurp-9999.29.tar.gz" +sha512sums="413337e0257e95e8e8d2aabf684bec81e746000a741809935b058490b8c42b494064f724e618b250330d8bb67a0a7a2a5adad17e3e6c96d4b193531a192a4d56 File-Slurp-9999.32.tar.gz" diff --git a/user/perl-getopt-long-descriptive/APKBUILD b/user/perl-getopt-long-descriptive/APKBUILD index b5492009c..affb9612a 100644 --- a/user/perl-getopt-long-descriptive/APKBUILD +++ b/user/perl-getopt-long-descriptive/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Getopt-Long-Descriptive _author=RJBS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.104 +pkgver=0.105 pkgrel=0 pkgdesc="Simpler Perl implementation of Getopt::Long" url="https://metacpan.org/release/Getopt-Long-Descriptive" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="5579faa6f9012cd03ac4d51149b0854771f15d8e324f8df345fe6af1a8f3fdeaaef6c5becee55bf77515da85d92aa61a63dfc5ee8264d2d0368e02a4a4cbd7fa Getopt-Long-Descriptive-0.104.tar.gz" +sha512sums="e7528ac509bc7fb49ee59a8ed8dec0c9a619a8f34c207e7a9185829666248797211a56576721b7fc8cdd44ae55d2d45f048958b79a6228ee76d91c3a52685236 Getopt-Long-Descriptive-0.105.tar.gz" diff --git a/user/perl-moox-struct/APKBUILD b/user/perl-moox-struct/APKBUILD index 116e1a0cc..66a7d2c50 100644 --- a/user/perl-moox-struct/APKBUILD +++ b/user/perl-moox-struct/APKBUILD @@ -5,13 +5,13 @@ _pkgreal=MooX-Struct _author=TOBYINK _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.017 +pkgver=0.020 pkgrel=0 pkgdesc="Structures for the Moo Perl object framework" url="https://metacpan.org/pod/MooX::Struct" arch="noarch" license="Artistic-2.0 OR GPL-2.0-only" -depends="perl perl-moo perl-namespace-clean perl-object-id perl-type-tiny" +depends="perl perl-moo perl-namespace-autoclean perl-object-id perl-type-tiny" makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="6877065c1ece8c7bef78871e76d279e9a35b7cf0ae6b499dcfb6f02e2fb6ad2a1c73823bb54b434ed8012eb3e8426a530155eae24e3053db46cfca7ff6ce8329 MooX-Struct-0.017.tar.gz" +sha512sums="a9a14efee9db43b39df02b452aed7f558360812c28581cc245ed8eea68fc328b40fee6a9c8949851048ee6fff3ec9aa99beb5ab63845f9bcb83d9c9d1c7e712e MooX-Struct-0.020.tar.gz" diff --git a/user/perl-mouse/APKBUILD b/user/perl-mouse/APKBUILD index 638aea5bf..8fcf9b0cb 100644 --- a/user/perl-mouse/APKBUILD +++ b/user/perl-mouse/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Mouse _author=SKAJI _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.5.9 +pkgver=2.5.10 pkgrel=0 pkgdesc="Moose minus the antlers" url="https://metacpan.org/pod/Mouse" @@ -34,4 +34,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="e817eecaeccb979c1b78819b61724ebaad9f938d82b76ad7b73a8bfe2f5e1c63a2cd8e8439bcededd17be4770af6bfa98b594e58278e0388272dbd5d416ea6c0 Mouse-v2.5.9.tar.gz" +sha512sums="949a2f18257a5afcf4dbbb84094974f4d80e1e4531b4b9d8618cf141252fd11b09b79daafe1de79faa620905988f649627bc2fceac357ea2f180db74cd48f711 Mouse-v2.5.10.tar.gz" diff --git a/user/perl-mozilla-ca/APKBUILD b/user/perl-mozilla-ca/APKBUILD index 0d15aed92..d8713579a 100644 --- a/user/perl-mozilla-ca/APKBUILD +++ b/user/perl-mozilla-ca/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Mozilla-CA _author=ABH _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=20180117 +pkgver=20200520 pkgrel=0 pkgdesc="Mozilla's CA certificate bundle for Perl" url="https://metacpan.org/release/Mozilla-CA" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="8b4187f47638ba8d670b3f5cafc1de4040dfec1dde6a932411c79b41a8a454bcd3b66f9818c6d28135e29551ce93bc3ddb61e648c7810b30cb147ea0beaaedba Mozilla-CA-20180117.tar.gz" +sha512sums="5bc7c43c55baa3f878fd2dbf1c85d6b20dcdc9e54ae073d1be4f6b808fa5a4b1205428b7967b5f752b31a62464a8b5cc67b32b3f70b834a4da9c39efe3d5d59f Mozilla-CA-20200520.tar.gz" diff --git a/user/perl-path-tiny/APKBUILD b/user/perl-path-tiny/APKBUILD index e30f0bbdd..f75e55398 100644 --- a/user/perl-path-tiny/APKBUILD +++ b/user/perl-path-tiny/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Path-Tiny _author=DAGOLDEN _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.112 +pkgver=0.114 pkgrel=0 pkgdesc="File path utility" url="https://metacpan.org/pod/Path::Tiny" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="c387192fc42a78aee506fa332fd9fcd385fbc28fed02bc41b9c50e4cff6c65700ad3fd9d840871ef3bf7a8029719d8fd8b84f993ac816ff65c8d4e2203ad3b3f Path-Tiny-0.112.tar.gz" +sha512sums="932d9d4658af1e578142ff3bb4e541e6fb7754397c55f869d17f9989a181c10b528779aeedcaafc2cd879a31a6febe63d220cbf843f187db92e6ae1087c39e56 Path-Tiny-0.114.tar.gz" diff --git a/user/perl-regexp-pattern/APKBUILD b/user/perl-regexp-pattern/APKBUILD index 4ab828d5e..3c400e799 100644 --- a/user/perl-regexp-pattern/APKBUILD +++ b/user/perl-regexp-pattern/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Regexp-Pattern _author=PERLANCAR _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.2.13 +pkgver=0.2.14 pkgrel=0 pkgdesc="Perl framework for regex collection standardization" url="https://metacpan.org/pod/Regexp::Pattern" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="174bdba6540a9593f99850f71ef919582e0a61c9079b89480fd1c817df5c40f7300c1402c9a9b1cc6844a0eb6af9ef48fac35ef1646754d1700759e94381114e Regexp-Pattern-0.2.13.tar.gz" +sha512sums="85386d757982eb374a85c8c12d16a1ad24384b741ed1bd63292d2d3504ff0ec613fa49627a7e7d4d0f53f8e594bd613dd0c5b9da5b3237ad54c0a099ece60b0e Regexp-Pattern-0.2.14.tar.gz" diff --git a/user/perl-specio/APKBUILD b/user/perl-specio/APKBUILD index e4b98e930..2952124bc 100644 --- a/user/perl-specio/APKBUILD +++ b/user/perl-specio/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Specio _author=DROLSKY _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.45 +pkgver=0.46 pkgrel=0 pkgdesc="Type constraints and coercions for Perl" url="https://metacpan.org/release/Specio" @@ -34,4 +34,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="28c32b155ddd1537e2ed2e634b667c4010903a4c68e4684f07f4bb74414eeaf5f5ef05f4ed898c830751abfacc51280b00970250db1b2e1219acc23e834994d7 Specio-0.45.tar.gz" +sha512sums="8dfc0e87bd640bd30aa9a92118f77305565dee2441f95c7e9f311b517c07573e3a0e977ea348eaf879dfafe6edc3c0d89625f28b5f3f0f2bff789178cd513802 Specio-0.46.tar.gz" diff --git a/user/perl-template-toolkit/APKBUILD b/user/perl-template-toolkit/APKBUILD index 40c898c4a..8d055549d 100644 --- a/user/perl-template-toolkit/APKBUILD +++ b/user/perl-template-toolkit/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Template-Toolkit _author=ATOOMIC _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.29 +pkgver=3.008 pkgrel=0 pkgdesc="Comprehensive template processing system" url="https://metacpan.org/release/Template-Toolkit" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="5b1bfeaf600a5628b6441e54de5c4af1cf4e01296792a79290d4bf2a698be47112e94a05fe3f47bf9ac64c4d8b9340aa6ef8738560fb1f96510d7d1c9f647a65 Template-Toolkit-2.29.tar.gz" +sha512sums="851becacca1b62fca4ee17912480f87d7059bd3c851e443128d3269331b0c876d6f888f33b99008f8c03e6b1edf9dad1318b736d567245d66fceacbf88c78023 Template-Toolkit-3.008.tar.gz" diff --git a/user/perl-test-deep/APKBUILD b/user/perl-test-deep/APKBUILD index b41b1e20a..36feb7f8b 100644 --- a/user/perl-test-deep/APKBUILD +++ b/user/perl-test-deep/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test-Deep _author=RJBS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.128 +pkgver=1.130 pkgrel=0 pkgdesc="Extremely flexible deep comparison" url="https://metacpan.org/pod/Test::Deep" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="d4642b3268a10d8e882beabfbb3b3bf891a57aa7ebb74bc4919a4368df9c9acd2351498401538ae50299071f99e06b4443686d20f8c9f95f5fd588309ccee302 Test-Deep-1.128.tar.gz" +sha512sums="de34197c97d44c68dd43372fa5a4d905a2ad636b5503c5f1443476a85b921f42cd07d475af8901dfee9deff1f29deef440c1783cdcc7f93c5f5030c4548ff9cf Test-Deep-1.130.tar.gz" diff --git a/user/perl-test-most/APKBUILD b/user/perl-test-most/APKBUILD index 7d6895596..e089952da 100644 --- a/user/perl-test-most/APKBUILD +++ b/user/perl-test-most/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test-Most _author=OVID _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.35 +pkgver=0.37 pkgrel=0 pkgdesc="Most commonly needed Perl test functions and features" url="https://metacpan.org/release/Test-Most" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="1b2d201811e59d7afce47ff5f7da67c170d4685ffbec23360757b5cacc9fe72fc82609bc46cc9d8e351fdb75715696457c201dd94fadaeca70a6f31690236291 Test-Most-0.35.tar.gz" +sha512sums="133dbb9815884fbecd65520dd2f2d43a761439c33f7d32ffdfc80ed3d3e05fb563dca420cf5445e61382735a048c467b35b5c160b1013b5f5c7616be00aa328d Test-Most-0.37.tar.gz" diff --git a/user/perl-test-utf8/APKBUILD b/user/perl-test-utf8/APKBUILD index 408a847be..020aaa9fe 100644 --- a/user/perl-test-utf8/APKBUILD +++ b/user/perl-test-utf8/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test-utf8 _author=MARKF _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.01 +pkgver=1.02 pkgrel=0 pkgdesc="Handy UTF8 tests" url="https://metacpan.org/pod/Test::utf8" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="07dcd5ed98a63f7d96bb0fc629b168773d02bb4c93c5bc44ec60738fc29669794547dfde5913f9de682cd583cf85f4d82b6151398aaebcfec9278525447b9c4e Test-utf8-1.01.tar.gz" +sha512sums="f544174ad570c5e027acf66dcf335ddc4be3727488559933a389dbd7f2214e66490f96d0e816677310468076719d891fa3da80524b2b10345d8be8eebf4a1469 Test-utf8-1.02.tar.gz" diff --git a/user/perl-test-warnings/APKBUILD b/user/perl-test-warnings/APKBUILD index 978cdc674..69f8ee727 100644 --- a/user/perl-test-warnings/APKBUILD +++ b/user/perl-test-warnings/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test-Warnings _author=ETHER _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.028 +pkgver=0.030 pkgrel=0 pkgdesc="Test for warnings and the lack of them" url="https://metacpan.org/pod/Test::Warnings" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="6e8c1012eeebd3260d36ef0bf731a6351ce704a400e24709009bc72b07a4411d6725ea612e19ad55edca6d985e0ea8d9da3a51713b4c655e5783f3d9e6e39ab0 Test-Warnings-0.028.tar.gz" +sha512sums="bb9fe480263b700d499fb6bff4321711807f63c0c96d1dd9b27fa8ee1d8a629fe23c46f37125a4c569c5bf784ff35fccce5815dfa93af55b2dfdcc99311fb40b Test-Warnings-0.030.tar.gz" diff --git a/user/perl-test2-suite/APKBUILD b/user/perl-test2-suite/APKBUILD index 9e3765505..1230f2449 100644 --- a/user/perl-test2-suite/APKBUILD +++ b/user/perl-test2-suite/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test2-Suite _author=EXODIST _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.000129 +pkgver=0.000130 pkgrel=0 pkgdesc="Collection of Perl modules in the Test2 namespace" url="https://metacpan.org/pod/Test2::Suite" @@ -35,4 +35,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="0d72ab6998f741ba016e1398a45b751930a016488b7b02117d476d6e8d6656a4de0f2ceae379260472d0eba7e8ca00e6bfa59240ee09c71ed9963be3dfd249da Test2-Suite-0.000129.tar.gz" +sha512sums="fbfa6d708de5e5e0d55221b53e86409db034eea1b6d5279cbc5b3a20a8156c959efb5cecdea4057f38525fd451655314ea4048620d4c17ae2df138a39c2816e5 Test2-Suite-0.000130.tar.gz" diff --git a/user/perl-text-template/APKBUILD b/user/perl-text-template/APKBUILD index 7afc5ca1d..ff4bb9b8d 100644 --- a/user/perl-text-template/APKBUILD +++ b/user/perl-text-template/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Text-Template _author=MSCHOUT _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.58 +pkgver=1.59 pkgrel=0 pkgdesc="Perl module for expanding embedded Perl in templates" url="https://metacpan.org/pod/Text::Template" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="23bf03529c7607806c16573b5c0d08ba0b87cf7eb859538d1944bc13952741a88c15588e8de173053a51640c5bdad99c5cc246a67cc05be7eff32853887fbb11 Text-Template-1.58.tar.gz" +sha512sums="18c56dfe10aa3e7af7ea4821c1d8002d89eb7fdf46917877e7e132cfee59783a91953255f79a355f435eff16304ae206e59557328ef51593745ae6c50e3acab7 Text-Template-1.59.tar.gz" diff --git a/user/perl-text-unidecode/APKBUILD b/user/perl-text-unidecode/APKBUILD new file mode 100644 index 000000000..e96572aa2 --- /dev/null +++ b/user/perl-text-unidecode/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-text-unidecode +_pkgreal=Text-Unidecode +_author=SBURKE +_au=${_author%%"${_author#??}"} +_a=${_author%%"${_author#?}"} +pkgver=1.30 +pkgrel=0 +pkgdesc="Transliterate Unicode text to ASCII" +url="https://metacpan.org/release/Text-Unidecode" +arch="noarch" +license="Artistic-1.0-Perl OR GPL-2.0-only" +depends="perl" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + make test +} + +package() { + make DESTDIR="$pkgdir" install + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="194f8aba0dcdc7a53338b86370b7cfb6c60d4a8982ada6084f0eb0ccd66ce461b831b6daf04932f039ff1b983dc3cd0c0ced1e8b455955d2699c36120b41a526 Text-Unidecode-1.30.tar.gz" diff --git a/user/perl-timedate/APKBUILD b/user/perl-timedate/APKBUILD index 65704784a..fe49a5df0 100644 --- a/user/perl-timedate/APKBUILD +++ b/user/perl-timedate/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=TimeDate _author=ATOOMIC _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.31 +pkgver=2.33 pkgrel=0 pkgdesc="Date and time handling routines for Perl" url="https://metacpan.org/release/TimeDate" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="abee40d77ce4a57e251575b450406b1d26ac369d05899c1630f996b6f3c0c5ac222b84ff04d6fdf4c0763eb0a5bc45a59edadcfb15c73982787c8c17e0ee2a2a TimeDate-2.31.tar.gz" +sha512sums="a3a20a0d9439e68bf621c66fad0598e6257345727be79c87c7cc99994b3a58eb738787fedb720beb069e9758ad1347c15313f64411806dd0f4dfbcca5061c820 TimeDate-2.33.tar.gz" diff --git a/user/perl-xs-object-magic/APKBUILD b/user/perl-xs-object-magic/APKBUILD index f708427dd..179caa8ed 100644 --- a/user/perl-xs-object-magic/APKBUILD +++ b/user/perl-xs-object-magic/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-xs-object-magic _pkgreal=XS-Object-Magic -_author=FLORA +_author=ETHER _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.04 +pkgver=0.05 pkgrel=0 pkgdesc="Opaque, extensible XS pointer backed objects using sv_magic" url="https://metacpan.org/pod/XS::Object::Magic" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="315288496c0bab79f16d010f7f140dc1483bb3a1053a7fc41a048308aa1f9ae01b03795be28f132c856360176372d2251315ae62db950e377be88ff222a441dd XS-Object-Magic-0.04.tar.gz" +sha512sums="8927ab903f95d4f14a1602b3b4040dc9351f3348249a37e93dbf5cc2417bbde3b5c9a7512436e58b6a16fa48f6f4b55a300951560971d457814e8ef5044e6469 XS-Object-Magic-0.05.tar.gz" diff --git a/user/perl-yaml-libyaml/APKBUILD b/user/perl-yaml-libyaml/APKBUILD index 25e153a20..32d2058c0 100644 --- a/user/perl-yaml-libyaml/APKBUILD +++ b/user/perl-yaml-libyaml/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=YAML-LibYAML _author=TINITA _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.81 +pkgver=0.82 pkgrel=0 pkgdesc="Perl YAML Serialization using XS and libyaml" url="https://metacpan.org/pod/YAML::LibYAML" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="469ac568f5b7562cb4e58150121f7dbaaf129ce2ae72690e94c644da980a43fb0e1b372c4d674ca5413741af1d2756971341631f03c51bd99479cfe775b7c6e2 YAML-LibYAML-0.81.tar.gz" +sha512sums="b4535ab4d19ea8a9c4aaa9683937bc822c59f80439fa1da0a02e057ce5d95f271ab06ce58346c58eeacd99d29bf276f5a1289992ca569f63d65ceff9b833da0c YAML-LibYAML-0.82.tar.gz" diff --git a/user/picmi/APKBUILD b/user/picmi/APKBUILD new file mode 100644 index 000000000..951b92ec4 --- /dev/null +++ b/user/picmi/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=picmi +pkgver=20.04.3 +pkgrel=0 +pkgdesc="Single-player logic/pattern game" +url="https://kde.org/applications/games/org.kde.picmi" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="qt5-qtbase-dev qt5-qtsvg-dev cmake extra-cmake-modules + qt5-qtdeclarative-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev + kdeclarative-dev kdoctools-dev ki18n-dev kio-dev knewstuff-dev + kxmlgui-dev libkdegames-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/picmi-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + -Bbuild . + make -C build +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test +} + +package() { + make DESTDIR="$pkgdir" -C build install +} + +sha512sums="d64b73880fcee4ec7f98d70787e7418da9df30eb26f3f136da8773d75589a44e0508c4e5a26d33d7e59e8b56bf2502a44553d0872ce5797b01dcbb03049e7def picmi-20.04.3.tar.xz" diff --git a/user/pidgin-otr/APKBUILD b/user/pidgin-otr/APKBUILD index 6d713b2ee..ee3d24c82 100644 --- a/user/pidgin-otr/APKBUILD +++ b/user/pidgin-otr/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pidgin-otr pkgver=4.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Enables encrypted, secure messaging in Pidgin IM" url="https://otr.cypherpunks.ca/" arch="all" diff --git a/user/pidgin/APKBUILD b/user/pidgin/APKBUILD index 83ee02c14..4a041097e 100644 --- a/user/pidgin/APKBUILD +++ b/user/pidgin/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pidgin -pkgver=2.13.0 -pkgrel=1 +pkgver=2.14.1 +pkgrel=0 pkgdesc="Multi-protocol instant messaging client" url="http://pidgin.im/" arch="all" @@ -10,9 +10,9 @@ depends="gst-plugins-base" makedepends="gtk+2.0-dev perl-dev libsm-dev startup-notification-dev libxml2-dev libidn-dev gnutls-dev dbus-dev dbus-glib-dev gstreamer-dev cyrus-sasl-dev ncurses-dev nss-dev tcl-dev tk-dev intltool gtkspell-dev - gst-plugins-base-dev farstream-dev" + gst-plugins-base-dev farstream-dev libgnt-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang finch libpurple" -source="https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/pidgin/$pkgname-$pkgver.tar.bz2" build() { LIBS="-lX11 -ltinfo" ./configure \ @@ -27,7 +27,6 @@ build() { --disable-meanwhile \ --disable-nm \ --enable-perl \ - --disable-python \ --disable-schemas-install \ --disable-screensaver \ --enable-tcl \ @@ -51,9 +50,7 @@ package() { finch() { pkgdesc="Text-based multi-protocol instant messaging client" mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/lib/gnt "$pkgdir"/usr/lib/libgnt.so.* \ - "$pkgdir"/usr/lib/finch \ - "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/lib/finch "$subpkgdir"/usr/lib/ mv "$pkgdir"/usr/bin/finch "$subpkgdir"/usr/bin/ } @@ -65,4 +62,4 @@ libpurple() { "$subpkgdir"/usr/share/ } -sha512sums="68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047 pidgin-2.13.0.tar.bz2" +sha512sums="6ce5c58f32fa680d7f67e37a42b0f77c8253018cee21df2895d52166d9eb6ecaf0458b1610adbd46f337d00e75933db7578c2f9808654bd22838ba5db0a13030 pidgin-2.14.1.tar.bz2" diff --git a/user/plasma-framework/APKBUILD b/user/plasma-framework/APKBUILD index fb047de4e..0668873b2 100644 --- a/user/plasma-framework/APKBUILD +++ b/user/plasma-framework/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-framework -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Frameworks for the KDE Plasma 5 desktop environment" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e4e0ef5fff99518061f79f7eb03fe8048fa8c5d863e8092f05f98dfa0fec8cb1f097d042ffb417434a1b0bd424c0997c4a2c38068bcae30e39324d001ea3ffd0 plasma-framework-5.68.0.tar.xz" +sha512sums="b120ff92f6adec4b08993004bda3eecb84afcb038155407850810d7c6b0bb33357730e4784525da3eb249368a97b893c1587e0411286c0455ab6b35caa116a7a plasma-framework-5.72.0.tar.xz" diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD index bc65648cb..bc48295b7 100644 --- a/user/postfix/APKBUILD +++ b/user/postfix/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=postfix -pkgver=3.4.9 +pkgver=3.4.14 pkgrel=0 pkgdesc="Mail server (MTA) that is Sendmail outside and Qmail inside" url="http://www.postfix.org/" @@ -92,6 +92,6 @@ sqlite() { _database "sqlite" "SQLite 3" } -sha512sums="9038850d79bf19460d55dede2dd97e6f4bd8255363b4004704e5f0493bf9b1c0729f5bb11663ba6f6ed34177205609f72401b0f55d1d9dbce5398b4603a0a991 postfix-3.4.9.tar.gz +sha512sums="520ec509dbf83390b480e4db5320b78162bb4d16e58b8a63de08c8012555150145ac3630931ab6bfd36e7ff82e75749ead8e0dce3fe645bc58ac1ec709e7dfd3 postfix-3.4.14.tar.gz 63ea7fe461fca1306088e9984acfab6ab3e919dafa2b606d43fbca472969e6ec232800071f939f5a4482c01c6d7b53a86de9e7e893ab94f4cb135d16ff5763cc honour-config-directory.patch 2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592 postfix.initd" diff --git a/user/prison/APKBUILD b/user/prison/APKBUILD index 2fa79cc16..11fe97d84 100644 --- a/user/prison/APKBUILD +++ b/user/prison/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=prison -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Qt Barcode library for programatically creating QR codes" url="https://www.kde.org/" @@ -44,4 +44,4 @@ quick() { mv "$pkgdir"/usr/lib/qt5/qml "$subpkgdir"/usr/lib/qt5/ } -sha512sums="dc3606bf25ec07f3702b9c5cb51fbb29c410d864349ca65fc5f86d26619be24ce42a14e969a2db4a11b8f1f57dca8705a0bd163e5bea468fe5edfa06a409f1c3 prison-5.68.0.tar.xz" +sha512sums="5f3021a23f4724de77bcbe942b023561dadcf39966d170ebb04885aced86fe6196b88bf5ed7f3cee1235d8fb5d2d1bef6c9e5b46eaa3e646ec44acd38a070f7d prison-5.72.0.tar.xz" diff --git a/user/purple-plugin-pack/APKBUILD b/user/purple-plugin-pack/APKBUILD index 1ae2b8691..1cbf72a67 100644 --- a/user/purple-plugin-pack/APKBUILD +++ b/user/purple-plugin-pack/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=purple-plugin-pack pkgver=2.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="Collection of plugins to enhance Pidgin and Finch" url="https://bitbucket.org/rekkanoryo/purple-plugin-pack/" arch="all" diff --git a/user/purpose/APKBUILD b/user/purpose/APKBUILD index dbad62201..a48d698cc 100644 --- a/user/purpose/APKBUILD +++ b/user/purpose/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=purpose -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="KDE context menu framework" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a8103026b5b7bef1dd4fd28912eaefbace466c39967a474a7b8abf1e074be58c5b3d68527c132fa79adf2785a059ae8a09537735b6a51b53aa553113b6d48aad purpose-5.68.0.tar.xz" +sha512sums="64359268f82d35e0c4a79f9a3b3472ea06217b719f73f145263598fe8f4df3e0025bcec4baf28a3dd5a7f86e2bb9ed1f2f46027a12c1c55235de349e22cd1284 purpose-5.72.0.tar.xz" diff --git a/user/py3-cparser/APKBUILD b/user/py3-cparser/APKBUILD index 4f076a744..49f9ce944 100644 --- a/user/py3-cparser/APKBUILD +++ b/user/py3-cparser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-cparser -pkgver=2.19 +pkgver=2.20 pkgrel=0 pkgdesc="C99 parser in pure Python" url="https://github.com/eliben/pycparser" @@ -25,4 +25,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="88fe63c1a7a344c564dfd3b4f99735a4159c8a3f5738bab839943ea7fcbf1f5340f67326550b7e66508ea5862897e5bcdf363c2a8d47eccb50890573a2640a98 py3-cparser-2.19.tar.gz" +sha512sums="d2dc48727750ec0a80d5e3b0c9fba390c3647416a3e18cad59429edb9f55d043c7695c52301b037c93af5d96ffc85fcba7cd54d376abdb89e973759c59fa189d py3-cparser-2.20.tar.gz" diff --git a/user/py3-cryptography/APKBUILD b/user/py3-cryptography/APKBUILD index a2f3c0091..9268e3edb 100644 --- a/user/py3-cryptography/APKBUILD +++ b/user/py3-cryptography/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-cryptography _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.8 +pkgver=2.9.2 pkgrel=0 pkgdesc="A package which provides cryptographic recipes and primitives" url="https://pypi.org/project/cryptography" @@ -32,4 +32,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="bf3ca44123c693b0602be19445925f9efebd46c469909e47b7907d57141fb6bd99268c33e1fe3f42a08ab8b4edd4f98f21b6a682f530352313334dfd31ba91e7 cryptography-2.8.tar.gz" +sha512sums="a8cb7ba229cddfa15bf4ed00d40e76e2ece57958203b9c50c3f782c7977e1c725fa147a1eebc31d50684a622d53e73f97864e1a935753472ea4b2d89eb6ffb6a cryptography-2.9.2.tar.gz" diff --git a/user/py3-dbus-python/APKBUILD b/user/py3-dbus-python/APKBUILD new file mode 100644 index 000000000..d45fa91b7 --- /dev/null +++ b/user/py3-dbus-python/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-dbus-python +_pkgname=${pkgname##py3-} +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=1.2.16 +pkgrel=0 +pkgdesc="D-Bus bindings for Python 3" +url="https://dbus.freedesktop.org/doc/dbus-python/" +arch="all" +options="!check" +license="MIT" +depends="python3" +makedepends="dbus-dev glib-dev python3-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +package() { + mkdir -p "$pkgdir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c dbus-python-1.2.16.tar.gz" diff --git a/user/py3-distutils-extra/APKBUILD b/user/py3-distutils-extra/APKBUILD index 9fb5b7b0b..5c0807786 100644 --- a/user/py3-distutils-extra/APKBUILD +++ b/user/py3-distutils-extra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=py3-distutils-extra -pkgver=2.43 +pkgver=2.45 pkgrel=0 pkgdesc="Python distutils extras for gettext, themed icons, and scrollkeepr docs" url="https://launchpad.net/python-distutils-extra" @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="a0a3ba147403e0096fd1c9f56eb898282edc7a1caf460128245730bf683d97af8706390127f2e997256b2ee50bc267125b2071b47e2eeac70ca0e2d58fa84176 python-distutils-extra-2.43.tar.bz2" +sha512sums="04d2be290726d7ceed599031bfa960468c6a8654c8d9105dd77cb5744f6908d1c9a6732095692aebde1f1e042ef70b2695d41586663e4d539ee96247a39f02a1 python-distutils-extra-2.45.tar.bz2" diff --git a/user/py3-freezegun/APKBUILD b/user/py3-freezegun/APKBUILD index 398e20971..4c5bd8624 100644 --- a/user/py3-freezegun/APKBUILD +++ b/user/py3-freezegun/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-freezegun _pkgname=freezegun _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.3.12 +pkgver=0.3.15 pkgrel=0 pkgdesc="Let your Python tests travel through time" url="https://pypi.python.org/pypi/freezegun" @@ -30,4 +30,4 @@ package() { } -sha512sums="f7d98ea84735b24380fa53e1e62622fe91be5a35cb75221ca4cb02418add9b0a4add9b2f691242be75acbc45d4745fef82ffe3c89890dcdffa4405940e527af4 py3-freezegun-0.3.12.tar.gz" +sha512sums="9f3836f8c9f207d9bccbcaec3f1af977b26aa3699ad5f792d052e105a0de530c6dda1641480c9cd551627186bf0c65d92bf39a6f4a61f458f762d8aa999180ba py3-freezegun-0.3.15.tar.gz" diff --git a/user/py3-josepy/APKBUILD b/user/py3-josepy/APKBUILD index 4cc48bb0b..d29a050a7 100644 --- a/user/py3-josepy/APKBUILD +++ b/user/py3-josepy/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: pkgname=py3-josepy _pkgname=${pkgname#py3-} -pkgver=1.2.0 +pkgver=1.3.0 pkgrel=0 pkgdesc="JOSE protocol implementation in Python" url="https://github.com/jezdez/josepy" @@ -25,4 +25,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="25a360b3893e1c1c524440b02e0af66c6dfefd756cebdad1c27ae8a82461200448a9c8fc835747e160cbcbb63261a4f79d7765eaae5e0b19feea5bf84d5e8896 josepy-1.2.0.tar.gz" +sha512sums="93d8ca09243ed273c532e1c5c413f356dca3e85db45614b88d82665a947088950d3c4d6304fec51bdc502a25722955a9fac47b7bc608a69cc1226a512f69c229 josepy-1.3.0.tar.gz" diff --git a/user/py3-lxml/APKBUILD b/user/py3-lxml/APKBUILD index 9237e12b9..548082a92 100644 --- a/user/py3-lxml/APKBUILD +++ b/user/py3-lxml/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-lxml _pkgname=lxml _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=4.5.0 +pkgver=4.5.2 pkgrel=0 pkgdesc="Python LXML Library" url="https://lxml.de/" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="7cb957b2ab9931c32984ad0808f51e650e82e2d9b14df3fd8df2dd8f2c5c261d26ebf2c672b723e89b00b867a0a8dbb9130023e48a5f302fd02d5409e1c8cd6c lxml-4.5.0.tar.gz" +sha512sums="58d287fc9533605117ffb391edbfe94a2abd0db9be11eb54c9f78ff348c8567d10874cc047e7ae099ef5ce4403ef3d5e5bd5e64aad158ce3c621f106e4c1df63 lxml-4.5.2.tar.gz" diff --git a/user/py3-mako/APKBUILD b/user/py3-mako/APKBUILD index af088ee11..cb8ab79a5 100644 --- a/user/py3-mako/APKBUILD +++ b/user/py3-mako/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-mako _pkgname=Mako _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.1.1 +pkgver=1.1.3 pkgrel=0 pkgdesc="Fast templating language for Python" url="http://www.makotemplates.org/" @@ -30,4 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="ff707ab3360148fe6e80bea7cd80d043514f08caebc502247c28c63a83e33d1be7513019605fc1adb77c32fc550e9bc16015c512bafde1a6f846aab0775d4ce7 Mako-1.1.1.tar.gz" +sha512sums="a9b94fa34a61e7794b6e4549fa0bada6ff84dfb0d9edb8d5c7f9b95d12184fa4499f42303cfee720b576a9f7e986a57d91ad3aeb26c9f93154dbc08fb2975952 Mako-1.1.3.tar.gz" diff --git a/user/py3-markdown/APKBUILD b/user/py3-markdown/APKBUILD index cf6a22b2a..5fbdbb8de 100644 --- a/user/py3-markdown/APKBUILD +++ b/user/py3-markdown/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-markdown _pkgname=Markdown _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=3.1.1 +pkgver=3.2.2 pkgrel=0 pkgdesc="A Python implementation of Markdown" url="https://python-markdown.github.io/" @@ -25,4 +25,4 @@ package() { python3 setup.py install --root="$pkgdir" } -sha512sums="78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090 Markdown-3.1.1.tar.gz" +sha512sums="72ce79b0daed4df2d09a458dad24da3e303143307640fb15d15cb10edc6c641d422dcf5043380c1572c4b9ed8f5fc11ec52e28928d8215d687309e4ce9ae3d7c Markdown-3.2.2.tar.gz" diff --git a/user/py3-parsedatetime/APKBUILD b/user/py3-parsedatetime/APKBUILD index 4e8698bc0..8f50cf353 100644 --- a/user/py3-parsedatetime/APKBUILD +++ b/user/py3-parsedatetime/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=py3-parsedatetime _pkgname=parsedatetime -pkgver=2.5 +pkgver=2.6 pkgrel=0 pkgdesc="Parse human-readable date/time strings" url="https://github.com/bear/parsedatetime" @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="f729c32a3e5ee94fe39322be4772dffacb0608753e106e64d79818a6be3febc36f37e0eeac73190f1510f5e88aa0755eb0fb85fab19aa53f4643619907b245bf parsedatetime-2.5.tar.gz" +sha512sums="ed7649feb8773fdb33d609ef0abe4d20f555744bd70e9766aba6b9a79d8415c7e2efea1d7ef5c6b5906f3bc90bff124ef92992ce17d83fe70575da2db918e543 parsedatetime-2.6.tar.gz" diff --git a/user/py3-pbr/APKBUILD b/user/py3-pbr/APKBUILD index a8885c816..7f831dbf8 100644 --- a/user/py3-pbr/APKBUILD +++ b/user/py3-pbr/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-pbr _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=5.4.4 +pkgver=5.4.5 pkgrel=0 pkgdesc="Python Build Reasonableness" url="https://pypi.org/project/pbr" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="da2c6c3020692215e02770ab5a31f2eccb489375e78ac2d796e3a413446c849699537d1188f0f5f83b4c8eea420af05c46cc6e2059b62ac530009ba4934e151f pbr-5.4.4.tar.gz" +sha512sums="b53ca10b7af7e365ff99ecf11942d3f047112d69f7e963716d07bc156077b08d79bb708bb93aae342e5e03c83278507b6990137dc34d0ebc11de53bd57ab3654 pbr-5.4.5.tar.gz" diff --git a/user/py3-psycopg2/APKBUILD b/user/py3-psycopg2/APKBUILD index 2e75817d4..3893ee0ab 100644 --- a/user/py3-psycopg2/APKBUILD +++ b/user/py3-psycopg2/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-psycopg2 _pkgname=psycopg2 _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.8.4 +pkgver=2.8.5 pkgrel=0 pkgdesc="PostgreSQL adapter for python" url="http://initd.org/psycopg" # No HTTPS @@ -25,4 +25,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="d4590c6e4e310d280b6b341cb23427b56b04c1ef08e877f0d99a79c6b00b959307bb18defaf1d9cea58482fb974a78760c5f26a3ece8c1f34ae1840570a71a28 psycopg2-2.8.4.tar.gz" +sha512sums="d4cf9b94573b90fe56555ea5cf841aa0c4c806770f92f35a7ef2531999bb50f98eb1276e56f1540b5f2695e443bac7e9cb8bbfbd24ed82164f99663259d2da3e psycopg2-2.8.5.tar.gz" diff --git a/user/py3-pygments/APKBUILD b/user/py3-pygments/APKBUILD index 9bfe39936..da51a4136 100644 --- a/user/py3-pygments/APKBUILD +++ b/user/py3-pygments/APKBUILD @@ -6,7 +6,7 @@ pkgname=py3-pygments _pkgname=Pygments _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.5.2 +pkgver=2.6.1 pkgrel=0 pkgdesc="A syntax highlighting package written in Python" url="https://pygments.org/" @@ -37,4 +37,4 @@ doc() { install -m 644 -D doc/pygmentize.1 "$pkgdir"/usr/share/man/man1/pygmentize.1 } -sha512sums="d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859 Pygments-2.5.2.tar.gz" +sha512sums="0d793bb6eabe43645541347e44932ee50ccd4309f40e7a327422bcbe57d40a7cb8bbf2fb0911744ed6f316c6c08f4216462be88d79192a2ea004d6da51329932 Pygments-2.6.1.tar.gz" diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD index aa822053a..c72cef87c 100644 --- a/user/py3-pygobject/APKBUILD +++ b/user/py3-pygobject/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=py3-pygobject -pkgver=3.36.0 +pkgver=3.36.1 pkgrel=0 pkgdesc="Python bindings for GObject libraries" url="https://wiki.gnome.org/Projects/PyGObject" @@ -25,4 +25,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="e07375e758d1ca0aefa7f12c9af739301371a857154577b62a17f3179adf1d9d37889d4f432cb6ac7804fb4c23f68a05d3ac5446df2800ecbca6fa27ed9b783d pygobject-3.36.0.tar.xz" +sha512sums="5e00dcd03dfe4f92acbf827c13c164b6b9740b2a8cef3b2dce70f96a2156fee2411c84dc669f12b910f4a93daa03ba845282832e2b09d8c887102d43764a345f pygobject-3.36.1.tar.xz" diff --git a/user/py3-pyparsing/APKBUILD b/user/py3-pyparsing/APKBUILD index 071bc3710..41331a9ff 100644 --- a/user/py3-pyparsing/APKBUILD +++ b/user/py3-pyparsing/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-pyparsing _pkgname=pyparsing _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.4.2 +pkgver=2.4.7 pkgrel=0 pkgdesc="Python parsing module" url="https://pypi.python.org/pypi/pyparsing" @@ -30,4 +30,4 @@ package() { } -sha512sums="27e5959eb1cf0c4d899746d2d32f5f000c3753278bdbbb670d24a077053e5c08caf8429f684186c502f6d9bf358702e0a8b3fea40cd2b50807cf02ea38c750dd py3-pyparsing-2.4.2.tar.gz" +sha512sums="0b9f8f18907f65cb3af1b48ed57989e183f28d71646f2b2f820e772476f596ca15ee1a689f3042f18458206457f4683d10daa6e73dfd3ae82d5e4405882f9dd2 py3-pyparsing-2.4.7.tar.gz" diff --git a/user/py3-python-dateutil/APKBUILD b/user/py3-python-dateutil/APKBUILD index 833c61ed2..f205ebfc5 100644 --- a/user/py3-python-dateutil/APKBUILD +++ b/user/py3-python-dateutil/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-python-dateutil _pkgname=python-dateutil _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.8.0 +pkgver=2.8.1 pkgrel=0 pkgdesc="Extensions to the standard Python datetime module" url="https://pypi.python.org/pypi/python-dateutil" @@ -13,8 +13,7 @@ license="Apache-2.0 AND BSD-3-Clause" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest py3-hypothesis py3-freezegun" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz - scm.patch" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { @@ -33,5 +32,4 @@ package() { } -sha512sums="ec7da86203572582f883a4686acf8a732a2de4f396d809057eb51b2c60dbca5623a7fa90c2c0618c281a2282c60841739bd837731a51cc876f4ff369297f2f81 py3-python-dateutil-2.8.0.tar.gz -992434700d9dd1d048e69c3e5a80489f2e45e43e865935542a04b4749ef42e5716c0dc17157bd6f1b3cd4fd6436aa7cb3707edbe587d5b873b55a4eb1000bd54 scm.patch" +sha512sums="337000216e0f8ce32d6363768444144183ab9268f69082f20858f2b3322b1c449e53b2f2b5dcb3645be22294659ce7838f74ace2fd7a7c4f2adc6cf806a9fa2c py3-python-dateutil-2.8.1.tar.gz" diff --git a/user/py3-python-dateutil/scm.patch b/user/py3-python-dateutil/scm.patch deleted file mode 100644 index 287b5269d..000000000 --- a/user/py3-python-dateutil/scm.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- python-dateutil-2.8.0/setup.py 2019-02-05 08:50:00.000000000 -0500 -+++ python-dateutil-2.8.0/setup.py 2019-07-24 15:40:41.520063790 -0400 -@@ -49,9 +49,6 @@ README = README() # NOQA - - - setup(name="python-dateutil", -- use_scm_version={ -- 'write_to': 'dateutil/_version.py', -- }, - description="Extensions to the standard Python datetime module", - author="Gustavo Niemeyer", - author_email="gustavo@niemeyer.net", -@@ -65,7 +62,7 @@ setup(name="python-dateutil", - python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*", - package_data={"dateutil.zoneinfo": ["dateutil-zoneinfo.tar.gz"]}, - zip_safe=True, -- setup_requires=['setuptools_scm'], -+ setup_requires=[], - install_requires=["six >=1.5"], - classifiers=[ - 'Development Status :: 5 - Production/Stable', diff --git a/user/py3-pyyaml/APKBUILD b/user/py3-pyyaml/APKBUILD index e2ce44251..afbf6f336 100644 --- a/user/py3-pyyaml/APKBUILD +++ b/user/py3-pyyaml/APKBUILD @@ -2,11 +2,12 @@ # Maintainer: pkgname=py3-pyyaml _pkgname=pyyaml -pkgver=5.1.2 +pkgver=5.3.1 pkgrel=0 pkgdesc="YAML parser and emitter for Python" url="https://pyyaml.org/wiki/PyYAML" arch="noarch" +# Certified net clean license="MIT" depends="python3 yaml" makedepends="python3-dev yaml yaml-dev" @@ -14,6 +15,10 @@ subpackages="" source="$pkgname-$pkgver.tar.gz::https://github.com/yaml/$_pkgname/archive/$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" +# secfixes: +# 5.3.1-r0: +# - CVE-2020-1747 + build() { # Seems like they need Cython to build the C extension now, so it falls back to pure Python. # Once we ship Cython we can probably change this. @@ -28,4 +33,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="7bc3dceadcfd512ede67581625887d00822464f20d3b646904f4a73afce8cf3b9766829c6004b626c31757edf8e2eedc27e60d96bee13afa68d3296a8a7f33bb py3-pyyaml-5.1.2.tar.gz" +sha512sums="27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556 py3-pyyaml-5.3.1.tar.gz" diff --git a/user/py3-sortedcontainers/APKBUILD b/user/py3-sortedcontainers/APKBUILD index b14785965..86b3330b7 100644 --- a/user/py3-sortedcontainers/APKBUILD +++ b/user/py3-sortedcontainers/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-sortedcontainers _pkgname=sortedcontainers _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=2.1.0 +pkgver=2.2.2 pkgrel=0 pkgdesc="Sorted container objects for Python 3" url="https://pypi.python.org/pypi/sortedcontainers" @@ -31,4 +31,4 @@ package() { } -sha512sums="6fe2b6e7d030b67aa990d62160079852feaee7828164eae03a6477dc1704863f6ed0daadb44dc919653c66996d51f833b5858351a8fd5ad28998f8010a8ca1a4 py3-sortedcontainers-2.1.0.tar.gz" +sha512sums="4a7da8d76111b56bda432b211c11ef48ac8af25ddf7fd961cf72628c18f878a6c2a22e272e108f3e5ad88a333b8f646b54c8dd11c9c642349c9da001140abd16 py3-sortedcontainers-2.2.2.tar.gz" diff --git a/user/py3-tz/APKBUILD b/user/py3-tz/APKBUILD index 1c9545f24..ed4b36ff3 100644 --- a/user/py3-tz/APKBUILD +++ b/user/py3-tz/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=py3-tz _pkgname=pytz -pkgver=2019.3 +pkgver=2020.1 pkgrel=0 pkgdesc="Timezone definitions for Python" url="http://pytz.sourceforge.net/" @@ -27,6 +27,6 @@ package() { mkdir -p "$pkgdir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="b925b59d197e7007dae8098d35518a470e4b7588d9114f51e4d8816813243a9f816f662055f690bedf56b86cc9ece06428ed8c55e5b3ed676ba0f504f7cb43af pytz-2019.3.tar.gz +sha512sums="4f652ab400bac0bd83ed305be7540094e674029a0cbde7da280adfd911b8c0a44023799b7c61971a5a61a1d6e3992c5b621e5e95bbfe962f310d5f26d4fda3ce pytz-2020.1.tar.gz be61b829014be0d0d7db0c544481d378a95324c1f5968cbbcd7887c6ee8ce52a0b47ae734e16fc5fb2429d8d49c8ef199b6b3b7194f9e654699bb73ab8f3a10d zoneinfo-noinstall.patch 7629da5d76056789e7c29a4f047d25fe77586d4a78e8a1ce7ad7c513507d286098666edb24ee5cadc9b0a4d5623336bba8a6b0f786072ce741177022201fdc54 zoneinfo-fix.patch" diff --git a/user/py3-zope-proxy/APKBUILD b/user/py3-zope-proxy/APKBUILD index 2704aa053..c75daac07 100644 --- a/user/py3-zope-proxy/APKBUILD +++ b/user/py3-zope-proxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=py3-zope-proxy _pkgname=zope.proxy -pkgver=4.3.2 +pkgver=4.3.5 pkgrel=0 pkgdesc="Zope module for class and function proxies" url="https://github.com/zopefoundation/zope.proxy" @@ -23,4 +23,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="4a42a4989775f01f1b663d71058aae9852690d713269b5d58c6e10784ed2ca6ca056be5261bb009f230e198818b92d4e1014961f1144dcfacb47202064a8a666 zope.proxy-4.3.2.tar.gz" +sha512sums="08b48cd284b07ddbceebd689ca8c96c0e9ec3521c8984ab37443d2fb48f9ddcae415ce6cfcc2415f29016e1825c4f5178b90637961e265993731000d450debc9 zope.proxy-4.3.5.tar.gz" diff --git a/user/qastools/APKBUILD b/user/qastools/APKBUILD index 0586a751d..fc15db669 100644 --- a/user/qastools/APKBUILD +++ b/user/qastools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qastools -pkgver=0.22.0 +pkgver=0.23.0 pkgrel=0 pkgdesc="ALSA mixer and utilities for Qt" url="https://gitlab.com/sebholt/qastools" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5f4c845df00e00236d61ad1009fc6aa529996e02a03aeb92211a12facf9bdce5e1626f4c97d96d88827dfe689bd961d1a2fd3f9164dca6947c08b4fc1d78483d qastools-v0.22.0.tar.bz2" +sha512sums="543e2f6407ba36f7cb0ce811ee1ceac14652960c58636671fabeaca25d154db263b654d07795ec2a81232b1e177469cbb45617099d40af47d6ab1148443582fb qastools-v0.23.0.tar.bz2" diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD index bc3744541..3398b6537 100644 --- a/user/qemu/APKBUILD +++ b/user/qemu/APKBUILD @@ -454,7 +454,7 @@ fb0130fa4e8771b23ae337ea3e5e29fd5f7dcfe7f9f7a68968f5b059bb4dd1336b0d04c118840d55 c6436b1cc986788baccd5fe0f9d23c7db9026f6b723260611cf894bd94ee830140a17ee5859efe0dad0ca3bfe9caae1269bc5c9ab4c6e696f35c7857c1b5c86b signal-fixes.patch 698f6b134f4ca87f4de62caf7a656841a40a451b8686ca95928f67a296e58a7493d432d9baa5f6360917865aa4929600baf1699993b0600923a066ca9d45d1da sysinfo-header.patch 2828cc612539aa93b5789de7de6d4f85d3cf82311484c0fe91fdd3efeb972057e2baa2a3809ed633d6caa1785642d49196cb282b095d7553c510c47ce7d6a702 fix-lm32-underlinking.patch -87f659800b78b31731ea1828a27a3762662ef124d10e942f6029b332d5e8cf4487f62a3d742ad59709c2eb9e3ae8af36fa849d6cbac89978a282d29786b9b41a time64.patch +44db77cab330075da601cc6083678c5f3ed1528936a8fd81148875bc67ed53332b21466c79ac6e5cf2b2e7d3824392dd7a52d0aaed03689be9b2dfddd5abba06 time64.patch d7de79ea74e36702cac4a59e472564a55f0a663be7e63c3755e32b4b5dfbc04b390ee79f09f43f6ae706ee2aec9e005eade3c0fd4a202db60d11f436874a17d7 MAP_SYNC-fix.patch 0ea3745c45507c00c3c036241992d594b5f7e9aa1f0fa9b425dd222390066e1ea2d0aa4923bde0e7f27b7cc2f759a122ae4b600c2fa682a5aad509e7d03ccad9 CVE-2020-1711.patch 5d9e7e065c6716024eab4984331071f42dcd5363c5456023f81a3ef0329ae578348d0f875868f85c9e1fee5e435d86e2eb7e342a957c36cd099cb5d5d9f3a78d CVE-2020-11102.patch diff --git a/user/qemu/time64.patch b/user/qemu/time64.patch index 8ec9f45df..342231146 100644 --- a/user/qemu/time64.patch +++ b/user/qemu/time64.patch @@ -18,3 +18,23 @@ evdev.type = le16_to_cpu(event->type); evdev.code = le16_to_cpu(event->code); evdev.value = le32_to_cpu(event->value); +--- qemu-4.2.0/contrib/vhost-user-input/main.c.old 2019-12-12 18:20:47.000000000 +0000 ++++ qemu-4.2.0/contrib/vhost-user-input/main.c 2020-06-15 04:46:15.198762807 +0000 +@@ -115,13 +115,16 @@ + static void vi_handle_status(VuInput *vi, virtio_input_event *event) + { + struct input_event evdev; ++ struct timeval tv; + int rc; + +- if (gettimeofday(&evdev.time, NULL)) { ++ if (gettimeofday(&tv, NULL)) { + perror("vi_handle_status: gettimeofday"); + return; + } + ++ evdev.input_event_sec = tv.tv_sec; ++ evdev.input_event_usec = tv.tv_usec; + evdev.type = le16toh(event->type); + evdev.code = le16toh(event->code); + evdev.value = le32toh(event->value); diff --git a/user/qps/APKBUILD b/user/qps/APKBUILD index ec708c3c0..5f884fb45 100644 --- a/user/qps/APKBUILD +++ b/user/qps/APKBUILD @@ -1,16 +1,18 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qps -pkgver=2.0.0 +pkgver=2.1.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt-based task manager" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev - qt5-qttools-dev libxrender-dev lxqt-build-tools>=0.6.0" + qt5-qttools-dev libxrender-dev lxqt-build-tools>=$_lxqt_build + liblxqt-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/qps/releases/download/$pkgver/qps-$pkgver.tar.xz qps-1.10.17-compile-fixes.patch @@ -39,5 +41,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="b5c3d194e97ac61ede43e29f4f12e3775ee8afabb1c1c344d068ea0af85fc8a574667cb6c4b801af620e81da1648b0618e31df7c0d5701cf47625482e8528019 qps-2.0.0.tar.xz +sha512sums="e5601657be94d4c21e189fc1113f4678a4bad70ca3c9c3882492625b37339d079d1e8240120bdb467bc47ca95a1b26f8e2da022c271377cf0dbf98e390bc8ac2 qps-2.1.0.tar.xz 32c154f1d3c9e74dda3eabfd2e3b9e9f3c1d77f808dfacc9dd05c904066832d92d361ca56ef9d784d945fad60cf67d6c909cbb730a0ffed1fea3bf44c3aad5a2 qps-1.10.17-compile-fixes.patch" diff --git a/user/qqc2-desktop-style/APKBUILD b/user/qqc2-desktop-style/APKBUILD index 2281459a7..3045ff7a5 100644 --- a/user/qqc2-desktop-style/APKBUILD +++ b/user/qqc2-desktop-style/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qqc2-desktop-style -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="QtQuickControls 2 style that uses QWidget's QStyle for painting" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="6f3a9c54715140971b92d88822e00fca2d84ab61819e60be8819629b2ab78444aa5215f3bcf4470d572691230e9ff9589788e313b9b439aa92b38e78b3a41605 qqc2-desktop-style-5.68.0.tar.xz" +sha512sums="641e7c1fb3a367eb17afb841fadf7c506ad4e7898d2cf595c2cdebffcac82672b9fd0ab9aafd7ab742b00d529b998b68e2621b6fbfcb0891dcf3701f8332ba23 qqc2-desktop-style-5.72.0.tar.xz" diff --git a/user/qt-creator/APKBUILD b/user/qt-creator/APKBUILD index 3ed606043..dbe83e008 100644 --- a/user/qt-creator/APKBUILD +++ b/user/qt-creator/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt-creator -pkgver=4.11.0 +pkgver=4.12.4 pkgrel=0 pkgdesc="Cross-platform multi-language programming IDE" url="https://doc.qt.io/qtcreator/index.html" @@ -27,4 +27,4 @@ package() { make install INSTALL_ROOT="$pkgdir"/usr } -sha512sums="29e5c72d4002cdddecbdea689dd5048aa8d0b74c980a6b8096b03c3c39f4868e4490c4516ba287a4082eaaa4ec412309c1d498a4f97754720c88ae4ab53d30b8 qt-creator-opensource-src-4.11.0.tar.gz" +sha512sums="137fda4882bce31b2844c6a4c1d54f5628f0812611266b2d7f74d6c155bec97809f50dca4a253c5d9686e7d0838ee568d054e5102333c63c30ca430f50370013 qt-creator-opensource-src-4.12.4.tar.gz" diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD index 4cb68524d..8e51ff124 100644 --- a/user/qt5-qtbase/APKBUILD +++ b/user/qt5-qtbase/APKBUILD @@ -2,7 +2,7 @@ pkgname=qt5-qtbase _pkgname=qtbase-everywhere-src pkgver=5.12.6 -pkgrel=1 +pkgrel=2 pkgdesc="Cross-platform application and UI framework" url="https://www.qt.io/" arch="all" @@ -29,6 +29,7 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu time64.patch CVE-2020-0569.patch CVE-2020-0570.patch + section-header.patch " # secfixes: qt @@ -182,4 +183,5 @@ ee78a44e28ba5f728914bfc3d8d5b467896c7de11a02d54b0bce11e40a4338b1f776c1fcc30cbd43 e3982b2df2ab4ba53b7a1329a9eb928eb1fee813c61cf6ac03d3300a767ffb57f019ac0fd89f633cac2330549446ff3d43344871296bf362815e7ebffadefa6b qt-musl-iconv-no-bom.patch 436f0bb7a89a88aa62c7b0398c4e91c325e78542e96f747c903f7e96dbf9d9b693d9688c722f2a74e287fb9ab31e861bd5ed8deb172ed28f56a1b8757663771c time64.patch ddeb0a59cf0901b38669314fd2f14dffba63c6cbd06a3d864cd329081cc2b10323ec52053a6ffe7baf5ee8a1e137331acfe5d874c03596660630dd151828da56 CVE-2020-0569.patch -b5973799d6dc7c03124b7df5424e5fa84cb81ec3b997e039b84cca21852abaf4ff61780b99c47f1fd6ce64ae61f61b2458ca2929e068644f1973a6f1c53a4d64 CVE-2020-0570.patch" +b5973799d6dc7c03124b7df5424e5fa84cb81ec3b997e039b84cca21852abaf4ff61780b99c47f1fd6ce64ae61f61b2458ca2929e068644f1973a6f1c53a4d64 CVE-2020-0570.patch +47b2973561965e3ef906f03480b3877ad0018f32d31fecb4c410abe22c68ccad7d232cfe68804b70111616e15b979fb26642225b984d8fdbfc6cf6899ad63a0d section-header.patch" diff --git a/user/qt5-qtbase/section-header.patch b/user/qt5-qtbase/section-header.patch new file mode 100644 index 000000000..20664104a --- /dev/null +++ b/user/qt5-qtbase/section-header.patch @@ -0,0 +1,95 @@ +From ba6e0e4aac4d06782325c7032c8ea475f2d3eab0 Mon Sep 17 00:00:00 2001 +From: David Faure <david.faure@kdab.com> +Date: Sat, 13 Apr 2019 19:37:37 +0200 +Subject: [PATCH 1/1] QHeaderView: fix assert when restoring section sizes over + less columns +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +If columns are removed and we get notified via layoutChanged, the code +tries to restore old section sizes, and went out of bounds, leading to +an assert in QVector. Simply add an if() to skip restoring out-of-bounds columns. + +This comes from https://bugs.kde.org/show_bug.cgi?id=395181, +which translates into the unittest that is part of this commit. + +Change-Id: Ide42176a758f87b21957c40508127d67f1d5a2d9 +Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> +Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> +--- + src/widgets/itemviews/qheaderview.cpp | 16 +++++++++------- + .../widgets/itemviews/qheaderview/tst_qheaderview.cpp | 17 +++++++++++++++++ + 2 files changed, 26 insertions(+), 7 deletions(-) + +diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp +index 62abf567511..99309633a7b 100644 +--- a/src/widgets/itemviews/qheaderview.cpp ++++ b/src/widgets/itemviews/qheaderview.cpp +@@ -2283,13 +2283,15 @@ void QHeaderViewPrivate::_q_sectionsChanged(const QList<QPersistentModelIndex> & + : index.row()); + // the new visualIndices are already adjusted / reset by initializeSections() + const int newVisualIndex = visualIndex(newLogicalIndex); +- auto &newSection = sectionItems[newVisualIndex]; +- newSection = item.section; +- +- if (newSection.isHidden) { +- // otherwise setSectionHidden will return without doing anything +- newSection.isHidden = false; +- q->setSectionHidden(newLogicalIndex, true); ++ if (newVisualIndex < sectionItems.count()) { ++ auto &newSection = sectionItems[newVisualIndex]; ++ newSection = item.section; ++ ++ if (newSection.isHidden) { ++ // otherwise setSectionHidden will return without doing anything ++ newSection.isHidden = false; ++ q->setSectionHidden(newLogicalIndex, true); ++ } + } + } + +diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +index eaf75e74945..1b3e1e1f34e 100644 +--- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp ++++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +@@ -248,6 +248,7 @@ private slots: + void sizeHintCrash(); + void testResetCachedSizeHint(); + void statusTips(); ++ void testRemovingColumnsViaLayoutChanged(); + + protected: + void setupTestData(bool use_reset_model = false); +@@ -353,6 +354,7 @@ public: + + void cleanup() + { ++ emit layoutAboutToBeChanged(); + cols = 3; + rows = 3; + emit layoutChanged(); +@@ -3489,5 +3491,20 @@ void tst_QHeaderView::statusTips() + QCOMPARE(headerView.statusTipText, QLatin1String("[0,1,0] -- Header")); + } + ++void tst_QHeaderView::testRemovingColumnsViaLayoutChanged() ++{ ++ const int persistentSectionSize = 101; ++ ++ QtTestModel model; ++ model.rows = model.cols = 5; ++ view->setModel(&model); ++ for (int i = 0; i < model.cols; ++i) ++ view->resizeSection(i, persistentSectionSize + i); ++ model.cleanup(); // down to 3 via layoutChanged (not columnsRemoved) ++ for (int j = 0; j < model.cols; ++j) ++ QCOMPARE(view->sectionSize(j), persistentSectionSize + j); ++ // The main point of this test is that the section-size restoring code didn't go out of bounds. ++} ++ + QTEST_MAIN(tst_QHeaderView) + #include "tst_qheaderview.moc" +-- +2.16.3 + diff --git a/user/qt5-qtnetworkauth/APKBUILD b/user/qt5-qtnetworkauth/APKBUILD new file mode 100644 index 000000000..59ace6b90 --- /dev/null +++ b/user/qt5-qtnetworkauth/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qt5-qtnetworkauth +_pkgname=qtnetworkauth-everywhere-src +pkgver=5.12.6 +pkgrel=0 +pkgdesc="Network authentication module for Qt" +url="https://www.qt.io/" +arch="all" +options="!check" +license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" +depends="" +makedepends="qt5-qtbase-dev" +subpackages="$pkgname-dev" +source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + qmake + make +} + +package() { + make install INSTALL_ROOT="$pkgdir" +} + +sha512sums="d66aac84310e8afa734613f8baf3bba830ed3562336f00f143cbb13dc831f58108da95a1a5c09ec5d26efb653c98ffedc83b62a2f0ec01ff14f6fc51b7c8f6ed qtnetworkauth-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5-qtwayland/APKBUILD b/user/qt5-qtwayland/APKBUILD new file mode 100644 index 000000000..daea318a5 --- /dev/null +++ b/user/qt5-qtwayland/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qt5-qtwayland +_pkgname=qtwayland-everywhere-src +pkgver=5.12.6 +pkgrel=0 +pkgdesc="Unstable Qt platform module for experimental Wayland display system" +url="https://www.qt.io/" +arch="all" +options="!check" +license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" +depends="" +makedepends="libxkbcommon-dev mesa-dev qt5-qtbase-dev wayland-dev" +subpackages="$pkgname-dev $pkgname-client $pkgname-compositor $pkgname-tools" +source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + qmake + make +} + +package() { + make install INSTALL_ROOT="$pkgdir" +} + +client() { + pkgdesc="Qt client library for experimental Wayland display system" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libQt5WaylandClient* "$subpkgdir"/usr/lib/ +} + +compositor() { + pkgdesc="Unstable Qt compositor library for experimental Wayland display system" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libQt5WaylandCompositor* "$subpkgdir"/usr/lib/ +} + +tools() { + pkgdesc="Tools for Qt integration with experimental Wayland display system" + mkdir -p "$subpkgdir"/usr/lib/qt5 + mv "$pkgdir"/usr/lib/qt5/bin "$subpkgdir"/usr/lib/qt5/ +} + +sha512sums="6d066d2f65f2727b9a1c7e71b973c81f8a8d2e6210c4c998403fcbb9e4cca2543fa11160b573c0646967a3351d33504c9f44ed98b1bb282735bf17e82808a4f4 qtwayland-everywhere-src-5.12.6.tar.xz" diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD index f54023654..1aa673cea 100644 --- a/user/qt5ct/APKBUILD +++ b/user/qt5ct/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qt5ct -pkgver=0.41 +pkgver=1.0 pkgrel=0 pkgdesc="GUI utility for configuring Qt5" url="https://sourceforge.net/projects/qt5ct/" @@ -21,4 +21,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="a94f9996dc2198d3c8c9af8610912d12b915b8c547a49c36f7bc083b6f237b318d7903e91fb6fcfe06996a319c361104c1923e6d0c49446b6fb66a1e44fae009 qt5ct-0.41.tar.bz2" +sha512sums="f650362c90782128e1b3ddb61e73d0295bc5b108a75c8a10d085ce9df7dc0926ac40baf80705136b39cc779212fc97e121757c440f2728aab12b761caace78b2 qt5ct-1.0.tar.bz2" diff --git a/user/qterminal/APKBUILD b/user/qterminal/APKBUILD index 2ccd6bdf2..d9704ad7d 100644 --- a/user/qterminal/APKBUILD +++ b/user/qterminal/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qterminal -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt-based terminal for LXQt" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 +makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt_build qtermwidget-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" source="https://github.com/lxqt/qterminal/releases/download/$pkgver/qterminal-$pkgver.tar.xz" @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="bb9ac6519236bb834892c1be50bc27f86631b2c7ed60c1ddd4300fedd48f3ea8a08aa453fa03199693486159f667f9391af9491dea5402b4f807ee91e8a6e5cf qterminal-0.14.1.tar.xz" +sha512sums="03c690fd090fc87e0475f5a34e19ff1d5aeaea146fe5c62aa09540b6abfa0363506c44c3e82c5d3957e351b883ac9fdd014da66ce7d44e7d3e5fecc8fcd7bcac qterminal-0.15.0.tar.xz" diff --git a/user/qtermwidget/APKBUILD b/user/qtermwidget/APKBUILD index 916d2e1f4..3af12cbca 100644 --- a/user/qtermwidget/APKBUILD +++ b/user/qtermwidget/APKBUILD @@ -1,17 +1,18 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=qtermwidget -pkgver=0.14.1 +pkgver=0.15.0 +_lxqt_build=0.7.0 pkgrel=0 pkgdesc="Qt-based terminal widget, used in QTerminal" -url="https://lxqt.org/" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" depends_dev="libutempter-dev" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev - lxqt-build-tools>=0.6.0 $depends_dev" + lxqt-build-tools>=$_lxqt_build $depends_dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/qtermwidget/releases/download/$pkgver/qtermwidget-$pkgver.tar.xz fix-linking.patch @@ -41,5 +42,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410 qtermwidget-0.14.1.tar.xz +sha512sums="95f44c77d0b678b1a204b559a7adb2fb68b2e82b2357d89239e9fc1c6f445346d84ec7f395d58f17a2ef7b42e58c02590f637683193eae4f7efbd001b61857c7 qtermwidget-0.15.0.tar.xz f2d43f12479a3a3a01be9ebee9ce349b0f4e60b07dfc79e8666ed913d5682987f81b08a397ee8ca628c36f5770ddfe63f5abafa94dff6c1c1e090adc1637af35 fix-linking.patch" diff --git a/user/quaternion/APKBUILD b/user/quaternion/APKBUILD index f8a5f8b8a..cb9dc25cf 100644 --- a/user/quaternion/APKBUILD +++ b/user/quaternion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=quaternion -pkgver=0.0.9.4c +pkgver=0.0.9.4e _pkgver=$(printf '%s' "$pkgver" | sed 's/_/-/') pkgrel=0 pkgdesc="Qt5-based Matrix chat client" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="405b8e6fae4bd4b2d6a08e582ae7451d080f0de2d993103d90cb2c613a7a9ab4e53c3bbcc298f0a6aedc6ff3da84ced763580c4806e1d5d59f08af131dc8b102 quaternion-0.0.9.4c.tar.gz" +sha512sums="5478892b7dce96a60f1429ee6dff9dd0b4fbb89bf45ecc2e499ee90f615af4de12d1de0002804420a85a21a6ba533e4799c94d2411067cb7d7aacca183d9d981 quaternion-0.0.9.4e.tar.gz" diff --git a/user/quazip/APKBUILD b/user/quazip/APKBUILD index f6afd9948..875541002 100644 --- a/user/quazip/APKBUILD +++ b/user/quazip/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=quazip -pkgver=0.8.1 +pkgver=0.9.1 pkgrel=0 pkgdesc="Qt ZIP archive library" url="https://stachenov.github.io/quazip/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb quazip-0.8.1.tar.gz" +sha512sums="db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0 quazip-0.9.1.tar.gz" diff --git a/user/rinutils/APKBUILD b/user/rinutils/APKBUILD index 9abfd0fc3..c09b392a6 100644 --- a/user/rinutils/APKBUILD +++ b/user/rinutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rinutils -pkgver=0.2.0 +pkgver=0.4.0 pkgrel=0 pkgdesc="C11 utilities library" url=" " @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="82d09313f014fd118025438575a90dbc5b9a46d3d58ed9ffc774380d285b32ed00e7d9b453097ce0b8efc20a85a783e178b0d6831e925da3cd65f35037306dc3 rinutils-0.2.0.tar.xz" +sha512sums="96c0fc1e8164df8703910a8e14215e1a3fa52d5cc2fdf90af2f21dd064236e2b2b5f44485689553cd0df7cb99aa01f71241983166683934175d907e9f583edb5 rinutils-0.4.0.tar.xz" diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index 4d17de4ea..f1c70ae01 100644 --- a/user/rocs/APKBUILD +++ b/user/rocs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rocs -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Graph theory IDE" url="https://www.kde.org/applications/education/rocs/" @@ -10,13 +10,11 @@ options="!check" # All tests require X11. license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev boost-dev - grantlee-dev qt5-qtwebkit-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev - karchive-dev kconfig-dev kcoreaddons-dev kcrash-dev kdeclarative-dev - ki18n-dev kitemviews-dev ktexteditor-dev kxmlgui-dev" + grantlee-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev karchive-dev + kconfig-dev kcoreaddons-dev kcrash-dev kdeclarative-dev ki18n-dev + kitemviews-dev ktexteditor-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/rocs-$pkgver.tar.xz - webkit.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/rocs-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,5 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1b4839197e5b40460a517221da4328c9283e4618eadf0dbeb20b7d5019a97f8fbac26dbf7c6a1b9b481bc4da8436ea6e632e38c1d6b33b1cb235055c76855984 rocs-19.12.3.tar.xz -0ed6660f78096d0f6b53e563f7c632dd1616beda4032a3a6556aef20dc1c79f6a31b93a377b005a1d3acaecd9da7b20ae8c0b3e7e36d97ef65837b207d3e94b3 webkit.patch" +sha512sums="b561e8864a700c832d36ce8fb645d29c09c4c9dcf34a01649ad6448b9d00a25945134821753ebeef56a607c3c66424a59d8a2372ae5561185fd37691709bfd5d rocs-20.04.3.tar.xz" diff --git a/user/rocs/webkit.patch b/user/rocs/webkit.patch deleted file mode 100644 index 87ba9e747..000000000 --- a/user/rocs/webkit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rocs-19.12.0/src/CMakeLists.txt.old 2019-12-05 19:44:59.000000000 +0000 -+++ rocs-19.12.0/src/CMakeLists.txt 2020-01-05 05:05:52.820317770 +0000 -@@ -103,7 +103,7 @@ - Qt5::Core - Qt5::Quick - Qt5::QuickWidgets -- Qt5::WebKit -+ Qt5::WebKitLegacy - Qt5::WebKitWidgets - Qt5::XmlPatterns - ) diff --git a/user/rpcsvc-proto/APKBUILD b/user/rpcsvc-proto/APKBUILD index 1f875bafc..713240eeb 100644 --- a/user/rpcsvc-proto/APKBUILD +++ b/user/rpcsvc-proto/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rpcsvc-proto -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=0 pkgdesc="RPC service protocol definitions and compiler" url=" " @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="02d08c2e53dd02923a470be4243fa8458ebe73c74dcb755b36c001bfb128747359c5b7c2ba76ea7b12cd4eaa6916edc60849e8ec4b43d2c462751038ba0205fc rpcsvc-proto-1.4.1.tar.xz" +sha512sums="631fbfc00af94c5d7def0759f27e97dc14d400b4468c906719ae18ecef74815730798c882d1aaa4f90359224e7b829019b786baddc3097905b54f940ca85a714 rpcsvc-proto-1.4.2.tar.xz" diff --git a/user/ruby-diff-lcs/APKBUILD b/user/ruby-diff-lcs/APKBUILD index c03e0e033..90f955653 100644 --- a/user/ruby-diff-lcs/APKBUILD +++ b/user/ruby-diff-lcs/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-diff-lcs _gemname=${pkgname#ruby-} -pkgver=1.3 -pkgrel=2 +pkgver=1.4.4 +pkgrel=0 pkgdesc="Generate difference sets between Ruby sequences" url="http://halostatue.github.io/diff-lcs/" arch="noarch" @@ -45,4 +45,4 @@ tools() { mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ } -sha512sums="b455f86ab006cbb823c2f8ed7fcde16c432e3783b6408ec305e57b7f4d0cf98bad586786947414ec3dc27e885b1485e534d26df19eaa9972874d78a8829b501e ruby-diff-lcs-1.3.tar.gz" +sha512sums="52fc0501516299396f570be7f35d856ddeed9637430019ca831759467474cecff72be0dace2fed020dacb5f551febef047e3f1928affa0ac0f18b636ee94baa7 ruby-diff-lcs-1.4.4.tar.gz" diff --git a/user/ruby-rspec-core/APKBUILD b/user/ruby-rspec-core/APKBUILD index 9749114a6..33fb1a78a 100644 --- a/user/ruby-rspec-core/APKBUILD +++ b/user/ruby-rspec-core/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-core _gemname=${pkgname#ruby-} -pkgver=3.9.1 -pkgrel=1 +pkgver=3.9.2 +pkgrel=0 pkgdesc="RSpec runner and formatters" url="https://relishapp.com/rspec/rspec-core" arch="noarch" @@ -37,5 +37,5 @@ package() { "$gemdir"/doc } -sha512sums="2da714ebf35e78be789758857efbebc69548df7a11fff8bcd74a854b61485ef726cf0cec781e27a97d20f4eac0010aad50656b6074248c94b1833d4cb267189a ruby-rspec-core-3.9.1.tar.gz +sha512sums="19c88cc73bcdd5be1136cc2d9e0fdb665c5b1c0a2ed92feb2c225264816387d2cbef2ff3555aab90a3921e39b05f30619acdcf20f92f4abf8e4eccd7fcb329f5 ruby-rspec-core-3.9.2.tar.gz e0cbcfddcc4c73d9b9673907e3b1a785b399c0b3b213761e9dbca9fadc55d50a88389eaf561f5603bd674eb94ce9f2ecf829d884eaa77df8ef1b565c0c7f25f2 gemspec.patch" diff --git a/user/ruby-rspec-expectations/APKBUILD b/user/ruby-rspec-expectations/APKBUILD index c465c5c4b..68c6dc95e 100644 --- a/user/ruby-rspec-expectations/APKBUILD +++ b/user/ruby-rspec-expectations/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-expectations _gemname=${pkgname#ruby-} -pkgver=3.9.1 +pkgver=3.9.2 pkgrel=0 pkgdesc="Provides a readable API to express expected outcomes of a code example in RSpec" url="https://relishapp.com/rspec/rspec-expectations/" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="23a453a46c3eb3bd3f2a39f48f62f05832cf559b570ba0e09235dd6299687254491bab50f5502fefe69dbdeefa09e9d8c5568bc77d0b6b658bb469e197e67572 ruby-rspec-expectations-3.9.1.tar.gz +sha512sums="d3ae1c93e936acc2278b5beaded9255ef78e3e9d0fed1cc9a14010930a396841bf4937cade164d0c9f4f2e4cafad86ab511309156e45387b624907365e7e611a ruby-rspec-expectations-3.9.2.tar.gz 1d477004521852e23d01b197187dbb434a2c7fd179e506c82a12e17f5d52470fe2a113112e7052b9479077eafa6759beb07c03301de1f8ea7f5c4643c92d8346 gemspec.patch" diff --git a/user/ruby-rspec-support/APKBUILD b/user/ruby-rspec-support/APKBUILD index 5f8457dd0..929134ede 100644 --- a/user/ruby-rspec-support/APKBUILD +++ b/user/ruby-rspec-support/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-support _gemname=${pkgname#ruby-} -pkgver=3.9.2 -pkgrel=1 +pkgver=3.9.3 +pkgrel=0 pkgdesc="Support utilities for RSpec gems" url="https://rubygems.org/gems/rspec-support" arch="noarch" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="436a3400a354012b06f471a339386667ed4854814b780f9c21d71182b001b3b4ab45ade578b56e4f2dec81325de5d88baa783f7e56b27bb215cfdc58448b10f1 ruby-rspec-support-3.9.2.tar.gz +sha512sums="ae66620f0a62bd0c0feea33ec45a0dc1029fa75efd399fe4fb10e53bea6652b93b84beb60e44003eeea9c8e374b403c39233842e55d6a3685347f740b9734481 ruby-rspec-support-3.9.3.tar.gz e9d611ea1789e835f742aa92f1e668840139e2621898edf158dc53e111db4119a324da65d2d28f5c6e737c82f261f4adb3beb8c244ee01d2f618778ed62d3731 gemspec.patch" diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD index b738b4c16..01a984414 100644 --- a/user/s6-portable-utils/APKBUILD +++ b/user/s6-portable-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-portable-utils -pkgver=2.2.2.2 +pkgver=2.2.2.4 pkgrel=0 pkgdesc="skarnet.org's portable miscellaneous utilities" url="https://skarnet.org/software/s6-portable-utils/" @@ -33,4 +33,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="ed7df36757780201ccfc0c35a4ab1f6eab16f9fd8a23a6c739a469b9b82862dbb60823748e82c4c902fac835a801f3f0ab0f3d90f20628d6ac8bf744a4fb44a2 s6-portable-utils-2.2.2.2.tar.gz" +sha512sums="678398a2c902c28f3d5c2e3be832bb956bd6c5a72727b83c218b1966ac52d56be430126e8c768355f47a1c70f6f445afa76099882d3c9040931ada4f4ed19afc s6-portable-utils-2.2.2.4.tar.gz" diff --git a/user/sane-airscan/APKBUILD b/user/sane-airscan/APKBUILD new file mode 100644 index 000000000..c106204f8 --- /dev/null +++ b/user/sane-airscan/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=sane-airscan +pkgver=0.99.8 +pkgrel=1 +pkgdesc="Universal scanner driver for AirScan (eSCL) scanners" +url=" " +arch="all" +license="unknown" +depends="" +makedepends="avahi-dev glib-dev libjpeg-turbo-dev libpng-dev libsoup-dev + libxml2-dev meson ninja sane-dev" +subpackages="$pkgname-doc" +source="sane-airscan-$pkgver.tar.gz::https://github.com/alexpevzner/sane-airscan/archive/$pkgver.tar.gz + git.patch + " + +build() { + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + . output + ninja -C output +} + +check() { + ninja -C output test +} + +package() { + DESTDIR="$pkgdir" ninja -C output install + mv "$pkgdir"/usr/etc "$pkgdir"/etc + rm "$pkgdir"/etc/sane.d/dll.conf +} + +sha512sums="2828deeea31297c64b9927bb2b2b982f16a16cbb446cf2ca685b13f79cb264e94c017b8930fe04004636a6e1122f1882bd58252a3302c0a13b3fc60566072155 sane-airscan-0.99.8.tar.gz +a195c23edaf399b6fc1ba7693afd34fa87504c9c8ff10d1d793b97c1b592bff90214cd18af764451a3af9860884509fa7701037322a551226a0bcd29473ca1cc git.patch" diff --git a/user/sane-airscan/git.patch b/user/sane-airscan/git.patch new file mode 100644 index 000000000..818580553 --- /dev/null +++ b/user/sane-airscan/git.patch @@ -0,0 +1,1212 @@ +diff --git a/COPYING b/COPYING +index 60549be..d159169 100644 +--- a/COPYING ++++ b/COPYING +@@ -1,12 +1,12 @@ +- GNU GENERAL PUBLIC LICENSE +- Version 2, June 1991 ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 + +- Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +- Preamble ++ Preamble + + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public +@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This + General Public License applies to most of the Free Software + Foundation's software and to any other program whose authors commit to + using it. (Some other Free Software Foundation software is covered by +-the GNU Library General Public License instead.) You can apply it to ++the GNU Lesser General Public License instead.) You can apply it to + your programs, too. + + When we speak of free software, we are referring to freedom, not +@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and + modification follow. +- +- GNU GENERAL PUBLIC LICENSE ++ ++ GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) +- ++ + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Program, + and can be reasonably considered independent and separate works in +@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent + access to copy the source code from the same place counts as + distribution of the source code, even though third parties are not + compelled to copy the source along with the object code. +- ++ + 4. You may not copy, modify, sublicense, or distribute the Program + except as expressly provided under this License. Any attempt + otherwise to copy, modify, sublicense or distribute the Program is +@@ -225,7 +225,7 @@ impose that choice. + + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. +- ++ + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Program under this License +@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals + of preserving the free status of all derivatives of our free software and + of promoting the sharing and reuse of software generally. + +- NO WARRANTY ++ NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY + FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER + PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. + +- END OF TERMS AND CONDITIONS +- +- How to Apply These Terms to Your New Programs ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it +@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least + the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> +- Copyright (C) 19yy <name of author> ++ Copyright (C) <year> <name of author> + + 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 +@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +- ++ 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. + + Also add information on how to contact you by electronic and paper mail. + + If the program is interactive, make it output a short notice like this + when it starts in an interactive mode: + +- Gnomovision version 69, Copyright (C) 19yy name of author ++ Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. +@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: + This General Public License does not permit incorporating your program into + proprietary programs. If your program is a subroutine library, you may + consider it more useful to permit linking proprietary applications with the +-library. If this is what you want to do, use the GNU Library General ++library. If this is what you want to do, use the GNU Lesser General + Public License instead of this License. +diff --git a/LICENSE b/LICENSE +index fe71f02..db02cb9 100644 +--- a/LICENSE ++++ b/LICENSE +@@ -16,8 +16,8 @@ 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., 59 Temple Place - Suite 330, Boston, +-MA 02111-1307, USA. ++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++MA 02110-1301 USA. + + As a special exception, the authors of sane-airscan give permission for + additional uses of the libraries contained in this release of sane-airscan. +diff --git a/Makefile b/Makefile +index 9d4e082..70555a8 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ + + CC = gcc + COMPRESS = gzip +-CFLAGS = -O2 -g -W -Wall -Werror ++CFLAGS += -O2 -g -W -Wall -Werror $(CPPFLAGS) + MANDIR = /usr/share/man/ + PKG_CONFIG = /usr/bin/pkg-config + STRIP = -s +@@ -82,7 +82,7 @@ $(BACKEND): $(OBJDIR)airscan.o $(LIBAIRSCAN) airscan.sym + $(CC) -o $(BACKEND) -shared $(OBJDIR)/airscan.o $(LIBAIRSCAN) $(airscan_LDFLAGS) + + $(DISCOVER): $(OBJDIR)discover.o $(LIBAIRSCAN) +- $(CC) -o $(DISCOVER) discover.c $(CPPFLAGS) $(airscan_CFLAGS) $(LIBAIRSCAN) $(airscan_LIBS) -fPIE ++ $(CC) -o $(DISCOVER) discover.c $(CPPFLAGS) $(airscan_CFLAGS) $(LIBAIRSCAN) $(airscan_LIBS) $(LDFLAGS) -fPIE + + $(LIBAIRSCAN): $(OBJ) Makefile + ar cru $(LIBAIRSCAN) $(OBJ) +@@ -105,6 +105,13 @@ clean: + rm -f test $(BACKEND) tags + rm -rf $(OBJDIR) + ++uninstall: ++ rm -f $(DESTDIR)$(PREFIX)$(BINDIR)/$(DISCOVER) ++ rm -f $(DESTDIR)$(PREFIX)$(CONFDIR)/dll.d/airscan ++ rm -f $(DESTDIR)$(PREFIX)$(LIBDIR)/sane/$(BACKEND) ++ rm -f $(DESTDIR)$(PREFIX)$(MANDIR)/man1/$(MAN_DISCOVER)* ++ rm -f $(DESTDIR)$(PREFIX)$(MANDIR)/man5/$(MAN_BACKEND)* ++ + man: $(MAN_DISCOVER) $(MAN_BACKEND) + + $(MAN_DISCOVER): $(MAN_DISCOVER).md +@@ -114,7 +121,7 @@ $(MAN_BACKEND): $(MAN_BACKEND).md + ronn --roff --manual=$(MAN_BACKEND_TITLE) $(MAN_BACKEND).md + + test: $(BACKEND) test.c +- $(CC) -o test test.c $(BACKEND) -Wl,-rpath . ${airscan_CFLAGS} ++ $(CC) -o test test.c $(BACKEND) -Wl,-rpath . $(LDFLAGS) ${airscan_CFLAGS} + + test-decode: test-decode.c $(LIBAIRSCAN) +- $(CC) -o test-decode test-decode.c $(CPPFLAGS) $(airscan_CFLAGS) $(LIBAIRSCAN) $(airscan_LIBS) ++ $(CC) -o test-decode test-decode.c $(CPPFLAGS) $(airscan_CFLAGS) $(LIBAIRSCAN) $(LDFLAGS) $(airscan_LIBS) +diff --git a/README.md b/README.md +index 469a2cd..f05f4d0 100644 +--- a/README.md ++++ b/README.md +@@ -51,10 +51,13 @@ Legend: + | Canon D570 | Yes | | + | Canon ImageCLASS MF743cdw | Yes<sup>[1](#note1)</sup> | | + | Canon imageRUNNER ADVANCE 4545/4551| Yes | Yes | ++| Canon imageRUNNER C3120L | Yes | Yes | + | Canon i-SENSYS MF641C | No | Yes | +-| Canon Lide 400 | Yes | | ++| Canon Lide 400 | Yes<sup>[2](#note1)</sup> | | + | Canon MF745C/746C | Yes | Yes | ++| Canon PIXMA MG5500 Series | No | Yes | + | Canon PIXMA MG7700 Series | Yes | | ++| Canon PIXMA TS5000 Series | Yes | | + | Canon PIXMA TS 9550 Series | Yes | | + | Canon TR4529 (PIXMA TR4500 Series) | Yes | | + | Canon TR7500 Series | No | Yes | +@@ -89,10 +92,10 @@ Legend: + | HP OfficeJet Pro 8730 | Yes | Yes | + | HP OfficeJet Pro 9010 series | Yes | | + | HP Smart Tank Plus 550 series | Yes | | +-| Kyocera ECOSYS M2040dn | Yes | Yes<sup>[2](#note2)</sup> | +-| Lexmark CX317dn | Yes<sup>[3](#note3)</sup> | Yes<sup>[3](#note3)</sup> | ++| Kyocera ECOSYS M2040dn | Yes | Yes<sup>[3](#note2)</sup> | ++| Lexmark CX317dn | Yes<sup>[4](#note3)</sup> | Yes<sup>[4](#note3)</sup> | + | Lexmark MC2535adwe | Yes | | +-| Ricoh MP C3003 | No | Yes<sup>[4](#note3)</sup> | ++| Ricoh MP C3003 | No | Yes<sup>[5](#note3)</sup> | + | Samsung M288x Series | No | Yes | + | Xerox VersaLink B405 | Yes | | + | TODO | | | +@@ -102,15 +105,21 @@ Legend: + scanning on its web console: Home->Menu->Preferences->Network->TCP/IP + Settings->Network Link Scan Settings->On. + +-<a name="note2"><sup>[2]</sup></a>: this device requires manual action on its front ++<a name="note3"><sup>[2]</sup></a>: this USB device supports IPP over USB protocol, which ++allows it to be used with network protocols like eSCL. To enable IPP over USB, you need ++to install additional program: either [ippusbxd](https://github.com/OpenPrinting/ippusbxd), which ++comes with some distros, or [ipp-usb](https://github.com/OpenPrinting/ipp-usb). 'ipp-usb` ++works better, binary packages available for many popular distros. ++ ++<a name="note3"><sup>[3]</sup></a>: this device requires manual action on its front + panel to initiate WSD scan: Send->WSD Scan->From Computer + +-<a name="note3"><sup>[3]</sup></a>: when low in memory, this device may scan at 400 DPI ++<a name="note4"><sup>[4]</sup></a>: when low in memory, this device may scan at 400 DPI + instead of requested 600 DPI. As sane-airscan reports image parameters to SANE before actual + image is received, and then adjust actual image to reported parameters, image will + be scaled down by the factor 2/3 at this case. Lower resolutions works well. + +-<a name="note3"><sup>[4]</sup></a>: by default, WSD scan command is disabled on this ++<a name="note5"><sup>[5]</sup></a>: by default, WSD scan command is disabled on this + device and needs to be enabled before use: Click [Configuration], click [Initial Settings] + under [Scanner], and then set [Prohibit WSD Scan Command] to [Do not Prohibit] (from + http://support.ricoh.com/bb_v1oi/pub_e/oi_view/0001047/0001047003/view/scanner/int/0095.htm) +diff --git a/airscan-device.c b/airscan-device.c +index f76fa23..82e267a 100644 +--- a/airscan-device.c ++++ b/airscan-device.c +@@ -119,7 +119,6 @@ struct device { + SANE_Int read_line_end; /* If read_line_num>read_line_end + no more lines left in image */ + SANE_Int read_line_off; /* Current offset in the line */ +- SANE_Int read_skip_lines; /* How many lines to skip */ + SANE_Int read_skip_bytes; /* How many bytes to skip at line + beginning */ + }; +@@ -487,6 +486,8 @@ static void + device_probe_endpoint (device *dev, zeroconf_endpoint *endpoint) + { + /* Switch endpoint */ ++ log_assert(dev->log, endpoint->proto != ID_PROTO_UNKNOWN); ++ + if (dev->endpoint_current == NULL || + dev->endpoint_current->proto != endpoint->proto) { + device_proto_set(dev, endpoint->proto); +@@ -851,8 +852,8 @@ device_geom; + * First of all, we use 3 different units to deal with geometrical + * parameters: + * 1) we communicate with frontend in millimeters +- * 2) we communicate with scanner in pixels, assuming protoc-specific DPI +- * (defined by devcaps::units) ++ * 2) we communicate with scanner in pixels, assuming ++ * protocol-specific DPI (defined by devcaps::units) + * 3) when we deal with image, sizes are in pixels in real resolution + * + * Second, scanner returns minimal and maximal window size, but +@@ -1289,6 +1290,7 @@ device_read_next (device *dev) + SANE_Parameters params; + image_decoder *decoder = dev->decoders[dev->proto_ctx.params.format]; + int wid, hei; ++ int skip_lines = 0; + + log_assert(dev->log, decoder != NULL); + +@@ -1330,7 +1332,7 @@ device_read_next (device *dev) + /* Setup image clipping */ + if (dev->job_skip_x >= wid || dev->job_skip_y >= hei) { + /* Trivial case - just skip everything */ +- dev->read_skip_lines = hei; ++ dev->read_line_end = 0; + dev->read_skip_bytes = 0; + line_capacity = dev->opt.params.bytes_per_line; + } else { +@@ -1352,12 +1354,12 @@ device_read_next (device *dev) + dev->read_skip_bytes = bpp * (dev->job_skip_x - win.x_off); + } + +- dev->read_skip_lines = 0; + if (win.y_off != dev->job_skip_y) { +- dev->read_skip_lines = dev->job_skip_y - win.y_off; ++ skip_lines = dev->job_skip_y - win.y_off; + } + + line_capacity = math_max(dev->opt.params.bytes_per_line, wid * bpp); ++ line_capacity += dev->read_skip_bytes; + } + + /* Initialize image decoding */ +@@ -1366,7 +1368,14 @@ device_read_next (device *dev) + + dev->read_line_num = 0; + dev->read_line_off = dev->opt.params.bytes_per_line; +- dev->read_line_end = hei - dev->read_skip_lines; ++ dev->read_line_end = hei - skip_lines; ++ ++ for (;skip_lines > 0; skip_lines --) { ++ err = image_decoder_read_line(decoder, dev->read_line_buf); ++ if (err != NULL) { ++ goto DONE; ++ } ++ } + + /* Wake up reader */ + pollable_signal(dev->read_pollable); +@@ -1408,8 +1417,9 @@ device_read_decode_line (device *dev) + return SANE_STATUS_EOF; + } + +- if (n < dev->read_skip_lines || n >= dev->read_line_end) { +- memset(dev->read_line_buf, 0xff, dev->opt.params.bytes_per_line); ++ if (n >= dev->read_line_end) { ++ memset(dev->read_line_buf + dev->read_skip_bytes, 0xff, ++ dev->opt.params.bytes_per_line); + } else { + error err = image_decoder_read_line(decoder, dev->read_line_buf); + +@@ -1419,7 +1429,7 @@ device_read_decode_line (device *dev) + } + } + +- dev->read_line_off = dev->read_skip_bytes; ++ dev->read_line_off = 0; + dev->read_line_num ++; + + return SANE_STATUS_GOOD; +@@ -1482,12 +1492,14 @@ device_read (device *dev, SANE_Byte *data, SANE_Int max_len, SANE_Int *len_out) + /* Read line by line */ + for (len = 0; status == SANE_STATUS_GOOD && len < max_len; ) { + if (dev->read_line_off == dev->opt.params.bytes_per_line) { +- status = device_read_decode_line (dev); ++ status = device_read_decode_line(dev); + } else { + SANE_Int sz = math_min(max_len - len, + dev->opt.params.bytes_per_line - dev->read_line_off); + +- memcpy(data, dev->read_line_buf + dev->read_line_off, sz); ++ memcpy(data, dev->read_line_buf + dev->read_skip_bytes + ++ dev->read_line_off, sz); ++ + data += sz; + dev->read_line_off += sz; + len += sz; +diff --git a/airscan-escl.c b/airscan-escl.c +index dbaa370..163bdd1 100644 +--- a/airscan-escl.c ++++ b/airscan-escl.c +@@ -335,16 +335,16 @@ escl_devcaps_source_parse (xml_rd *xml, devcaps_source **out) + goto DONE; + } + +- if (src->max_wid_px != 0 && src->max_hei_px != 0 ) ++ if (src->max_wid_px != 0 && src->max_hei_px != 0) + { + /* Validate window size */ +- if (src->min_wid_px >= src->max_wid_px ) ++ if (src->min_wid_px > src->max_wid_px) + { + err = ERROR("Invalid scan:MinWidth or scan:MaxWidth"); + goto DONE; + } + +- if (src->min_hei_px >= src->max_hei_px) ++ if (src->min_hei_px > src->max_hei_px) + { + err = ERROR("Invalid scan:MinHeight or scan:MaxHeight"); + goto DONE; +diff --git a/airscan-http.c b/airscan-http.c +index 6758368..ca6f8b0 100644 +--- a/airscan-http.c ++++ b/airscan-http.c +@@ -114,6 +114,7 @@ http_uri_new_relative (const http_uri *base, const char *path, + + /* Free the URI + */ ++#ifndef __clang_analyzer__ + void + http_uri_free (http_uri *uri) + { +@@ -123,6 +124,7 @@ http_uri_free (http_uri *uri) + g_free(uri); + } + } ++#endif + + /* Get URI string + */ +@@ -689,9 +691,21 @@ http_client_onerror (http_client *client, + void + http_client_cancel (http_client *client) + { +- while (client->pending->len != 0) { +- http_query_cancel(client->pending->pdata[0]); ++ size_t i, len = client->pending->len; ++ size_t sz = len * sizeof(http_query*); ++ http_query **qlist = g_alloca(len); ++ ++ /* Note, without this stupid copying of client->pending->pdata, ++ * clang analyzer doesn't understand that http_query_cancel() ++ * has a side effect of removing http_query pointer from the ++ * array and erroneously claims that memory used after free ++ */ ++ memcpy(qlist, client->pending->pdata, sz); ++ for (i = 0; i < len; i ++) { ++ http_query_cancel(qlist[i]); + } ++ ++ log_assert(client->log, client->pending->len == 0); + } + + /* Cancel all pending queries with matching address family and uintptr +@@ -988,12 +1002,13 @@ http_query_cancel (http_query *q) + g_object_ref(q->msg); + soup_session_cancel_message(http_session, q->msg, SOUP_STATUS_CANCELLED); + soup_message_set_status(q->msg, SOUP_STATUS_CANCELLED); +- g_object_unref(q->msg); + + log_debug(q->client->log, "HTTP %s %s: %s", q->msg->method, + http_uri_str(q->uri), + soup_status_get_phrase(SOUP_STATUS_CANCELLED)); + ++ g_object_unref(q->msg); ++ + http_query_free(q); + } + +@@ -1225,6 +1240,8 @@ http_start_stop (bool start) + g_object_set_property(G_OBJECT(http_session), + SOUP_SESSION_SSL_STRICT, &val); + } else { ++ ll_node *node; ++ + soup_session_abort(http_session); + g_object_unref(http_session); + http_session = NULL; +@@ -1232,10 +1249,8 @@ http_start_stop (bool start) + /* Note, soup_session_abort() may leave some requests + * pending, so we must free them here explicitly + */ +- while (!ll_empty(&http_query_list)) { +- ll_node *node = ll_first(&http_query_list); ++ while ((node = ll_pop_beg(&http_query_list)) != NULL) { + http_query *q = OUTER_STRUCT(node, http_query, list_node); +- + http_query_free(q); + } + } +diff --git a/airscan-math.c b/airscan-math.c +index d801304..ee7f301 100644 +--- a/airscan-math.c ++++ b/airscan-math.c +@@ -99,7 +99,6 @@ math_range_merge (SANE_Range *out, const SANE_Range *r1, const SANE_Range *r2) + SANE_Word quant = math_lcm(r1->quant, r2->quant); + SANE_Word min, max, bounds_min, bounds_max; + +- min = math_min(r1->min, r2->min); + bounds_min = math_max(r1->min, r2->min); + bounds_max = math_min(r1->max, r2->max); + +diff --git a/airscan-netif.c b/airscan-netif.c +index a762377..a086792 100644 +--- a/airscan-netif.c ++++ b/airscan-netif.c +@@ -92,6 +92,41 @@ netif_distance_get (const struct sockaddr *addr) + return distance; + } + ++/* Check that interface has non-link-local address ++ * of particular address family ++ */ ++bool ++netif_has_non_link_local_addr (int af, int ifindex) ++{ ++ struct ifaddrs *ifa; ++ ++ for (ifa = netif_ifaddrs; ifa != NULL; ifa = ifa->ifa_next) { ++ struct sockaddr *addr; ++ ++ /* Skip interface without address */ ++ if ((addr = ifa->ifa_addr) == NULL) { ++ continue; ++ } ++ ++ /* Check address family against requested */ ++ if (addr->sa_family != af) { ++ continue; ++ } ++ ++ /* Skip link-local addresses */ ++ if (ip_sockaddr_is_linklocal(addr)) { ++ continue; ++ } ++ ++ /* Check interface index */ ++ if (ifindex == (int) if_nametoindex(ifa->ifa_name)) { ++ return true; ++ } ++ } ++ ++ return false; ++} ++ + /* Get list of network interfaces addresses + */ + netif_addr* +diff --git a/airscan-wsdd.c b/airscan-wsdd.c +index 15bf02a..c53105b 100644 +--- a/airscan-wsdd.c ++++ b/airscan-wsdd.c +@@ -26,6 +26,12 @@ + #define WSDD_RETRANSMIT_MAX 250 /* Max retransmit time */ + #define WSDD_DISCOVERY_TIME 2500 /* Overall discovery time */ + ++/* This delay is taken, if we have discovered, say, device's IPv6 ++ * addresses and have a strong suspicion that device has not yet ++ * discovered IPv4 addresses as well ++ */ ++#define WSDD_PUBLISH_DELAY 1000 ++ + /* WS-Discovery stable endpoint path + */ + #define WSDD_STABLE_ENDPOINT \ +@@ -49,12 +55,13 @@ typedef struct { + * device discovery + */ + typedef struct { +- zeroconf_finding finding; /* Base class */ +- const char *address; /* Device "address" in WS-SD sense */ +- ll_head xaddrs; /* List of wsdd_xaddr */ +- http_client *http_client; /* HTTP client */ +- ll_node list_node; /* In wsdd_finding_list */ +- bool published; /* This finding is published */ ++ zeroconf_finding finding; /* Base class */ ++ const char *address; /* Device "address" in WS-SD sense */ ++ ll_head xaddrs; /* List of wsdd_xaddr */ ++ http_client *http_client; /* HTTP client */ ++ ll_node list_node; /* In wsdd_finding_list */ ++ eloop_timer *publish_timer; /* WSDD_PUBLISH_DELAY timer */ ++ bool published; /* This finding is published */ + } wsdd_finding; + + /* wsdd_xaddr represents device transport address +@@ -207,9 +214,8 @@ wsdd_xaddr_list_purge (ll_head *list) + { + ll_node *node; + +- while ((node = ll_first(list)) != NULL) { ++ while ((node = ll_pop_beg(list)) != NULL) { + wsdd_xaddr *xaddr = OUTER_STRUCT(node, wsdd_xaddr, list_node); +- ll_del(&xaddr->list_node); + wsdd_xaddr_free(xaddr); + } + } +@@ -269,6 +275,10 @@ wsdd_finding_free (wsdd_finding *wsdd) + http_client_cancel(wsdd->http_client); + http_client_free(wsdd->http_client); + ++ if (wsdd->publish_timer != NULL) { ++ eloop_timer_cancel(wsdd->publish_timer); ++ } ++ + zeroconf_endpoint_list_free(wsdd->finding.endpoints); + g_free((char*) wsdd->address); + wsdd_xaddr_list_purge(&wsdd->xaddrs); +@@ -282,17 +292,100 @@ wsdd_finding_free (wsdd_finding *wsdd) + static void + wsdd_finding_publish (wsdd_finding *wsdd) + { +- if (!wsdd->published) { +- wsdd->published = true; +- zeroconf_finding_publish(&wsdd->finding); ++ if (wsdd->published) { ++ return; ++ } ++ ++ wsdd->published = true; ++ wsdd->finding.endpoints = zeroconf_endpoint_list_sort_dedup( ++ wsdd->finding.endpoints); ++ ++ if (wsdd->publish_timer != NULL) { ++ log_debug(wsdd_log, "\"%s\": publish-delay timer canceled", ++ wsdd->finding.model); ++ ++ eloop_timer_cancel(wsdd->publish_timer); ++ wsdd->publish_timer = NULL; ++ } ++ ++ zeroconf_finding_publish(&wsdd->finding); ++} ++ ++/* WSDD_PUBLISH_DELAY timer callback ++ */ ++static void ++wsdd_finding_publish_delay_timer_callback (void *data) ++{ ++ wsdd_finding *wsdd = data; ++ ++ wsdd->publish_timer = NULL; ++ log_debug(wsdd_log, "\"%s\": publish-delay timer expired", ++ wsdd->finding.model); ++ ++ wsdd_finding_publish(wsdd); ++} ++ ++/* Publish wsdd_finding with optional delay ++ */ ++static void ++wsdd_finding_publish_delay (wsdd_finding *wsdd) ++{ ++ bool delay = false; ++ ++ if (wsdd->published) { ++ return; ++ } ++ ++ /* Continue discovery, if interface has IPv4/IPv6 address, ++ * and we have not yet discovered address of the same address ++ * family of device ++ * ++ * Some devices doesn't return their IPv4 endpoints, if ++ * metadata is queried via IPv6, and visa versa. This is ++ * possible that we will finish discovery of the particular ++ * address family, before we'll ever know that the device ++ * may have address of another address family, so part ++ * of addresses will be never discovered (see #44 for details). ++ * ++ * To prevent this situation, we continue discovery with ++ * some reasonable delay, if network interface has IPv4/IPv6 ++ * address, but device is not yet. ++ */ ++ ++ if (netif_has_non_link_local_addr(AF_INET, wsdd->finding.ifindex) && ++ !zeroconf_endpoint_list_has_non_link_local_addr(AF_INET, ++ wsdd->finding.endpoints)) { ++ log_debug(wsdd_log, ++ "\"%s\": IPv4 address expected but not yet discovered", ++ wsdd->finding.model); ++ delay = true; ++ } ++ ++ if (netif_has_non_link_local_addr(AF_INET6, wsdd->finding.ifindex) && ++ !zeroconf_endpoint_list_has_non_link_local_addr(AF_INET6, ++ wsdd->finding.endpoints)) { ++ log_debug(wsdd_log, ++ "\"%s\": IPv6 address expected but not yet discovered", ++ wsdd->finding.model); ++ delay = true; ++ } ++ ++ if (delay) { ++ if (wsdd->publish_timer == NULL) { ++ wsdd->publish_timer = eloop_timer_new(WSDD_PUBLISH_DELAY, ++ wsdd_finding_publish_delay_timer_callback, wsdd); ++ } ++ ++ return; + } ++ ++ wsdd_finding_publish(wsdd); + } + +-/* Add wsdd_finding to the wsdd_finding_list. +- * If finding already present, does nothing and returns NULL ++/* Get existent finding or add a new one + */ + static wsdd_finding* +-wsdd_finding_add (int ifindex, const char *address) ++wsdd_finding_get (int ifindex, const char *address) + { + ll_node *node; + wsdd_finding *wsdd; +@@ -302,7 +395,7 @@ wsdd_finding_add (int ifindex, const char *address) + wsdd = OUTER_STRUCT(node, wsdd_finding, list_node); + if (wsdd->finding.ifindex == ifindex && + !strcmp(wsdd->address, address)) { +- return NULL; ++ return wsdd; + } + } + +@@ -343,6 +436,25 @@ wsdd_finding_by_address (ip_addr addr) + return NULL; + } + ++/* Check if finding already has particular xaddr ++ */ ++static bool ++wsdd_finding_has_xaddr (wsdd_finding *wsdd, const wsdd_xaddr *xaddr) ++{ ++ ll_node *node; ++ wsdd_xaddr *xaddr2; ++ ++ for (LL_FOR_EACH(node, &wsdd->xaddrs)) { ++ xaddr2 = OUTER_STRUCT(node, wsdd_xaddr, list_node); ++ ++ if (http_uri_equal(xaddr->uri, xaddr2->uri)) { ++ return true; ++ } ++ } ++ ++ return false; ++} ++ + /* Delete wsdd_finding from the wsdd_finding_list + */ + static void +@@ -532,24 +644,7 @@ DONE: + g_free(manufacturer); + + if (http_client_num_pending(wsdd->http_client) == 0) { +- zeroconf_endpoint *endpoint; +- +- wsdd->finding.endpoints = zeroconf_endpoint_list_sort_dedup( +- wsdd->finding.endpoints); +- +- log_debug(wsdd_log, "\"%s\": address: %s", +- wsdd->finding.model, wsdd->address); +- log_debug(wsdd_log, "\"%s\": uuid: %s", +- wsdd->finding.model, wsdd->finding.uuid.text); +- log_debug(wsdd_log, "\"%s\": discovered endpoints:", +- wsdd->finding.model); +- +- for (endpoint = wsdd->finding.endpoints; endpoint != NULL; +- endpoint = endpoint->next) { +- log_debug(wsdd_log, " %s", http_uri_str(endpoint->uri)); +- } +- +- wsdd_finding_publish(wsdd); ++ wsdd_finding_publish_delay(wsdd); + } + } + +@@ -738,28 +833,42 @@ wsdd_resolver_message_dispatch (wsdd_resolver *resolver, + goto DONE; + } + +- /* Add a finding. Do nothing if device already exist */ +- wsdd = wsdd_finding_add(resolver->ifindex, msg->address); +- if (wsdd == NULL) { +- goto DONE; +- } ++ /* Add a finding or get existent one */ ++ wsdd = wsdd_finding_get(resolver->ifindex, msg->address); + +- /* If device is not scanner or (which is very unlikely) +- * has no xaddrs, just publish it without endpoints, +- * so zeroconf stuff will know that there is no need to +- * wait anymore for a device with this UUID, and we +- * are done ++ /* Import newly discovered xaddrs and initiate metadata ++ * query + */ +- if (!msg->is_scanner || ll_empty(&msg->xaddrs)) { +- wsdd_finding_publish(wsdd); +- goto DONE; ++ while ((node = ll_pop_beg(&msg->xaddrs)) != NULL) { ++ xaddr = OUTER_STRUCT(node, wsdd_xaddr, list_node); ++ ++ if (wsdd_finding_has_xaddr(wsdd, xaddr)) { ++ wsdd_xaddr_free(xaddr); ++ continue; ++ } ++ ++ ll_push_end(&wsdd->xaddrs, &xaddr->list_node); ++ if (msg->is_scanner) { ++ wsdd_finding_get_metadata(wsdd, resolver->ifindex, xaddr); ++ } + } + +- /* Initiate metadata query */ +- ll_cat(&wsdd->xaddrs, &msg->xaddrs); +- for (LL_FOR_EACH(node, &wsdd->xaddrs)) { +- xaddr = OUTER_STRUCT(node, wsdd_xaddr, list_node); +- wsdd_finding_get_metadata(wsdd, resolver->ifindex, xaddr); ++ /* If there is no pending metadata queries, it may mean ++ * one of the following: ++ * 1) device is not scanner, metadata won't be requested ++ * 2) there is no xaddrs (which is very unlikely, but ++ * just in case...) ++ * 3) device already known and all metadata queries ++ * already finished ++ * ++ * At this case we can publish device now ++ */ ++ if (http_client_num_pending(wsdd->http_client) == 0) { ++ if (msg->is_scanner) { ++ wsdd_finding_publish_delay(wsdd); ++ } else { ++ wsdd_finding_publish(wsdd); ++ } + } + break; + +@@ -774,6 +883,7 @@ wsdd_resolver_message_dispatch (wsdd_resolver *resolver, + /* Cleanup and exit */ + DONE: + wsdd_message_free(msg); ++ log_trace(wsdd_log, ""); + } + + +diff --git a/airscan-zeroconf.c b/airscan-zeroconf.c +index dfff5b8..293a05d 100644 +--- a/airscan-zeroconf.c ++++ b/airscan-zeroconf.c +@@ -129,11 +129,8 @@ zeroconf_device_add (zeroconf_finding *finding) + } + + ll_init(&device->findings); +- +- device->ifaces_cap = ZEROCONF_DEVICE_IFACES_INITIAL_LEN; +- device->ifaces = g_malloc(device->ifaces_cap * sizeof(*device->ifaces)); +- + ll_push_end(&zeroconf_device_list, &device->node_list); ++ + return device; + } + +@@ -233,7 +230,12 @@ zeroconf_device_ifaces_add (zeroconf_device *device, int ifindex) + { + if (!zeroconf_device_ifaces_lookup(device, ifindex)) { + if (device->ifaces_len == device->ifaces_cap) { +- device->ifaces_cap *= 2; ++ if (device->ifaces_cap == 0) { ++ device->ifaces_cap = ZEROCONF_DEVICE_IFACES_INITIAL_LEN; ++ } else { ++ device->ifaces_cap *= 2; ++ } ++ + device->ifaces = g_realloc(device->ifaces, + device->ifaces_cap * sizeof(*device->ifaces)); + } +@@ -260,7 +262,7 @@ zeroconf_device_rebuild_sets (zeroconf_device *device) + finding = OUTER_STRUCT(node, zeroconf_finding, list_node); + proto = zeroconf_method_to_proto(finding->method); + +- zeroconf_device_ifaces_add(device, finding->ifindex ); ++ zeroconf_device_ifaces_add(device, finding->ifindex); + if (proto != ID_PROTO_UNKNOWN) { + device->protocols |= 1 << proto; + } +@@ -316,19 +318,26 @@ static void + zeroconf_device_borrow_findings (zeroconf_device *device, + int ifindex, ll_head *output) + { +- ll_node *node, *next; +- zeroconf_finding *finding; ++ ll_node *node; ++ ll_head leftover; + +- for (node = ll_first(&device->findings); node != NULL; node = next) { +- next = ll_next(&device->findings, node); ++ ll_init(&leftover); ++ ++ while ((node = ll_pop_beg(&device->findings)) != NULL) { ++ zeroconf_finding *finding; + + finding = OUTER_STRUCT(node, zeroconf_finding, list_node); ++ + if (finding->ifindex == ifindex) { + finding->device = NULL; + ll_push_end(output, node); ++ } else { ++ ll_push_end(&leftover, node); + } + } + ++ ll_cat(&device->findings, &leftover); ++ + if (ll_empty(&device->findings)) { + zeroconf_device_del(device); + return; +@@ -556,7 +565,7 @@ zeroconf_ident_split (const char *ident, unsigned int *devid, ID_PROTO *proto) + + /* Decode proto and devid */ + *proto = zeroconf_ident_proto_decode(*ident); +- if (*proto == NUM_ID_PROTO) { ++ if (*proto == ID_PROTO_UNKNOWN) { + return NULL; + } + +@@ -774,6 +783,25 @@ zeroconf_endpoint_list_sort_dedup (zeroconf_endpoint *list) + return list; + } + ++/* Check if endpoints list contains a non-link-local address ++ * of the specified address family ++ */ ++bool ++zeroconf_endpoint_list_has_non_link_local_addr (int af, ++ const zeroconf_endpoint *list) ++{ ++ for (;list != NULL; list = list->next) { ++ const struct sockaddr *addr = http_uri_addr(list->uri); ++ if (addr != NULL && addr->sa_family == af) { ++ if (!ip_sockaddr_is_linklocal(addr)) { ++ return true; ++ } ++ } ++ } ++ ++ return false; ++} ++ + /******************** Static configuration *********************/ + /* Look for device's static configuration by device name + */ +@@ -850,7 +878,7 @@ zeroconf_finding_publish (zeroconf_finding *finding) + */ + device = zeroconf_device_find_by_uuid(finding->uuid); + if (device != NULL && finding->name != NULL) { +- if (device->ifaces_len == 1 && device->ifaces[0] == finding->ifindex ){ ++ if (device->ifaces_len == 1 && device->ifaces[0] == finding->ifindex){ + /* Case 2: all findings belongs to the same network + * interface; upgrade anonymous device to named + */ +@@ -1055,6 +1083,41 @@ zeroconf_device_list_qsort_cmp (const void *p1, const void *p2) + return cmp; + } + ++/* Format list of protocols, for zeroconf_device_list_log ++ */ ++static void ++zeroconf_device_list_fmt_protocols (char *buf, size_t buflen, unsigned int protocols) ++{ ++ ID_PROTO proto; ++ size_t off = 0; ++ ++ buf[0] = '\0'; ++ for (proto = 0; proto < NUM_ID_PROTO; proto ++) { ++ if ((protocols & (1 << proto)) != 0) { ++ off += snprintf(buf + off, buflen - off, " %s", ++ id_proto_name(proto)); ++ } ++ } ++ ++ if (buf[0] == '\0') { ++ strcpy(buf, " none"); ++ } ++} ++ ++/* Log device information in a context of zeroconf_device_list_get ++ */ ++static void ++zeroconf_device_list_log (zeroconf_device *device, const char *name, unsigned int protocols) ++{ ++ char buf[64]; ++ ++ zeroconf_device_list_fmt_protocols(buf, sizeof(buf), device->protocols); ++ log_debug(zeroconf_log, "%s: supported protocols:%s", name, buf); ++ ++ zeroconf_device_list_fmt_protocols(buf, sizeof(buf), protocols); ++ log_debug(zeroconf_log, "%s: chosen protocols:%s", name, buf); ++} ++ + /* Get list of devices, in SANE format + */ + const SANE_Device** +@@ -1065,10 +1128,14 @@ zeroconf_device_list_get (void) + const SANE_Device **dev_list = sane_device_array_new(); + ll_node *node; + ++ log_debug(zeroconf_log, "zeroconf_device_list_get: requested"); ++ + /* Wait until device table is ready */ + zeroconf_initscan_wait(); + + /* Build list of devices */ ++ log_debug(zeroconf_log, "zeroconf_device_list_get: building list of devices"); ++ + dev_count = 0; + + for (dev_conf = conf.devices; dev_conf != NULL; dev_conf = dev_conf->next) { +@@ -1097,8 +1164,18 @@ zeroconf_device_list_get (void) + zeroconf_device_name_model(device, &name, &model); + protocols = zeroconf_device_protocols(device); + ++ zeroconf_device_list_log(device, name, protocols); ++ + if (zeroconf_find_static_by_name(name) != NULL) { + /* Static configuration overrides discovery */ ++ log_debug(zeroconf_log, ++ "%s: skipping, device clashes statically configured", name); ++ continue; ++ } ++ ++ if (protocols == 0) { ++ log_debug(zeroconf_log, ++ "%s: skipping, no of supported protocols discovered", name); + continue; + } + +@@ -1327,6 +1404,8 @@ zeroconf_init (void) + log_trace(zeroconf_log, " protocol = %s", s); + + s = "?"; ++ (void) s; /* Silence CLANG analyzer warning */ ++ + switch (conf.wsdd_mode) { + case WSDD_FAST: s = "fast"; break; + case WSDD_FULL: s = "full"; break; +diff --git a/airscan.h b/airscan.h +index 3aca207..2a36333 100644 +--- a/airscan.h ++++ b/airscan.h +@@ -130,8 +130,10 @@ ll_push_beg (ll_head *head, ll_node *node) + static inline void + ll_del (ll_node *node) + { +- node->ll_prev->ll_next = node->ll_next; +- node->ll_next->ll_prev = node->ll_prev; ++ ll_node *p = node->ll_prev, *n = node->ll_next; ++ ++ p->ll_next = n; ++ n->ll_prev = p; + + /* Make double-delete safe */ + node->ll_next = node->ll_prev = node; +@@ -143,14 +145,19 @@ ll_del (ll_node *node) + static inline ll_node* + ll_pop_beg (ll_head *head) + { +- ll_node *node; ++ ll_node *node, *next; + +- if (ll_empty(head)) { +- return NULL; ++ node = head->node.ll_next; ++ if (node == &head->node) { ++ return NULL; /* List is empty if it is looped to itself */ + } + +- node = head->node.ll_next; +- ll_del(node); ++ next = node->ll_next; ++ next->ll_prev = &head->node; ++ head->node.ll_next = next; ++ ++ /* Make double-delete safe */ ++ node->ll_next = node->ll_prev = node; + + return node; + } +@@ -161,14 +168,19 @@ ll_pop_beg (ll_head *head) + static inline ll_node* + ll_pop_end (ll_head *head) + { +- ll_node *node; ++ ll_node *node, *prev; + +- if (ll_empty(head)) { +- return NULL; ++ node = head->node.ll_prev; ++ if (node == &head->node) { ++ return NULL; /* List is empty if it is looped to itself */ + } + +- node = head->node.ll_prev; +- ll_del(node); ++ prev = node->ll_prev; ++ prev->ll_next = &head->node; ++ head->node.ll_prev = prev; ++ ++ /* Make double-delete safe */ ++ node->ll_next = node->ll_prev = node; + + return node; + } +@@ -702,6 +714,12 @@ typedef enum { + NETIF_DISTANCE + netif_distance_get (const struct sockaddr *addr); + ++/* Check that interface has non-link-local address ++ * of particular address family ++ */ ++bool ++netif_has_non_link_local_addr (int af, int ifindex); ++ + /* Compare addresses by distance. Returns: + * <0, if addr1 is closer that addr2 + * >0, if addr2 is farther that addr2 +@@ -2055,6 +2073,13 @@ zeroconf_endpoint_list_sort (zeroconf_endpoint *list); + zeroconf_endpoint* + zeroconf_endpoint_list_sort_dedup (zeroconf_endpoint *list); + ++/* Check if endpoints list contains a non-link-local address ++ * of the specified address family ++ */ ++bool ++zeroconf_endpoint_list_has_non_link_local_addr (int af, ++ const zeroconf_endpoint *list); ++ + /******************** MDNS Discovery ********************/ + /* Called by zeroconf to notify MDNS about initial scan timer expiration + */ +@@ -2594,6 +2619,7 @@ log_panic (log_ctx *log, const char *fmt, ...); + if (!(expr)) { \ + log_panic(log,"file %s: line %d (%s): assertion failed: (%s)",\ + __FILE__, __LINE__, __PRETTY_FUNCTION__, #expr); \ ++ __builtin_unreachable(); \ + } \ + } while (0) + +@@ -2603,6 +2629,7 @@ log_panic (log_ctx *log, const char *fmt, ...); + do { \ + log_panic(log,"file %s: line %d (%s): internal error", \ + __FILE__, __LINE__, __PRETTY_FUNCTION__); \ ++ __builtin_unreachable(); \ + } while (0) + + #endif +diff --git a/sane-airscan.5 b/sane-airscan.5 +index 84ed929..32656e1 100644 +--- a/sane-airscan.5 ++++ b/sane-airscan.5 +@@ -1,7 +1,7 @@ + .\" generated with Ronn/v0.7.3 + .\" http://github.com/rtomayko/ronn/tree/0.7.3 + . +-.TH "SANE\-AIRSCAN" "5" "May 2020" "" "AirScan (eSCL) and WSD SANE backend" ++.TH "SANE\-AIRSCAN" "5" "July 2020" "" "AirScan (eSCL) and WSD SANE backend" + . + .SH "NAME" + \fBsane\-airscan\fR \- SANE backend for AirScan (eSCL) and WSD scanners and MFP +@@ -82,7 +82,7 @@ To manually configure a device, add the following section to the configuration f + [devices] + "Kyocera eSCL" = http://192\.168\.1\.102:9095/eSCL, eSCL + "Kyocera WSD" = http://192\.168\.1\.102:5358/WSDScanner, WSD +-"Device I don\'t want to see" = disable ++"Device I do not want to see" = disable + . + .fi + . +@@ -146,8 +146,8 @@ Debuggung facilities can be controlled using the \fB[debug]\fR section of the co + enable = false | true + + ; Enable protocol trace and configure output directory +-; for trace files\. To specify path relative to user\'s +-; home directory, start it with tilda character, followed ++; for trace files\. Like in shell, to specify path relative to ++; the home directory, start it with tilda character, followed + ; by slash, i\.e\., "~/airscan/trace"\. The directory will + ; be created automatically\. + trace = path +diff --git a/sane-airscan.5.md b/sane-airscan.5.md +index 4461900..6c6ec10 100644 +--- a/sane-airscan.5.md ++++ b/sane-airscan.5.md +@@ -46,7 +46,7 @@ file: + [devices] + "Kyocera eSCL" = http://192.168.1.102:9095/eSCL, eSCL + "Kyocera WSD" = http://192.168.1.102:5358/WSDScanner, WSD +- "Device I don't want to see" = disable ++ "Device I do not want to see" = disable + + The `[devices]` section contains all manually configured devices, one line per + device, and each line contains a device name on a left side of equation and +@@ -109,8 +109,8 @@ of the configuration file: + enable = false | true + + ; Enable protocol trace and configure output directory +- ; for trace files. To specify path relative to user's +- ; home directory, start it with tilda character, followed ++ ; for trace files. Like in shell, to specify path relative to ++ ; the home directory, start it with tilda character, followed + ; by slash, i.e., "~/airscan/trace". The directory will + ; be created automatically. + trace = path +diff --git a/test-decode.c b/test-decode.c +index 5b2879e..af774a5 100644 +--- a/test-decode.c ++++ b/test-decode.c +@@ -26,7 +26,7 @@ typedef struct { + + /* Print error message and exit + */ +-void ++void __attribute__((noreturn)) + die (const char *format, ...) + { + va_list ap; +@@ -218,6 +218,7 @@ main (int argc, char **argv) + save_write(save, line); + } + ++ g_free(line); + save_close(save); + + return 0; diff --git a/user/sane/APKBUILD b/user/sane/APKBUILD index 6a3e19a8c..d9f618013 100644 --- a/user/sane/APKBUILD +++ b/user/sane/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sane _pkgname=sane-backends -pkgver=1.0.29 +pkgver=1.0.30 pkgrel=0 pkgdesc="Scanner access library" url="http://www.sane-project.org/" @@ -37,13 +37,14 @@ done subpackages="$pkgname-doc $pkgname-dev $subpackages $pkgname-utils saned saned-openrc:openrc:noarch $pkgname-udev::noarch $_pkgname::noarch $pkgname-lang" -source="https://gitlab.com/sane-project/backends/uploads/54f858b20a364fc35d820df935a86478/sane-backends-1.0.29.tar.gz +source="https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-1.0.30.tar.gz saned.initd endian.patch include.patch network.patch pidfile.patch check.patch + BTS-304.patch " builddir="$srcdir"/$_pkgname-$pkgver @@ -138,10 +139,11 @@ _backend() { fi } -sha512sums="9ee431b0c048119719e15905f8743c7a0fd8bc6fcee81d75df8459a989cab7e39bf045518976713a7e1d94c816dd1a1e0fa190612d815c0ddb6a51d2abf3fd54 sane-backends-1.0.29.tar.gz +sha512sums="e9f4ab1f21d5ab0e09b101389c325947824945af968f08b307485f79d4dc4c134b8a1979fb0cf0cfa72435abffe70d0060748a2c2ec46514eb15a0442ee181a5 sane-backends-1.0.30.tar.gz 0a06eaa28b345202f2bdf8361e06f843bb7a010b7d8f80132f742672c94249c43f64031cefa161e415e2e2ab3a53b23070fb63854283f9e040f5ff79394ac7d1 saned.initd c7523b2684726cf35c0b251fe2e1863120284ff6ea3f93b53feb5dfa020c1e383910ecdd1a0c77a2289912ac4fd355cb3c743ea3706dab1bcf0a3412e1d0fbcc endian.patch 1779ff8beb1ba5f9238c25d819a7f0045f7e257c19b511315feb85650e445ca86450a9e1d7ff8650499d3dae808589a6c2e358d5f3f39a3f40ce4999179b86d6 include.patch -9cb595841f59b5105ecc85e4c0ad8781c52caa2354fb823c920ec467e88afbe47f2b3f4a7a3980bef5dbf22983c5786f051a9d10aea97b4bf7c4a05378592029 network.patch +dfeaef3c94c3e66b1cfb27348b8e1f3620143fd9a41e3c0b33d9c16f9bc4af2b20e40c83fec385c5765e8c3a812a00508bccdf8f27d571cfc0d8fac9dee41205 network.patch 8f0a1529a5793bc78422419b674963b543527c932476c9ea2d92ea0ad0a286691da306020824c1aaa0b35929f571480d21d7fc464a9f652e15664854c75a4cea pidfile.patch -4de6f60452c0451769f5ce41e41ca4c2867a723e0d2bf22796dc8a266359bdc8a9e9542f4ba2dc42b15bd25b1c83d2c339177796043fdbcbc9d73ad4957f723c check.patch" +4de6f60452c0451769f5ce41e41ca4c2867a723e0d2bf22796dc8a266359bdc8a9e9542f4ba2dc42b15bd25b1c83d2c339177796043fdbcbc9d73ad4957f723c check.patch +de2bd02d02e9a2d061d7c5783d3e4e64e9a68e83b15adc122946efff369ad5e382bd918a9585f5fe99ede546f002bb3db0f1b54306f4409fde38b2e26c008162 BTS-304.patch" diff --git a/user/sane/BTS-304.patch b/user/sane/BTS-304.patch new file mode 100644 index 000000000..64b7dca02 --- /dev/null +++ b/user/sane/BTS-304.patch @@ -0,0 +1,30 @@ +diff --git a/backend/genesys/image_pixel.cpp b/backend/genesys/image_pixel.cpp +index 1b83e127d..1ebba7fe0 100644 +--- a/backend/genesys/image_pixel.cpp ++++ b/backend/genesys/image_pixel.cpp +@@ -46,6 +46,7 @@ + #include "image.h" + + #include <array> ++#include <cmath> + + namespace genesys { + +@@ -207,7 +208,7 @@ void set_pixel_to_row(std::uint8_t* data, std::size_t x, Pixel pixel, PixelForma + float val = (pixel.r >> 8) * 0.3f; + val += (pixel.g >> 8) * 0.59f; + val += (pixel.b >> 8) * 0.11f; +- data[x] = static_cast<std::uint16_t>(val); ++ data[x] = static_cast<std::uint16_t>(roundf(val)); + return; + } + case PixelFormat::I16: { +@@ -215,7 +216,7 @@ void set_pixel_to_row(std::uint8_t* data, std::size_t x, Pixel pixel, PixelForma + float val = pixel.r * 0.3f; + val += pixel.g * 0.59f; + val += pixel.b * 0.11f; +- auto val16 = static_cast<std::uint16_t>(val); ++ auto val16 = static_cast<std::uint16_t>(roundf(val)); + data[x] = val16 & 0xff; + data[x + 1] = (val16 >> 8) & 0xff; + return; diff --git a/user/sane/network.patch b/user/sane/network.patch index 4e422e28d..845bf9913 100644 --- a/user/sane/network.patch +++ b/user/sane/network.patch @@ -1,23 +1,22 @@ -diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c -index a57d7c7..d0a1e92 100644 ---- a/sanei/sanei_tcp.c -+++ b/sanei/sanei_tcp.c -@@ -45,6 +45,7 @@ - #include <unistd.h> +--- sane-backends-1.0.30/sanei/sanei_tcp.c 2020-05-17 06:54:18.000000000 -0500 ++++ sane-backends-1.0.30/sanei/sanei_tcp.c 2020-06-10 14:10:06.980398975 -0500 +@@ -46,6 +46,7 @@ #include <stdlib.h> #include <string.h> + #include <limits.h> +#include <time.h> - #ifdef HAVE_WINSOCK2_H - #include <winsock2.h> -@@ -123,14 +124,27 @@ sanei_tcp_write(int fd, const u_char * buf, int count) - ssize_t - sanei_tcp_read(int fd, u_char * buf, int count) + #ifndef SSIZE_MAX + #define SSIZE_MAX LONG_MAX +@@ -130,6 +131,7 @@ sanei_tcp_read(int fd, u_char * buf, siz { -- ssize_t bytes_recv = 0, rc = 1; -+ ssize_t bytes_recv = 0, rc = 1; + size_t bytes_recv = 0; + ssize_t rc = 1; + int retry = 5; + if (count > SSIZE_MAX) { + errno = EINVAL; +@@ -139,9 +141,21 @@ sanei_tcp_read(int fd, u_char * buf, siz while (bytes_recv < count && rc > 0) { rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0); diff --git a/user/schismtracker/APKBUILD b/user/schismtracker/APKBUILD index 6392b0e6b..6e09d6af0 100644 --- a/user/schismtracker/APKBUILD +++ b/user/schismtracker/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Horst Burkhardt <horst@adelielinux.org> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=schismtracker -pkgver=20190805 +pkgver=20200412 pkgrel=0 pkgdesc="A highly portable Impulse Tracker clone" url="http://schismtracker.org/" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6ef51d8938a31b2978cfa40bef2bf04eb6b02e8443d8b221454f6e47f3b49308c9999f1af61cf9786b5bc32b621c1548a702e53403df211176dacabc3252b83d schismtracker-20190805.tar.gz" +sha512sums="f4c55ad7d47c9e90aecd8fbe9be399e0b82cd8a815ba1df9c1e23141b0c8a8bb80c9256ce5530327f52b3a34bf84b918d4e1f093ab19d47c180435a63ee6f23b schismtracker-20200412.tar.gz" diff --git a/user/screengrab/APKBUILD b/user/screengrab/APKBUILD index 2418064f5..ab52075ea 100644 --- a/user/screengrab/APKBUILD +++ b/user/screengrab/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=screengrab -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=0 pkgdesc="Cross-platform Qt-based software for taking screenshots" url="https://github.com/lxqt/screengrab" @@ -10,7 +10,7 @@ options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev - kwindowsystem-dev libqtxdg-dev>=3.3.1" + kwindowsystem-dev libqtxdg-dev>=3.5.0" subpackages="$pkgname-doc" source="https://github.com/lxqt/screengrab/releases/download/$pkgver/screengrab-$pkgver.tar.xz" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="f08cd37489062d4b9c66278203b2fdd0298d1222e42e9240c5812779216289728f84a6567d7570ad3bf209834df4549acd9d31550c328f7785da6176b237d7e7 screengrab-2.0.0.tar.xz" +sha512sums="f65d1aa4a36bf7e11e29bd1d1ad009f979e3c66a27204cd74c7ef7a54bde4027efdf030933cb81d2f9cb8b67715e868e1454a1faf7bbbb63cf162214bad8dc02 screengrab-2.0.1.tar.xz" diff --git a/user/shared-mime-info/APKBUILD b/user/shared-mime-info/APKBUILD index a3361af07..0e670e51f 100644 --- a/user/shared-mime-info/APKBUILD +++ b/user/shared-mime-info/APKBUILD @@ -1,33 +1,30 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=shared-mime-info -pkgver=1.15 +pkgver=2.0 pkgrel=0 pkgdesc="MIME database for desktop software" url="https://freedesktop.org/wiki/Software/shared-mime-info" arch="all" +options="!check" # Requires unpackaged dependency xdgmime. license="GPL-2.0+" depends="" -makedepends="glib-dev itstool libxml2-dev libxml2-utils" +makedepends="glib-dev itstool libxml2-dev libxml2-utils meson ninja xmlto" subpackages="$pkgname-doc $pkgname-lang" install="$pkgname.post-deinstall" triggers="$pkgname.trigger=/usr/share/mime" -source="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-1.15.tar.xz" +source="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0440063a2e6823a4b1a6fb2f2af8350f/shared-mime-info-2.0.tar.xz" build() { - ac_cv_func_fdatasync=no ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --disable-update-mimedb - make -j1 + meson -Dprefix=/usr build + ninja -C build } check() { - make check + ninja -C build check } package() { - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="3666aa500dfa6a28bd0524400c47fa16d90ae61f8c80f350fd895972319ec2f511618b8a7fa3cbde621edee46fde19e4506bda62f0bd2d0ede1b08d7bdb9aef2 shared-mime-info-1.15.tar.xz" +sha512sums="f4a1ea9a408ffcff325e57585dec5862405e9fd6c79e444048039f3061676501c40168cecf8935d002644a702a21f08f0f7c680ef6a65fdf188e0d892f3cc085 shared-mime-info-2.0.tar.xz" diff --git a/user/snappy/APKBUILD b/user/snappy/APKBUILD index 3662d501e..c03bf7054 100644 --- a/user/snappy/APKBUILD +++ b/user/snappy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=snappy -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=0 pkgdesc="Fast compression and decompression library" url="https://google.github.io/snappy/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf snappy-1.1.7.tar.gz" +sha512sums="efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c snappy-1.1.8.tar.gz" diff --git a/user/solid/APKBUILD b/user/solid/APKBUILD index 994c3bb6f..cf8661073 100644 --- a/user/solid/APKBUILD +++ b/user/solid/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=solid -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Platform-independent hardware discovery and access" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df0a7520b698c28324c1881585d551aac885f43edb6e2dda4e95dc3a9fbb6d7609807a64042acf02bae72c55d6081205033228a1e250ada06b61ede5c3f544b7 solid-5.68.0.tar.xz" +sha512sums="f6474541e90af822353f15093ee11eafda1e135059e35219284e8a2ab7a5a606bd9df31ccb491d72c9dacd40ffb0ad87a697aaa47108a94c57c955734f4b3df0 solid-5.72.0.tar.xz" diff --git a/user/sonnet/APKBUILD b/user/sonnet/APKBUILD index 74ac2fd11..6b41e300f 100644 --- a/user/sonnet/APKBUILD +++ b/user/sonnet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sonnet -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for implementing portable spell check functionality" url="https://www.kde.org/" @@ -47,4 +47,4 @@ aspell() { "$subpkgdir"/usr/lib/qt5/plugins/kf5/sonnet/sonnet_aspell.so } -sha512sums="add681532d2cfe371662306376da07bd337446f67d2b375a878bf53355e08407d24e1e63155f313e31b737a70014a052c19a1d120bbc67aeffd6be525f0aada3 sonnet-5.68.0.tar.xz" +sha512sums="8c5f552d9676d9be3cef0c69e986fbdd8b523d343e2a71e866a745ff555e5bb83829ab7a0ef7c1460104f91395ac912308c14c8c29da79e5d021d0401ce211d4 sonnet-5.72.0.tar.xz" diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index 00793ced6..95170e3cc 100644 --- a/user/spectacle/APKBUILD +++ b/user/spectacle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spectacle -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6bc10c376a63d6558c478e5844c5bc1c099d58c04593d5dc9bf2d0b17543fce62c202d8c3b9c2ade144566e205d9621546b777c134d1159529e7a3bc7b9d6766 spectacle-19.12.3.tar.xz -36665d1b7d8b7c8004e457179f03fff1eed3865ee3e558f44f19022b80e39bbb2659de3e7b9affe654d5dbc5077890b38b6b4351f3a43324733749fbd36880ac no-wayland.patch" +sha512sums="ba2fdcf4c57efe213e79638a0b81c3061e2df432a4702b2d4830dfb3ed9c2f10cd6573b678b153a95414fee4807320345001f416db348a2b6633afbc5b93c546 spectacle-20.04.3.tar.xz +4bade3af7f06a1b2eb9568eee2905db04d8aa8647fa9414ba1da32cc2ea5e7029b9db2ad121381a04754b1abea36508b82e68a326db726759943aac5206fb455 no-wayland.patch" diff --git a/user/spectacle/no-wayland.patch b/user/spectacle/no-wayland.patch index 554e64d34..50c7cc8b7 100644 --- a/user/spectacle/no-wayland.patch +++ b/user/spectacle/no-wayland.patch @@ -19,7 +19,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3395c1b..06009f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -68,7 +68,6 @@ find_package( +@@ -67,7 +67,6 @@ find_package( NewStuff GlobalAccel XmlGui @@ -31,7 +31,7 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6ff1b30..80e50dd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -84,7 +84,6 @@ target_link_libraries( +@@ -87,7 +87,6 @@ target_link_libraries( KF5::NewStuff KF5::GlobalAccel KF5::XmlGui @@ -52,7 +52,7 @@ index 41e5858..92ced06 100644 #include <QGuiApplication> #include <QScreen> #include <QtCore/qmath.h> -@@ -52,7 +50,7 @@ const int QuickEditor::magZoom = 5; +@@ -53,7 +51,7 @@ const int QuickEditor::magZoom = 5; const int QuickEditor::magPixels = 16; const int QuickEditor::magOffset = 32; @@ -61,7 +61,7 @@ index 41e5858..92ced06 100644 QWidget(parent), mMaskColor(QColor::fromRgbF(0, 0, 0, 0.15)), mStrokeColor(palette().highlight().color()), -@@ -91,19 +89,7 @@ QuickEditor::QuickEditor(const QPixmap &thePixmap, KWayland::Client::PlasmaShell +@@ -91,18 +89,6 @@ dprI = 1.0 / devicePixelRatioF(); setGeometry(0, 0, static_cast<int>(mPixmap.width() * dprI), static_cast<int>(mPixmap.height() * dprI)); @@ -70,18 +70,16 @@ index 41e5858..92ced06 100644 - using namespace KWayland::Client; - winId(); - auto surface = Surface::fromWindow(windowHandle()); -- if (!surface) { -- return; +- if (surface) { +- PlasmaShellSurface *plasmashellSurface = plasmashell->createSurface(surface, this); +- plasmashellSurface->setRole(PlasmaShellSurface::Role::Panel); +- plasmashellSurface->setPanelTakesFocus(true); +- plasmashellSurface->setPosition(geometry().topLeft()); - } -- PlasmaShellSurface *plasmashellSurface = plasmashell->createSurface(surface, this); -- plasmashellSurface->setRole(PlasmaShellSurface::Role::Panel); -- plasmashellSurface->setPanelTakesFocus(true); -- plasmashellSurface->setPosition(geometry().topLeft()); - } -+ - if (config->rememberLastRectangularRegion()) { - QRect cropRegion = config->cropRegion(); - if (!cropRegion.isEmpty()) { + if (Settings::rememberLastRectangularRegion() || Settings::alwaysRememberRegion()) { + auto savedRect = Settings::cropRegion(); + QRect cropRegion = QRect(savedRect[0], savedRect[1], savedRect[2], savedRect[3]); diff --git a/src/QuickEditor/QuickEditor.h b/src/QuickEditor/QuickEditor.h index 8dd6586..8187995 100644 --- a/src/QuickEditor/QuickEditor.h @@ -182,11 +180,10 @@ index 3e90a99..8994995 100644 using MainWindowPtr = std::unique_ptr<KSMainWindow>; using EditorPtr = std::unique_ptr<QuickEditor>; -@@ -98,4 +92,3 @@ class SpectacleCore: public QObject +@@ -93,4 +87,3 @@ class SpectacleCore: public QObject bool mIsGuiInited; bool mCopyToClipboard; - KWayland::Client::PlasmaShell *mWaylandPlasmashell; }; -- 2.22.1 - diff --git a/user/spectrwm/APKBUILD b/user/spectrwm/APKBUILD index 651311cdf..e52d25653 100644 --- a/user/spectrwm/APKBUILD +++ b/user/spectrwm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=spectrwm -pkgver=3.3.0 +pkgver=3.4.1 _pkgver=$(printf '%s' "$pkgver" | tr . _) pkgrel=0 pkgdesc="Small dynamic tiling window manager" @@ -32,4 +32,4 @@ package() { done } -sha512sums="743affffd0437641a760ae29ccbd0084baee3354dadc48f3fc9ab70bffa2413ffe3af67f1223413aa1bbf8c679fbae1fbbdd71a840b3e44f5df83b527f63c1cc spectrwm-3.3.0.tar.gz" +sha512sums="94d468833124b51fa12b29b173126f10f27dd551d599459e4bea589721b3df6f1f0af0ea67326ed3ad462e1203d3bbcb82032ff83abfa0943ec45afd29dedaa6 spectrwm-3.4.1.tar.gz" diff --git a/user/spice-gtk/APKBUILD b/user/spice-gtk/APKBUILD index fb44cc0ec..e8a558036 100644 --- a/user/spice-gtk/APKBUILD +++ b/user/spice-gtk/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=spice-gtk pkgver=0.38 -pkgrel=0 +pkgrel=1 pkgdesc="A GTK+ widget for SPICE clients" url="https://www.spice-space.org/" arch="all" @@ -13,7 +13,7 @@ depends="gst-plugins-good" depends_dev="gobject-introspection-dev gtk+3.0-dev" makedepends="$depends_dev acl-dev bash cyrus-sasl-dev eudev-dev gst-plugins-base-dev gstreamer-dev gstreamer-tools gtk-doc - json-glib-dev libjpeg-turbo-dev libucontext-dev + json-glib-dev libjpeg-turbo-dev libxrandr-dev lz4-dev meson openssl-dev opus-dev polkit-dev py3-pyparsing py3-six spice-protocol zlib-dev" @@ -24,8 +24,6 @@ source="https://www.spice-space.org/download/gtk/$pkgname-$pkgver.tar.xz " build() { - export CFLAGS="$CFLAGS -lucontext" - # Note: pulseaudio support is disabled because it's deprecated. # Audio is still supported through gstreamer. # @@ -41,6 +39,7 @@ build() { -Dcelt051=disabled \ -Dpulse=disabled \ -Dusbredir=disabled \ + -Dcoroutine=gthread \ . output ninja -C output } diff --git a/user/spice-protocol/APKBUILD b/user/spice-protocol/APKBUILD index 1fb5b5c3c..d7782af72 100644 --- a/user/spice-protocol/APKBUILD +++ b/user/spice-protocol/APKBUILD @@ -1,31 +1,29 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spice-protocol -pkgver=0.14.1 +pkgver=0.14.2 pkgrel=0 pkgdesc="Spice protocol header files" url="https://www.spice-space.org/" arch="noarch" +options="!check" # No test suite. license="BSD-3-Clause AND LGPL-2.1+" depends="" -makedepends="" +makedepends="meson ninja" subpackages="" -source="https://www.spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2" +source="https://www.spice-space.org/download/releases/$pkgname-$pkgver.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr - make + meson -Dprefix=/usr -Ddatadir=lib build + ninja -C build } check() { - make check + ninja -C build check } package() { - make pkgconfigdir=/usr/lib/pkgconfig DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="88b0e652564a1f826ee6d3c165ab05c40d13f366567db3840805f03d433d13d7f722225219c26759770d2cde33221fe6d97528521d0eb14bc069cd7ce9af8482 spice-protocol-0.14.1.tar.bz2" +sha512sums="181015f0f56d679ebfdbd6dbed37b50b1c0be550a714e8faf70624631d9a246fe68454eb44a1bae1765e1739f2d7469ab767c44f49776751826a4919ec88160e spice-protocol-0.14.2.tar.xz" diff --git a/user/spleen/APKBUILD b/user/spleen/APKBUILD index aa902f9bc..90332a07c 100644 --- a/user/spleen/APKBUILD +++ b/user/spleen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spleen -pkgver=1.5.0 +pkgver=1.7.0 pkgrel=0 pkgdesc="Monospace bitmap typeface from OpenBSD" url="https://www.cambus.net/spleen-monospaced-bitmap-fonts/" @@ -20,4 +20,4 @@ package() { done } -sha512sums="0d03ea534f872c3509c1ab7f2947e4a6e2edf4436daa65db23f83622599c820c59c373f1fd97edebfaa728606109736de09a173443054f84259f7c09175d81df spleen-1.5.0.tar.gz" +sha512sums="a6b675fd302644477f70304f20f915ac598b9e09faa82ab93579b2b5856d2d857f33b73e958e3ec4674ad6638b43982f77d2412fb1afdb3970acf9a773008212 spleen-1.7.0.tar.gz" diff --git a/user/sprunge/APKBUILD b/user/sprunge/APKBUILD index 85003c4b9..a42f9b93e 100644 --- a/user/sprunge/APKBUILD +++ b/user/sprunge/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=sprunge -pkgver=0.6 +pkgver=0.7 pkgrel=0 pkgdesc="Helper script to paste things to http://sprunge.us" url="http://sprunge.us" @@ -20,10 +20,10 @@ package() { } tpaste() { - url="http://tpaste.us" + url="https://tpaste.us" pkgdesc="Helper script to paste things to $url" mkdir -p "$subpkgdir"/usr/bin - printf "#!/bin/sh\n\nexec curl -F 'tpaste=<-' http://tpaste.us" > \ + printf "#!/bin/sh\n\nexec curl -F 'tpaste=<-' https://tpaste.us" > \ "$subpkgdir"/usr/bin/tpaste chmod 755 "$subpkgdir"/usr/bin/tpaste } diff --git a/user/step/APKBUILD b/user/step/APKBUILD index 08fb2ce0e..76b564d60 100644 --- a/user/step/APKBUILD +++ b/user/step/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=step -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Interactive physics simulation" url="https://www.kde.org/applications/education/step/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af8c67a0e6678461a2536a7abdc7b27d1ed4d172bf838414c29c47ff4ed42db5e32a2c6394bfa704d3bd2de04c4186fe608da16aa6e13414de26555cbf4cd7a1 step-19.12.3.tar.xz" +sha512sums="1df12a6994a0f3e62bff837fc8e0ff8fc9b4afb651f51ee1e14e4cdc80905fc21d7a9af540433e0f97a7040e2ed4968d9a81a4f868bb46b07c0c7ad1efb21f96 step-20.04.3.tar.xz" diff --git a/user/strongswan/APKBUILD b/user/strongswan/APKBUILD index d933c0639..299f89908 100644 --- a/user/strongswan/APKBUILD +++ b/user/strongswan/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=strongswan -pkgver=5.8.2 +pkgver=5.8.4 pkgrel=0 pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE" url="https://www.strongswan.org/" @@ -89,6 +89,6 @@ package() { install -m755 -D "$srcdir/charon.initd" "$pkgdir/etc/init.d/charon" } -sha512sums="423e7924acfe8a03ad7d4359ae9086fd516798fcf5eb948a27b52ea719f4d8954b83ea30ce94191ea1647616611df8a1215cb4d5c7ec48676624df6c41853e1d strongswan-5.8.2.tar.bz2 +sha512sums="15e866b0d6cc4ea94f17856b519d926ae08c15d3b62f675f62685d0722ca8fa26b46afb1ad1c866e9d5f347d77a747f57d0c6d7f6bd57762f37d7798f9e28103 strongswan-5.8.4.tar.bz2 8b61e3ffbb39b837733e602ec329e626dc519bf7308d3d4192b497d18f38176789d23ef5afec51f8463ee1ddaf4d74546b965c03184132e217cbc27017e886c9 strongswan.initd 7182bed917585bce9749b4495ad64d3052d2999dbb505c34d568acd6df7b151232ec10c8efe12f0a07d0555ddfe01aad4e3b767b08f17a55ffcbedc57dc9d934 charon.initd" diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD index 4e8c89514..4305b9766 100644 --- a/user/subversion/APKBUILD +++ b/user/subversion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=subversion -pkgver=1.13.0 +pkgver=1.14.0 pkgrel=0 pkgdesc="Version control system from 2000" url="https://subversion.apache.org/" @@ -89,5 +89,5 @@ pl() { mv "$pkgdir"/usr/lib/*perl* "$subpkgdir"/usr/lib/ } -sha512sums="36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2 subversion-1.13.0.tar.bz2 +sha512sums="af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b subversion-1.14.0.tar.bz2 1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a python3-bang.patch" diff --git a/user/swig/APKBUILD b/user/swig/APKBUILD index 91e1c5aa3..5107a0299 100644 --- a/user/swig/APKBUILD +++ b/user/swig/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=swig -pkgver=4.0.1 +pkgver=4.0.2 pkgrel=0 pkgdesc="Tool for integrating C and C++ code with other languages" url="http://www.swig.org/" @@ -32,4 +32,4 @@ package() { install -D -m644 LICENSE-UNIVERSITIES "$pkgdir"/usr/share/licenses/$pkgname/LICENSE-UNIVERSITIES } -sha512sums="595ef01cb83adfa960ceed9c325a9429192549e8d1e9aa3ab35a4301512a61d82e2e89a8c7939c2a5a0811254ea1832a443bd387e11459eb2b0bafc563ad1308 swig-4.0.1.tar.gz" +sha512sums="05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed swig-4.0.2.tar.gz" diff --git a/user/syntax-highlighting/APKBUILD b/user/syntax-highlighting/APKBUILD index 5716c32c0..735783ba0 100644 --- a/user/syntax-highlighting/APKBUILD +++ b/user/syntax-highlighting/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=syntax-highlighting -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="Framework for rendering programming code with formatting" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ffb4b1e57bd912ed76c93b8ea074af3fd8343cd094a584647bef42870366cd089c6ba2070670a57e4997ba6ac122775af5066d5bae4891f3533e4b7bfecf1fee syntax-highlighting-5.68.0.tar.xz" +sha512sums="cbeb375a0c5af7646848f6d2df112f5ded5cb8614ab8054fae4133ff5420624879bb3db57928d5528731f100497ccb30b348555444eded5a87b95be49e747c23 syntax-highlighting-5.72.0.tar.xz" diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD index 65f658c29..a683848a4 100644 --- a/user/tellico/APKBUILD +++ b/user/tellico/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tellico -pkgver=3.2.3 +pkgver=3.3.1 pkgrel=0 pkgdesc="Collection manager" url="https://tellico-project.org/" @@ -48,5 +48,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4b2e524607d79638730b86d67e4af0e69294ae0e5e87ca971cf5319e32eee9597b0825149babbf7e0c9a78fd42a1e34fa82eff64c4e22ca61dd478afa95b58a7 tellico-3.2.3.tar.xz +sha512sums="12d49aba8c99cd16e426ac0144fa7343c5b1348a8c9a0892f30ff274f0e98f9ad7819c03c4ecdd0dc2f826377468ebdab1996828e992fcd293c7ffe4f844ab74 tellico-3.3.1.tar.xz 4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch" diff --git a/user/threadweaver/APKBUILD b/user/threadweaver/APKBUILD index cd127de65..46bf456ac 100644 --- a/user/threadweaver/APKBUILD +++ b/user/threadweaver/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=threadweaver -pkgver=5.68.0 +pkgver=5.72.0 pkgrel=0 pkgdesc="High-level threading framework" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d1473867df5d5143e69f076899159016f489df40b898be79f41e4ea35f4e1b95feab5f145dbabf17af50516a6301db0c8dc9813b9f48f2cb26149c8c09b158a8 threadweaver-5.68.0.tar.xz" +sha512sums="83f3e1893bc7273ad70dc300bde77247b6fcde6b63c478b12fd150b0dc5e514acca2448cd7a3a9f42eaa7d95a8243ce5ece1e55a4176c1069cd62b7466cb195a threadweaver-5.72.0.tar.xz" diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index fd25092a2..664fbef09 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=thunar -pkgver=1.8.14 +pkgver=1.8.15 pkgrel=0 pkgdesc="File manager for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ce6da526e6378ffc90686f6ae25e56109e8af7d0c592345aca3de4603f4c5b3d089255bc313f2a60ee454cc3f0af52106584663c72ecd542a9c92769559c6787 thunar-1.8.14.tar.bz2" +sha512sums="50020084105daf5d5464cdcd29827fa212b121b0f6a385b6e2820fd120b6880cffafe63f51e737bc33d13f174f83de5c165f2ce155ff6aae74cc1b285cbdc8db thunar-1.8.15.tar.bz2" diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD index 1270dcbc3..fc2887d63 100644 --- a/user/thunderbird/APKBUILD +++ b/user/thunderbird/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=thunderbird -pkgver=68.7.0 +pkgver=68.9.0 pkgrel=0 pkgdesc="Email client from Mozilla" url="https://www.thunderbird.net/" @@ -36,7 +36,6 @@ source="https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thun fix-mutex-build.patch fix-seccomp-bpf.patch mozilla-build-arm.patch - rust-config.patch shut-up-warning.patch skia-sucks1.patch skia-sucks2.patch @@ -70,6 +69,12 @@ ldpath="$_mozappdir" # - CVE-2020-6821 # - CVE-2020-6822 # - CVE-2020-6825 +# 68.9.0-r0: +# - CVE-2020-6831 +# - CVE-2020-12387 +# - CVE-2020-12392 +# - CVE-2020-12395 +# - CVE-2020-12397 unpack() { default_unpack @@ -164,7 +169,7 @@ package() { ${pkgdir}/usr/share/applications/thunderbird.desktop } -sha512sums="fae763030b7a54930291a10f298b7fa4ffc400849082f576556b9040d095f1007ae686daf1241dff8b73bac35c14acf21c156a18a3e16d62a7719c6cc34e4d1f thunderbird-68.7.0.source.tar.xz +sha512sums="891472c95ba6ff46061131504e89010da512a84b0e1dea0482e603fd4c87f11e099280a245c7dd9fc9320c48229c26602565c089d86f1a1f4271b29b6fc606f0 thunderbird-68.9.0.source.tar.xz 16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0 Python-2.7.16.tar.xz 5519234df2934ac2f3d76c8cad7e4f0fe15cf83ea4beb32c6489d8b7839b3ebea88bdb342e0d2a9c1c7c95e9455d234b0a5aa0e73446fd8027b520f080a2bb5b mozconfig ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch @@ -172,7 +177,6 @@ ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53 c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880 fix-mutex-build.patch 70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d fix-seccomp-bpf.patch e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch -45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8 rust-config.patch 39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch e751ffab263f03d4c74feebc617e3af115b1b53cf54fe16c3acc585eec67773f37aa8de4c19599fa6478179b01439025112ef2b759aa9923c9900e7081cb65a9 skia-sucks1.patch 9152bd3e6dc446337e6a2ed602279c620aedecc796ba28e777854c4f41fcf3067f9ebd086a4b63a6b76c2e69ec599ac6435b8eeda4f7488b1c45f69113facba4 skia-sucks2.patch diff --git a/user/thunderbird/rust-config.patch b/user/thunderbird/rust-config.patch deleted file mode 100644 index eab72a0e4..000000000 --- a/user/thunderbird/rust-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urw firefox-68.0-old/build/moz.configure/rust.configure firefox-68.0/build/moz.configure/rust.configure ---- firefox-68.0-old/build/moz.configure/rust.configure 2019-07-07 15:56:29.345963800 +0000 -+++ firefox-68.0/build/moz.configure/rust.configure 2019-07-07 16:19:25.990645334 +0000 -@@ -193,12 +193,16 @@ - ambiguous = set() - per_raw_os = {} - for t in out: -+ if 'fuchsia' in t: continue - t = split_triplet(t, allow_unknown=True) - endianness = t.endianness - if t.cpu.startswith('thumb') and endianness not in ('big', 'little'): - endianness = 'little' - key = (t.cpu, endianness, t.os) - if key in per_os: -+ # hax to allow Adélie toolchains to work -+ if 'foxkit' in per_os[key].alias: -+ continue - previous = per_os[key] - per_raw_os[(previous.cpu, previous.endianness, - previous.raw_os)] = previous diff --git a/user/tk/APKBUILD b/user/tk/APKBUILD index 007ff7b69..8e98bc621 100644 --- a/user/tk/APKBUILD +++ b/user/tk/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=tk -pkgver=8.6.9.1 +pkgver=8.6.10 pkgrel=0 pkgdesc="GUI toolkit for the Tcl scripting language" url="http://tcl.sourceforge.net/" @@ -13,7 +13,7 @@ makedepends="$depends_dev libpng-dev" subpackages="$pkgname-doc $pkgname-dev" source="https://downloads.sourceforge.net/sourceforge/tcl/$pkgname$pkgver-src.tar.gz" _major=8.6 -builddir="$srcdir"/tk8.6.9/unix +builddir="$srcdir"/tk$pkgver/unix build() { ./configure \ @@ -50,4 +50,4 @@ dev() { done } -sha512sums="b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92 tk8.6.9.1-src.tar.gz" +sha512sums="d12ef3a5bde9e10209a24e9f978bd23360a979d8fa70a859cf750a79ca51067a11ef6df7589303b52fe2a2baed4083583ddaa19e2c7cb433ea523639927f1be5 tk8.6.10-src.tar.gz" diff --git a/user/trigger-rally/APKBUILD b/user/trigger-rally/APKBUILD index 9e71972d1..14e56deca 100644 --- a/user/trigger-rally/APKBUILD +++ b/user/trigger-rally/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=trigger-rally pkgver=0.6.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="Fast-paced rally racing game" url="http://trigger-rally.sourceforge.net/" arch="all" diff --git a/user/ttf-jetbrains-mono/APKBUILD b/user/ttf-jetbrains-mono/APKBUILD new file mode 100644 index 000000000..54857a62a --- /dev/null +++ b/user/ttf-jetbrains-mono/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Jonas Vautherin <jonas.vautherin@protonmail.ch> +# Maintainer: Jonas Vautherin <jonas.vautherin@protonmail.ch> +pkgname=ttf-jetbrains-mono +pkgver=1.0.6 +pkgrel=0 +pkgdesc="A typeface for developers" +url="https://www.jetbrains.com/lp/mono" +arch="noarch" +options="!check" # No test suite +license="Apache-2.0" +depends="fontconfig" +makedepends="" +source="https://github.com/JetBrains/JetBrainsMono/releases/download/v${pkgver}/JetBrainsMono-${pkgver}.zip" +builddir="$srcdir/JetBrainsMono-$pkgver" + +package() { + mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} + + cd ttf + for i in *.ttf; do + install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} + done +} + +sha512sums="c7d980f8aa16f0773510d71c1b96bdf0d6adc73bef188a50b789517eb4c5eae98fa4feffc0d75f504a31b913d5531f03a709cb87584171f37af662e3c88e4561 JetBrainsMono-1.0.6.zip" diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD index 23d44cdb2..9d5b07819 100644 --- a/user/ttf-sudo/APKBUILD +++ b/user/ttf-sudo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=ttf-sudo -pkgver=0.40 +pkgver=0.42 pkgrel=0 pkgdesc="Monospaced font family for programming and console users" url="https://www.kutilek.de/sudo-font/" @@ -20,4 +20,4 @@ package() { done } -sha512sums="c585866ff72bf94ed4bd452a238bfd7d603c813b9105d0d57f1c91dc5c14d5bbee6f8707497a1644b5be1657d81f6a337fc4f16a79ddad519d208c7c03a2f045 sudo.zip" +sha512sums="e48016ed1a4f6cc29f7301667a7e6a4cb7c09c85a2410c8eea3cfadb0b89ed29495834c5ac007f05b3fa25d63f3597118ac468fba4c2913282810cc23dd755e0 sudo.zip" diff --git a/user/twm/APKBUILD b/user/twm/APKBUILD index de08c9b46..ec7ea903c 100644 --- a/user/twm/APKBUILD +++ b/user/twm/APKBUILD @@ -2,7 +2,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=twm -pkgver=1.0.10 +pkgver=1.0.11 pkgrel=0 pkgdesc="Tom's/Tab Window Manager for the X Window System" url="https://www.X.Org" @@ -11,9 +11,9 @@ options="!check" # No test suite. license="MIT AND X11" depends="" makedepends="bison util-macros libxext-dev libx11-dev libxt-dev - libice-dev libxmu-dev" + libice-dev libxmu-dev libxrandr-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1280683fce7ebbf5670239cb1f3cee2b40612bd9850d98827e793cf8bf298bdb58e48387cab943ea6befc6f7b34da2567353c22b8eaeb8bcf1b9e303cd7e6a9e twm-1.0.10.tar.bz2" +sha512sums="948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d twm-1.0.11.tar.xz" diff --git a/user/uchardet/APKBUILD b/user/uchardet/APKBUILD index 153dfc63b..c25bc1baf 100644 --- a/user/uchardet/APKBUILD +++ b/user/uchardet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=uchardet -pkgver=0.0.6 +pkgver=0.0.7 pkgrel=0 pkgdesc="Universal character encoding detection library" url="https://www.freedesktop.org/wiki/Software/uchardet/" @@ -10,7 +10,8 @@ license="MPL-1.1 OR GPL-2.0+ OR LGPL-2.1+" depends="" makedepends="cmake" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.freedesktop.org/software/uchardet/releases/uchardet-$pkgver.tar.xz" +source="https://www.freedesktop.org/software/uchardet/releases/uchardet-$pkgver.tar.xz + no-debug-suffix.patch" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -35,4 +36,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 uchardet-0.0.6.tar.xz" +sha512sums="ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f uchardet-0.0.7.tar.xz +2e6f9d34daa6ba7dab07843368017448a17162d4d55bbc01665d00afa61a36f8b44fd6149706b806c8980632bdf33d073e0a93559d809852e18460551f330ecb no-debug-suffix.patch" diff --git a/user/uchardet/no-debug-suffix.patch b/user/uchardet/no-debug-suffix.patch new file mode 100644 index 000000000..f12bb565e --- /dev/null +++ b/user/uchardet/no-debug-suffix.patch @@ -0,0 +1,14 @@ +diff -Nurd uchardet-0.0.7/CMakeLists.txt uchardet-0.0.7.new/CMakeLists.txt +--- uchardet-0.0.7/CMakeLists.txt 2020-04-23 09:48:58.000000000 +0000 ++++ uchardet-0.0.7.new/CMakeLists.txt 2020-06-13 08:26:38.946585352 +0000 +@@ -12,10 +12,6 @@ + set (UCHARDET_VERSION_MINOR 0) + set (UCHARDET_VERSION_REVISION 7) + +-if (CMAKE_BUILD_TYPE MATCHES Debug) +- set (version_suffix .debug) +-endif (CMAKE_BUILD_TYPE MATCHES Debug) +- + set ( + UCHARDET_VERSION + ${UCHARDET_VERSION_MAJOR}.${UCHARDET_VERSION_MINOR}.${UCHARDET_VERSION_REVISION}${version_suffix} diff --git a/user/udisks2/APKBUILD b/user/udisks2/APKBUILD index 02118dcd5..41fc57eb4 100644 --- a/user/udisks2/APKBUILD +++ b/user/udisks2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=udisks2 -pkgver=2.8.4 -pkgrel=1 +pkgver=2.9.0 +pkgrel=0 pkgdesc="A Disk Manager" url="https://www.freedesktop.org/wiki/Software/udisks" arch="all" @@ -51,6 +51,6 @@ libs() { "$subpkgdir"/usr/lib/ } -sha512sums="70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c udisks-2.8.4.tar.bz2 +sha512sums="314355c9b0cc562b2359ea77137b3f2189c48e642c67cc9d9ed07048176967b67e78dfb3190dd160db2f92e8143a4f005bf2cc1aa814388a79201705e5297d0c udisks-2.9.0.tar.bz2 e2b2cc10868ca341603c3403631b9962c9c776bf96f4ac2c764425363ffdbe1cd9c35233e568f84b276a1f6702b1ac5b9a14b4a62983067c44c433b58d1b7175 50-udisks2.rules 4352d63458ca51b362844d60109948ebeeecdc492a93443b391c0d75b6fff0c0af5018c8a8e441fb37bffd59c734298eaa936fcb0cd4c42ac55c1298b398b1dc O_CLOEXEC.patch" diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD index ae1798e8e..e5660e0ab 100644 --- a/user/umbrello/APKBUILD +++ b/user/umbrello/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=umbrello -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Software modelling tool and code generator" url="https://umbrello.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f5edf5021bf5568053bd9f79dfc1f5ca586fa27c2b8e6660100d09f06bfd6c69867f7bbe16010a11703f30b02383edd965d0e2834e62b650504d00b76e8e269a umbrello-19.12.3.tar.xz +sha512sums="dd85330578a8c9a9568ce40758d76848fee76fa4ac16a44faeeb064480910038d734876ef9e2475e01e75a13f3d0b8d444fbf78542c9648ee6a8f59b4dc9b83c umbrello-20.04.3.tar.xz fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch" diff --git a/user/unicode-data/APKBUILD b/user/unicode-data/APKBUILD index 799b9fd2c..42ec0b956 100644 --- a/user/unicode-data/APKBUILD +++ b/user/unicode-data/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=unicode-data -pkgver=12.1.0 +pkgver=13.0.0 pkgrel=0 pkgdesc="Unicode data files" url="https://unicode.org" @@ -29,9 +29,9 @@ package() { "$srcdir"/Unihan.zip } -sha512sums="2cd8a92ec3feabd77ddd48f7553287c057b9ff968244a91a29754837fe4e02175a0fd9d848bdab946fc44bd249442fe5862bb892d0e714ee3dadd571f1f7b77c Blocks.txt -999db016b6a0bc3628cbdff22f027019f88f00383eff77a6ee0a1eeb92ddc29a30a2c9ab0568f22b412e11598b5953d3d91bd5dadea457d1721b9bf79f637264 DerivedAge.txt -feed2bc6c95042c480ddca92ad2515277314e1937a15603f8a3e816e021adad0662e1fe0d5149d7dbb14f54b13ef9bf433a0306dd63daf7c2fc0907ba4ae4bbd NamesList.txt -17678d900ac545641c214436b36489962be3566d355e2fe08ac30be5759bf68851e34c44100bf3d5dc72833a9a679745829c7772f48a59786cbd87973acfd4ef Scripts.txt -09be79ddcc2e019584522635f7c134bcd0ca50baf3517b6eb8ef76e5ce8109a6a8b20f3af593e7e8ab94e5bec1b98ebf43d79de53890d6bac3f33b9abb0e35c6 UnicodeData.txt -7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375 Unihan.zip" +sha512sums="a4407867ac3721e608d193786d4f7882aa3b42c61a9f83f207a74196888339b2f0cacc357bd15e25632c805d8a7c29f635c1bdcd6998b703763071622541b56c Blocks.txt +c4697aac5e447e37c79f0cd0f35f70d9c717eff7328c4b706c9e938ead0fc60292998374a63b3f06d5c134788e9b9e2762948ac4a6b58cc38455adf95705c8fe DerivedAge.txt +97a22d75146b15e5c671efca5fe6caec23b4f516846bd4018dde7363cd6c5a4e1ea567d520c86a000955a753f71c91e3a0b1b39d306cb77946071fbb9e522412 NamesList.txt +c747fde612b0d500175db6495985ab14d33f98a5a9f0851d1102a30e0b6d1fc75283bd014c9aa11bb4382b7a9d1ecedf57a58bdcaafe9473a87cafa316ede04c Scripts.txt +1a4a662e2ab33469976bf5f91aa6933ed9b73f6d4179a2daffb349e1869d7d6cfa885b164e82d15dcdad7458cd451c81add58d875eb0c70de854589dc97b2055 UnicodeData.txt +87238202b5da069ab1bbc4672d86c6fd0711e354fb17f53b0b4152850c56c0fa09e6e45820ae52d49756b25fe696518ceaa34cbfe5366ff60688c9a5c3a2d5be Unihan.zip" diff --git a/user/unifont/APKBUILD b/user/unifont/APKBUILD index cfbacb7ff..b7949f605 100644 --- a/user/unifont/APKBUILD +++ b/user/unifont/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Breno Leitao <breno.leitao@gmail.com> # Maintainer: pkgname=unifont -pkgver=12.1.03 +pkgver=13.0.03 pkgrel=0 pkgdesc="GNU font package with all Unicode 11 characters" url="http://unifoundry.com/unifont.html" @@ -22,4 +22,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4826095b3d5ab164a16a27d27334ab2ba62f39db46f164ceb31dccae14c8c0f2a1ea4d2141167c9328b699ab987bb094900d7d7af98a3c0b8d2260430d62200a unifont-12.1.03.tar.gz" +sha512sums="5dd6576bbc158e5dac4f8812a724c4fc8ed2702b7ea22d4b2d9265d9d58bfddc4d4607eacdb7053896559b218986bec3709cbe734656a7cf9daa328de4a21bee unifont-13.0.03.tar.gz" diff --git a/user/uwsgi/APKBUILD b/user/uwsgi/APKBUILD index a8f216aa3..340d86175 100644 --- a/user/uwsgi/APKBUILD +++ b/user/uwsgi/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=uwsgi -pkgver=2.0.18 -pkgrel=2 +pkgver=2.0.19.1 +pkgrel=0 pkgdesc="Web application server" url="https://projects.unbit.it/uwsgi" arch="all" @@ -83,4 +83,4 @@ rack() { _plugpack rack "Ruby Rack" } -sha512sums="6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61 uwsgi-2.0.18.tar.gz" +sha512sums="e18359c5ea3606d5de7fb3a0074d777e1c4b41f51f4b1a21f1446f32253058d7924286d9ed8a159d4c6e6c0ea64df7fc3c70b2933c3433b9a9cce39737e702bf uwsgi-2.0.19.1.tar.gz" diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD index 78b7a4e36..f578de6a4 100644 --- a/user/vala/APKBUILD +++ b/user/vala/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=vala -pkgver=0.48.3 +pkgver=0.48.7 pkgrel=0 pkgdesc="Compiler for the Vala programming language" url="https://wiki.gnome.org/Projects/Vala" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e73eade8b0cfa312d896c81b76e045bc9b8b71bd89298c0f8d78b2f596eebf64dc0eea8d1e266b2c17a774105560ed47590fbe00d65b1fda8db6823ac3ba4bb4 vala-0.48.3.tar.xz" +sha512sums="93ed6f98ff3be35d327794c5d81f30239c84838d49991b70dced1672f070e4675576da43b7555748d66ecae70102cd422e6af9b562f22bb34b40c07c73bac882 vala-0.48.7.tar.xz" diff --git a/user/valgrind/0001-Ensure-ELFv2-is-supported-on-PPC64.patch b/user/valgrind/0001-Ensure-ELFv2-is-supported-on-PPC64.patch index 5d7dbe29c..247657759 100644 --- a/user/valgrind/0001-Ensure-ELFv2-is-supported-on-PPC64.patch +++ b/user/valgrind/0001-Ensure-ELFv2-is-supported-on-PPC64.patch @@ -302,12 +302,13 @@ diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c index df842aa..de37070 100644 --- a/coregrind/m_machine.c +++ b/coregrind/m_machine.c -@@ -2073,7 +2073,8 @@ void* VG_(fnptr_to_fnentry)( void* f ) +@@ -2073,8 +2073,9 @@ void* VG_(fnptr_to_fnentry)( void* f ) || defined(VGP_ppc32_linux) || defined(VGP_ppc64le_linux) \ || defined(VGP_s390x_linux) || defined(VGP_mips32_linux) \ || defined(VGP_mips64_linux) || defined(VGP_arm64_linux) \ -- || defined(VGP_x86_solaris) || defined(VGP_amd64_solaris) -+ || defined(VGP_x86_solaris) || defined(VGP_amd64_solaris) \ + || defined(VGP_x86_solaris) || defined(VGP_amd64_solaris) \ +- || defined(VGP_nanomips_linux) ++ || defined(VGP_nanomips_linux) \ + || (defined(VGP_ppc64be_linux) && !defined(VG_PLAT_USES_PPCTOC)) return f; # elif defined(VGP_ppc64be_linux) diff --git a/user/valgrind/APKBUILD b/user/valgrind/APKBUILD index 4bcc705b9..ff9c64d49 100644 --- a/user/valgrind/APKBUILD +++ b/user/valgrind/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=valgrind -pkgver=3.15.0 +pkgver=3.16.1 pkgrel=0 pkgdesc="A tool to help find memory-management problems in programs" url="http://valgrind.org/" @@ -62,8 +62,8 @@ package() { fi } -sha512sums="5695d1355226fb63b0c80809ed43bb077b6eed4d427792d9d7ed944c38b557a84fe3c783517b921e32f161228e10e4625bea0550faa4685872bb4454450cfa7f valgrind-3.15.0.tar.bz2 -250177c3f50940560de9ad885cf5d9d7aa060ac832ced04875e1109b9114ec34e358a5c2309c8548f657e293cf50d980306d47b2cdf5e429aeabd10ffe666104 0001-Ensure-ELFv2-is-supported-on-PPC64.patch +sha512sums="2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950 valgrind-3.16.1.tar.bz2 +f90aa3cef5d3561d4602ff63b8f355b8427cbe6bb2ecd6bfc2e2bb063915fa40a70d923dbc60a643ee3fb7bcfbbddac049c6f6133c541189dd82b891f7ad9dbc 0001-Ensure-ELFv2-is-supported-on-PPC64.patch 9ee297d1b2b86891584443ad0caadc4977e1447979611ccf1cc55dbee61911b0b063bc4ad936d86c451cedae410cb3219b5a088b2ad0aa17df182d564fe36cfe arm.patch 57086a768f3876b26b0e507bc159a73f0955f03d5af8cc30e21103e348ca67f2e58b5555a5a97f299751c6602692ad43d8346bb68a80917d740fb4d65bba9665 realloc.patch d011b2769d35ca3206967e6dac9f3fb24a6496e5bbfdc73342382245c89375b09d6948b10ba3cf8aa0050c79c0dd13b75764aec0ec5c6ac479fa930941067747 suppressions.patch diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index 6c9a23c97..13fefc76c 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=vlc -pkgver=3.0.8 +pkgver=3.0.11 pkgrel=0 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" @@ -205,14 +205,14 @@ libs() { default_libs } -sha512sums="5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70 vlc-3.0.8.tar.xz +sha512sums="8219cc46e434c7b2f12321d4e1b21eae123a546eeb22f768c463537a4a4986ab395053f8a794628cfd17236f81665f12b2b3f6867af73b102b81628204b6c444 vlc-3.0.11.tar.xz 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd4630948e30c4329d27bd928f95de20fe1050d5e839778a4d012 endian-fix.patch 63adb16b3a1927ee3de27ac339cbfbbaa346a69928c527f883259d1e03b5cb59f26a55feeda767837b448c455de584abcb53dc733b2845c0cc13621d72e7f6fd fix-testing.patch 35f83e38a6a0dd1e3c37e3dc6d63b1406d2f9454ed246854c1408d6f35ad74b743c5b0dbc19442bab65aad4268707ffa85bfda9e72b2d711c1d3412d955bf150 lua.patch e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89 omxil-rpi-codecs.patch -a117ca4d7fd66a5f959fdeaddfdce2f8442fe9f2c13995bb7f4792a7745c00813813aa962f76e957e3b0735344a5dc000e0644ce09f23458802a2932231655c3 tar-compat.patch +3557686d76ab26fd401cb8758944b23173e6983f55b34d923d6808a2cc1f8efa9d0de58ab3b1664c713a579d1a94c4fcd8d731327eebd23c599bf037571e5406 tar-compat.patch c0107655249687655846a9547ca1a5670b9207443180600e7a149c69ffb96d7226787c19b018d4033db9b284c1a5faa8d7d42188ed40c3b8bb051256febf11c5 test-s390x.patch 55e245190b443dde9c7215ea5210612fcca164900a9a4b025ccf0d1e3fc5206d00b52355b256974421e37c609875627f1db19f0f5a084511aec0daf677ecc9d6 vlc.initd d89190dca1b8b2c3faca5863dc6c7e6eb24e05178e6f75ed752fd3c6a73cb8a42d2625b6e56453296b7096ea868be642ecd42745dac20e7f13fc67dd3c3c7c49 vlc.confd" diff --git a/user/vlc/tar-compat.patch b/user/vlc/tar-compat.patch index 34169ef56..6cbfb88ce 100644 --- a/user/vlc/tar-compat.patch +++ b/user/vlc/tar-compat.patch @@ -1,9 +1,9 @@ ---- vlc-3.0.1/share/Makefile.am.old 2018-02-06 18:41:06.000000000 +0000 -+++ vlc-3.0.1/share/Makefile.am 2018-04-05 23:19:37.081889895 +0000 -@@ -94,7 +94,7 @@ - $(AM_V_at)rm -f -- skins2/default.vlt.tmp - $(AM_V_GEN)GZIP=--no-name \ +--- vlc-3.0.11/share/Makefile.am.old 2020-04-05 13:46:34.000000000 +0000 ++++ vlc-3.0.11/share/Makefile.am 2020-07-07 20:50:05.832207915 +0000 +@@ -97,7 +97,7 @@ + GZIP=--no-name \ tar cvvzf skins2/default.vlt.tmp \ + --format=ustar $$tarsort \ - --owner=root --group=root --directory="$(srcdir)/skins2" \ + --uid=0 --gid=0 --directory="$(srcdir)/skins2" \ default/ diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index d55cd91b5..88a7cfb4b 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=vte -pkgver=0.60.1 +pkgver=0.60.3 pkgrel=0 pkgdesc="Virtual terminal emulator library for Gnome" url="https://www.gnome.org" @@ -27,5 +27,5 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="123a8fcc14f4dba450411f95f43eb60108fee95c328d0e7331c9366d96ba2caa548dece3e95a8b779dda19d322d6879d02abc6ac68e36450e4e72f17a0963c30 vte-0.60.1.tar.xz +sha512sums="3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18 vte-0.60.3.tar.xz 4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch" diff --git a/user/wimlib/APKBUILD b/user/wimlib/APKBUILD new file mode 100644 index 000000000..97b72cdda --- /dev/null +++ b/user/wimlib/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: CyberLeo <cyberleo@cyberleo.net> +# Maintainer: CyberLeo <cyberleo@cyberleo.net> +pkgname=wimlib +pkgver=1.13.2 +pkgrel=0 +pkgdesc="Windows Imaging (WIM) archive manipulation library and tools" +url="https://wimlib.net/" +arch="all" +license="(GPL-2.0 OR LGPL-2.1) AND CC0" +depends="" +makedepends="libxml2-dev fuse-dev ntfs-3g ntfs-3g-dev" +subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" +source="https://wimlib.net/downloads/wimlib-$pkgver.tar.gz" + +build() { + ./configure \ + --prefix=/usr + make +} + +check() { + PATH="/usr/sbin:${PATH}" make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="8d70a737724bec7591977de5b772b708864ce7548cfe79ebee7508de1013a9915aca356d2b73e6b2959bce671be0a275463546503b616f61833724c5bb75faba wimlib-1.13.2.tar.gz" diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD index 7fac2165c..3ac5683cf 100644 --- a/user/wireguard-module/APKBUILD +++ b/user/wireguard-module/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: Laurent Bercot <ska-adelie@skarnet.org> _kver="5.4.5-mc0" -pkgver=1.0.20200401 +pkgver=1.0.20200506 pkgrel=0 _pkgname="wireguard-module" pkgname="$_pkgname-$_kver" @@ -39,4 +39,4 @@ _patch() { "$builddir"/kernel-tree-scripts/create-patch.sh > "$subpkgdir/usr/share/wireguard/wireguard-$pkgver.patch" } -sha512sums="894da609c7102eb1d076a4a7bdaa96c7d5f0d64b4b86fdf01068ac5f4af966652e7ad7f18b1295a7fc4447f53b55a9ec45f1b3f36f0f9df7fb08836dfdff89f0 wireguard-linux-compat-1.0.20200401.tar.xz" +sha512sums="39a27a515919933dbed71624be3f8f3f512073b522e1e16248c9eda749dd72a3db5a02d85d29855160eb182415f489a4c02c1659ef9589507c99dbfe74ea3074 wireguard-linux-compat-1.0.20200506.tar.xz" diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD index db64e132e..219a91836 100644 --- a/user/wireguard-tools/APKBUILD +++ b/user/wireguard-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> -# Maintainer: Luis Ressel <aranea@aixah.de> +# Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=wireguard-tools -pkgver=1.0.20200319 +pkgver=1.0.20200513 pkgrel=0 pkgdesc="Userland tools for the WireGuard VPN" url="https://www.wireguard.com/" @@ -29,4 +29,4 @@ bashcomp() { mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/" } -sha512sums="d5bcd153f9b10f184b9a1bf9a81f33a9713ab4863ab5aa190eac60e92919756c8fecbb0d3cfb83bae20ac78fc43fdd7168f37294cdd7c5ee21f2a1b2db5fdf41 wireguard-tools-1.0.20200319.tar.xz" +sha512sums="4d27b262350b6b47843a323c2e7ab8d2bdd48065c265778abdec85b3f6fc92aa9af77d76e368df9cc8e435eae1c0ce50fed52e1d78db54358c1884d34be08d2c wireguard-tools-1.0.20200513.tar.xz" diff --git a/user/wireless-regdb/APKBUILD b/user/wireless-regdb/APKBUILD index 7b46e7f29..43e059bd3 100644 --- a/user/wireless-regdb/APKBUILD +++ b/user/wireless-regdb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: pkgname=wireless-regdb -pkgver=2019.06.03 +pkgver=2020.04.29 pkgrel=0 pkgdesc="Database of regulatory radio restrictions" url="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb" @@ -19,4 +19,4 @@ package() { install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" db.txt } -sha512sums="73209ca28c59d6760349ffb713f550300e80db1592bae52b6d252ac9401fa2bb2ace7e6c30cf55df7541da9cef4c8587f3790f7aa34529552468e4b63a3d8fdb wireless-regdb-2019.06.03.tar.xz" +sha512sums="736b1dabfa35bd2639ec8b50c12aa1f04ed7cd5cd9c4db2b4cfc58fbbe21713196bf6d92e4bdb46e328ddcef220e0737fe34fc41370b2327786bb5d93d7ba2e9 wireless-regdb-2020.04.29.tar.xz" diff --git a/user/xapian-core/APKBUILD b/user/xapian-core/APKBUILD index 20005d338..a7c352fa3 100644 --- a/user/xapian-core/APKBUILD +++ b/user/xapian-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=xapian-core -pkgver=1.4.14 +pkgver=1.4.16 pkgrel=0 pkgdesc="Open source search engine library" url="https://xapian.org/" @@ -46,5 +46,5 @@ libxapian() { mv "$pkgdir"/usr/lib/$subpkgname* "$subpkgdir"/usr/lib } -sha512sums="c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b xapian-core-1.4.14.tar.xz +sha512sums="3d319ab672485e840019ee28b54b1c59bbd535c1802874f58593fb999681c19bff3e776dc19ab5d5bd97734bf01f1408f36ae49e21ca9706ca187db49f8a18a6 xapian-core-1.4.16.tar.xz 639c0ecd75be0627d334628b5adf581a7da92c4f86dfb86a92669368ff8a874d4bf4e344b8f3b1276d22d126d2bc44c8ab727e39e1c29c0358fe7bbc8aa8050d timeval-t.patch" diff --git a/user/xf86-input-libinput/APKBUILD b/user/xf86-input-libinput/APKBUILD index 2aa771d80..529661f8e 100644 --- a/user/xf86-input-libinput/APKBUILD +++ b/user/xf86-input-libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-input-libinput -pkgver=0.29.0 +pkgver=0.30.0 pkgrel=0 pkgdesc="X.Org generic input driver using libinput" url="https://www.X.Org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f19ef2e9e0c1336d8e0b17853e1fe0c66ecf50e7b10b10b6c5cbafc99323694597821e15e8e358419ef3c68d1009967fd2ec3760800c85adbb71ac3ecc99954b xf86-input-libinput-0.29.0.tar.bz2" +sha512sums="823f80f7d53866f2f06c1fb7b2d64111bf807329acaaeda4a09413cdb5f3e3235c1dd4f99183aae75adf5a01503e40e35b4449b31f977afd842b4723b062c380 xf86-input-libinput-0.30.0.tar.bz2" diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD index 0aa0fdd1f..9025a7fa0 100644 --- a/user/xfce4-notifyd/APKBUILD +++ b/user/xfce4-notifyd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-notifyd -pkgver=0.4.4 -pkgrel=1 +pkgver=0.6.1 +pkgrel=0 pkgdesc="Notification service for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -11,7 +11,7 @@ depends="" makedepends="intltool libice-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev xfce4-panel-dev libnotify-dev dbus-glib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfce4-notifyd/${pkgver%.*}/xfce4-notifyd-$pkgver.tar.bz2" build() { LIBS="-lintl -lX11" ./configure \ @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="546a5063673e36ef26bcdac624bfcef41a14918dbb496fb3d282613334f173b51669184b6bcfbee0f07a17863620898be2f464e487ca9755abe7285d6a43d8d5 xfce4-notifyd-0.4.4.tar.bz2" +sha512sums="d48752cd4e02e515e4c5d147b7bce678a56f47f0bd336e3b9db4e14fc2b0355e0582816957fc43c313a5779b5495c836ee5da4f0cb83616a0164d692a169415f xfce4-notifyd-0.6.1.tar.bz2" diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD index ef98510e3..35644eab4 100644 --- a/user/xfce4-taskmanager/APKBUILD +++ b/user/xfce4-taskmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-taskmanager -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=0 pkgdesc="Process manager for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="670e8fd09bdaa85dc822dd5a7b055f898941e8079315843344e4dae12e2c0a14049b58241fb58f170461e7b8829bc479bea1a488b756210ef91ef8a4d7ff3348 xfce4-taskmanager-1.2.2.tar.bz2" +sha512sums="e3fbc89e4a1f6d3cd2f03388626b86129244c9d16092c74db18459efcaffc401a4aaab0588d9b96771f609bf5b17fa0a923a17d598e148b6d71efbb08aa5faf3 xfce4-taskmanager-1.2.3.tar.bz2" diff --git a/user/xfce4-time-out-plugin/APKBUILD b/user/xfce4-time-out-plugin/APKBUILD index 607bdf263..7af85df23 100644 --- a/user/xfce4-time-out-plugin/APKBUILD +++ b/user/xfce4-time-out-plugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-time-out-plugin -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=0 pkgdesc="Forced computer break plugin for the XFCE panel" url="https://xfce.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="03d27d98a3968daf93357556a5ca63641ceee3ce9f53db5287ce27a282d3f4a068a2c9be14d7690d4188901245521c03b68bb3fe39e1ed0e1f6a95eecc1dc846 xfce4-time-out-plugin-1.1.0.tar.bz2" +sha512sums="463d210eb6cfaa79c3470b44e7fb42ab44ce8fec0e403d8c71344a5bbc68af29e0da0fe759471ed873637114adf947699ecbaea1129f36e2dd6dc56db0c2ca87 xfce4-time-out-plugin-1.1.1.tar.bz2" diff --git a/user/xfce4-whiskermenu-plugin/APKBUILD b/user/xfce4-whiskermenu-plugin/APKBUILD index 7800f5703..5fea02e5a 100644 --- a/user/xfce4-whiskermenu-plugin/APKBUILD +++ b/user/xfce4-whiskermenu-plugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfce4-whiskermenu-plugin -pkgver=2.4.3 +pkgver=2.4.4 _pkgmaj=${pkgver%.*} pkgrel=0 pkgdesc="Whisker menu plugin for the XFCE panel" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="378f9b1a5ef4ffab079090aeb10b2e571918aadf7dddb051dc30288b325d3f1e6621fe9c2d3db5815b706d63361d77616124a543d0c96e0d1cc06407152e9f32 xfce4-whiskermenu-plugin-2.4.3.tar.bz2" +sha512sums="2fe27567d301f66de4648f1c3104a2ecb90c3b25672d5babcde69507559628a3a74b14d1526ff70dd75d64f7d056c8baae645f5a9291bf8c5e30a1a8258721ba xfce4-whiskermenu-plugin-2.4.4.tar.bz2" diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index c211fb629..f5b5b681b 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfconf -pkgver=4.14.1 +pkgver=4.14.3 pkgrel=0 pkgdesc="Configuration framework for the XFCE desktop environment" url="https://xfce.org" @@ -39,4 +39,4 @@ perl() { mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib } -sha512sums="727d013f7e71e0eb9ff17e464acd65c1fa507f8eba1bd29621dae070161042f60f47b8ac048b28849bf45232d04d5d6e48530aa0bd1e661a3f58db47703a8808 xfconf-4.14.1.tar.bz2" +sha512sums="e3add05018215cc597bb76d852903077e1fd0a21429c462116c560739eaf32167f9dddac3adb36e89b9380b87fc4b4c38d4ee9fdd5139b540268be437fc3a713 xfconf-4.14.3.tar.bz2" diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index b6c907d50..2657ca4d6 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xfwm4 -pkgver=4.14.0 +pkgver=4.14.2 pkgrel=0 pkgdesc="Window manager for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="27261b08b53ba7e70db547db81775154c2f4285ab0f1f8336bd9ef0aeacb3ab705ae8ac5b05f9ac23de550a9065e76487dc93a99e553549bff1c25ceb5216939 xfwm4-4.14.0.tar.bz2" +sha512sums="9e28f7782ce6c1734f9a50efec75d4c03a193bf078fd29f42c11770cef134c4516c256cb9c4b92a71bbbbfca81f37ba0ce19477831bb1da858c839135005b8f2 xfwm4-4.14.2.tar.bz2" diff --git a/user/xkeyboard-config/APKBUILD b/user/xkeyboard-config/APKBUILD index 8ede47ac1..e685ff22c 100644 --- a/user/xkeyboard-config/APKBUILD +++ b/user/xkeyboard-config/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xkeyboard-config -pkgver=2.29 +pkgver=2.30 pkgrel=0 pkgdesc="Keyboard configuration files for X11" url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" @@ -32,4 +32,4 @@ package() { install -m755 -d "$pkgdir"/var/lib/xkb } -sha512sums="202255af097f3063d76341d1b4a7672662dc645f9bcd7afa87bc966a41db4c20fc6b8f4fbe2fcaec99b6bc458eac10129141a866a165857c46282f6705b78670 xkeyboard-config-2.29.tar.bz2" +sha512sums="2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4 xkeyboard-config-2.30.tar.bz2" diff --git a/user/xmlsec/APKBUILD b/user/xmlsec/APKBUILD index 5c71b8f19..1bbd3abb7 100644 --- a/user/xmlsec/APKBUILD +++ b/user/xmlsec/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=xmlsec -pkgver=1.2.29 +pkgver=1.2.30 _pkgname="$pkgname${pkgver%%.*}" pkgrel=0 pkgdesc="C-based XML signature and encryption syntax and processing library" @@ -68,4 +68,4 @@ nss() { mv "$pkgdir"/usr/lib/libxmlsec1-nss.so* "$subpkgdir"/usr/lib/ } -sha512sums="07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d xmlsec1-1.2.29.tar.gz" +sha512sums="07152470a9fe5d077f8a358608ca1d8a79ee0d2777660f61ed5717dc640714a3adfe66843e6a4023898eb0f5ed79771d70c41132571f3a1aeda82c1894b69c98 xmlsec1-1.2.30.tar.gz" diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 989c75152..018ab875b 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=xterm -pkgver=353 +pkgver=357 pkgrel=0 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" @@ -45,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ea63858ec069a769f0a25a159d17099044686e20649233631244fed29440fa8beebbd0dd8ccaf4260fb3d26996a49013eeeea7e0c98860e00d2e657019e2611 xterm-353.tgz +sha512sums="a4e3998496fe202835e97fef50eb608cbb0345d8f503dd4d629a1d313664b2c536e97e7eafdf9d346df87e31822f5cf6f78dc66833b0fe01b6d79dd7c58dc751 xterm-357.tgz 6811cd67ffe21dc23c9ad6a439291bb0b3c3d347f4d5e2cd65de9f790fde2bf7323fe9f1b309d95ac98a3ffaae5989bc73a2c5fe08aa9f6a2c6cbc3b9adcf8d9 posix-ptmx.patch" diff --git a/user/xvidcore/APKBUILD b/user/xvidcore/APKBUILD index 6908df902..6d200463b 100644 --- a/user/xvidcore/APKBUILD +++ b/user/xvidcore/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=xvidcore -pkgver=1.3.6 +pkgver=1.3.7 pkgrel=0 pkgdesc="Open source MPEG-4 video codec" url="https://labs.xvid.com/" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de319e28c656c8105fa596eb69984b7176e004f617d9e21cb9014e2b26d23e68fe558c69685dd550d891261d79c21d2226cbbaae55e5486255e2089e9f61e6a5 xvidcore-1.3.6.tar.bz2" +sha512sums="e2b22e7a7e103af7adcc999d95484f991a0a33df02b912fe042b2e23d2af07381c737d23158dbf0fad770ee680572f86fbe04ab2ef33c81e2e0180ead2acc8ed xvidcore-1.3.7.tar.bz2" diff --git a/user/xxhash/APKBUILD b/user/xxhash/APKBUILD index 6d8140994..ff9328e9f 100644 --- a/user/xxhash/APKBUILD +++ b/user/xxhash/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xxhash -pkgver=0.7.3 +pkgver=0.7.4 pkgrel=0 pkgdesc="Fast non-cryptographic hashing algorithm" url="https://cyan4973.github.io/xxHash/" @@ -31,4 +31,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="72949010a267f063768241b182464c386005b4078f56902fee2f7804bd01f6c27878a6a4ec2a266cd59162934a7e471264ac5757dba570a97a2b5dad7703c664 xxHash-0.7.3.tar.gz" +sha512sums="9dbf8424b355d6551c18cff7ed7dbd26d4e5735b9a07fe54911b7438d6ffed3a3c2429ac09b616de630ea16cf32ff73529b6c3fad4af78ae0cb2b06155086aea xxHash-0.7.4.tar.gz" diff --git a/user/yakuake/APKBUILD b/user/yakuake/APKBUILD index b57f1a969..a2e5a84ef 100644 --- a/user/yakuake/APKBUILD +++ b/user/yakuake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=yakuake -pkgver=19.12.3 +pkgver=20.04.3 pkgrel=0 pkgdesc="Drop-down KDE terminal emulator" url="https://www.kde.org/applications/system/yakuake/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="87ed8b0088b60ea707aebbbd5d70a385759af7779f10d5a0e3590ff1490bcf34e96f3020f203c05936a122a301c7f64edf3fa86493d8c1fcff41ff2f74917df7 yakuake-19.12.3.tar.xz" +sha512sums="a5b9b42b8fb47fe94c06cbdfc54683ae33ce9a84da3942efba1fee52e6103bd8ab60ef4bf46316793577813940250909fe74e722db77f57157e650612e592658 yakuake-20.04.3.tar.xz" diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD index 424f883b1..aee2f895a 100644 --- a/user/youtube-dl/APKBUILD +++ b/user/youtube-dl/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=youtube-dl -pkgver=2020.03.24 +pkgver=2020.06.16.1 pkgrel=0 pkgdesc="Command-line program to download videos from YouTube and many other sites" url="https://youtube-dl.org" @@ -66,5 +66,5 @@ fishcomp() { "$subpkgdir/usr/share/fish/completions/" } -sha512sums="421c0ae412977cdf94d079aa7982360ffdfc4271bb7af27a598adbdb8454c2044e5c44ff3a9f339e9b0989c1264223ca83bba6a9151d01052f8f72c076d9e369 youtube-dl-2020.03.24.tar.gz +sha512sums="2f0c01cd1a52293afd8c4fddc20b6f7baca94903fbe852769ad1d25740bd87e38d42ee4a275c2e3d611c639c432f6245d27f361471c6b566da03677384a04e54 youtube-dl-2020.06.16.1.tar.gz 5760d06e6bbc1eee2c6be2d1f580f86b3cfa5f4bc44a62fb8145ce1cd41352ecf2f65d65d79a2d7f1ec129a34c28a7ec3d0d328c907e743bfcea54c65c71285d tumblr.patch" diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD index adac93a71..1fadaf24b 100644 --- a/user/z3/APKBUILD +++ b/user/z3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=z3 -pkgver=4.8.7 +pkgver=4.8.8 pkgrel=0 pkgdesc="Mathematical theorem prover" url=" " @@ -13,6 +13,10 @@ subpackages="$pkgname-dev py3-$pkgname:py3:noarch" source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz" builddir="$srcdir/z3-z3-$pkgver" +case "$CARCH" in +pmmx) options="$options textrels";; +esac + build() { PYTHON=python3 ./configure \ --prefix=/usr \ @@ -37,4 +41,4 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="145e2b2f1fa4edd0917107c7e1d54d779c7ed85c48af2ce6def4c90d1c4db05f74c9657e173cedf48770589fbe484c97fa1923295271cd3792523ffc4f67ed0c z3-4.8.7.tar.gz" +sha512sums="a6823cadb7cdad11b8f0db1530676c0ec4853886dfb3c4dbc5b798c5dbd445afb0c61675f81cb7f99c1b1734d9cd0ec96a07c68a948da3c25801fc6767fea47f z3-4.8.8.tar.gz" |