diff options
52 files changed, 299 insertions, 261 deletions
diff --git a/system/apk-tools/APKBUILD b/system/apk-tools/APKBUILD index d9e29a241..78478e51e 100644 --- a/system/apk-tools/APKBUILD +++ b/system/apk-tools/APKBUILD @@ -70,6 +70,6 @@ static() { } sha512sums="1b190cfd04c69369bd4f2b708d4df0f8cf2937e1580c95138fd2c2257e7604d015deaca10a9fe0da6742981caadb6b067c15e417a1951866f781b8a5c71c98ee apk-tools-2.10.3.tar.xz -a89007da158cbca67d5c18df2f117958604d69bf49251ccd11052457d5926eebe3d6573dfca238bd246e64661a7e373b1853fd226e4cca34c148195e688ae846 deep.patch +059f0368b096c53357db567bf720f049cf19a88dbf10dc2496a739dfe332a6487b87f07056d7cf6f0c8a385782821547d4aba8c393591c4070838f1c98819dda deep.patch 53d446734d32341cbd9ca00aedcd65d4d99220da354a9339837a6c79609a321f61ae917fb3cd9d4bffebcfc171d06c0f0d315e29a2d16285545c4fa085a75639 list.patch 746d00ce2af554a25db7ecea2b0a4d8f7399d2560efb6bf59ea144012d0163d3e0bad84c799bd706e8be6c0a543d4e35728d6beb269fddbbea626384009129cb pmmx.patch" diff --git a/system/apk-tools/deep.patch b/system/apk-tools/deep.patch index f315339cc..b9e361717 100644 --- a/system/apk-tools/deep.patch +++ b/system/apk-tools/deep.patch @@ -1,84 +1,50 @@ -From e61635ada7901763919caeaa01fa62ead3f6e97f Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Fri, 31 May 2019 21:32:02 -0500 -Subject: [PATCH 1/1] upgrade: add --deep option to upgrade everything +From b0be9f610c02bb2d5e681a3904940d311e9de298 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Mon, 3 Jun 2019 14:53:46 +0300 +Subject: solver: fix common dependency merging to inherit pinning and flags +Notably this fixes occasional issues when doing upgrade with multiple +versions of same packages. Without this the upgrade flag is not always +propagated properly down the dependency chain. --- - src/apk_solver.h | 1 + - src/solver.c | 10 ++++++++++ - src/upgrade.c | 5 +++++ - 3 files changed, 16 insertions(+) + src/solver.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) -diff --git a/src/apk_solver.h b/src/apk_solver.h -index b8b072d..908b3fd 100644 ---- a/src/apk_solver.h -+++ b/src/apk_solver.h -@@ -35,6 +35,7 @@ struct apk_changeset { - #define APK_SOLVERF_REINSTALL 0x0004 - #define APK_SOLVERF_LATEST 0x0008 - #define APK_SOLVERF_IGNORE_CONFLICT 0x0010 -+#define APK_SOLVERF_DEEP 0x0020 - - void apk_solver_set_name_flags(struct apk_name *name, - unsigned short solver_flags, diff --git a/src/solver.c b/src/solver.c -index e10cf8b..8437d61 100644 +index e10cf8b..2121dd9 100644 --- a/src/solver.c +++ b/src/solver.c -@@ -40,6 +40,7 @@ struct apk_solver_state { - unsigned int pinning_inherit; - unsigned int default_repos; - unsigned ignore_conflict : 1; -+ unsigned deep_upgrade : 1; - }; - - static struct apk_provider provider_none = { -@@ -510,6 +511,14 @@ static int compare_providers(struct apk_solver_state *ss, +@@ -462,6 +462,8 @@ static void reconsider_name(struct apk_solver_state *ss, struct apk_name *name) + name->name, name0->name); + name0->ss.requirers++; + name_requirers_changed(ss, name0); ++ foreach_array_item(p, name0->providers) ++ inherit_pinning_and_flags(ss, p->pkg, pkg); + } + } + } +@@ -510,7 +512,6 @@ static int compare_providers(struct apk_solver_state *ss, unsigned int solver_flags; int r; -+ /* In deep upgrades, always return the greater version */ -+ if (ss->deep_upgrade) -+ switch (apk_version_compare_blob(*pA->version, *pB->version)) { -+ case APK_VERSION_LESS: -+ return -1; -+ case APK_VERSION_GREATER: -+ return 1; -+ } - +- /* Prefer existing package */ if (pkgA == NULL || pkgB == NULL) -@@ -1006,6 +1015,7 @@ restart: - ss->changeset = changeset; - ss->default_repos = apk_db_get_pinning_mask_repos(db, APK_DEFAULT_PINNING_MASK); - ss->ignore_conflict = !!(solver_flags & APK_SOLVERF_IGNORE_CONFLICT); -+ ss->deep_upgrade = !!(solver_flags & APK_SOLVERF_DEEP); - list_init(&ss->dirty_head); - list_init(&ss->unresolved_head); - -diff --git a/src/upgrade.c b/src/upgrade.c -index 14457b5..e48d8e3 100644 ---- a/src/upgrade.c -+++ b/src/upgrade.c -@@ -38,6 +38,9 @@ static int option_parse_applet(void *ctx, struct apk_db_options *dbopts, int opt - case 'a': - uctx->solver_flags |= APK_SOLVERF_AVAILABLE; - break; -+ case 'd': -+ uctx->solver_flags |= APK_SOLVERF_DEEP; -+ break; - case 'l': - uctx->solver_flags |= APK_SOLVERF_LATEST; - break; -@@ -59,6 +62,8 @@ static const struct apk_option options_applet[] = { - { 0x10000, "no-self-upgrade", - "Do not do early upgrade of 'apk-tools' package" }, - { 0x10001, "self-upgrade-only", "Only do self-upgrade" }, -+ { 'd', "deep", -+ "Include dependencies when upgrading world" }, - }; + return (pkgA != NULL) - (pkgB != NULL); +@@ -675,8 +676,11 @@ static void select_package(struct apk_solver_state *ss, struct apk_name *name) - static const struct apk_option_group optgroup_applet = { + if (name->ss.requirers || name->ss.has_iif) { + foreach_array_item(p, name->providers) { +- dbg_printf(" consider "PKG_VER_FMT" iif_triggered=%d, tag_ok=%d, selectable=%d, provider_priority=%d, installed=%d\n", +- PKG_VER_PRINTF(p->pkg), p->pkg->ss.iif_triggered, p->pkg->ss.tag_ok, p->pkg->ss.pkg_selectable, ++ dbg_printf(" consider "PKG_VER_FMT" iif_triggered=%d, tag_ok=%d, selectable=%d, available=%d, flags=0x%x, provider_priority=%d, installed=%d\n", ++ PKG_VER_PRINTF(p->pkg), ++ p->pkg->ss.iif_triggered, p->pkg->ss.tag_ok, ++ p->pkg->ss.pkg_selectable, p->pkg->ss.pkg_available, ++ p->pkg->ss.solver_flags, + p->pkg->provider_priority, p->pkg->ipkg != NULL); + /* Ensure valid pinning and install-if trigger */ + if (name->ss.requirers == 0 && -- -2.21.0 +cgit v1.2.1 diff --git a/system/bubblewrap/APKBUILD b/system/bubblewrap/APKBUILD index 0147c92c6..1589504a6 100644 --- a/system/bubblewrap/APKBUILD +++ b/system/bubblewrap/APKBUILD @@ -1,26 +1,32 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> -# Maintainer: +# Maintainer: Max Rees <maxcrees@me.com> pkgname=bubblewrap -pkgver=0.3.1 +pkgver=0.3.3 pkgrel=0 pkgdesc="Unprivileged sandboxing tool" url="https://github.com/projectatomic/bubblewrap" arch="all" -options="!check suid" # ? +options="!check suid" # requires suid to already be set in order to check license="LGPL-2.0+" makedepends="autoconf automake libcap-dev docbook-xsl" +checkdepends="sudo" subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" source="bubblewrap-$pkgver.tar.gz::https://github.com/projectatomic/bubblewrap/archive/v$pkgver.tar.gz - realpath-workaround.patch musl-fixes.patch" + realpath-workaround.patch + musl-fixes.patch + tests.patch" + +# secfixes: +# 0.3.3-r0: +# - CVE-2019-12439 prepare() { cd "$builddir" - NOCONFIGURE=1 ./autogen.sh + srcdir= NOCONFIGURE=1 ./autogen.sh default_prepare } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,8 +38,19 @@ build() { make } +check() { + # Uses sudo to chown root and setuid $builddir/test-bwrap + # + # As of 0.3.3-r0, all tests pass on ppc64 except those relating + # to bind mounts over symlinks. Those tests fail because musl's + # realpath depends on the availability of /proc, which is not + # available in the middle of the setup procedure since pivot_root + # has been performed at least once. They have been patched to be + # skipped. + make check +} + package() { - cd "$builddir" make install DESTDIR="$pkgdir" } @@ -46,6 +63,7 @@ bashcomp() { mv "$pkgdir"/usr/share/bash-completion/ "$subpkgdir"/usr/share/ } -sha512sums="fbc44976f53fdf8913b94c57d1f26a3b87c773e86a289e58fd3d7b1c4ea7f33c862f1a38a4f791315358990928768a68334f0a171302c18a16c7e2e9f1a146dd bubblewrap-0.3.1.tar.gz +sha512sums="b1c38fad90ddaa23a5f2dd49f9ec3f9d9af7426af321ae9f7c43dd64f11a448b3502942a42112a1c6ebf8a4dea2e1196b17c31cca9c2f119dc2e0c1674c345ae bubblewrap-0.3.3.tar.gz 400a0446670ebf80f16739f1a7a2878aadc3099424f957ba09ec3df780506c23a11368f0578c9e352d7ca6473fa713df826fad7a20c50338aa5f9fa9ac6b84a4 realpath-workaround.patch -f59cda3b09dd99db9ca6d97099a15bb2523e054063d677502317ae3165ba2e32105a0ae8f877afc3827bd28d093c9d9d413270f4c87d9fe5f26f3eee670d916e musl-fixes.patch" +f59cda3b09dd99db9ca6d97099a15bb2523e054063d677502317ae3165ba2e32105a0ae8f877afc3827bd28d093c9d9d413270f4c87d9fe5f26f3eee670d916e musl-fixes.patch +d572a6296729ab192dd4f04707e0271df600d565897ce089b7f00b9ae6c62e71a087e864b4c4972e0a64aeb222a337ff4ed95560620c200cc44534db1ca79efd tests.patch" diff --git a/system/bubblewrap/tests.patch b/system/bubblewrap/tests.patch new file mode 100644 index 000000000..651d6269a --- /dev/null +++ b/system/bubblewrap/tests.patch @@ -0,0 +1,23 @@ +--- bubblewrap-0.3.3/tests/test-run.sh 2019-05-01 04:51:47.000000000 -0400 ++++ bubblewrap-0.3.3/tests/test-run.sh 2019-06-03 14:43:33.881226220 -0400 +@@ -127,8 +127,9 @@ + fi + + # bind dest in symlink (https://github.com/projectatomic/bubblewrap/pull/119) +- $RUN $ALT --dir /tmp/dir --symlink dir /tmp/link --bind /etc /tmp/link true +- echo "ok - can bind a destination over a symlink" ++ #$RUN $ALT --dir /tmp/dir --symlink dir /tmp/link --bind /etc /tmp/link true ++ #echo "ok - can bind a destination over a symlink" ++ echo "ok # SKIP musl realpath depends on /proc" + done + + # Test devices +@@ -215,7 +216,7 @@ + # Test --die-with-parent + + cat >lockf-n.py <<EOF +-#!/usr/bin/env python ++#!/usr/bin/env python3 + import struct,fcntl,sys + path = sys.argv[1] + if sys.argv[2] == 'wait': diff --git a/system/file/APKBUILD b/system/file/APKBUILD index f8ba0ac8c..86a09ce68 100644 --- a/system/file/APKBUILD +++ b/system/file/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=file -pkgver=5.36 +pkgver=5.37 pkgrel=0 pkgdesc="File type identification utility" url="http://www.darwinsys.com/file/" @@ -43,4 +43,4 @@ libmagic() { mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr } -sha512sums="2060219ee5eef286cb2e17bce892401b2e2e411db0f54991899ad895ae535a756c0775168731887ef147e830808dfc8f10f1b87d0a6b3cfaaad4b3e1329ff17e file-5.36.tar.gz" +sha512sums="9b6ae3dd910a03d2161c91ebc75ac91eb7dbd279563462b77daf902d9ae9f0a70de12c37a498b20c6357d6594059d01841bfd104592107b65c08d8343fca19d2 file-5.37.tar.gz" diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index 0dcdd373b..ebea01e68 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vim -pkgver=8.1.1206 +pkgver=8.1.1461 pkgrel=0 pkgdesc="advanced text editor" url="https://www.vim.org" @@ -81,6 +81,6 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="2977716257033e0842f2ddbabf6636e51c5eba3c75bd4b33e6f497de85e1d59701aae8907ddace78debb306a17a9c2dbd18478aa0a0a3020a50f5d8119a0baec vim-8.1.1206.tar.gz +sha512sums="4c0237808d126069cb023246fc58d7743f8b9813e934a37e8061da43391712abc388921ee62fedc5c76bd374e82496bd8aabc6d8a9248fd8e77064895450032a vim-8.1.1461.tar.gz 12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc 16026a3ed3e080b3f8281948579ab678e9acd724ad594463279712fbf1024bcd923155a133bd08118848d2c6cdf11c69489d85b1c7438f60b4c279094714d181 no-default-mouse.patch" diff --git a/user/ant/APKBUILD b/user/ant/APKBUILD new file mode 100644 index 000000000..8afaf5929 --- /dev/null +++ b/user/ant/APKBUILD @@ -0,0 +1,58 @@ +# Contributor: Steeve Chailloux <steeve@chaahk.com> +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=ant +pkgver=1.10.6 +pkgrel=0 +pkgdesc="Java-based build tool" +url="http://ant.apache.org/" +arch="noarch" +license="Apache-2.0" +makedepends="" +depends="openjdk8" +source="https://www-eu.apache.org/dist/ant/source/apache-$pkgname-$pkgver-src.tar.gz + ant.sh + imageio_fix_java_test.patch + imageio_fix_test.patch" +builddir="$srcdir/apache-$pkgname-$pkgver" + +_anthome="/usr/lib/java/$pkgname" + +build() { + sh ./bootstrap.sh + ./bootstrap/bin/ant dist-lite +} + +check() { + ./bootstrap/bin/ant test +} + +package() { + local destdir="$pkgdir/$_anthome" + + install -dm755 "$destdir"/bin + rm dist/bin/*.bat dist/bin/*.cmd + install -m755 dist/bin/* "$destdir"/bin + + install -dm755 "$pkgdir"/usr/bin + ln -sf $_anthome/bin/ant "$pkgdir"/usr/bin/ant + + install -dm755 "$destdir"/lib + install -m644 dist/lib/*.jar "$destdir"/lib + + # symlink to junit so it's on the javac build path for ant + # matches behavior on ubuntu 9 and makes sense for compatibility + ln -sf ../../junit.jar "$destdir"/lib/junit.jar + + # The license says the NOTICE file should be redistributed for + # derivative works, so lets supply it. + install -m644 -D NOTICE "$pkgdir"/usr/share/licenses/$pkgname/NOTICE + + install -m644 -D $srcdir/$pkgname.sh "$pkgdir"/etc/profile.d/$pkgname.sh +} + +sha512sums="2bef0cf5f53ce9fa6e9dc7a673745f75bcd0df027f9ff07442cf66bc8d7d99e022153b08d20d314061b497763e85d587c3087952b3f5730e5a19b2656f3236fb apache-ant-1.10.6-src.tar.gz +955fe52b415d57716df1338eff6d667d80e06a67bffd53def7d63d96f1224157b724a92df647afe8b3243dea749e221aec1e86d5be01060408fa000ec1132374 ant.sh +9a698041a06ccc6db7765133fc6fabc6f2d0e70b96ff9de594bd836fc05ac33f489968a4fdd12fe044458eb3b99e905ca1e2a62a55acdbacebff9782c82a27de imageio_fix_java_test.patch +1457c7415df1e80c8763b4db9f41cbdebfa58e17bcd263dae9ce31f9ee601650b51a893e4e0a324c974b60a6c2076fddfd78180baca0bcdbff65e9e88b30e063 imageio_fix_test.patch" diff --git a/user/ant/ant.sh b/user/ant/ant.sh new file mode 100644 index 000000000..bab7b972d --- /dev/null +++ b/user/ant/ant.sh @@ -0,0 +1,3 @@ +#!/bin/sh +ANT_HOME="/usr/share/java/ant" +export ANT_HOME diff --git a/user/ant/imageio_fix_java_test.patch b/user/ant/imageio_fix_java_test.patch new file mode 100644 index 000000000..4fa856e73 --- /dev/null +++ b/user/ant/imageio_fix_java_test.patch @@ -0,0 +1,26 @@ +diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java +index c96691d..e8cfd29 100644 +--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java ++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java +@@ -86,21 +86,6 @@ public class ImageIOTest { + assertTrue("File was not overwritten.", lastModified < overwrittenLastModified); + } + +- @Test +- public void testDrawOverwriteTrue() { +- buildRule.executeTarget("testSimpleScale"); +- assertThat(buildRule.getLog(), containsString("Processing File")); +- File f = new File(buildRule.getOutputDir(), LARGEIMAGE); +- assumeTrue("Could not change file modification date", +- f.setLastModified(f.lastModified() - FILE_UTILS.getFileTimestampGranularity() * 2)); +- long lastModified = f.lastModified(); +- buildRule.executeTarget("testDrawOverwriteTrue"); +- assertThat(buildRule.getLog(), containsString("Processing File")); +- f = new File(buildRule.getOutputDir(), LARGEIMAGE); +- long overwrittenLastModified = f.lastModified(); +- assertTrue("File was not overwritten.", lastModified < overwrittenLastModified); +- } +- + @Test + public void testOverwriteFalse() { + buildRule.executeTarget("testSimpleScale"); diff --git a/user/ant/imageio_fix_test.patch b/user/ant/imageio_fix_test.patch new file mode 100644 index 000000000..ad3cc3e67 --- /dev/null +++ b/user/ant/imageio_fix_test.patch @@ -0,0 +1,23 @@ +diff --git a/src/etc/testcases/taskdefs/optional/image/imageio.xml b/src/etc/testcases/taskdefs/optional/image/imageio.xml +index a7d6a23..0f0318b 100644 +--- a/src/etc/testcases/taskdefs/optional/image/imageio.xml ++++ b/src/etc/testcases/taskdefs/optional/image/imageio.xml +@@ -59,18 +59,6 @@ + </imageio> + </target> + +- <!-- this should produce a single file in the dest dir, overwriting any existing file --> +- <target name="testDrawOverwriteTrue" depends="setUp"> +- <imageio includes="*.jpg" srcdir="${src.dir}" destdir="${output}" +- overwrite="yes" failonerror="no"> +- <scale width="300" proportions="width"/> +- <draw xloc="10" yloc="10"> +- <rectangle height="50" width="50" strokewidth="2"/> +- <text string="Test"/> +- </draw> +- </imageio> +- </target> +- + <!-- this should not overwrite the existing file --> + <target name="testOverwriteFalse" depends="setUp"> + <imageio includes="*.jpg" srcdir="${src.dir}" destdir="${output}" diff --git a/user/glib-networking/APKBUILD b/user/glib-networking/APKBUILD index 83ee6af4a..c0ef9ac59 100644 --- a/user/glib-networking/APKBUILD +++ b/user/glib-networking/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=glib-networking -pkgver=2.60.1 +pkgver=2.60.2 _ver=${pkgver%.*} pkgrel=0 pkgdesc="Networking support for GLib" @@ -12,8 +12,7 @@ depends="ca-certificates" makedepends="bash glib-dev gnutls-dev gsettings-desktop-schemas-dev intltool libgcrypt-dev libproxy-dev meson ninja p11-kit-dev" subpackages="$pkgname-lang" -source="https://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.xz - glib-networking-2.60-new-gnutls-cert-error-fix.patch" +source="https://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.xz" prepare() { cd "$builddir" @@ -38,5 +37,4 @@ package() { rm -f "$pkgdir"/usr/lib/gio/modules/*.a } -sha512sums="a40a7e9678076db1a469f0d8ffdcb0c6658ef96ff1d9637299fbb07985f4c42bae3f1415f8df15242718420d20eb90de93253a00d1f6a347110b3f8a74bcc717 glib-networking-2.60.1.tar.xz -b9d3d744aec5337553e228ff1ee0616b1d79d1766ef9d87e644706a154f8e6151b15651b73a7073482e5cbe20b54ac78bd34f7ad77ebf0d34c42d969b4315241 glib-networking-2.60-new-gnutls-cert-error-fix.patch" +sha512sums="bfb8c716e78dfce997baaeb8aaafc1f187aa18fabee0197211f741d6175c21760e8eb5f514711e12f19ed7d7a0e4931dc7469b0ba778dc0e354c9123cf5a67f1 glib-networking-2.60.2.tar.xz" diff --git a/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch b/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch deleted file mode 100644 index ab04dae3e..000000000 --- a/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1ce6b40da8ecbf997c5522a592a122e805aa81c4 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@igalia.com> -Date: Wed, 3 Apr 2019 18:00:55 -0500 -Subject: [PATCH] gnutls: Handle new GNUTLS_E_CERTIFICATE_REQUIRED - -This new error in GnuTLS 3.6.7 should correspond to -G_TLS_ERROR_CERTIFICATE_REQUIRED. This fixes our client auth tests when -run with GnuTLS 3.6.7. - -Fixes #70 ---- - tls/gnutls/gtlsconnection-gnutls.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c -index 27bbbcd..774d668 100644 ---- a/tls/gnutls/gtlsconnection-gnutls.c -+++ b/tls/gnutls/gtlsconnection-gnutls.c -@@ -1062,7 +1062,11 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls, - else - return 0; - } -- else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) -+ else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND -+#ifdef GNUTLS_E_CERTIFICATE_REQUIRED -+ || status == GNUTLS_E_CERTIFICATE_REQUIRED /* Added in GnuTLS 3.6.7 */ -+#endif -+ ) - { - g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_CERTIFICATE_REQUIRED, - _("TLS connection peer did not send a certificate")); diff --git a/user/gtksourceview-3.0/APKBUILD b/user/gtksourceview-3.0/APKBUILD index 12ec22e9c..23f34a3c2 100644 --- a/user/gtksourceview-3.0/APKBUILD +++ b/user/gtksourceview-3.0/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gtksourceview-3.0 -pkgver=3.24.10 +pkgver=3.24.11 pkgrel=0 pkgdesc="Source viewer widget for GTK+ 3.0" url="https://gnome.org" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="990935ed7c3b10a1659cf22bd36eb71e76088768f7b70234b50465f542592720bb6b206746e0606c96ab99ba0208535fc6073b4f6c0f3427acd0ab5a43420d46 gtksourceview-3.24.10.tar.xz" +sha512sums="3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2 gtksourceview-3.24.11.tar.xz" diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index 03d94659e..02a94f8f6 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gvim _pkgreal=vim -pkgver=8.1.1206 +pkgver=8.1.1461 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -74,4 +74,4 @@ package() { ln -s gvim rgvim } -sha512sums="2977716257033e0842f2ddbabf6636e51c5eba3c75bd4b33e6f497de85e1d59701aae8907ddace78debb306a17a9c2dbd18478aa0a0a3020a50f5d8119a0baec vim-8.1.1206.tar.gz" +sha512sums="4c0237808d126069cb023246fc58d7743f8b9813e934a37e8061da43391712abc388921ee62fedc5c76bd374e82496bd8aabc6d8a9248fd8e77064895450032a vim-8.1.1461.tar.gz" diff --git a/user/imagemagick/APKBUILD b/user/imagemagick/APKBUILD index 77580a3aa..c527b6c0f 100644 --- a/user/imagemagick/APKBUILD +++ b/user/imagemagick/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=imagemagick -pkgver=7.0.8.42 +pkgver=7.0.8.48 _abiver=7 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 @@ -81,4 +81,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="88f57b69ece3b93b0af41e85bacb0b232cf07e7d0aab34e1479ce6c5fe29b1cfcdcd8bc6b2b87773c2109122614a0f64847629029470d945409b08b19032d936 ImageMagick-7.0.8-42.tar.xz" +sha512sums="194773526b86762fbcd509a722114c88b23a7bdd96431f666581e11d2c13334e6f58c1edcecb6e9117a00ea873cca8657887f7962ccbb5748d1c692b7756c792 ImageMagick-7.0.8-48.tar.xz" diff --git a/user/isync/APKBUILD b/user/isync/APKBUILD index a1a5a09e3..19c801b6e 100644 --- a/user/isync/APKBUILD +++ b/user/isync/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=isync -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=0 pkgdesc="IMAP and MailDir mailbox synchronizer" url="http://isync.sourceforge.net/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b5186f2afe97cab58ce55d3ec19ae7371676ae614448614a9e3e02d09662c34b74e559f0926661fa0300ab22dab9e2e9089b78ee38b94141ff3f8b4d75578ffa isync-1.3.0.tar.gz" +sha512sums="59d702d41d4a4e72f03cb282b414d0bb859593171763e845bc24d116a74f807a79e5be61f1dd1f59a9ece492322bceac156b08958a246cbfbe7f230fab4cdda2 isync-1.3.1.tar.gz" diff --git a/user/libdc1394/0001-Fix-bad-variable-type-uint-int.patch b/user/libdc1394/0001-Fix-bad-variable-type-uint-int.patch deleted file mode 100644 index c2a572857..000000000 --- a/user/libdc1394/0001-Fix-bad-variable-type-uint-int.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9d0c3158bc73292ca755477f60cbf5b5fd622fde Mon Sep 17 00:00:00 2001 -From: Damien Douxchamps <ddsf@douxchamps.net> -Date: Thu, 12 Jan 2017 16:47:27 +0900 -Subject: [PATCH] Fix bad variable type uint -> int - -Type was change to uint in recent commit but it should have been INT. - -Signed-off-by: Damien Douxchamps <ddsf@douxchamps.net> ---- - libdc1394/AUTHORS | 1 + - libdc1394/dc1394/bayer.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/libdc1394/dc1394/bayer.c b/libdc1394/dc1394/bayer.c -index 10a4c1b..cbdc417 100644 ---- a/dc1394/bayer.c -+++ b/dc1394/bayer.c -@@ -24,6 +24,7 @@ - #include <limits.h> - #include <math.h> - #include <stdlib.h> -+#include <stdint.h> - #include <string.h> - #include "conversions.h" - -@@ -775,7 +776,7 @@ dc1394_bayer_Downsample(const uint8_t *restrict bayer, uint8_t *restrict rgb, in - { - uint8_t *outR, *outG, *outB; - register int i, j; -- uint tmp; -+ int tmp; - int st=sx*sy; - int p; - int sx2=sx<<1; --- -2.11.0 - diff --git a/user/libdc1394/APKBUILD b/user/libdc1394/APKBUILD index 8bed91739..d36d55a47 100644 --- a/user/libdc1394/APKBUILD +++ b/user/libdc1394/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=libdc1394 -pkgver=2.2.5 -pkgrel=4 +pkgver=2.2.6 +pkgrel=0 pkgdesc="Programming interface to control FireWire / IIDC cameras" url="https://damien.douxchamps.net/ieee1394/libdc1394/" arch="all" @@ -12,9 +12,7 @@ depends="" depends_dev="libusb-dev libraw1394-dev" makedepends="$depends_dev linux-headers" subpackages="$pkgname-dev $pkgname-doc" -source="https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/$pkgver/libdc1394-$pkgver.tar.gz - 0001-Fix-bad-variable-type-uint-int.patch - " +source="https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/$pkgver/libdc1394-$pkgver.tar.gz" build() { cd "$builddir" @@ -34,5 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4a02560b7b2db7199b91c35786cb9d5af51398795fc1b7f0cb577d3563b27c0d03d407fa472d9756a2f87b658350a55d29c16fef401a74f835ba86e25214d13c libdc1394-2.2.5.tar.gz -ab19b1aecec17b1caa6b225f626b6adcf80818cb59f693df69e9f0f2b4014846be22aa93473a62da8c7ae937ea8265f90499a9561d48e6bfe931e1e00cb16c60 0001-Fix-bad-variable-type-uint-int.patch" +sha512sums="2d60ed1054da67d8518e870193b60c1d79778858f48cc6487e252de00cc57a08548515d41914a37d0227d29e158d68892c290f83930ffd95f4a483dce5aa3d25 libdc1394-2.2.6.tar.gz" diff --git a/user/libebml/APKBUILD b/user/libebml/APKBUILD index 5ed4be827..03b2e73d7 100644 --- a/user/libebml/APKBUILD +++ b/user/libebml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libebml -pkgver=1.3.7 +pkgver=1.3.9 pkgrel=0 pkgdesc="Library to parse Extensible Binary Meta-Language files" url="https://www.matroska.org/" @@ -29,4 +29,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="ad574a73a1d2c5fbd4581991ff790ef22cfcaf5645295b06dce36235b43d552bbec3b400d3c80550c8020ed3720226fad05348c6034c444da1106439c7fd9fc1 libebml-1.3.7.tar.xz" +sha512sums="a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e libebml-1.3.9.tar.xz" diff --git a/user/libgphoto2/APKBUILD b/user/libgphoto2/APKBUILD index 7bd75969d..59cd04e35 100644 --- a/user/libgphoto2/APKBUILD +++ b/user/libgphoto2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libgphoto2 -pkgver=2.5.22 +pkgver=2.5.23 pkgrel=0 pkgdesc="Digital camera library" url="http://www.gphoto.org" @@ -46,4 +46,4 @@ package() { "$pkgdir/lib/udev/rules.d/54-gphoto.rules" } -sha512sums="8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb libgphoto2-2.5.22.tar.bz2" +sha512sums="f5f8f33e934989e6f832952c6c7c2c9e37c436652a08191e8ccced293447a090cb596fff80b9b0ad52c99c0ffc08a1207ca7ef2b630dc52f4c6d7f86e4cbc95a libgphoto2-2.5.23.tar.bz2" diff --git a/user/libgsf/APKBUILD b/user/libgsf/APKBUILD index 086da1e6c..b0916d3da 100644 --- a/user/libgsf/APKBUILD +++ b/user/libgsf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libgsf -pkgver=1.14.45 +pkgver=1.14.46 pkgrel=0 pkgdesc="Library for manipulating structured files" url="https://www.gnome.org/" @@ -45,4 +45,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1 } -sha512sums="2e993150b6fec336a14fd85d5c631e4a3b43187039dab0cba3b8badf62873f39814392db92bb737b92aa9a6d8b4ba41f1fb248c1fe07b88cddd28ded5e4d9ebd libgsf-1.14.45.tar.xz" +sha512sums="130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0 libgsf-1.14.46.tar.xz" diff --git a/user/libical/APKBUILD b/user/libical/APKBUILD index 7a27c56d4..4d03d3c27 100644 --- a/user/libical/APKBUILD +++ b/user/libical/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libical -pkgver=3.0.4 -pkgrel=2 +pkgver=3.0.5 +pkgrel=0 pkgdesc="Reference implementation of the iCalendar format" url="https://libical.github.io/libical/" arch="all" @@ -18,7 +18,8 @@ build() { cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DSHARED_ONLY=true + -DSHARED_ONLY=true \ + -DENABLE_GTK_DOC=OFF make } @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9 libical-3.0.4.tar.gz" +sha512sums="9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656 libical-3.0.5.tar.gz" diff --git a/user/libmatroska/APKBUILD b/user/libmatroska/APKBUILD index 85e521369..6a8ea1f9d 100644 --- a/user/libmatroska/APKBUILD +++ b/user/libmatroska/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libmatroska -pkgver=1.5.0 +pkgver=1.5.2 pkgrel=0 pkgdesc="Library to parse Matroska files" url="https://www.matroska.org/" @@ -29,4 +29,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="eb59b5afd9d510c2d6c7408b0053a261cee6669a9f5bbb1a939d98d96ac6c9b8f340691e95310268f59c954a1d9f72322fd0ec7b442a74c56cd2e2c22eb3a754 libmatroska-1.5.0.tar.xz" +sha512sums="122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2 libmatroska-1.5.2.tar.xz" diff --git a/user/libpng/APKBUILD b/user/libpng/APKBUILD index e3504e859..ec109c15a 100644 --- a/user/libpng/APKBUILD +++ b/user/libpng/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=libpng -pkgver=1.6.36 +pkgver=1.6.37 pkgrel=0 pkgdesc="Portable Network Graphics library" url="http://www.libpng.org/" @@ -55,6 +55,6 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="8b9c54c5555d6a736eaf298cbbae1e08199001202bacabc6212d75fa619e2ecf06bcf36db0321bfdb90a3dc5cde361c8d951002701637a557c34eae80f5d0936 libpng-1.6.36.tar.gz -8fa213204768b058459ffd5eae6b3661c3f185d3baf1913da4337e7b7855e567f2525e7f67411c32fa8cb177a5f93d538c3d0ce17a94d4aa71bd9cffabe8b311 libpng-1.6.36-apng.patch.gz +sha512sums="2ce2b855af307ca92a6e053f521f5d262c36eb836b4810cb53c809aa3ea2dcc08f834aee0ffd66137768a54397e28e92804534a74abb6fc9f6f3127f14c9c338 libpng-1.6.37.tar.gz +226adcb3a8c60f2267fe2976ab531329ae43c2603dab4d0cf8f16217d64069936b879f3d6516b75d259c47d6f5c5b1f24f887602206c8e46abde0fb7f5c7946b libpng-1.6.37-apng.patch.gz e3fae918f14bc34e7c126892f69527c6e1b4d72593835ece839d9a28cff55a886b2030f877cf9e29b2c97abf2e47bbb5ba54584828edd2a841c2556f330b9c7e libpng-fix-arm-neon.patch" diff --git a/user/libshout/APKBUILD b/user/libshout/APKBUILD index 5e0f491b5..f3b9e2796 100644 --- a/user/libshout/APKBUILD +++ b/user/libshout/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=libshout -pkgver=2.4.1 -pkgrel=2 +pkgver=2.4.2 +pkgrel=0 pkgdesc="Library for accessing a Icecast server" url="http://www.icecast.org/" arch="all" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219 libshout-2.4.1.tar.gz" +sha512sums="ae4b042009887de22d105eb8238f4362f6ff51bd645fd51b5a87c4b5e3f5fdc99e9f99f85c24ae2e9d23eab92b854a7e733bf9f8cc61a8362ce984f02a014e93 libshout-2.4.2.tar.gz" diff --git a/user/libsoup/APKBUILD b/user/libsoup/APKBUILD index ddcf75515..65c1d4edc 100644 --- a/user/libsoup/APKBUILD +++ b/user/libsoup/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libsoup -pkgver=2.66.1 +pkgver=2.66.2 pkgrel=0 pkgdesc="GObject-based HTTP library" url="https://wiki.gnome.org/Projects/libsoup" @@ -29,4 +29,4 @@ package() { DESTDIR="$pkgdir" ninja install } -sha512sums="bb9c15cae965606d5f7c009fab9223445235982269d23ff20e89249b10d3423797427e7cff39c31a3f5db99b0c2d7a01eb911edb61309603cdeb8f2467fe6039 libsoup-2.66.1.tar.xz" +sha512sums="1df443470239f23d22301e37e36f3d34963352ee0122f317cd15b19d90115831091bddcee27bc6f0d4994adcf4e5bd9c0395de2bd7f39ae305ba0edea7789092 libsoup-2.66.2.tar.xz" diff --git a/user/luarocks/APKBUILD b/user/luarocks/APKBUILD index f890e8403..7bc21d7e0 100644 --- a/user/luarocks/APKBUILD +++ b/user/luarocks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=luarocks -pkgver=3.1.0 +pkgver=3.1.2 pkgrel=0 pkgdesc="Package manager for Lua software" url="https://luarocks.org/" @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fd8b63671641b0872d91af6e3f129a3b1264c23ba71b51d523ff4382ffb005799a341c4ffc6483818ed56a9d6945115018078eea7c9228ed8cb5df69207ee846 luarocks-3.1.0.tar.gz" +sha512sums="78ef1d72302c88fa9989aaf4dba8d7043a2929b709631be2003d3419df828e9168b207365c56bbbf0b52bf81d15fc96b92a7c7abb5dd11dde3630d23886ff51c luarocks-3.1.2.tar.gz" diff --git a/user/mate-calc/APKBUILD b/user/mate-calc/APKBUILD index f55f691fc..a8f505202 100644 --- a/user/mate-calc/APKBUILD +++ b/user/mate-calc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=mate-calc -pkgver=1.22.0 +pkgver=1.22.1 pkgrel=0 pkgdesc="Calculator utility for the MATE desktop environment" url="https://mate-desktop.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a0d72a17dc9e7e97ef36cb2f089db126b1f91790d6a34ae829ef9cea87e82b025ba106f08e8c677352e72423a6670a3bf8751eecc67444cd8cea8dc8f3cf6728 mate-calc-1.22.0.tar.xz" +sha512sums="8e8efa1c17f6b6330471d877bc4d9c8486c64fb22ac3e3caf13a47f8be030664f1ca635a2323a78c5345a838fda307c3b4913caa748a67cc45fe43b9c8070e9a mate-calc-1.22.1.tar.xz" diff --git a/user/notmuch/APKBUILD b/user/notmuch/APKBUILD index 4e8153630..c97dce2cc 100644 --- a/user/notmuch/APKBUILD +++ b/user/notmuch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=notmuch -pkgver=0.28.3 +pkgver=0.28.4 pkgrel=0 pkgdesc="Thread-based email index, search and tagging" url="https://notmuchmail.org/" @@ -92,5 +92,5 @@ zshcomp() { mv "$pkgdir/usr/share/zsh" "$subpkgdir/usr/share" } -sha512sums="dd3931b78cc27540e962f1fca5f4ebb1c04b2637a5761cda023f307fd9be4b5ddc2af26010330868c55200fa96b60b2a11b3b22d4c20d2a4a2d3787421ed85cf notmuch-0.28.3.tar.gz +sha512sums="77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7 notmuch-0.28.4.tar.gz b2991ee5edf927f04d904d99888dbce17a98e9d4d7d809bc2248f45d214025f4a1632b19e4fbca2b08e99721ec8a7eea82384c5c718206884801c7bfa5a8c540 0.28.2-disable-rpath.patch" diff --git a/user/p11-kit/APKBUILD b/user/p11-kit/APKBUILD index ee6c68cb9..fff4a60c6 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.15 +pkgver=0.23.16.1 pkgrel=0 pkgdesc="Library for loading and sharing PKCS#11 modules" url="https://p11-glue.github.io/p11-glue/p11-kit.html" @@ -46,4 +46,4 @@ trust() { "$subpkgdir"/usr/lib/pkcs11/ } -sha512sums="d703eec12626b79551ce337521f7ea7b1a0b64c211d7a93d831dd28ec1de77c7b58358c1588bf82d70f047c01ad9433fa8a286d1a25ae3f6b0ee6016b8c42950 p11-kit-0.23.15.tar.gz" +sha512sums="7d0bbd793b43dba081054b4d022a8dbd1d477a3bd6aced72a641087023cf020f1d898899a08e737880e6c810f924814c62497c5ecb19f8322cde42667426a9a7 p11-kit-0.23.16.1.tar.gz" diff --git a/user/qpdf/APKBUILD b/user/qpdf/APKBUILD index 663813fcc..df20bbe25 100644 --- a/user/qpdf/APKBUILD +++ b/user/qpdf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=qpdf -pkgver=8.4.0 +pkgver=8.4.2 pkgrel=0 pkgdesc="Command-line tools and library for transforming PDF files" url="http://qpdf.sourceforge.net" @@ -57,4 +57,4 @@ fix_qdf() { mv "$pkgdir"/usr/bin/fix-qdf "$subpkgdir"/usr/bin/ } -sha512sums="13225c6285311e8fe89970971b082b9613e70d474ee71dd5572f1ae268234d366c2c9c7bf427c4758a746a1a27ecc0127d31044ab501dbc08885c8aa0a514028 qpdf-8.4.0.tar.gz" +sha512sums="9cde046fb5e42dc331933294155583fb20408704a0cab3075cc3e97bd4643e3178e4162b8de7434aa2304097e7734f985fdc8e7b05cc028c37193dce91797f7a qpdf-8.4.2.tar.gz" diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD index e32542954..98328624a 100644 --- a/user/qt5ct/APKBUILD +++ b/user/qt5ct/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=qt5ct -pkgver=0.38 +pkgver=0.39 pkgrel=0 pkgdesc="GUI utility for configuring Qt5" url="https://sourceforge.net/projects/qt5ct/" @@ -23,4 +23,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="0c33beca5103f6c01fceabffea50df5798f055b1e530fc084b294917d8bfa6ea78db72385e8941fe92164c682a069b166c69595e2e06bc62be0595a3718a7323 qt5ct-0.38.tar.bz2" +sha512sums="ea7a4f34bae5aac622bcf9171982a16a982c8318d8c218c97e452e9fa7f4ea39018d269b2c62467830642961f873d9464c5a93a88529562340f13582436bdf65 qt5ct-0.39.tar.bz2" diff --git a/user/sane/APKBUILD b/user/sane/APKBUILD index 1a5e2fc16..941402502 100644 --- a/user/sane/APKBUILD +++ b/user/sane/APKBUILD @@ -4,7 +4,7 @@ pkgname=sane _pkgname=sane-backends pkgver=1.0.27 -pkgrel=4 +pkgrel=5 pkgdesc="Scanner access library" url="http://www.sane-project.org/" arch="all" @@ -35,7 +35,8 @@ for _backend in $_backends; do subpackages="$subpackages $pkgname-backend-$_backend:_backend" done subpackages="$pkgname-doc $pkgname-dev $subpackages $pkgname-utils saned - $pkgname-udev::noarch $_pkgname::noarch" + saned-openrc:openrc:noarch $pkgname-udev::noarch $_pkgname::noarch + $pkgname-lang" source="http://distfiles.gentoo.org/distfiles/$_pkgname-$pkgver.tar.gz saned.initd include.patch @@ -81,6 +82,12 @@ saned() { mkdir -p "$subpkgdir"/etc/sane.d "$subpkgdir"/usr mv "$pkgdir"/etc/sane.d/saned.conf "$subpkgdir"/etc/sane.d mv "$pkgdir"/usr/sbin "$subpkgdir"/usr/ +} + +openrc() { + pkgdesc="Network scanner server (OpenRC runscripts)" + depends="saned" + install_if="saned=$pkgver-r$pkgrel openrc" install -Dm755 "$srcdir"/saned.initd "$subpkgdir"/etc/init.d/saned } @@ -101,7 +108,7 @@ udev() { backends() { local _backend; pkgdesc="$pkgdesc (metapackage)" - depends="$pkgname-utils $pkgname-saned" + depends="$pkgname-utils saned" for _backend in $_backends; do [ "$_backend" = "test" ] && continue depends="$depends $pkgname-backend-$_backend" diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD index 38c088160..b2f0fa449 100644 --- a/user/thunar-volman/APKBUILD +++ b/user/thunar-volman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=thunar-volman -pkgver=0.9.1 +pkgver=0.9.2 pkgrel=0 pkgdesc="Volume manager for Thunar" url="https://xfce.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="73d9884dc667e4f8554d2b06f7116bbe25fa4e113300f0cd32bc2229c22001cc709333d5ac5618f7d5c8a35e58fb7a61e48ecafa634c7e239e9af329dc4149bc thunar-volman-0.9.1.tar.bz2" +sha512sums="808f3dfdf105911275b0c96705604bd1575cd9c5bddaaae96583949c995a3bc84a71ce154c05ed3ce395d4b4d78e4d67770f79b3226fd4a35c509f5e612de72f thunar-volman-0.9.2.tar.bz2" diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index 2cc4590c0..0f92f1070 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=thunar -pkgver=1.8.4 +pkgver=1.8.6 pkgrel=0 pkgdesc="File manager for the XFCE desktop environment" url="https://xfce.org" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="886c0789aa19c2ab2ef34892c4afd09c857585b4796140ea3c84ccb9e1e1ca2935cf7e3a760a6ca8d8c68a5866663412500b4779878c7f48c9365c3ac7bf0eec Thunar-1.8.4.tar.bz2" +sha512sums="086dc139627d8f11341b2db91358ef1831d2b8494d34abac49355dbaf850a21c30f979294f9adf2bc8548e5f817a4e165803a3db74cd989cd3867a4e228d74db Thunar-1.8.6.tar.bz2" diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD index fbf615688..5c400ece4 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=tumbler -pkgver=0.2.3 -pkgrel=1 +pkgver=0.2.4 +pkgrel=0 pkgdesc="Thumbnail generation service for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aefe284c3baa1d8eaf79c9bdb3cfc044ee6a1f36be34efd67541e6310aa275b5235b29f68483b7b7b5a8df699a8b3db8dc75569ec2b90253756fd6285a2e3816 tumbler-0.2.3.tar.bz2" +sha512sums="cf1d9499ff293086176a0e5055181e5527d9ae39a7786d9fe15a47202e1b02218981c072229e736a7057e85bf0c6ceff34c1f55a12396b3df0b3ab9fda822d02 tumbler-0.2.4.tar.bz2" diff --git a/user/unifont/APKBUILD b/user/unifont/APKBUILD index 70182158c..67e99c144 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.0.01 +pkgver=12.1.02 pkgrel=0 pkgdesc="GNU font package with all Unicode 11 characters" url="http://unifoundry.com/unifont.html" @@ -24,4 +24,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e44678acbf696d0529f3c2fe7fe796d3d6908a54b8eaa3f7cd5717d5bebc2698aed7f4e5cde4a954330d8bcaac6a5886839afb854d271ac3a03b460f774215c1 unifont-12.0.01.tar.gz" +sha512sums="031336c5811957f211e442c9d3a3920cc3149f80681802a0f9e2a9c905ccce8f0434bf37f6000d30ff568aa5020d4017034906be2b38ead7ebb35b7dc8d47299 unifont-12.1.02.tar.gz" diff --git a/user/wireguard-module-power8-64k/APKBUILD b/user/wireguard-module-power8-64k/APKBUILD index ed1fa1ba3..487d722c0 100644 --- a/user/wireguard-module-power8-64k/APKBUILD +++ b/user/wireguard-module-power8-64k/APKBUILD @@ -3,7 +3,7 @@ # KEEP THIS IN SYNC with the other wireguard-module packages. _kflavour="-power8-64k" _kver="4.14.88-mc13" -pkgver=0.0.20190406 +pkgver=0.0.20190601 pkgrel=0 _pkgname="wireguard-module$_kflavour" pkgname="$_pkgname-$_kver" @@ -29,4 +29,4 @@ package() { make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install } -sha512sums="e3035030299f5a6ae3ac0c2e35dc2d54745cda8f31185b21c6590f1ddcc9c7a83bf7b71cc71f6d48ed6dc8f2b31f3c704f8fa85685d4113f4c560f7eba7b7d5e WireGuard-0.0.20190406.tar.xz" +sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3 WireGuard-0.0.20190601.tar.xz" diff --git a/user/wireguard-module-power8/APKBUILD b/user/wireguard-module-power8/APKBUILD index 260d22029..da2e52d80 100644 --- a/user/wireguard-module-power8/APKBUILD +++ b/user/wireguard-module-power8/APKBUILD @@ -3,7 +3,7 @@ # KEEP THIS IN SYNC with the other wireguard-module packages. _kflavour="-power8" _kver="4.14.88-mc13" -pkgver=0.0.20190406 +pkgver=0.0.20190601 pkgrel=0 _pkgname="wireguard-module$_kflavour" pkgname="$_pkgname-$_kver" @@ -29,4 +29,4 @@ package() { make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install } -sha512sums="e3035030299f5a6ae3ac0c2e35dc2d54745cda8f31185b21c6590f1ddcc9c7a83bf7b71cc71f6d48ed6dc8f2b31f3c704f8fa85685d4113f4c560f7eba7b7d5e WireGuard-0.0.20190406.tar.xz" +sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3 WireGuard-0.0.20190601.tar.xz" diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD index 4bb25ae3e..cb3bfaf98 100644 --- a/user/wireguard-module/APKBUILD +++ b/user/wireguard-module/APKBUILD @@ -3,7 +3,7 @@ # KEEP THIS IN SYNC with the other wireguard-module packages. _kflavour="" _kver="4.14.88-mc13" -pkgver=0.0.20190406 +pkgver=0.0.20190601 pkgrel=0 _pkgname="wireguard-module$_kflavour" pkgname="$_pkgname-$_kver" @@ -29,4 +29,4 @@ package() { make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install } -sha512sums="e3035030299f5a6ae3ac0c2e35dc2d54745cda8f31185b21c6590f1ddcc9c7a83bf7b71cc71f6d48ed6dc8f2b31f3c704f8fa85685d4113f4c560f7eba7b7d5e WireGuard-0.0.20190406.tar.xz" +sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3 WireGuard-0.0.20190601.tar.xz" diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD index 493da9d37..2ae8d845b 100644 --- a/user/wireguard-tools/APKBUILD +++ b/user/wireguard-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=wireguard-tools _pkgreal=WireGuard -pkgver=0.0.20190406 +pkgver=0.0.20190601 pkgrel=0 pkgdesc="Userland tools for the WireGuard VPN" url="https://www.wireguard.com/" @@ -43,4 +43,4 @@ _patch() { } -sha512sums="e3035030299f5a6ae3ac0c2e35dc2d54745cda8f31185b21c6590f1ddcc9c7a83bf7b71cc71f6d48ed6dc8f2b31f3c704f8fa85685d4113f4c560f7eba7b7d5e WireGuard-0.0.20190406.tar.xz" +sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3 WireGuard-0.0.20190601.tar.xz" diff --git a/user/wireless-regdb/APKBUILD b/user/wireless-regdb/APKBUILD index 678ec0bdd..610629eb5 100644 --- a/user/wireless-regdb/APKBUILD +++ b/user/wireless-regdb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=wireless-regdb -pkgver=2019.03.01 +pkgver=2019.06.03 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="f0b94e1f661d86f4fcd39384588e10d7353ad085563ddc40a98446b416ce0d7bd0cbe34f1d9620ac45a33f16b7bfe58419da915061942cd5f51d5a3bf9809d72 wireless-regdb-2019.03.01.tar.xz" +sha512sums="73209ca28c59d6760349ffb713f550300e80db1592bae52b6d252ac9401fa2bb2ace7e6c30cf55df7541da9cef4c8587f3790f7aa34529552468e4b63a3d8fdb wireless-regdb-2019.06.03.tar.xz" diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD index 575436450..92a917018 100644 --- a/user/xfce4-appfinder/APKBUILD +++ b/user/xfce4-appfinder/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-appfinder -pkgver=4.13.2 +pkgver=4.13.3 pkgrel=0 pkgdesc="An application finder for the XFCE desktop environment" url="https://xfce.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="96ac782c785649ddf75f8659f9cf10f42c37bab647824f0c76714baca0b61904fa8ba6d23dc1574aae5fdf2538201936d26b42ea6c0f5d5f0f9d71c8ba0a51b8 xfce4-appfinder-4.13.2.tar.bz2" +sha512sums="47f69e8daf6f963b8130c0380f2201cdb2d02212cfb8b5c05fedbebb78222d3bd35db0fd422418cf3f9d1f2b90e66ee4d143bed57881f5673aefca8bc58e059a xfce4-appfinder-4.13.3.tar.bz2" diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD index 4e70ac9d3..9594fc9a8 100644 --- a/user/xfce4-panel/APKBUILD +++ b/user/xfce4-panel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-panel -pkgver=4.13.4 +pkgver=4.13.5 pkgrel=0 pkgdesc="Panel for the XFCE desktop environment" url="https://xfce.org" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="16a3680aa2ab7fa357ca9d477ea0e41ca159a2c626fe65454ccdca339bb501ff0979264f5a4ae4728e3c0efe24e193eb28e7b5d1e003fecad8ab36b8457203c8 xfce4-panel-4.13.4.tar.bz2" +sha512sums="3eb4034bd6eae38f8f533b8cd2cae4ec8b40cab5f0d6810639baad641b4adaf15d03254ec79cd49d04e3498d3a4752bd9e968a0383468e7337106b3665092c4e xfce4-panel-4.13.5.tar.bz2" diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD index dc6232180..dd6dab858 100644 --- a/user/xfce4-power-manager/APKBUILD +++ b/user/xfce4-power-manager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-power-manager -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=0 pkgdesc="Power management support for the XFCE desktop environment" url="https://xfce.org" @@ -12,7 +12,6 @@ makedepends="intltool gtk+3.0-dev libxfce4ui-dev libice-dev libnotify-dev subpackages="$pkgname-doc $pkgname-lang" langdir="/usr/lib/locale" source="http://archive.xfce.org/src/xfce/xfce4-power-manager/1.6/xfce4-power-manager-$pkgver.tar.bz2" -sha512sums="b81ce1b35892a6cd0b1d4fb590ccc25b906cde6f782de2fffbe78ea89e00df15e51ea1f47576c173b7512cd617f5142868fca8cf81519b6fe165a5ecc67a5478 xfce4-power-manager-1.6.1.tar.bz2" build() { cd "$builddir" @@ -36,3 +35,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="d1c475ad3cf194c19a2ad1decc4c80a9f504d74b64dec71887c14c576cd5a2932799cd0068f6356a15590fa67c6d0434401ad36b7a2fa6a3b62d51290cd7b68c xfce4-power-manager-1.6.2.tar.bz2" diff --git a/user/xfce4-session/APKBUILD b/user/xfce4-session/APKBUILD index 52b1ac232..5b431f963 100644 --- a/user/xfce4-session/APKBUILD +++ b/user/xfce4-session/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-session -pkgver=4.13.1 -pkgrel=2 +pkgver=4.13.2 +pkgrel=0 pkgdesc="Session management for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5845e3591919e23ca176199e81075a097ef9d65cbcf23b34d84afc649a307bfa8c6492e3a01855cacff9328da809725213ec1fa9d76024c0a0c25cce3c51da1b xfce4-session-4.13.1.tar.bz2" +sha512sums="cb1e63a3df9c4ac3efcb0cce20cb5528f9d1a46731ad4b32634ad5f4a53711f05b40d98464bfd562b4e3d42b2555827ece03e63c6a433e879fa0f0a4ccda6a57 xfce4-session-4.13.2.tar.bz2" diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD index 4b894e6ee..7fc818d88 100644 --- a/user/xfce4-settings/APKBUILD +++ b/user/xfce4-settings/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-settings -pkgver=4.13.5 +pkgver=4.13.6 pkgrel=0 pkgdesc="GUI settings application for the XFCE desktop environment" url="https://xfce.org" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5e7b13b25767091ab0b1a5683359f33e4a86151dd9321681fc4d896fcd9cc569effaebfbab70bc734e07041e9fbb1c3015f9a177146de8a128c4a539462dba5e xfce4-settings-4.13.5.tar.bz2" +sha512sums="7fe4655a5644dec8688eebc508e23bace7af76c6b8eeb3821fa9a4ec79862cde64cf59ee2ac70a27ff378ef887ce6d109ef1b1d9e5f7e98f96fdb43604e024b6 xfce4-settings-4.13.6.tar.bz2" diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index 09144df61..74dd12c7d 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfconf -pkgver=4.13.6 +pkgver=4.13.7 pkgrel=0 pkgdesc="Configuration framework for the XFCE desktop environment" url="https://xfce.org" @@ -43,4 +43,4 @@ perl() { mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib } -sha512sums="0eaa1ad428be5bea97b891a6bf0488293064e31d4869b70389ded940a23f9d8cffd0801dd98932658a67e57d6a0da95998872202cf7756aa24caa8f9d2c5f755 xfconf-4.13.6.tar.bz2" +sha512sums="113fb22b449a318b0cca6521914eda6cfeb6b2056a1aad4d49a5e83c28661c843c9912bbf7eddb7d6cd1f172b532c73dd02259bf6fabe60a377024f9f8d5825d xfconf-4.13.7.tar.bz2" diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD index 75dcffed9..920f041d3 100644 --- a/user/xfdesktop/APKBUILD +++ b/user/xfdesktop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfdesktop -pkgver=4.13.3 +pkgver=4.13.4 pkgrel=0 pkgdesc="Desktop manager for the XFCE desktop environment" url="https://xfce.org" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5d828ad653b46ab1edc8300335321bab48e0ad2be1ae02944eff553375a6059513aeb363c73aaec1a6958dd3f1c873920287ad911cfe7b8096b447f1b8165ce3 xfdesktop-4.13.3.tar.bz2" +sha512sums="3943fc2af3ca3996a38900fea4a03004e1d3f8728a8517c988bd59744607ed8e4ba3f135d6075833af206df3c35464633f47e374c26fcbb8a20f0f1ecfdb7da6 xfdesktop-4.13.4.tar.bz2" diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index d560fff66..130fc60d9 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfwm4 -pkgver=4.13.1 -pkgrel=1 +pkgver=4.13.2 +pkgrel=0 pkgdesc="Window manager for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -11,8 +11,7 @@ makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev gobject-introspection-dev vala-dev" subpackages="$pkgname-lang" langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-$pkgver.tar.bz2 - fix-mask-length.patch" +source="http://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-$pkgver.tar.bz2" build() { cd "$builddir" @@ -36,5 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320 xfwm4-4.13.1.tar.bz2 -88733a4d69b58b0c98f2f46694ccc8bda4e5bc1b565d952123cee466b3f89f95d72fc28c8e9c173dcc0aee606c9f4b085d891004d769b74ad0c7084d8dec00a9 fix-mask-length.patch" +sha512sums="85440a377cd7034e986b317e35c25ac6d4723bd4c1ce1e6951d8545a44f3c47340952fd0211f55cf19411539be6d86f4c34fca7b2219b0873654a6d311c95055 xfwm4-4.13.2.tar.bz2" diff --git a/user/xfwm4/fix-mask-length.patch b/user/xfwm4/fix-mask-length.patch deleted file mode 100644 index dd050c8dc..000000000 --- a/user/xfwm4/fix-mask-length.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru xfwm4-4.13.1.orig/src/device.c xfwm4-4.13.1/src/device.c ---- xfwm4-4.13.1.orig/src/device.c 2018-07-29 16:08:54.000000000 +0300 -+++ xfwm4-4.13.1/src/device.c 2018-09-12 08:49:18.130254993 +0300 -@@ -301,7 +301,7 @@ - guint i; - - xievent_mask->deviceid = XIAllMasterDevices; -- xievent_mask->mask_len = sizeof (mask); -+ xievent_mask->mask_len = len; - xievent_mask->mask = mask; - - for (i = 0; i < G_N_ELEMENTS (core_to_xi2); i++) diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 3c8e5f5b4..859f3ea61 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xterm -pkgver=344 +pkgver=346 pkgrel=0 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" @@ -45,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="872f69e13ad8e26de355f7611dabc7a66e2f6b00313b440b8054cc4fa0fbde936dd8d54ec09c892e8760080acaccbd8b7e72cdcbebb291dd92e01593eb14e91a xterm-344.tgz +sha512sums="ef0db8132a88b8bd980343007a61ca3c4c1b7ece23ef8e72245a17fa8305fa4dfed9cdf0613d8daf60da53fb8b03d41acd22aee04f2d51aeffb4a340268f51f7 xterm-346.tgz e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch" |