diff options
267 files changed, 2263 insertions, 1582 deletions
diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD index 79d5a0c4d..d74b12cf5 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.1.0 +pkgver=2.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="d117c0433b08d7bf4986ff49a39b6cbd1048399e74a3781ba48b27008d18c1cedfaca79c1d0510919b194bc593699ba99a736c377815cb3659cec772b45b1cd1 bc-2.1.0.tar.xz" +sha512sums="976ef9ba4251ee78f927ee0fa2b5e65b8186d4cbe22f5210b03b79606f52263a731dbcf5380ca0e79b681c98f67f886fb9e773b57cd5f065549af3df174766e2 bc-2.1.3.tar.xz" diff --git a/system/binutils/APKBUILD b/system/binutils/APKBUILD index 8304e5c7d..682f2e93c 100644 --- a/system/binutils/APKBUILD +++ b/system/binutils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> pkgname=binutils pkgver=2.32 -pkgrel=3 +pkgrel=4 pkgdesc="Tools necessary to build programs" url="https://www.gnu.org/software/binutils/" depends="" @@ -15,6 +15,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" # non-PIC is unsupported by musl/ppc [ "${CARCH}" != "ppc" ] || options='!check' source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz + arm-pie.patch binutils-ld-fix-static-linking.patch disable-gnu-mbind.patch disable-ifunc-tests.patch @@ -140,6 +141,7 @@ libs() { } sha512sums="d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz +2f862c473b357effe63221a47c4a34893eff50e4ab3c7b500b19754f3c7bf81ee695c35e5ce16f6c6fcd75696d270d04f282ae4c7d32b42a61b667ff1eccce8f arm-pie.patch ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch d378fdf1964f8f2bd0b1e62827ac5884bdf943aa435ec89c29fc84bb045d406b733fffaff8fdd8bd1cba8ddea7701c4cf6ccf3ed76a8a3df9c72b447737575a6 disable-gnu-mbind.patch 474ab24097bbb5b24433620549e5234fe65c547824c1342f693c718ffbc81e2d968259cce2d650b55200dd1ec89da207ea2db10c551cd9941285c4600b4297b2 disable-ifunc-tests.patch diff --git a/system/binutils/arm-pie.patch b/system/binutils/arm-pie.patch new file mode 100644 index 000000000..f42477a04 --- /dev/null +++ b/system/binutils/arm-pie.patch @@ -0,0 +1,24 @@ +Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=25056 +Author: Rich Felker <dalias@libc.org> +Upstream-Status: reported + +--- binutils-2.32/bfd/elf32-arm.c.orig 2019-10-02 07:47:36.153918869 -0400 ++++ binutils-2.32/bfd/elf32-arm.c 2019-10-02 08:37:09.108263016 -0400 +@@ -11624,7 +11624,7 @@ + { + /* If we don't know the module number, create a relocation + for it. */ +- if (bfd_link_pic (info)) ++ if (bfd_link_dll (info)) + { + Elf_Internal_Rela outrel; + +@@ -11728,7 +11728,7 @@ + now, and emit any relocations. If both an IE GOT and a + GD GOT are necessary, we emit the GD first. */ + +- if ((bfd_link_pic (info) || indx != 0) ++ if ((bfd_link_dll (info) || indx != 0) + && (h == NULL + || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT + && !resolved_to_zero) diff --git a/system/e2fsprogs/APKBUILD b/system/e2fsprogs/APKBUILD index ba7869fe8..741de2e38 100644 --- a/system/e2fsprogs/APKBUILD +++ b/system/e2fsprogs/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=e2fsprogs -pkgver=1.45.3 -pkgrel=1 +pkgver=1.45.4 +pkgrel=0 pkgdesc="Standard ext2/3/4 filesystem utilities" url="http://e2fsprogs.sourceforge.net" arch="all" @@ -13,7 +13,6 @@ makedepends="$depends_dev linux-headers" subpackages="$pkgname-lang $pkgname-dev $pkgname-doc libcom_err $pkgname-libs" source="https://www.kernel.org/pub/linux/kernel/people/tytso/$pkgname/v$pkgver/$pkgname-$pkgver.tar.xz header-fix.patch - CVE-2019-5094.patch " # secfixes: @@ -59,6 +58,5 @@ libcom_err() { mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/ } -sha512sums="9f898d353af48a1d357cb01f64187b6dfef671bb2e0450438530fe4fa9454fccc6b755c9469d81e702e6d85a4defd02ae0a493897a4b3284cb112e8444c9bf52 e2fsprogs-1.45.3.tar.xz -34ca45c64a132bb4b507cd4ffb763c6d1b7979eccfed20f63417e514871b47639d32f2a3ecff090713c21a0f02ac503d5093960c80401d64081c592d01af279d header-fix.patch -f82cf01938eb150446a7014ba48d51578ace42aecd427e225a3640033a4d8f2ec5a29dd02a3c0dfa45d2140cb2187303397c2d0124a2f987304c25182cc9578a CVE-2019-5094.patch" +sha512sums="408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda e2fsprogs-1.45.4.tar.xz +34ca45c64a132bb4b507cd4ffb763c6d1b7979eccfed20f63417e514871b47639d32f2a3ecff090713c21a0f02ac503d5093960c80401d64081c592d01af279d header-fix.patch" diff --git a/system/e2fsprogs/CVE-2019-5094.patch b/system/e2fsprogs/CVE-2019-5094.patch deleted file mode 100644 index 21baf660a..000000000 --- a/system/e2fsprogs/CVE-2019-5094.patch +++ /dev/null @@ -1,211 +0,0 @@ -From 8dbe7b475ec5e91ed767239f0e85880f416fc384 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Sun, 1 Sep 2019 00:59:16 -0400 -Subject: libsupport: add checks to prevent buffer overrun bugs in quota code - -A maliciously corrupted file systems can trigger buffer overruns in -the quota code used by e2fsck. To fix this, add sanity checks to the -quota header fields as well as to block number references in the quota -tree. - -Addresses: CVE-2019-5094 -Addresses: TALOS-2019-0887 -Signed-off-by: Theodore Ts'o <tytso@mit.edu> ---- - lib/support/mkquota.c | 1 + - lib/support/quotaio_tree.c | 71 ++++++++++++++++++++++++++++++---------------- - lib/support/quotaio_v2.c | 28 ++++++++++++++++++ - 3 files changed, 76 insertions(+), 24 deletions(-) - -diff --git a/lib/support/mkquota.c b/lib/support/mkquota.c -index 0b9e7665..ddb53124 100644 ---- a/lib/support/mkquota.c -+++ b/lib/support/mkquota.c -@@ -671,6 +671,7 @@ errcode_t quota_compare_and_update(quota_ctx_t qctx, enum quota_type qtype, - err = qh.qh_ops->scan_dquots(&qh, scan_dquots_callback, &scan_data); - if (err) { - log_debug("Error scanning dquots"); -+ *usage_inconsistent = 1; - goto out_close_qh; - } - -diff --git a/lib/support/quotaio_tree.c b/lib/support/quotaio_tree.c -index a7c2028c..6cc4fb5b 100644 ---- a/lib/support/quotaio_tree.c -+++ b/lib/support/quotaio_tree.c -@@ -540,6 +540,17 @@ struct dquot *qtree_read_dquot(struct quota_handle *h, qid_t id) - return dquot; - } - -+static int check_reference(struct quota_handle *h, unsigned int blk) -+{ -+ if (blk >= h->qh_info.u.v2_mdqi.dqi_qtree.dqi_blocks) { -+ log_err("Illegal reference (%u >= %u) in %s quota file", -+ blk, h->qh_info.u.v2_mdqi.dqi_qtree.dqi_blocks, -+ quota_type2name(h->qh_type)); -+ return -1; -+ } -+ return 0; -+} -+ - /* - * Scan all dquots in file and call callback on each - */ -@@ -558,7 +569,7 @@ static int report_block(struct dquot *dquot, unsigned int blk, char *bitmap, - int entries, i; - - if (!buf) -- return 0; -+ return -1; - - set_bit(bitmap, blk); - read_blk(dquot->dq_h, blk, buf); -@@ -580,23 +591,12 @@ static int report_block(struct dquot *dquot, unsigned int blk, char *bitmap, - return entries; - } - --static void check_reference(struct quota_handle *h, unsigned int blk) --{ -- if (blk >= h->qh_info.u.v2_mdqi.dqi_qtree.dqi_blocks) -- log_err("Illegal reference (%u >= %u) in %s quota file. " -- "Quota file is probably corrupted.\n" -- "Please run e2fsck (8) to fix it.", -- blk, -- h->qh_info.u.v2_mdqi.dqi_qtree.dqi_blocks, -- quota_type2name(h->qh_type)); --} -- - static int report_tree(struct dquot *dquot, unsigned int blk, int depth, - char *bitmap, - int (*process_dquot) (struct dquot *, void *), - void *data) - { -- int entries = 0, i; -+ int entries = 0, ret, i; - dqbuf_t buf = getdqbuf(); - __le32 *ref = (__le32 *) buf; - -@@ -607,22 +607,40 @@ static int report_tree(struct dquot *dquot, unsigned int blk, int depth, - if (depth == QT_TREEDEPTH - 1) { - for (i = 0; i < QT_BLKSIZE >> 2; i++) { - blk = ext2fs_le32_to_cpu(ref[i]); -- check_reference(dquot->dq_h, blk); -- if (blk && !get_bit(bitmap, blk)) -- entries += report_block(dquot, blk, bitmap, -- process_dquot, data); -+ if (check_reference(dquot->dq_h, blk)) { -+ entries = -1; -+ goto errout; -+ } -+ if (blk && !get_bit(bitmap, blk)) { -+ ret = report_block(dquot, blk, bitmap, -+ process_dquot, data); -+ if (ret < 0) { -+ entries = ret; -+ goto errout; -+ } -+ entries += ret; -+ } - } - } else { - for (i = 0; i < QT_BLKSIZE >> 2; i++) { - blk = ext2fs_le32_to_cpu(ref[i]); - if (blk) { -- check_reference(dquot->dq_h, blk); -- entries += report_tree(dquot, blk, depth + 1, -- bitmap, process_dquot, -- data); -+ if (check_reference(dquot->dq_h, blk)) { -+ entries = -1; -+ goto errout; -+ } -+ ret = report_tree(dquot, blk, depth + 1, -+ bitmap, process_dquot, -+ data); -+ if (ret < 0) { -+ entries = ret; -+ goto errout; -+ } -+ entries += ret; - } - } - } -+errout: - freedqbuf(buf); - return entries; - } -@@ -642,6 +660,7 @@ int qtree_scan_dquots(struct quota_handle *h, - int (*process_dquot) (struct dquot *, void *), - void *data) - { -+ int ret; - char *bitmap; - struct v2_mem_dqinfo *v2info = &h->qh_info.u.v2_mdqi; - struct qtree_mem_dqinfo *info = &v2info->dqi_qtree; -@@ -655,10 +674,14 @@ int qtree_scan_dquots(struct quota_handle *h, - ext2fs_free_mem(&dquot); - return -1; - } -- v2info->dqi_used_entries = report_tree(dquot, QT_TREEOFF, 0, bitmap, -- process_dquot, data); -+ ret = report_tree(dquot, QT_TREEOFF, 0, bitmap, process_dquot, data); -+ if (ret < 0) -+ goto errout; -+ v2info->dqi_used_entries = ret; - v2info->dqi_data_blocks = find_set_bits(bitmap, info->dqi_blocks); -+ ret = 0; -+errout: - ext2fs_free_mem(&bitmap); - ext2fs_free_mem(&dquot); -- return 0; -+ return ret; - } -diff --git a/lib/support/quotaio_v2.c b/lib/support/quotaio_v2.c -index 38be2a34..73906676 100644 ---- a/lib/support/quotaio_v2.c -+++ b/lib/support/quotaio_v2.c -@@ -175,6 +175,8 @@ static int v2_check_file(struct quota_handle *h, int type, int fmt) - static int v2_init_io(struct quota_handle *h) - { - struct v2_disk_dqinfo ddqinfo; -+ struct v2_mem_dqinfo *info; -+ __u64 filesize; - - h->qh_info.u.v2_mdqi.dqi_qtree.dqi_entry_size = - sizeof(struct v2r1_disk_dqblk); -@@ -185,6 +187,32 @@ static int v2_init_io(struct quota_handle *h) - sizeof(ddqinfo)) != sizeof(ddqinfo)) - return -1; - v2_disk2memdqinfo(&h->qh_info, &ddqinfo); -+ -+ /* Check to make sure quota file info is sane */ -+ info = &h->qh_info.u.v2_mdqi; -+ if (ext2fs_file_get_lsize(h->qh_qf.e2_file, &filesize)) -+ return -1; -+ if ((filesize > (1U << 31)) || -+ (info->dqi_qtree.dqi_blocks > -+ (filesize + QT_BLKSIZE - 1) >> QT_BLKSIZE_BITS)) { -+ log_err("Quota inode %u corrupted: file size %llu; " -+ "dqi_blocks %u", h->qh_qf.ino, -+ filesize, info->dqi_qtree.dqi_blocks); -+ return -1; -+ } -+ if (info->dqi_qtree.dqi_free_blk >= info->dqi_qtree.dqi_blocks) { -+ log_err("Quota inode %u corrupted: free_blk %u; dqi_blocks %u", -+ h->qh_qf.ino, info->dqi_qtree.dqi_free_blk, -+ info->dqi_qtree.dqi_blocks); -+ return -1; -+ } -+ if (info->dqi_qtree.dqi_free_entry >= info->dqi_qtree.dqi_blocks) { -+ log_err("Quota inode %u corrupted: free_entry %u; " -+ "dqi_blocks %u", h->qh_qf.ino, -+ info->dqi_qtree.dqi_free_entry, -+ info->dqi_qtree.dqi_blocks); -+ return -1; -+ } - return 0; - } - --- -cgit 1.2-0.3.lf.el7 - diff --git a/system/expat/APKBUILD b/system/expat/APKBUILD index 4a6f547e3..cc412af83 100644 --- a/system/expat/APKBUILD +++ b/system/expat/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=expat -pkgver=2.2.7 -pkgrel=1 +pkgver=2.2.9 +pkgrel=0 pkgdesc="An XML Parser library written in C" url="https://libexpat.github.io/" arch="all" @@ -10,8 +10,7 @@ depends="" checkdepends="bash" makedepends="" subpackages="$pkgname-dev $pkgname-doc" -source="https://downloads.sourceforge.net/project/expat/expat/$pkgver/expat-$pkgver.tar.bz2 - CVE-2019-15903.patch" +source="https://downloads.sourceforge.net/project/expat/expat/$pkgver/expat-$pkgver.tar.bz2" # secfixes: # 2.2.1-r0: @@ -38,5 +37,4 @@ package() { make DESTDIR="$pkgdir/" install } -sha512sums="a078692317b44f14a9acdca4ddc04adac6a48d22ab321bba3e9e32c92131752aa397915d7121c4a95dc1b603d6a6128f7dce3741093d4322944787e0b49b4c00 expat-2.2.7.tar.bz2 -02d1719307dffdab98e90f242a77aa61cab79ae63ea28d6fa1219b4191d7247e5c319d3adf9781c9086e392c05fd6b6558051b0792ade5cb6c64e7583c67a70d CVE-2019-15903.patch" +sha512sums="8ea4b89a171dfda8267c8b7a0295516d169bf7f46587ebe460fe0ae7a31478a119ae2a7eaa09b3ce46b107ec7cd2274ea66d91c08b8a4ad6b98ba984cdd4e15b expat-2.2.9.tar.bz2" diff --git a/system/expat/CVE-2019-15903.patch b/system/expat/CVE-2019-15903.patch deleted file mode 100644 index c81e72bbb..000000000 --- a/system/expat/CVE-2019-15903.patch +++ /dev/null @@ -1,181 +0,0 @@ -Grabbed from Debian since upstream patch does not apply to 2.2.7. - -https://sources.debian.org/patches/expat/2.2.7-2/CVE-2019-15903_Deny_internal_entities_closing_the_doctype.patch/ -https://github.com/libexpat/libexpat/commit/c20b758c332d9a13afbbb276d30db1d183a85d43 - -From c20b758c332d9a13afbbb276d30db1d183a85d43 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 28 Aug 2019 00:24:59 +0200 -Subject: [PATCH 1/3] xmlparse.c: Deny internal entities closing the doctype - -diff --git a/lib/xmlparse.c b/lib/xmlparse.c -index 0553e3df..c29a6449 100644 ---- a/lib/xmlparse.c -+++ b/lib/xmlparse.c -@@ -405,7 +405,7 @@ initializeEncoding(XML_Parser parser); - static enum XML_Error - doProlog(XML_Parser parser, const ENCODING *enc, const char *s, - const char *end, int tok, const char *next, const char **nextPtr, -- XML_Bool haveMore); -+ XML_Bool haveMore, XML_Bool allowClosingDoctype); - static enum XML_Error - processInternalEntity(XML_Parser parser, ENTITY *entity, - XML_Bool betweenDecl); -@@ -4232,7 +4232,7 @@ externalParEntProcessor(XML_Parser parse - - parser->m_processor = prologProcessor; - return doProlog(parser, parser->m_encoding, s, end, tok, next, -- nextPtr, (XML_Bool)!parser->m_parsingStatus.finalBuffer); -+ nextPtr, (XML_Bool)!parser->m_parsingStatus.finalBuffer, XML_TRUE); - } - - static enum XML_Error PTRCALL -@@ -4282,7 +4282,7 @@ prologProcessor(XML_Parser parser, - const char *next = s; - int tok = XmlPrologTok(parser->m_encoding, s, end, &next); - return doProlog(parser, parser->m_encoding, s, end, tok, next, -- nextPtr, (XML_Bool)!parser->m_parsingStatus.finalBuffer); -+ nextPtr, (XML_Bool)!parser->m_parsingStatus.finalBuffer, XML_TRUE); - } - - static enum XML_Error -@@ -4293,7 +4293,8 @@ doProlog(XML_Parser parser, - int tok, - const char *next, - const char **nextPtr, -- XML_Bool haveMore) -+ XML_Bool haveMore, -+ XML_Bool allowClosingDoctype) - { - #ifdef XML_DTD - static const XML_Char externalSubsetName[] = { ASCII_HASH , '\0' }; -@@ -4472,6 +4473,11 @@ doProlog(XML_Parser parser, - } - break; - case XML_ROLE_DOCTYPE_CLOSE: -+ if (allowClosingDoctype != XML_TRUE) { -+ /* Must not close doctype from within expanded parameter entities */ -+ return XML_ERROR_INVALID_TOKEN; -+ } -+ - if (parser->m_doctypeName) { - parser->m_startDoctypeDeclHandler(parser->m_handlerArg, parser->m_doctypeName, - parser->m_doctypeSysid, parser->m_doctypePubid, 0); -@@ -5409,7 +5415,7 @@ processInternalEntity(XML_Parser parser, - if (entity->is_param) { - int tok = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next); - result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd, tok, -- next, &next, XML_FALSE); -+ next, &next, XML_FALSE, XML_FALSE); - } - else - #endif /* XML_DTD */ -@@ -5456,7 +5462,7 @@ internalEntityProcessor(XML_Parser parse - if (entity->is_param) { - int tok = XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next); - result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd, tok, -- next, &next, XML_FALSE); -+ next, &next, XML_FALSE, XML_TRUE); - } - else - #endif /* XML_DTD */ -@@ -5483,7 +5489,7 @@ internalEntityProcessor(XML_Parser parse - parser->m_processor = prologProcessor; - tok = XmlPrologTok(parser->m_encoding, s, end, &next); - return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr, -- (XML_Bool)!parser->m_parsingStatus.finalBuffer); -+ (XML_Bool)!parser->m_parsingStatus.finalBuffer, XML_TRUE); - } - else - #endif /* XML_DTD */ - -From 438493691f1b8620a71d5aee658fe160103ff863 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 28 Aug 2019 15:14:19 +0200 -Subject: [PATCH 3/3] tests: Cover denying internal entities closing the - doctype - -diff --git a/tests/runtests.c b/tests/runtests.c -index b0d1b0af..e102a55e 100644 ---- a/tests/runtests.c -+++ b/tests/runtests.c -@@ -8151,6 +8151,68 @@ START_TEST(test_misc_utf16le) - } - END_TEST - -+#ifdef XML_DTD -+START_TEST(test_misc_deny_internal_entity_closing_doctype_issue_317) { -+ const char *const inputOne = "<!DOCTYPE d [\n" -+ "<!ENTITY % e ']><d/>'>\n" -+ "\n" -+ "%e;"; -+ const char *const inputTwo = "<!DOCTYPE d [\n" -+ "<!ENTITY % e1 ']><d/>'><!ENTITY % e2 '&e1;'>\n" -+ "\n" -+ "%e2;"; -+ const char *const inputThree = "<!DOCTYPE d [\n" -+ "<!ENTITY % e ']><d'>\n" -+ "\n" -+ "%e;"; -+ const char *const inputIssue317 = "<!DOCTYPE doc [\n" -+ "<!ENTITY % foo ']>\n" -+ "<doc>Hell<oc (#PCDATA)*>'>\n" -+ "%foo;\n" -+ "]>\n" -+ "<doc>Hello, world</dVc>"; -+ -+ const char *const inputs[] = {inputOne, inputTwo, inputThree, inputIssue317}; -+ size_t inputIndex = 0; -+ -+ for (; inputIndex < sizeof(inputs) / sizeof(inputs[0]); inputIndex++) { -+ XML_Parser parser; -+ enum XML_Status parseResult; -+ int setParamEntityResult; -+ XML_Size lineNumber; -+ XML_Size columnNumber; -+ const char *const input = inputs[inputIndex]; -+ -+ parser = XML_ParserCreate(NULL); -+ setParamEntityResult -+ = XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS); -+ if (setParamEntityResult != 1) -+ fail("Failed to set XML_PARAM_ENTITY_PARSING_ALWAYS."); -+ -+ parseResult = XML_Parse(parser, input, (int)strlen(input), 0); -+ if (parseResult != XML_STATUS_ERROR) { -+ parseResult = XML_Parse(parser, "", 0, 1); -+ if (parseResult != XML_STATUS_ERROR) { -+ fail("Parsing was expected to fail but succeeded."); -+ } -+ } -+ -+ if (XML_GetErrorCode(parser) != XML_ERROR_INVALID_TOKEN) -+ fail("Error code does not match XML_ERROR_INVALID_TOKEN"); -+ -+ lineNumber = XML_GetCurrentLineNumber(parser); -+ if (lineNumber != 4) -+ fail("XML_GetCurrentLineNumber does not work as expected."); -+ -+ columnNumber = XML_GetCurrentColumnNumber(parser); -+ if (columnNumber != 0) -+ fail("XML_GetCurrentColumnNumber does not work as expected."); -+ -+ XML_ParserFree(parser); -+ } -+} -+END_TEST -+#endif - - static void - alloc_setup(void) -@@ -12251,6 +12313,10 @@ make_suite(void) - tcase_add_test(tc_misc, test_misc_features); - tcase_add_test(tc_misc, test_misc_attribute_leak); - tcase_add_test(tc_misc, test_misc_utf16le); -+#ifdef XML_DTD -+ tcase_add_test(tc_misc, -+ test_misc_deny_internal_entity_closing_doctype_issue_317); -+#endif - - suite_add_tcase(s, tc_alloc); - tcase_add_checked_fixture(tc_alloc, alloc_setup, alloc_teardown); diff --git a/system/gdb/APKBUILD b/system/gdb/APKBUILD index 71030a769..c6a4883f0 100644 --- a/system/gdb/APKBUILD +++ b/system/gdb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gdb -pkgver=8.3 +pkgver=8.3.1 pkgrel=0 pkgdesc="The GNU Debugger" url="https://www.sourceware.org/gdb/" @@ -21,7 +21,6 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz " build() { - cd "$builddir" local _config=" --build=$CBUILD --host=$CHOST @@ -40,19 +39,21 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install # resolve conflict with binutils-doc rm -f "$pkgdir"/usr/share/info/bfd.info rm -f "$pkgdir"/usr/share/info/dir + # resolve conflict with binutils-lang + rm -f "$pkgdir"/usr/share/locale/*/LC_MESSAGES/bfd.mo + # those are provided by binutils rm -rf "$pkgdir"/usr/include rm -rf "$pkgdir"/usr/lib } -sha512sums="47ac074d20a09a3fac8f4a41dce0a0cbe6ef702f7dc21ba8b7d650d306128dcae481e9a16bf65e596b3a541dc82ae57c02bcbb786d551b4ef3e2917b9b6f0ae1 gdb-8.3.tar.xz +sha512sums="9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a gdb-8.3.1.tar.xz 986e68275f7692f39b5d8aedeb9f9e88f0e5bebb3f8c7f104933c525d35ca54fc90e18698c1e3e1009e8a188e5e70d6f252cb39e4c75e37db7bf479017e0da32 s390x-use-elf-gdb_fpregset_t.patch 04911f87904b62dd7662435f9182b20485afb29ddb3d6398a9d31fef13495f7b70639c77fdae3a40e2775e270d7cd40d0cfd7ddf832372b506808d33c8301e01 ppc-musl.patch b75e1c1ee503a1948a7d5b8d90427b5c7d38ded69978056cee0adca222771a5c95ed1ac73127fcae7b795ea94296344eee5fca47e4cd04b418c164a756fb0933 ppc-ptregs.patch diff --git a/system/iproute2/APKBUILD b/system/iproute2/APKBUILD index 8c7c1a64b..287dfb603 100644 --- a/system/iproute2/APKBUILD +++ b/system/iproute2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iproute2 -pkgver=5.2.0 -pkgrel=1 +pkgver=5.3.0 +pkgrel=0 pkgdesc="IP configuration, routing, and traffic control utilities" url="https://wiki.linuxfoundation.org/networking/iproute2" arch="all" @@ -55,4 +55,4 @@ bashcomp() { rmdir -p "$pkgdir"/usr/share 2>/dev/null || true } -sha512sums="82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1 iproute2-5.2.0.tar.xz" +sha512sums="c20ce477cb3ec24194ea56d3d9037795e26975ffde188b63ba974a0aa671dd169f356e9446bf43dc56523e01c0bafa442b91d83da9b2302daee18e237f2f3157 iproute2-5.3.0.tar.xz" diff --git a/system/libcap-ng/APKBUILD b/system/libcap-ng/APKBUILD index 5bf8dc29d..a31545601 100644 --- a/system/libcap-ng/APKBUILD +++ b/system/libcap-ng/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libcap-ng -pkgver=0.7.9 +pkgver=0.7.10 pkgrel=0 pkgdesc="POSIX capabilities library" url="https://people.redhat.com/sgrubb/libcap-ng/index.html" @@ -15,7 +15,6 @@ source="https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$pkgver.tar.gz " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -44,5 +41,5 @@ utils() { mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ } -sha512sums="095edabaf76a943aab0645b843b14e20b1733ba1d47a8e34d82f6586ca9a1512ba2677d232b13dd3900b913837401bb58bf74481970e967ba19041959dc43259 libcap-ng-0.7.9.tar.gz +sha512sums="1b93c7f5c20ae5cc705fe5244af3e299454e988388cda95f006e248d97c0713e77da2a81c67ecf15755f3958df373fc6d1ca14197d6357ab1f2d8c3a0fd12def libcap-ng-0.7.10.tar.gz 8de98ce0fae63812cf7fd17e788343798b0cab63ba029f046ac9b89b2305da17432bafdd3dfa36046fc2cc0a453e0c889f6744c632f4617e0e5fc08e2823e324 fix-includes.patch" diff --git a/system/mawk/APKBUILD b/system/mawk/APKBUILD index 8f2cd7faf..9c84905f8 100644 --- a/system/mawk/APKBUILD +++ b/system/mawk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mawk -pkgver=1.3.4.20171017 +pkgver=1.3.4.20190203 pkgrel=0 pkgdesc="Pattern scanning and text processing language" url="https://invisible-island.net/mawk/mawk.html" @@ -13,7 +13,6 @@ source="https://invisible-mirror.net/archives/$pkgname/$pkgname-$_dlver.tgz" builddir="$srcdir/$pkgname-$_dlver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,14 +24,12 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install ln -s mawk "$pkgdir"/usr/bin/awk } check() { - cd "$builddir" make check } -sha512sums="4ed6ca0ecca12e7409d3d364b72dc6a2b411c61bf53fe8aa0b0cac65a3bdb941921c0b81d94f34c8ac9f4922c8c7566d347b5e6b5c74518ae3a88904f9e20f27 mawk-1.3.4-20171017.tgz" +sha512sums="64d5b1838d34d30e32966f46cb7457c865caccfe9fe1049d2645ba301b1ddb4efc18588115dbcf96234a2a0b791211a7f82264a3c81899459dc3029e65837646 mawk-1.3.4-20190203.tgz" diff --git a/system/nspr/APKBUILD b/system/nspr/APKBUILD index 9700b0491..667e2d189 100644 --- a/system/nspr/APKBUILD +++ b/system/nspr/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nspr -pkgver=4.21 +pkgver=4.22 pkgrel=0 pkgdesc="Netscape Portable Runtime" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" @@ -60,6 +60,6 @@ package() { "$pkgdir"/usr/include/nspr/md } -sha512sums="4f152c6ca32d9dd4cf3d92b4b54f249ac1fa39047811f7c0c7a67bdc73173cf7de0dce36dc278ad781189ea2fdc71fa70e044597676a8b1f5e6d664907e5ab7c nspr-4.21.tar.gz +sha512sums="d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b nspr-4.22.tar.gz ee654f609a90b9a95c1901ad1d56cdef7cce8bca9efc092198607944f142f8fec924b13219ca6663facd0f0d59b671b8b3de58ab3449c4c863d42e2937f02184 fix-getproto.patch 1f694fc151f6578080449e3aa999c520486bbe117b8237150966ec43092db4156e81412ac889045e0c0c3bf65d459af5bdc1cf19c9fa3dab120405a60732f15a stacksize.patch" diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD index 20aea14c3..7f3cc141d 100644 --- a/system/nss/APKBUILD +++ b/system/nss/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nss -pkgver=3.45 +pkgver=3.46.1 _ver=$(printf '%s' "$pkgver" | tr . _) pkgrel=0 pkgdesc="Mozilla Network Security Services" @@ -147,7 +147,7 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="33360a1bb4e0a0a974070c354ee82c515d5cfa2a12c9c96817a9fdb3e4ca1ad62eb95886b9b0d60e2f69efda964376d0671c1e3c920b2ea614aeecb719c6ff29 nss-3.45.tar.gz +sha512sums="f4c24f0e31d11413cbbf791a24687c02cd934b9baf4a3e9ce27406638a1d497654fbeec79c22ab4ad29374dd0063c05104c9514580b1b8156ed8d18404e1681b nss-3.46.1.tar.gz 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in 0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09 nss-util.pc.in 09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15 nss-softokn.pc.in diff --git a/system/perl-error/APKBUILD b/system/perl-error/APKBUILD index 5fe1529d4..b859d15eb 100644 --- a/system/perl-error/APKBUILD +++ b/system/perl-error/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-error _realname=Error -pkgver=0.17027 +pkgver=0.17028 pkgrel=0 pkgdesc="Perl module error/exception handling in an OO-ish way" url="https://metacpan.org/release/Error" @@ -37,4 +37,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="f7a649254bd2a5228a0baaa7bb286872dcbcf373134446176ff63a5ec0159e7472e0ea930aaff78f7f7961f797ae0a8e5c8725bdc06d2bab177ce469a4ede4b9 Error-0.17027.tar.gz" +sha512sums="bba62e9cac092f53e7606d7673a6cbf4e2684eefd7a44e17859071e6a2dfb45ea471279443b287e1b40dfb89ce351d17d92151d91d6ad59a7737a32e472c58fc Error-0.17028.tar.gz" diff --git a/system/perl-http-daemon/APKBUILD b/system/perl-http-daemon/APKBUILD index c4c86414d..a0fc81ce5 100644 --- a/system/perl-http-daemon/APKBUILD +++ b/system/perl-http-daemon/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-http-daemon -pkgver=6.05 -_author=E -_author2=${_author}T -_author3=${_author2}HER +pkgver=6.06 +_author=O +_author2=${_author}A +_author3=${_author2}LDERS pkgrel=0 pkgdesc="HTTP::Daemon perl module" url="https://metacpan.org/release/HTTP-Daemon" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="26a5dd4f215b7d3c488c414101e975db0b8f38f11c983312d3c1d89f22e9c80895d6ae3f60fd4b00b6cbea5814992ad705237848cf2c9eab40eb82cd0109b32d HTTP-Daemon-6.05.tar.gz" +sha512sums="8e6dcf4451aaa6bd5f38508a087e5bb9b7f5105e8e243d09bdd3f4be3d7009222b3d9f8e494f049b48f0caebf36f239b8bbc7b8edc805f7d32b1bbeb38431732 HTTP-Daemon-6.06.tar.gz" diff --git a/system/perl-test-simple/APKBUILD b/system/perl-test-simple/APKBUILD index 00702bc44..8eaaecffa 100644 --- a/system/perl-test-simple/APKBUILD +++ b/system/perl-test-simple/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-simple _pkgreal=Test-Simple -pkgver=1.302166 +pkgver=1.302168 pkgrel=0 pkgdesc="Basic utilities for writing Perl tests" url="https://metacpan.org/release/Test-Simple" @@ -29,4 +29,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="7bf1759d265f1c9dec01cf42baf0359926e1bb955ebe93b9c9f3d918932cdc39cabd07e18fa2e899540ae5495d7be5b21877cc74805e911db9a9abaf154cefd5 Test-Simple-1.302166.tar.gz" +sha512sums="4c3b7e4e157b62a0d0939464486090d31d79dcc9c84c010bd2917b8fb7436546fe26b812490f140eb6a149fb465a5a027fb101395e519b476918ff0af0715568 Test-Simple-1.302168.tar.gz" diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD index e608e4637..537c1010a 100644 --- a/system/ruby/APKBUILD +++ b/system/ruby/APKBUILD @@ -31,11 +31,18 @@ # - CVE-2019-8323 # - CVE-2019-8324 # - CVE-2019-8325 +# 2.5.7-r0: +# - CVE-2012-6708 +# - CVE-2015-9251 +# - CVE-2019-15845 +# - CVE-2019-16201 +# - CVE-2019-16254 +# - CVE-2019-16255 # pkgname=ruby -pkgver=2.5.5 +pkgver=2.5.7 _abiver="${pkgver%.*}.0" -pkgrel=2 +pkgrel=0 pkgdesc="An object-oriented language for quick and easy programming" url="https://www.ruby-lang.org/" arch="all" @@ -307,7 +314,7 @@ _mvgem() { done } -sha512sums="06b1d58536ebfacb7b56c1e6ed4b8ab816fadc4f48c845a452554cd262e7908199a30e5793f3cbaec2db56a8803aa5c6089abf7bf06c8fc47867e97870b7dfec ruby-2.5.5.tar.xz +sha512sums="63b7c75fab44cd1bd22f22ddec00c740cf379ac7240da0dfafcec54347766695faef47428ce1c433fd77fa96992e976c984697067fa526236d383b12adc9ce75 ruby-2.5.7.tar.xz 20e7e5ee9936a93872fe1ad836dd1fde001fe4a0e7ed54c26727ad83da3ceb0e6247681d9dd4f98a69e1b0250703ed8fc682d44075780d5f47faa1d5f58d2bdb rubygems-avoid-platform-specific-gems.patch 814fe6359505b70d8ff680adf22f20a74b4dbd3fecc9a63a6c2456ee9824257815929917b6df5394ed069a6869511b8c6dce5b95b4acbbb7867c1f3a975a0150 test_insns-lower-recursion-depth.patch e99b36940fa8fdd445d82738c70b8fc042cab042a4662cab156578aad2dac9673a96da22b6676aa36beac08070e92a7798c60d6f36eeb169216c4c51864ce2fe fix-get_main_stack.patch diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD index 040754adc..1c6bcc854 100644 --- a/system/strace/APKBUILD +++ b/system/strace/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=strace -pkgver=5.2 +pkgver=5.3 pkgrel=0 pkgdesc="A useful diagnositic, instructional, and debugging tool" url="https://strace.io/" @@ -51,6 +51,6 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35 strace-5.2.tar.xz +sha512sums="02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a strace-5.3.tar.xz 64bcd5a335d8117bf6d6eb1e47b47ef5d3df5bdc6e4c52379e0e8b099fd06e5d4fa362b3b88fbacec350783f65de589f2fb562d9df04e2895c8a74c8198e6cea fix-ppc-pt-regs-collision.patch 6616161b6e015c5e56b7171995d28ab63a865156b7f9826b4be26beaac863f0ebc341014910ea53157a810c6afafc10ce80b2d31f4d649d28718a9be78795c6c nlattr-fix.patch" diff --git a/system/tzdata/APKBUILD b/system/tzdata/APKBUILD index dc641bde4..cdcbdbc26 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=2019b -_tzcodever=2019b +pkgver=2019c +_tzcodever=2019c _ptzver=0.5 pkgrel=0 pkgdesc="Time zone data" @@ -54,7 +54,7 @@ package() { "$pkgdir"/usr/bin/posixtz } -sha512sums="bcfb417fe3b7c39e702da0090291db0489744f733010ae183007fce5e441bfce885fb25ed11730cf7f363572e107d7ff0c4b38691bb99def2d8cf7017c05720f tzcode2019b.tar.gz -c0104078d994e501d80a41bea31364b1390a75c2fbf42968a8343a090e2ac2eddbc58770ca470b192ea19dec89fcc634141a1de703ea2ffa0325176a64afe1fc tzdata2019b.tar.gz +sha512sums="61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b tzcode2019c.tar.gz +2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565 tzdata2019c.tar.gz 68dbaab9f4aef166ac2f2d40b49366527b840bebe17a47599fe38345835e4adb8a767910745ece9c384b57af815a871243c3e261a29f41d71f8054df3061b3fd posixtz-0.5.tar.xz f54ce213d74c5a8387e1a7c56299bc6eee65a035772288222128abc249a112067b8791b88b45c342b2d4d8d12e9e4f1f2f5c92c5de67f8b6413b1ebf1d7de467 0001-posixtz-fix-up-lseek.patch" diff --git a/system/xfsprogs/APKBUILD b/system/xfsprogs/APKBUILD index 52ae967b5..868e90131 100644 --- a/system/xfsprogs/APKBUILD +++ b/system/xfsprogs/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xfsprogs -pkgver=5.2.0 -pkgrel=1 +pkgver=5.2.1 +pkgrel=0 pkgdesc="XFS filesystem utilities" url="http://xfs.org/index.php/Main_Page" arch="all" @@ -48,6 +48,6 @@ base() { mv "$subpkgdir"/sbin/xfs_scrub "$pkgdir"/sbin/ } -sha512sums="ddc01a3aca3d84a2bb848a3954b1704056d0fc3fb302981bf67208e0435cf3887f44eefcdb40460b576fbe6cfb26a48ad6f032092829b3a2bb1ca4fae9fcc5f4 xfsprogs-5.2.0.tar.gz +sha512sums="4bf598b811dddae8dfc7e7086a157a53667602c80a34b0d037f94d3d8e35ad7172ac0b89ba83118a3bfa85d1127982cdb08fb3e30f38b63e3f124d19267d6532 xfsprogs-5.2.1.tar.gz c23d5dca744c4589ede517701fc8ea02f9b7a59568d907269048741806d2e6c9e56ed3493163d63dbf16193ff99471206548b25efcda18e3e5dff14eb38066d4 fix-mmap.patch 29c77c550fa8f7a0b3794649d278a2cb3a65c9368db19415866910160adb6d5a52f1be4f8713b58c5c87f149b6212c068ae27a4547a6c4e4fe7b1584e1261dae no-utmp-header.patch" diff --git a/system/zstd/APKBUILD b/system/zstd/APKBUILD index 72ae16746..89f6ed7a0 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.2 +pkgver=1.4.3 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="b760f201ff8d018c422b030d3f59245b5f1cfd157ba8d6eb9fe9240e23d5739ca7b5a705b2d5e8ace703d041ab77bea66d735b283e51facfb18923794fabe213 zstd-1.4.2.tar.gz" +sha512sums="cb36772a59f79922e65c0f869384dca4ef2948c1d1440abcddecc7e3838efee5b547dad97b9023cdcf17bf10a32412b8f3b20a5e16b79314e61074987edecfab zstd-1.4.3.tar.gz" diff --git a/user/adwaita-icon-theme/APKBUILD b/user/adwaita-icon-theme/APKBUILD index 1815af7fb..d5964e80d 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.32.0 +pkgver=3.34.0 pkgrel=0 pkgdesc="GNOME system icon set" url="https://www.gnome.org/" @@ -10,10 +10,9 @@ license="CC-BY-SA-3.0 OR LGPL-3.0-only" depends="" makedepends="" subpackages="" -source="https://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.32/adwaita-icon-theme-$pkgver.tar.xz" +source="https://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/${pkgver%.*}/adwaita-icon-theme-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9609732cd51c6794d4d86598818bb2a589b0f4b6b795e57f3507dad69b21ef1b2fc2e83e24e937428bbace32fcccf587a5771cbc02c5768206e704f0456a6d1d adwaita-icon-theme-3.32.0.tar.xz" +sha512sums="fc47e9448f498710fb9abf4c839918630f64cee189a0dec60672784bfdf6d350e6fc06d13732fb206380523507d1d3c3ca7609f68438d4b5b76d888b172d3072 adwaita-icon-theme-3.34.0.tar.xz" diff --git a/user/alkimia/APKBUILD b/user/alkimia/APKBUILD index 31c586984..b864f1105 100644 --- a/user/alkimia/APKBUILD +++ b/user/alkimia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=alkimia -pkgver=8.0.1 +pkgver=8.0.2 pkgrel=0 pkgdesc="Library for common financial functionality" url="https://community.kde.org/Alkimia/libalkimia" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,13 +32,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="be943e854c6c2d3f85332b456be9fb3c3528fac403228a7d4ab9362856d53ea622ba9e96b70f7be47058aa0016eec78381dc7649db3b06938d4547ba1e181517 alkimia-8.0.1.tar.xz" +sha512sums="5c0c121cac121f68042208ea9b126e4916ee4fa11f41d99709fbf11c44f433ec5eb0c0e112a4e6dc9ccfbc8a5295729cee566783f089bbe9ec2b32b5084839a6 alkimia-8.0.2.tar.xz" diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD index 60f7905ef..ff42f337f 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Mathematical object library" url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cef8eef841feb1223e2bfbc4168efe3f6a7cf7d28936ff601047255cfe30df4385250a13b1ba78bb90a8e9677ea8e77a31a3c3025006bbdc17eb6e86d81dc1be analitza-19.08.0.tar.xz" +sha512sums="356144976b8926a58c62e084c1a6a202afc89409a491d1ab11ca6b49ea385bce9cebce904b4a75b03a258c780c922eba2ab061a3e2d4b9e6229b7717663fcd47 analitza-19.08.1.tar.xz" diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD index e0e522f16..1588b844b 100644 --- a/user/apache-httpd/APKBUILD +++ b/user/apache-httpd/APKBUILD @@ -148,7 +148,7 @@ c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f0010 336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2 apache-httpd.confd 5762d53f39ce7ecd730e05ddf6c063ede65cd75b9e7d67217784c80366646491ef9474306e8eb119c8fb5b4358407b07636a4e9cd82325d8df4e3e00dabc3459 apache-httpd.initd 18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b apache-httpd.logrotate -d83681930c96fcecd2f7913044cebb7d8d9994fe1cb187a5cf58727935707cc43721d2f487f8adbccbbcf2ec6091d945d94ccb4eda1722c0ea341af3435d5f12 httpd.conf +927fd409221a6a632db6786f112e6e804f0e45adc2d4bc4754c84af9a2f8374b53816a9f493d9c870ecd6c5aeb365ee248d254aea1f7c2730efadd212a508d18 httpd.conf 83d57c57b809340bb07291c340ded5903ae55c0bba7c48e4eb0d27529ce4ecb6e235378ad770c69c8be2762b5346fa5bec94b6c585510719c37fe6addb33f998 alias.conf 7def0982bda42d5fe3a1812128be455fe0a47161f7fd0facd9ff85056f043a19f520bdb1c01b9f3fb25ddd66aa6224fb4b183f107bccd56719e0c7a88ad70bd9 http2.conf 9745ec511331b2ec399bf7895bc935f9c8526fd81d47cb17e42c1f5c010bbbea0b5ef2f2f4b12984dc8c77f410132010c3e73347a49ebe5feb0c1a763fe73a82 host.conf diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index 8bc274cd5..359ae0ab3 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3a594d951e9f8c128e67fa6caa508f67b5831cc553b683acab9ec60254318f4ac2fc30e70a27d93d98f7eddc217fc377dcef7d9f5780728a0ab15843b0400e2e ark-19.08.0.tar.xz" +sha512sums="438cffcacc628af6ff9d086819d0572fbe9afea5ce81a31d1cb34bffc46c1bbbcb4b271fb951d4a19ed5beb9f57c1cfa95f8d4a5543702ba090ce9e25095a6fc ark-19.08.1.tar.xz" diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD index 9e99cafe4..9711ec5a2 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Pronunciation trainer for languages" url="https://www.kde.org/applications/education/artikulate/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dbd4cd9069c81e51053b6b90b6fbd089ee9594d5d9ba1ff4c87aee5f0f1f4931847438b7546eea54293fce1746d6c1bf69080c8519a76b83ce3c7149c5c79393 artikulate-19.08.0.tar.xz +sha512sums="d103b15caf0a504e017bc8d2ffd95e03acfde63361b98ec3d1151c4118749babdbf00c298f6e2cf20061969b967a0ac43bcc76b72b58540e187e71e674c3ecdb artikulate-19.08.1.tar.xz dd9a912f7499fee5a7d737f987ba97856e373d48d944d45fb2cfaf192bc5c79f05dc530f0ca62d5982ef86dcf1479211186657ecef0450c07a43527bd66eb7c8 inappropriate-qt.patch" diff --git a/user/at-spi2-atk/APKBUILD b/user/at-spi2-atk/APKBUILD index 4f328d84f..7177dfbad 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.32.0 +pkgver=2.34.0 pkgrel=0 pkgdesc="GTK+ module to bridge ATK to D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -15,26 +15,17 @@ makedepends="$depends_dev at-spi2-core-dev glib-dev intltool libxml2-dev meson subpackages="$pkgname-dev" source="https://download.gnome.org/sources/at-spi2-atk/${pkgver%.*}/at-spi2-atk-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir _build -} - build() { - cd "$builddir"/_build - meson -Dprefix=/usr - ninja + meson -Dprefix=/usr build + ninja -C build } check() { - cd "$builddir"/_build - ninja test + ninja -C build test } package() { - cd "$builddir"/_build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="095ceaa33d5b35f1f4f81a31bea00487c054493cb29d4fdbcf74331ec8d1b9570dc7cb93e1cc06da9ea3f5805e7a3a9e7bf80cfdbce86a1822c2a46327109393 at-spi2-atk-2.32.0.tar.xz" +sha512sums="515ad4d0a000fa47a7848f3ea9f95f8e0c582f9d9876725deb8e521c60e290f73655445456e6c238f382cb8773b56db2795c221029ec931bad68395326b6bb04 at-spi2-atk-2.34.0.tar.xz" diff --git a/user/at-spi2-core/APKBUILD b/user/at-spi2-core/APKBUILD index edd3dd5f3..92c017b61 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.32.1 +pkgver=2.34.0 pkgrel=0 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -16,19 +16,16 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/at-spi2-core/${pkgver%.*}/at-spi2-core-$pkgver.tar.xz" build() { - cd "$builddir" meson --prefix=/usr builddir/ ninja -C builddir/ } check() { - cd "$builddir" ninja -C builddir/ test } package() { - cd "$builddir" DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="cec6ea1426b25d9738c5c401a1038b39e04b1e989b7ef8e02590d117b35cfb253b260cc6e41b09e10e007801fedcb7702c48ba7f3a0c7b6c1f16edd4e8ad0cca at-spi2-core-2.32.1.tar.xz" +sha512sums="99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8 at-spi2-core-2.34.0.tar.xz" diff --git a/user/atk/APKBUILD b/user/atk/APKBUILD index c87c8dfd7..c6040d0c6 100644 --- a/user/atk/APKBUILD +++ b/user/atk/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=atk -pkgver=2.32.0 +pkgver=2.34.1 pkgrel=0 pkgdesc="A library providing a set of interfaces for accessibility" url="https://www.gtk.org/" @@ -11,26 +11,17 @@ makedepends="glib-dev gobject-introspection-dev gtk-doc meson musl-utils ninja" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir _build -} - build() { - cd "$builddir"/_build - meson -Dprefix=/usr -Dintrospection=true -Ddocs=true - ninja + meson -Dprefix=/usr -Dintrospection=true -Ddocs=true build + ninja -C build } check() { - cd "$builddir"/_build - ninja test + ninja -C build test } package() { - cd "$builddir"/_build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="8cd2a3ee006f21835f3e564f2e1de4ae61bd9529b4c0b4f2e3ece88e905e2dd36b67affb089f41582806a1397576602a526a4b8698303708894f20af97ecac22 atk-2.32.0.tar.xz" +sha512sums="a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e atk-2.34.1.tar.xz" diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD index dc0df497e..ff8e0fbf2 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Widgets that utilise the Baloo desktop indexing engine" url="https://www.KDE.org/" @@ -41,6 +41,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="16fc7e652a939bc758fee34bc1778dd77ced17708c61b4c247907a0a3372d7df8fee60f6e93df828d46f62972325210edf0c8c3eaf8143fa874f344fe0820c2d baloo-widgets-19.08.0.tar.xz +sha512sums="3c6856cfbf7d5f61d6c3cddbe49e42e684a340a26e7401db27054b01d0bf7a275a3909f127fee66d86228b25af6fcf275447e856a7db0bb450c0dc581446ce23 baloo-widgets-19.08.1.tar.xz 4a89ef01e6b8cbea694745e99b53c9d85a0d4da05e33dd77603312df36e6ee058a9d551e99de831a7e3099699b376cf2caccffd3339a21acc6a8b8170aaaeb05 frameworks.patch 291f7f99ad6b9d98dafe5e35c9e18ef46d45d5e3b5a5e9aaefa96983519db7306c73815e1ef80b51f69f56802b6fac39532718eb2867a3faee7f1bdfa2c7f64f revert.patch" diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD index 872c88857..3f142bcfc 100644 --- a/user/bind/APKBUILD +++ b/user/bind/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=bind -pkgver=9.14.4 +pkgver=9.14.6 _p=${pkgver#*_p} _ver=${pkgver%_p*} _major=${pkgver%%.*} @@ -147,7 +147,7 @@ tools() { done } -sha512sums="f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932 bind-9.14.4.tar.gz +sha512sums="129cb6c8e18fabf9f9fda91afa06fccf65e7009b2e8f9f7c1960f0039d35c22614986fbea36ca0b7bbc74995e380df083a641cf51601a0cf0c87e7dbb77a0366 bind-9.14.6.tar.gz 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015 named.initd 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD index 84186f75c..ac852bcc2 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Memory enhancement game" url="https://www.kde.org/applications/education/blinken/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="524b629cdcaa3707740718678e478adede43ec0f9d6ef57d84482bd0e2dc790da39c7bdc99c8125cc7f78111049330366d1393973e8272e8cf58876b6677654c blinken-19.08.0.tar.xz" +sha512sums="93d6e28918c7eee798385f11f7ba9c81fbc0ee7273f295cbd8ff2db80e6fc150b21215b6785a28b927038771bfcbe03069d2e4149285693b0f3ccca212520154 blinken-19.08.1.tar.xz" diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD index 7f81e4cdc..ba48826c6 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Arcade bombing game" url="https://www.kde.org/applications/games/bomber/" @@ -39,5 +39,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0bd3a6746e59875c6e14f7df1deb5f07a7db8f29a401a39e58b358ff78f1304243e28fcabc798cb9b7ed03fa5edef9d7f8c3c6257cef3d39f61a76b28345cdea bomber-19.08.0.tar.xz +sha512sums="49b488316af97b20d81f920ec496264d5a2343f1c4960837d6ad6418cca27664410ffecb2e1d3a021b1c8f586198772ebfc0c157d85917bb1f393244e4624e3b bomber-19.08.1.tar.xz 160ae239dae8ad3504b622660bb92a3b08dd1abf37161ce2d1c23ada5558f763a64a8fd9cbc25fd4a8946e274bde97df91fcb39742ba9a551ea397e1f81c51d4 ridiculous-qt.patch" diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD index 0a723c03a..1b1afb937 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Gomoku or Connect Five game" url="https://www.kde.org/applications/games/bovo/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d0829acc26414224351da2dc21d2960bbb1e881b14fbb7715ada7a397586a79165c9c4cfc8dea4fbafbbbd7f0240d462e5213f262da8466c4ea11897d9e0a500 bovo-19.08.0.tar.xz" +sha512sums="908fea4b58cdd1b06918c3588347d50a3e28de1b9d93013eab73c4bef896302a6655a770dd947e0e76ed4aa583e55f7b00921d4a303a5c99d499748bd0e3d463 bovo-19.08.1.tar.xz" diff --git a/user/btrfs-progs/APKBUILD b/user/btrfs-progs/APKBUILD index 8dd0c6168..ffc0d10e7 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.2.1 +pkgver=5.2.2 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="7da495df7dd2ef1c7961eda132c5f587785c7a91d2531a0c5ed3917f07c708d02acd48681520c10c375edd7a8a7ecab371e806077ccae7899eb41a5ddea89c59 btrfs-progs-v5.2.1.tar.xz" +sha512sums="97eaf3dd8ce1629f0acace23f3eedc7c6942299ddb65cdc3b0a7b623026db1063d72f3c1b6297782705e08dfc4c361384e17b5e27a16e756cd0a81e35e79aa9c btrfs-progs-v5.2.2.tar.xz" diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD index dc33e9de3..c1ceebd9e 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="KDE worksheet interface for popular mathematical applications" url="https://edu.kde.org/cantor/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ed40d123211b7f1585affcd88fa9549d15ebcda3fa23cdbb6ea7fc932eb79b3d84428cc0552350644faebded17088887d0e3dcda5635c4ac69df56be395a63a1 cantor-19.08.0.tar.xz" +sha512sums="b2f789905133880de99039cdae81698ed869860167f644c6898dd5e483eb0c4a479b6f5b3c5d2b6bfaddf30a4434224fdf517eaeb8aa77949e192c35b769f8ef cantor-19.08.1.tar.xz" diff --git a/user/catfish/APKBUILD b/user/catfish/APKBUILD index 81306848e..eacc0772b 100644 --- a/user/catfish/APKBUILD +++ b/user/catfish/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=catfish -pkgver=1.4.9 +pkgver=1.4.10 pkgrel=0 pkgdesc="File-searching application for the XFCE desktop environment" url="https://xfce.org" @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="c62596a09ed481eac5a4544dcfcc71c02177c115b6bf050b1f2421a575ef589c0c1569ef26d6864e472f2331f0561c7f1146c58bc7873af8036d6e7350465c3d catfish-1.4.9.tar.bz2" +sha512sums="baf9007b2ce2418fa5704e10884f509e4361505537e2ce70a7f8c8c61009094a09d7d032e0a6b4ca174f33bf76783ee2665f781cce47d2b236f2633e25192f29 catfish-1.4.10.tar.bz2" diff --git a/user/ccache/APKBUILD b/user/ccache/APKBUILD index 4dfbcdec6..e8df804e5 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.2 +pkgver=3.7.4 pkgrel=0 pkgdesc="A fast C/C++ compiler cache" url="https://ccache.dev/" @@ -46,4 +46,4 @@ package() { done } -sha512sums="3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147 ccache-3.7.2.tar.xz" +sha512sums="cc382f37f7efb30a64f6fc2b136ef7424fe51795a778dbb18dde7c9e80636515f242f51c3ef3231f74d154e65ed9e815abf8241eb1a8f4e0b4fe4f533ea27146 ccache-3.7.4.tar.xz" diff --git a/user/certbot/APKBUILD b/user/certbot/APKBUILD index db7d90abe..052386d04 100644 --- a/user/certbot/APKBUILD +++ b/user/certbot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: pkgname=certbot -pkgver=0.37.1 +pkgver=0.39.0 pkgrel=0 pkgdesc="The EFF's reference ACME client" url="https://certbot.eff.org/" @@ -38,4 +38,4 @@ acme() { python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="c6a54a795823d5ba7178adc3c494703c120a7c748f402c2afa626eadeca6d73acd03e0ec96c553ef12f6839dfb268608b590efc6b0d574382f3c44a258059999 certbot-0.37.1.tar.gz" +sha512sums="17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0 certbot-0.39.0.tar.gz" diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD new file mode 100644 index 000000000..ede81a9c5 --- /dev/null +++ b/user/cloc/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=cloc +pkgver=1.84 +pkgrel=0 +pkgdesc="Perl utility for counting lines of code in various languages" +url="https://github.com/AlDanial/cloc" +arch="all" +license="GPL-2.0+" +depends="perl perl-regexp-common perl-algorithm-diff" +checkdepends="perl-parallel-forkmanager" +subpackages="$pkgname-doc" +source="https://github.com/AlDanial/cloc/releases/download/$pkgver/cloc-$pkgver.tar.gz" + +build() { + cd Unix + make DESTDIR="$pkgdir" doc +} + +check() { + cd Unix + make DESTDIR="$pkgdir" test-perl +} + +package() { + cd Unix + make DESTDIR="$pkgdir" install +} + +sha512sums="cfcc1854d7f3257bcd66f13b1053a856ae31acc35f94537e20cbb341ab256390bded1f00ff6b1ce2bc60a1a69379b6915d398297e2f878bc4eea190c59b22669 cloc-1.84.tar.gz" diff --git a/user/dconf/APKBUILD b/user/dconf/APKBUILD index 988cfbae5..88160df56 100644 --- a/user/dconf/APKBUILD +++ b/user/dconf/APKBUILD @@ -1,11 +1,12 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=dconf -pkgver=0.32.0 +pkgver=0.34.0 pkgrel=0 pkgdesc="Configuration management for the Gnome desktop environment" url="https://gnome.org" arch="all" +options="!check" # Requires running D-Bus daemon. license="LGPL-2.0+ AND LGPL-2.1+" depends="dbus" makedepends="meson ninja @@ -14,24 +15,19 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz" build() { - cd "$builddir" meson \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ + -Dprefix=/usr \ --buildtype=release \ - . output - ninja -C output + . build + ninja -C build } check() { - cd "$builddir" + ninja -C build test } package() { - cd "$builddir" - DESTDIR="$pkgdir" ninja -C output install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0 dconf-0.32.0.tar.xz" +sha512sums="8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743 dconf-0.34.0.tar.xz" diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD index 5b4d650b1..fa8781177 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Lightweight desktop file manager" url="https://www.kde.org/applications/system/dolphin/" @@ -44,6 +44,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="39afe693238b375f81a270d8b28a58c543aaab2a11e59d1c29f0daacbdaf1c43c271aae14104ba574349db2de690cef577d2143487248c86607ec247bc653824 dolphin-19.08.0.tar.xz +sha512sums="bcac00cdec1de2aab8b33f57f990c3b5c74f98d499c70adbc1a7f9b9528642221071c45716ea29f65c28733e2a282dd824e1dd4f2c305a4d2206345010aa5c87 dolphin-19.08.1.tar.xz 9c61e0fd899d172f1a5e67f9621099c69ce673a1c66cc948dcf3bd74278c8fc206a029d33c56934fb7b42a91191c1259d966d4b39e4208226e9830c9f27ec411 baloo.patch 08801b4ae25e1f64eeb2b574bc09eed526f0fa570a6c12982db55aa5aa26498191c1a15c73bdb37664204cadd84abe80c9168f298558861010183af9e6c30368 frameworks.patch" diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD index 0d10e8bbe..6ad0393a1 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Multimedia player with a focus on simplicity" url="https://www.kde.org/applications/multimedia/dragonplayer/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1f9c410e314f075b4d73af68893d25dd406f222c34f62f0d57af96371a4e2cbcdbdd04a3684974435172c3a343fef45639e6a80a1729b1ab02d5829d08d46ed0 dragon-19.08.0.tar.xz" +sha512sums="da94e5ca7c8fba2f67c3fb1d1c7a874cae69669cdec41736767b53301585494c681c78b382fb56124df9582cfb736cc6ca518eae698a3f23ca5c8817fac4f22f dragon-19.08.1.tar.xz" diff --git a/user/emacs/APKBUILD b/user/emacs/APKBUILD index 438cf665b..9f02d79a6 100644 --- a/user/emacs/APKBUILD +++ b/user/emacs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=emacs -pkgver=26.2 +pkgver=26.3 pkgrel=0 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch="all" @@ -133,5 +133,5 @@ gtk2() { _subpackage gtk2 } -sha512sums="c223ff5c51ca8bdf887bacb2dc37b08a637d39ed6f887cc24f67397e46fe5fdb68f33f21b97300b985c749f32aa09080d33103271637ed4ce5d9f2ea34ce9fe1 emacs-26.2.tar.xz +sha512sums="4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9 emacs-26.3.tar.xz 8898f309aeaf274366849bd5c56c8e2a1be94dfee2f01b20f1700bf26203f49b9600237e5090fc3d8eaad3ea246f803ffd493d0c04cb3512084a4e3bf58f8f5e gamedir.patch" diff --git a/user/erlang/APKBUILD b/user/erlang/APKBUILD index 3c0e6ad73..befef61d9 100644 --- a/user/erlang/APKBUILD +++ b/user/erlang/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=erlang -pkgver=22.0.7 +pkgver=22.1.1 pkgrel=0 pkgdesc="Soft real-time system programming language" url="https://www.erlang.org/" @@ -13,7 +13,6 @@ makedepends="autoconf automake flex libxml2-utils libxslt-dev m4 ncurses-dev subpackages="$pkgname-dev" source="erlang-$pkgver.tar.gz::https://github.com/erlang/otp/archive/OTP-$pkgver.tar.gz fix-wx-linking.patch - safe-signal-handling.patch " builddir="$srcdir/otp-OTP-$pkgver" @@ -28,7 +27,8 @@ build() { --localstatedir=/var \ --enable-shared-zlib \ --enable-ssl=dynamic-ssl-lib \ - --enable-threads + --enable-threads \ + --disable-hipe make } @@ -51,6 +51,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cf84cc20b97ed46f9ab3c7f1d77bcf6254ac3ebbb5c1e4e5202f4d5ba3d9c3bf5542567b047edaa68c204bc67ca667b1d96eb8153ac660e628c78fe271b6a8d9 erlang-22.0.7.tar.gz -91c62e6a894d6f1ae371025e49c02ff25f1cc244fb18c8eae87c9e031d8216bab901b8d278df67db08f260f0d56fa18122f191405e4d58ca64934259f156b907 fix-wx-linking.patch -dc2fe08e40c73b48b356382c43c982f9f0091e601bbdf6e032358bd5c74c3573b423ef4df454b87c8534105fdbc19ce2245609cc7d5679109c15abaf56d3ef69 safe-signal-handling.patch" +sha512sums="ee1a3bb355ffd083c3355caf60189799d322cff2a01314ba5df141ccdc4de45dbfe3967e661e3dfbcf14fc04dc1f855d7a3660f9b2daa2451a83422eda7cba39 erlang-22.1.1.tar.gz +91c62e6a894d6f1ae371025e49c02ff25f1cc244fb18c8eae87c9e031d8216bab901b8d278df67db08f260f0d56fa18122f191405e4d58ca64934259f156b907 fix-wx-linking.patch" diff --git a/user/erlang/safe-signal-handling.patch b/user/erlang/safe-signal-handling.patch deleted file mode 100644 index 0996069ba..000000000 --- a/user/erlang/safe-signal-handling.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- otp-OTP-21.2.6.orig/erts/emulator/hipe/hipe_x86_signal.c -+++ otp-OTP-21.2.6/erts/emulator/hipe/hipe_x86_signal.c -@@ -159,16 +159,10 @@ - - #if !(defined(__GLIBC__) || defined(__DARWIN__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__sun__)) - /* -- * Unknown libc -- assume musl. Note: musl deliberately does not provide a musl-specific -- * feature test macro, so we cannot check for it. -- * -- * sigaction is a weak alias for __sigaction, which is a wrapper for __libc_sigaction. -- * There are libc-internal calls to __libc_sigaction which install handlers, so we must -- * override __libc_sigaction rather than __sigaction. -+ * Unknown libc -- assume musl. Also assume signal delivery on musl is safe. - */ --#define NEXT_SIGACTION "__libc_sigaction" --#define LIBC_SIGACTION __libc_sigaction --#define OVERRIDE_SIGACTION -+#undef NEXT_SIGACTION -+#undef OVERRIDE_SIGACTION - #ifndef _NSIG - #define _NSIG NSIG - #endif diff --git a/user/evince/APKBUILD b/user/evince/APKBUILD index ea6b66231..0b33539d5 100644 --- a/user/evince/APKBUILD +++ b/user/evince/APKBUILD @@ -1,21 +1,20 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=evince -pkgver=3.32.0 -pkgrel=2 +pkgver=3.34.0 +pkgrel=0 pkgdesc="GNOME document viewer" url="https://wiki.gnome.org/Apps/Evince" arch="all" license="GPL-2.0+ AND MIT AND BSD-3-Clause AND LGPL-2.0+ AND X11 AND LGPL-3.0-only AND Public-Domain AND LGPL-2.1+" -depends="gst-plugins-base gst-plugins-good" +depends="gsettings-desktop-schemas gst-plugins-base gst-plugins-good" makedepends="djvulibre-dev glib-dev gobject-introspection-dev gsettings-desktop-schemas-dev gstreamer-dev gst-plugins-base-dev gtk+3.0-dev itstool libarchive-dev libexecinfo-dev libgxps-dev libsecret-dev libspectre-dev libxml2-dev libxml2-utils poppler-dev tiff-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://ftp.gnome.org/pub/gnome/sources/evince/3.32/evince-$pkgver.tar.xz - CVE-2019-11459.patch" +source="https://ftp.gnome.org/pub/gnome/sources/evince/${pkgver%.*}/evince-$pkgver.tar.xz" # secfixes: # 3.32.0-r2: @@ -76,5 +75,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="565298a200d9ae2f6b4cb53c3cba0d0d0e4cfbef60e4145bfb9c82a5682947ceb2371e52c27179cd69a238cd387bcfd744d3c55df814b6347f07781aec3ea658 evince-3.32.0.tar.xz -ebb8e2e0b2754d4634c99fda7669171e97b583dfbcd383682b70eb36ce816f1bcf1c2cb81b4ffbfac86db891d9f63bd0c2d90ff9ca3838c64a258b6a0002f7c4 CVE-2019-11459.patch" +sha512sums="41e59cca65003e6abca934f770b0504af13644222e88223b1b713aafd6b3335873422e914775f79182fe45de4d7fda3767cbb41c6088ff47fa8560e97b19bde2 evince-3.34.0.tar.xz" diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index 49be257f1..06d9db55c 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpeg -pkgver=4.2 +pkgver=4.2.1 pkgrel=0 pkgdesc="Record, convert, and stream audio and video" url="https://ffmpeg.org/" @@ -97,5 +97,5 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="c1f6a86736c417790d7b88d687fdba28c620682a7247d8865062b90a9510b798a0230ab0bc993de85021fefb1044fa929a6c29c77d91b81c52873af569210313 ffmpeg-4.2.tar.xz +sha512sums="3efddc7d6bbccba9a1f55bf0e6caa8a578405a7e12058ce526766ed5eca9d45a783dbf86325ab860a8eabbe29701f8093e691f0138e0d9cc883cfe5200b3561b ffmpeg-4.2.1.tar.xz 32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" diff --git a/user/ffmpegthumbnailer/APKBUILD b/user/ffmpegthumbnailer/APKBUILD index ae8a1c7e0..c4787b97f 100644 --- a/user/ffmpegthumbnailer/APKBUILD +++ b/user/ffmpegthumbnailer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=ffmpegthumbnailer -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=0 pkgdesc="Thumbnail generator based on FFMPEG" url="https://github.com/dirkvdb/ffmpegthumbnailer" @@ -10,7 +10,6 @@ license="GPL-2.0+" makedepends="ffmpeg-dev libjpeg-turbo-dev libpng-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/$pkgver/ffmpegthumbnailer-$pkgver.tar.bz2" -sha512sums="526d15b2c754fcb1415e69fb54cb6e7d0102b6d73a32a7e8528df81e32633dfe3786898984fdb988c93daee7218956c75c096ef657c9b3a42399d2d1d27c7bbf ffmpegthumbnailer-2.2.0.tar.bz2" build() { cd "$builddir" @@ -40,3 +39,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="227f41aaca897f8aaa5c2182baa97e26af189a4e99acb74b994aac4a71f9405bc6df08cfa7cebbcc89536cec95115757f78effb4827ef637a93a8af278525be2 ffmpegthumbnailer-2.2.1.tar.bz2" diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD index c0bf64a41..2a1f16f2f 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="KDE video thumbnail system using FFmpeg" url="https://www.KDE.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ca0ed1631d7cb9af049e1328269a9b01ee442c514d400ea5836b4b7bbbc003ee3d1b3fe9c07c2a6cd99a02cc4caf251f7b6c11be0eb08fd9dfba08aa9e4847d6 ffmpegthumbs-19.08.0.tar.xz" +sha512sums="6467dd681938d72a008cf0baebebecf2ba95dcfe8dc6ed997576750749e9b9ae7b78816c1b25c36abbfe0450181322c86640c5dee244dbb23df5c383c0bd4738 ffmpegthumbs-19.08.1.tar.xz" diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD index ebaf536bf..aca2f0801 100644 --- a/user/firefox-esr/APKBUILD +++ b/user/firefox-esr/APKBUILD @@ -38,6 +38,8 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f fix-mutex-build.patch fix-seccomp-bpf.patch mozilla-build-arm.patch + ppc32-fix.patch + rust-32bit.patch rust-config.patch shut-up-warning.patch stackwalk-x86-ppc.patch @@ -108,8 +110,8 @@ prepare() { echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig # too much memory - if [ -z "$JOBS" ] || [ $JOBS -ge 16 ]; then - JOBS=16 + if [ -z "$JOBS" ] || [ $JOBS -ge 32 ]; then + JOBS=32 fi echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$JOBS\"" >> "$builddir"/mozconfig @@ -117,6 +119,10 @@ prepare() { pmmx|x86*) echo "ac_add_options --disable-elf-hack" >> "$builddir"/mozconfig ;; + ppc) + echo "ac_add_options --disable-webrtc" >> "$builddir"/mozconfig; + export LDFLAGS="$LDFLAGS -latomic" + ;; esac rm "$builddir"/third_party/python/virtualenv/virtualenv_support/pip*.whl @@ -200,6 +206,8 @@ ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53 c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880 fix-mutex-build.patch 70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d fix-seccomp-bpf.patch e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch +06a3f4ee6d3726adf3460952fcbaaf24bb15ef8d15b3357fdd1766c7a62b00bd53a1e943b5df7f4e1a69f4fae0d44b64fae1e027d7812499c77894975969ea10 ppc32-fix.patch +7c615703dc9b8427eeadd13bc9beda02e1c3d986cac1167feaf48fdfdcc15b7456460d4d58f301054cf459242ee75bbcd76bf67e26c2a443bc5655975d24ca1b rust-32bit.patch 45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8 rust-config.patch 39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch 452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448 stackwalk-x86-ppc.patch diff --git a/user/firefox-esr/ppc32-fix.patch b/user/firefox-esr/ppc32-fix.patch new file mode 100644 index 000000000..b4103c65f --- /dev/null +++ b/user/firefox-esr/ppc32-fix.patch @@ -0,0 +1,43 @@ +--- firefox-68.1.0/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp ++++ firefox-68.1.0/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp +@@ -45,11 +45,8 @@ invoke_copy_to_stack(uint32_t* d, + uint64_t tempu64; + + for(uint32_t i = 0; i < paramCount; i++, s++) { +- if(s->IsPtrData()) { +- if(s->type == nsXPTType::T_JSVAL) +- tempu32 = (uint32_t) &s->ptr; +- else +- tempu32 = (uint32_t) s->ptr; ++ if(s->IsIndirect()) { ++ tempu32 = (uint32_t) &s->val; + } + else { + switch(s->type) { +@@ -70,7 +67,7 @@ invoke_copy_to_stack(uint32_t* d, + } + } + +- if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { ++ if (!s->IsIndirect() && s->type == nsXPTType::T_DOUBLE) { + #ifndef __NO_FPRS__ + if (fpr < FPR_COUNT) + fpregs[fpr++] = s->val.d; +@@ -88,7 +85,7 @@ invoke_copy_to_stack(uint32_t* d, + d += 2; + } + } +- else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { ++ else if (!s->IsIndirect() && s->type == nsXPTType::T_FLOAT) { + #ifndef __NO_FPRS__ + if (fpr < FPR_COUNT) + fpregs[fpr++] = s->val.f; // if passed in registers, floats are promoted to doubles +@@ -99,7 +96,7 @@ invoke_copy_to_stack(uint32_t* d, + else + *((float*) d++) = s->val.f; + } +- else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64 ++ else if (!s->IsIndirect() && (s->type == nsXPTType::T_I64 + || s->type == nsXPTType::T_U64)) { + if (gpr & 1) gpr++; // longlongs are aligned in odd/even register pairs, eg. r5/r6 + if ((gpr + 1) < GPR_COUNT) { diff --git a/user/firefox-esr/rust-32bit.patch b/user/firefox-esr/rust-32bit.patch new file mode 100644 index 000000000..f9281cb7a --- /dev/null +++ b/user/firefox-esr/rust-32bit.patch @@ -0,0 +1,20 @@ +--- firefox-68.1.0/config/makefiles/rust.mk.old 2019-08-26 16:52:20.000000000 +0000 ++++ firefox-68.1.0/config/makefiles/rust.mk 2019-10-03 21:17:55.062373830 +0000 +@@ -47,7 +47,7 @@ + ifndef DEVELOPER_OPTIONS + ifndef MOZ_DEBUG_RUST + # Enable link-time optimization for release builds. +-cargo_rustc_flags += -C lto ++# OOMs on 32-bit machines: cargo_rustc_flags += -C lto + endif + endif + +@@ -246,7 +246,7 @@ + ifndef DEVELOPER_OPTIONS + ifndef MOZ_DEBUG_RUST + ifeq ($(OS_ARCH), Linux) +- $(call py_action,check_binary,--target --networking $@) ++# Fails because we disable LTO: $(call py_action,check_binary,--target --networking $@) + endif + endif + endif diff --git a/user/fluidsynth/APKBUILD b/user/fluidsynth/APKBUILD index 1630ac43d..d08281f80 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.0.5 +pkgver=2.0.7 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="5344ac889d2927dc2465bae40096d756a9bf9b1100e287ba0621c55ffc76f9cb8fa763f6bc832d701cd0ad2997965cf344f58ae4b3dd445eb3491e3659c093d9 fluidsynth-2.0.5.tar.gz" +sha512sums="c939c77277767541b90ae8bc24687cd9cd11b375264e6b5017658f5fd9c5637a3ce09bc4ad837a349e4a63883fe5ecbe80e65dd91d2cbf71072bcbcfc068614e fluidsynth-2.0.7.tar.gz" diff --git a/user/font-util/APKBUILD b/user/font-util/APKBUILD index a02cd6232..082f59123 100644 --- a/user/font-util/APKBUILD +++ b/user/font-util/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-util -pkgver=1.3.1 -pkgrel=3 +pkgver=1.3.2 +pkgrel=0 pkgdesc="X.org font utilities" url="https://www.X.Org/" arch="all" -license="custom" +license="MIT AND X11 AND BSD-2-Clause" depends="perl" depends_dev="font-util" makedepends="$depends_dev util-macros" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,13 +22,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } -sha512sums="9fd6dd4c0a01ede5f0b09ec0f9d316267ca086e2ee9526a43a4e4d6ce3cd67c977293bd3cf440328ca417292fcae1579888b24b7259eaf012230890210d74889 font-util-1.3.1.tar.bz2" +sha512sums="7cac529b12ae71185b89c72c1569b9826f52eeaecc1c76010338e7c42c4078ae339f18220b580bbd68fb5dc09df6ecf169a47c32e6104d8ee53bd443fa21d167 font-util-1.3.2.tar.bz2" diff --git a/user/freeglut/APKBUILD b/user/freeglut/APKBUILD index f89c0cac6..34b38ebf2 100644 --- a/user/freeglut/APKBUILD +++ b/user/freeglut/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=freeglut -pkgver=3.0.0 +pkgver=3.2.1 pkgrel=0 pkgdesc="free reimplementation of OpenGL Utility Toolkit (GLUT) library" url="http://freeglut.sourceforge.net/" @@ -10,11 +10,10 @@ options="!check" # No test suite. license="X11" depends_dev="mesa-dev libx11-dev libice-dev libxxf86vm-dev libxi-dev glu-dev" makedepends="$depends_dev cmake" -subpackages="$pkgname-dev $pkgname-doc" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" +subpackages="$pkgname-dev" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" cmake . \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -24,10 +23,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - - install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0 freeglut-3.0.0.tar.gz" +sha512sums="aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08 freeglut-3.2.1.tar.gz" diff --git a/user/fribidi/APKBUILD b/user/fribidi/APKBUILD index d729be4a2..97f2ebbe7 100644 --- a/user/fribidi/APKBUILD +++ b/user/fribidi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fribidi -pkgver=1.0.5 +pkgver=1.0.7 pkgrel=0 pkgdesc="Free Implementation of the Unicode Bidirectional algorithm" url="http://fribidi.org" @@ -12,7 +12,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/fribidi/fribidi/releases/download/v$pkgver/fribidi-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,13 +21,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2 fribidi-1.0.5.tar.bz2" +sha512sums="c7a1834eb5e79e337b31c62b75e9ab61f761cc5d6eef5c9ac9610f69ed044ce9d2d2efac150cad167eea3e1d573b27765e5d01abc4b4f9e43c7903d5980ba8c0 fribidi-1.0.7.tar.bz2" diff --git a/user/gdk-pixbuf/APKBUILD b/user/gdk-pixbuf/APKBUILD index 6092f1eff..a12334d2e 100644 --- a/user/gdk-pixbuf/APKBUILD +++ b/user/gdk-pixbuf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gdk-pixbuf -pkgver=2.38.1 +pkgver=2.38.2 pkgrel=0 pkgdesc="GTK+ image loading library" url="https://www.gtk.org/" @@ -38,4 +38,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920 gdk-pixbuf-2.38.1.tar.xz" +sha512sums="b0f83cca9bfbe45dab200b19a5ec6231b628c09633fd41348f433c226d523c2f9b805d41e4d955e9fd65c5b6d24df59c7c94193032379d6f09b0472ae988a0c1 gdk-pixbuf-2.38.2.tar.xz" diff --git a/user/glib-networking/APKBUILD b/user/glib-networking/APKBUILD index f9e3fd7ce..365b7e906 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.3 +pkgver=2.62.0 _ver=${pkgver%.*} pkgrel=0 pkgdesc="Networking support for GLib" @@ -14,10 +14,6 @@ makedepends="bash glib-dev gnutls-dev gsettings-desktop-schemas-dev intltool subpackages="$pkgname-lang" source="https://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.xz" -prepare() { - default_prepare -} - build() { meson -Dprefix=/usr _build ninja -C _build @@ -32,4 +28,4 @@ package() { rm -f "$pkgdir"/usr/lib/gio/modules/*.a } -sha512sums="06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f glib-networking-2.60.3.tar.xz" +sha512sums="2b9b0414baba307d35f8f6539fcbf0cf224da1970c532b130718deeeaa85f5601b8285ce822888273afed7fa643b62310bf306bbfa22f465134af345f3cd0e9d glib-networking-2.62.0.tar.xz" diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index 8640fcf1b..88376c187 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.60.6 +pkgver=2.62.0 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" @@ -75,7 +75,7 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9 glib-2.60.6.tar.xz +sha512sums="4a880f9cc0209e99e814c4ef0adf3ef82ec5cca413ebb3e6d2da17768b7099744ca57f0a86b5aeb443c8ee0b663581ddb8bb577fa7bcc645bd64817b39991d63 glib-2.62.0.tar.xz 32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch 657d3fdf7f8ac7edd5bae572d00497f2236fbe5a91a577f3cb7ceb2ccf067f2944918b2b90308fc1061f45daf3d4910067b98642383ce8761da2a1faff6e9b4f broken-gio-tests.patch 0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998 fix-spawn.patch diff --git a/user/glibmm/APKBUILD b/user/glibmm/APKBUILD index 9ceb52bb2..a0bac403d 100644 --- a/user/glibmm/APKBUILD +++ b/user/glibmm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=glibmm -pkgver=2.60.0 +pkgver=2.62.0 pkgrel=0 pkgdesc="C++ interfaces for glib" url="https://gnome.org" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/glibmm/${pkgver%.*}/glibmm-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ea0477d5cb6e59019e87f929630ff32ac38dd5e4fb53fe84ef64b5b41c1090c8e10a0a67b26c786ab4d9ebf64b993fa0044333b4aa8554c331a0a6d02039c5ad glibmm-2.60.0.tar.xz" +sha512sums="f26fca5724c17d915480556b6918ae6e4999c14a25e7623cda3d37a59d6965310fc2b2d8a8500a849f1d0f00fd2d326eeddc690207846d38a13ae695ad0805de glibmm-2.62.0.tar.xz" diff --git a/user/gmime/APKBUILD b/user/gmime/APKBUILD index 37f1bc7ee..c1edaaa02 100644 --- a/user/gmime/APKBUILD +++ b/user/gmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=gmime -pkgver=3.2.3 +pkgver=3.2.4 pkgrel=0 pkgdesc="MIME utility library" url="https://developer.gnome.org/gmime/" @@ -9,14 +9,19 @@ arch="all" license="LGPL-2.1+" depends="" depends_dev="gpgme-dev libidn2-dev zlib-dev" -makedepends="$depends_dev" checkdepends="gnupg" +makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - 3.2.3-broken-tests.patch" + 3.2.3-broken-tests.patch + " + +prepare() { + default_prepare + autoreconf -vif +} build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,20 +34,13 @@ build() { make } -prepare() { - default_prepare - autoreconf -vif -} - check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4 gmime-3.2.3.tar.xz +sha512sums="34592e89a2f923dacc37ac535da785918c2c0d6a63b0f2ec1d86393264aace44d1060e8ef4a77e60fd57e97475435f8e79d87e46b269ae332db9b9aaf98bf61b gmime-3.2.4.tar.xz 443e768e15eb25116368739957ac31a30cd10a921c113b76af1a0baf0c690ca1346463577289d24ce8f46deb014dd014040033bc1f3d02d8a2190c70dd4c2a74 3.2.3-broken-tests.patch" diff --git a/user/gobject-introspection/APKBUILD b/user/gobject-introspection/APKBUILD index 81dca7aed..cc92875e1 100644 --- a/user/gobject-introspection/APKBUILD +++ b/user/gobject-introspection/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gobject-introspection -pkgver=1.60.2 +pkgver=1.62.0 pkgrel=0 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" @@ -15,26 +15,17 @@ subpackages="$pkgname-doc $pkgname-dev" replaces="libgirepository" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir -p build -} - build() { - cd "$builddir"/build - meson -Dprefix=/usr - ninja + meson -Dprefix=/usr build + ninja -C build } check() { - cd "$builddir"/build - ninja test + ninja -C build test } package() { - cd "$builddir"/build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } dev() { @@ -46,4 +37,4 @@ dev() { replaces="gobject-introspection" } -sha512sums="8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e gobject-introspection-1.60.2.tar.xz" +sha512sums="b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638 gobject-introspection-1.62.0.tar.xz" diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD index 847e712c7..cf58ca8aa 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Clone of the classic Bomberman game" url="https://www.kde.org/applications/games/granatier/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="069d76b3c466a7d13ab657acabd0088033933bb8fd9ed155a260fd2b26dbe44d8609d665059bb987ad9eb6db96d5452c1b72dc86428af6d278952764e676f67a granatier-19.08.0.tar.xz" +sha512sums="7955833bf73fb410c492ac292d621d7afbc4b1c157e298a1e5a4802deca260dd172c0c92e768f4eb9e720b89b15f37f1a1cd8645bdd6ce8bb15addebfb9e559b granatier-19.08.1.tar.xz" diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD index d571310e7..69c53c313 100644 --- a/user/grub/APKBUILD +++ b/user/grub/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=grub -pkgver=2.02 -pkgrel=8 +pkgver=2.04 +pkgrel=0 pkgdesc="Bootloader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" arch="all !s390x" @@ -33,11 +33,10 @@ install="$pkgname.post-upgrade" triggers="$pkgname.trigger=/boot" source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz + adelie-branding.patch fix-gcc-no-pie-specs.patch grub2-accept-empty-module.patch grub-xen-host_grub.cfg - the-arch-everyone-uses-and-nobody-loves.patch - x86_64_asm.patch default-grub update-grub quirk-01_radeon_agpmode @@ -170,12 +169,11 @@ emu() { mv $pkgdir/usr/lib/grub/*-emu $subpkgdir/usr/lib/grub/ } -sha512sums="cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088 grub-2.02.tar.xz +sha512sums="9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb grub-2.04.tar.xz +f8c9af848c14abc3e4cc749b3ec80432d1d69bf945c8e48f1650ec35d2442450dc0436a02a4737d5d06f21d5fdef54a91120a393e8d77a6b55aeb897aa1fe85c adelie-branding.patch f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857f8f42601eba82c855607513eb6ce5b2af6bd6c71f046e288 fix-gcc-no-pie-specs.patch -2fefc6d5c1388dba6d368451f47c216171136f03891e87777ee392884d7ef53c70b2a2565af676237216565f203f62b79aec0d1a82979b21aa29c4ebf87ac566 grub2-accept-empty-module.patch +6e001762f7f562f2fafed56118079122e7602c731c70723241276f523e0882a3930d720fd847143d379ffd85626d2d7d3fa914590c0de1f0903a293695e71c41 grub2-accept-empty-module.patch 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg -088455205f2f397d60e43eab19ed73994880ea1f442661f7975846cceaf2b112d92fd1341119d7dbfad3af2174dfd4d4721f31dead1ac35f4a3cb7c0d92f8a04 the-arch-everyone-uses-and-nobody-loves.patch -8752b5e689ec3b7e1f438c7207adc517d7acb4f7d15fda2907bc9177883a686f23994c66641bfc0c7620365415972b5d8b74f511c13dd234f5f3461dda4bb445 x86_64_asm.patch 1e6ae4a3884829864dbd789d3c3a0d43a5aa5f279c3ebb25f71775686e9236bc1c6295e5064ad32b384635987ee0814df95e9ca33bc57bc8e0aeb47bec34270e default-grub 0907a810e9ba5be92d10dae38403d1e50fb9b324799df36d2241ff59f545dace37a65f2b1c8f07367220da4fd341d8f21dd9a4fab8da6c87ae52d7ffbca3dbd7 update-grub 78b7ec141a364994c7de181e47fedca820add9960c56c7adf4c14ee11d5249a0887fd788ecd5d24b9bdd102b7c40395181e2f7c3fe5ab795dd7c0057ba1115c5 quirk-01_radeon_agpmode" diff --git a/user/grub/adelie-branding.patch b/user/grub/adelie-branding.patch new file mode 100644 index 000000000..606c1e6e9 --- /dev/null +++ b/user/grub/adelie-branding.patch @@ -0,0 +1,25 @@ +--- grub-2.04/util/grub.d/10_linux.in.old 2018-11-24 17:13:02.000000000 +0000 ++++ grub-2.04/util/grub.d/10_linux.in 2019-10-03 01:22:34.593401423 +0000 +@@ -28,12 +28,16 @@ + + CLASS="--class gnu-linux --class gnu --class os" + +-if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then +- OS=GNU/Linux +-else +- OS="${GRUB_DISTRIBUTOR} GNU/Linux" +- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" +-fi ++case "x${GRUB_DISTRIBUTOR}" in ++ x) ++ OS=GNU/Linux;; ++ xAdélie|xAdelie) ++ OS="Adélie Linux"; ++ CLASS="--class adelie";; ++ *) ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux"; ++ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}";; ++esac + + # loop-AES arranges things so that /dev/loop/X can be our root device, but + # the initrds that Linux uses don't like that. diff --git a/user/grub/grub2-accept-empty-module.patch b/user/grub/grub2-accept-empty-module.patch index 16655b1a8..f4f62d433 100644 --- a/user/grub/grub2-accept-empty-module.patch +++ b/user/grub/grub2-accept-empty-module.patch @@ -10,13 +10,13 @@ also no relocations that's no problem (and that is checked independendly). --- grub-2.02~beta3/util/grub-module-verifierXX.c.mm 2016-02-11 10:57:41.000000000 +0000 +++ grub-2.02~beta3/util/grub-module-verifierXX.c 2016-08-31 15:26:36.000000000 +0000 -@@ -224,7 +224,8 @@ check_symbols (const struct grub_module_ - Elf_Shdr *s = find_section (arch, e, ".moddeps"); +@@ -225,7 +225,8 @@ check_symbols (const struct grub_module_ + s = find_section (arch, e, ".moddeps"); if (!s) -- grub_util_error ("no symbol table and no .moddeps section"); -+ /*grub_util_error ("no symbol table and no .moddeps section");*/ +- grub_util_error ("%s: no symbol table and no .moddeps section", modname); ++ /*grub_util_error ("%s: no symbol table and no .moddeps section", modname);*/ + return; /* An empty module happens for all_video.module for Xen */ if (!s->sh_size) - grub_util_error ("no symbol table and empty .moddeps section"); + grub_util_error ("%s: no symbol table and empty .moddeps section", modname); diff --git a/user/grub/the-arch-everyone-uses-and-nobody-loves.patch b/user/grub/the-arch-everyone-uses-and-nobody-loves.patch deleted file mode 100644 index 2d09149f7..000000000 --- a/user/grub/the-arch-everyone-uses-and-nobody-loves.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 563b1da6e6ae7af46cc8354cadb5dab416989f0a Mon Sep 17 00:00:00 2001 -From: Michael Chang <mchang@suse.com> -Date: Mon, 26 Mar 2018 16:52:34 +0800 -Subject: Fix packed-not-aligned error on GCC 8 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When building with GCC 8, there are several errors regarding packed-not-aligned. - -./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned] - -This patch fixes the build error by cleaning up the ambiguity of placing -aligned structure in a packed one. In "struct grub_btrfs_time" and "struct -grub_gpt_part_type", the aligned attribute seems to be superfluous, and also -has to be packed, to ensure the structure is bit-to-bit mapped to the format -laid on disk. I think we could blame to copy and paste error here for the -mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as -the name suggests. :) - -Signed-off-by: Michael Chang <mchang@suse.com> -Tested-by: Michael Chang <mchang@suse.com> -Tested-by: Paul Menzel <paulepanter@users.sourceforge.net> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/fs/btrfs.c | 2 +- - include/grub/efiemu/runtime.h | 2 +- - include/grub/gpt_partition.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 4849c1ceb..be195448d 100644 ---- a/grub-core/fs/btrfs.c -+++ b/grub-core/fs/btrfs.c -@@ -175,7 +175,7 @@ struct grub_btrfs_time - { - grub_int64_t sec; - grub_uint32_t nanosec; --} __attribute__ ((aligned (4))); -+} GRUB_PACKED; - - struct grub_btrfs_inode - { -diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h -index 9b6b729f4..36d2dedf4 100644 ---- a/include/grub/efiemu/runtime.h -+++ b/include/grub/efiemu/runtime.h -@@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel - - struct efi_variable - { -- grub_efi_guid_t guid; -+ grub_efi_packed_guid_t guid; - grub_uint32_t namelen; - grub_uint32_t size; - grub_efi_uint32_t attributes; -diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h -index 1b32f6725..9668a68c3 100644 ---- a/include/grub/gpt_partition.h -+++ b/include/grub/gpt_partition.h -@@ -28,7 +28,7 @@ struct grub_gpt_part_type - grub_uint16_t data2; - grub_uint16_t data3; - grub_uint8_t data4[8]; --} __attribute__ ((aligned(8))); -+} GRUB_PACKED; - typedef struct grub_gpt_part_type grub_gpt_part_type_t; - - #define GRUB_GPT_PARTITION_TYPE_EMPTY \ --- -cgit v1.1-33-g03f6 - diff --git a/user/grub/x86_64_asm.patch b/user/grub/x86_64_asm.patch deleted file mode 100644 index 67a0d833f..000000000 --- a/user/grub/x86_64_asm.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 842c390469e2c2e10b5aa36700324cd3bde25875 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <hjl.tools@gmail.com> -Date: Sat, 17 Feb 2018 06:47:28 -0800 -Subject: [PATCH] x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32 - -Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a: - -https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a - -x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for -32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as -R_X86_64_PC32. - -Signed-off-by: H.J. Lu <hjl.tools@gmail.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/efiemu/i386/loadcore64.c | 1 + - grub-core/kern/x86_64/dl.c | 1 + - util/grub-mkimagexx.c | 1 + - util/grub-module-verifier.c | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c -index e49d0b6..18facf4 100644 ---- a/grub-core/efiemu/i386/loadcore64.c -+++ b/grub-core/efiemu/i386/loadcore64.c -@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - err = grub_efiemu_write_value (addr, - *addr32 + rel->r_addend - + sym.off -diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c -index 4406906..3a73e6e 100644 ---- a/grub-core/kern/x86_64/dl.c -+++ b/grub-core/kern/x86_64/dl.c -@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - { - grub_int64_t value; - value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value - -diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c -index a2bb054..39d7efb 100644 ---- a/util/grub-mkimagexx.c -+++ b/util/grub-mkimagexx.c -@@ -832,6 +832,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - { - grub_uint32_t *t32 = (grub_uint32_t *) target; - *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32) -diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c -index 9179285..a79271f 100644 ---- a/util/grub-module-verifier.c -+++ b/util/grub-module-verifier.c -@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = { - -1 - }, (int[]){ - R_X86_64_PC32, -+ R_X86_64_PLT32, - -1 - } - }, --- -1.9.1 - diff --git a/user/gsettings-desktop-schemas/APKBUILD b/user/gsettings-desktop-schemas/APKBUILD index 185d15bdf..47bf9ddf4 100644 --- a/user/gsettings-desktop-schemas/APKBUILD +++ b/user/gsettings-desktop-schemas/APKBUILD @@ -1,45 +1,39 @@ # Maintainer: pkgname=gsettings-desktop-schemas -pkgver=3.32.0 +pkgver=3.34.0 pkgrel=0 pkgdesc="GSettings schemas shared by GNOME desktop components" url="https://developer.gnome.org/gio/unstable/GSettings.html" arch="noarch" -license="LGPL-2.0-or-later" +license="LGPL-2.0+" makedepends="glib-dev gobject-introspection-dev intltool meson ninja" subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" prepare() { default_prepare - cd "$builddir" sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in } build() { - cd "$builddir" - mkdir -p build && cd build - meson -Dprefix=/usr .. - ninja + meson -Dprefix=/usr build + ninja -C build } check() { - cd "$builddir"/build - ninja test + ninja -C build test } package() { - cd "$builddir"/build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } dev() { default_dev depends="$pkgname" - cd "$builddir" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/share/pkgconfig "$subpkgdir"/usr/lib } -sha512sums="cf1d78a8f9f1697e20c995286b50d556c2ecc83bf4b28be19b3258a724494a2827fb9567cabf29cda1c590488fd2645e905072e08321766c8bdddd22ac3710dc gsettings-desktop-schemas-3.32.0.tar.xz" +sha512sums="6cbe59facf77566ed93faabafc6b00ad03fb398a9a4686ba94a08b1c2d0df1d44bd673fb4d51340209a66ebc0aa32095615e7e63b78f4cc4c10d240a7b0a8fa1 gsettings-desktop-schemas-3.34.0.tar.xz" diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD index 2682bc026..8788400ab 100644 --- a/user/gst-plugins-base/APKBUILD +++ b/user/gst-plugins-base/APKBUILD @@ -1,27 +1,24 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-base -pkgver=1.16.0 +pkgver=1.16.1 pkgrel=0 pkgdesc="GStreamer multimedia framework - Base plugins" url="https://gstreamer.freedesktop.org/" arch="all" options="!check" # fails overlaycomposition on ppc64 license="GPL LGPL" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends="" -replaces="gst-plugins-base1" +checkdepends="orc-compiler" makedepends="alsa-lib-dev cdparanoia-dev expat-dev glib-dev gobject-introspection-dev gstreamer-dev libice-dev libogg-dev libsm-dev libtheora-dev libvorbis-dev libx11-dev libxt-dev libxv-dev mesa-dev opus-dev orc-dev pango-dev perl cmd:which !gst-plugins-base" -checkdepends="orc-compiler" -source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz - endian.patch - " +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +replaces="gst-plugins-base1" +source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz" ldpath="/usr/lib/gstreamer-1.0" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -39,12 +36,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } @@ -53,5 +48,4 @@ doc() { replaces="${pkgname}1-doc" } -sha512sums="4fa404156a384000e26e72ff0f701edb5a160181b48362350529177ca1c9325a3c58b83904bf5056262fe2609bc7f5913e835278973e049315deecfd1f26a3af gst-plugins-base-1.16.0.tar.xz -f146e76bedabd7b028cc64a9a671f7fb1ac1655164159d47953ea1afddafee1e40470593442f22152fb7e3579847dc4fc6e1f6e16a7c47252d5f3c25a6ae7353 endian.patch" +sha512sums="ce65b5d63d3ac6c20b051d477d09515bfb1c2e4b10c58346180265bdc4ae44dd9833727b5eea5fe9c409a3cd8874429be23654c7a5c23e881c0e8f9e89fb32c9 gst-plugins-base-1.16.1.tar.xz" diff --git a/user/gst-plugins-base/endian.patch b/user/gst-plugins-base/endian.patch deleted file mode 100644 index 403f40f69..000000000 --- a/user/gst-plugins-base/endian.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gst-plugins-base-1.16.0/tests/check/libs/video.c.old 2019-03-29 12:21:21.000000000 +0000 -+++ gst-plugins-base-1.16.0/tests/check/libs/video.c 2019-05-01 15:49:10.000628817 +0000 -@@ -2828,7 +2828,7 @@ - fail_unless_equals_int (data[i + 3], 0x80); - #else - /* A - R - G - B */ -- fail_unless_equals_int (data[i], 0x00); -+ fail_unless_equals_int (data[i], 0x80); - fail_unless_equals_int (data[i + 1], 0x80); - fail_unless_equals_int (data[i + 2], 0x80); - fail_unless_equals_int (data[i + 3], 0x80); diff --git a/user/gst-plugins-good/APKBUILD b/user/gst-plugins-good/APKBUILD index 31f9963e5..c9147e89e 100644 --- a/user/gst-plugins-good/APKBUILD +++ b/user/gst-plugins-good/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-good -pkgver=1.16.0 +pkgver=1.16.1 pkgrel=0 pkgdesc="GStreamer multimedia framework - Free, well-written plugins" url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html" @@ -22,7 +22,6 @@ source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good- " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -36,12 +35,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -55,5 +52,5 @@ gtk() { "$subpkgdir"/usr/lib/gstreamer-1.0/ } -sha512sums="01ae64426d62500c12eb98073fcdf4bbbb7df69b5d30a153491a6e3bcd9bfa6e6a3a7fdedd7b7293ce9405e909a4a57c691f293a58525f21281136deac7c0a7c gst-plugins-good-1.16.0.tar.xz +sha512sums="06dc1887626864c30248df53d48e85ffdf0d1660d74f70f23c325c0844e9ca390556846cbae77fe9a4a90cb992e9a55117c15a9031b44a48d45dc07a61b18da4 gst-plugins-good-1.16.1.tar.xz 1cecf260cfeb19675a819f9858426aaed3b9627ed90b8facb6cb12dfc0b265232639b1888d7cc03edb87025e3eddab6e3606f16b5f7ca261a6b1c39b0dbdc6f7 endian-test.patch" diff --git a/user/gstreamer/APKBUILD b/user/gstreamer/APKBUILD index 4beb70d0f..d781a46a8 100644 --- a/user/gstreamer/APKBUILD +++ b/user/gstreamer/APKBUILD @@ -1,21 +1,21 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gstreamer -pkgver=1.16.0 +pkgver=1.16.1 pkgrel=0 pkgdesc="GStreamer multimedia framework" url="https://gstreamer.freedesktop.org/" arch="all" options="!check" license="LGPL-2.0+" -subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-lang" -replaces="gstreamer1" +depends="" depends_dev="libxml2-dev" makedepends="$depends_dev bison flex gobject-introspection-dev glib-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-lang" +replaces="gstreamer1" source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,7 +31,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -47,4 +46,4 @@ doc() { default_doc replaces="${pkgname}1-doc" } -sha512sums="d65d8ee78e5c245ed710fe7907e35d18bfe8729518552f86ea6f16bbcfef7b1c418e0fbe94fc79cb2626510fdf486d457fb040290e84d383964c8ab140455652 gstreamer-1.16.0.tar.xz" +sha512sums="30abcf20fa16cdedbacbecabef66367e614c9c5865311238397afbbe30fe6588909ddd7e917c4ec0749c4095c6f73b4de2e57a93ff2c1b97629206b05fc06173 gstreamer-1.16.1.tar.xz" diff --git a/user/gutenprint/APKBUILD b/user/gutenprint/APKBUILD index 67f344222..42198e73d 100644 --- a/user/gutenprint/APKBUILD +++ b/user/gutenprint/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gutenprint -pkgver=5.3.1 +pkgver=5.3.3 pkgrel=0 pkgdesc="Open source printer drivers" url="http://gimp-print.sourceforge.net/" @@ -12,12 +12,9 @@ depends="" makedepends="cups-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" install="$pkgname.post-install $pkgname.post-upgrade" -source="https://downloads.sourceforge.net/gimp-print/gutenprint-$pkgver.tar.xz - freopen.patch - " +source="https://downloads.sourceforge.net/gimp-print/gutenprint-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,14 +27,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="214d07e6f78130e95c8c9d98f0862921d26f74a7c302afabdb138b35ef5f02f52fa143411983867fd7015477c16ca18cf8001e6552c27cd4a12c08ff77e92986 gutenprint-5.3.1.tar.xz -a4a74b7eeffdb12cc106c7da33bef24a7e80fca94091a8301b61df60e642e54fb57f5f00027530d86a83c3aff086ff43439b46bcfdcafa29073c60445d49781e freopen.patch" +sha512sums="d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6 gutenprint-5.3.3.tar.xz" diff --git a/user/gutenprint/freopen.patch b/user/gutenprint/freopen.patch deleted file mode 100644 index ddc351fec..000000000 --- a/user/gutenprint/freopen.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gutenprint-5.3.1/src/xml/printers/check_duplicate_printers.c.old 2018-09-03 15:19:33.000000000 +0000 -+++ gutenprint-5.3.1/src/xml/printers/check_duplicate_printers.c 2019-05-01 20:32:48.290238929 +0000 -@@ -34,7 +34,7 @@ - if (getenv("BUILD_VERBOSE")) - dup2(2, 3); - (void) snprintf(path, PATH_MAX, "%scheck_duplicate_printers_%d.log", getenv("STP_TEST_LOG_PREFIX"), getpid()); -- stdout = freopen(path, "w", stdout); -+ freopen(path, "w", stdout); - dup2(1, 2); - } - setenv("STP_CHECK_DUPLICATE_PRINTERS", "TRUE", 1); diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD index 84b2cd8d4..d9e1de2db 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.08.0 +pkgver=19.08.1 pkgrel=2 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="4ca7b39d2e149ffe9bdb1234e264ea3bbeeaca0125462ffe7f79b1653448df44596bab69d4ad61df2d73d4ec8777cb61054da7c6d7badb11ee96560f8b105b49 gwenview-19.08.0.tar.xz" +sha512sums="c897239eb1693c131087b2dac4cf71f11fc35b132047eeb5d311dfc0f16962683158f5f381df294575a924c764a3e081b42b032665739fb10504c79392049836 gwenview-19.08.1.tar.xz" diff --git a/user/hwids/APKBUILD b/user/hwids/APKBUILD index 1fcbe079d..02221d9c8 100644 --- a/user/hwids/APKBUILD +++ b/user/hwids/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=hwids -pkgver=20190316 +pkgver=20190818 pkgrel=0 pkgdesc="Hardware identification databases" url="https://github.com/gentoo/hwids/" @@ -16,12 +16,10 @@ source="https://github.com/gentoo/hwids/archive/hwids-$pkgver.tar.gz" builddir="$srcdir/hwids-hwids-$pkgver" build() { - cd "$builddir" make UDEV=yes } package() { - cd "$builddir" make DESTDIR="$pkgdir" DOCDIR="/usr/share/doc/$pkgname-$pkgver" \ MISCDIR="/usr/share/hwdata" UDEV=yes install } @@ -67,4 +65,4 @@ udev() { mv "$pkgdir"/etc "$subpkgdir"/ } -sha512sums="6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e hwids-20190316.tar.gz" +sha512sums="74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2 hwids-20190818.tar.gz" diff --git a/user/iso-codes/APKBUILD b/user/iso-codes/APKBUILD index 51f3e4f3e..896a990a4 100644 --- a/user/iso-codes/APKBUILD +++ b/user/iso-codes/APKBUILD @@ -1,15 +1,16 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=iso-codes -pkgver=4.3 +pkgver=4.4 pkgrel=0 pkgdesc="Lists of country, language, and currency names" -url=" " +url="https://salsa.debian.org/iso-codes-team/iso-codes" arch="noarch" license="LGPL-2.1+" depends="" makedepends="python3" subpackages="$pkgname-lang $pkgname-dev" -source="http://anduin.linuxfromscratch.org/BLFS/$pkgname/$pkgname-$pkgver.tar.xz" +source="https://salsa.debian.org/iso-codes-team/$pkgname/-/archive/$pkgname-$pkgver/$pkgname-$pkgname-$pkgver.tar.bz2" +builddir="$srcdir/$pkgname-$pkgname-$pkgver" build() { ./configure \ @@ -27,4 +28,4 @@ package() { make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install } -sha512sums="5217b8d9d7a0db3ee5f89831f9fb4938e79a7c33a73fcde9e057eb825a08973d6115aa7a709552cb9ef29c4ad094bb7a1e848cbb6f8fb01efb15d4205c235dc0 iso-codes-4.3.tar.xz" +sha512sums="fecb169889e86e87fa90b9ffbbb79d12d4ce4f0ea7b4f699b2ff978f88bdbb790e5b37120d9b696fb13db56845727b6ff102049878e06bbc26b258214eeb3c05 iso-codes-iso-codes-4.4.tar.bz2" diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD index 146944946..bc2749237 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="KDE Jukebox" url="https://juk.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c769cec1ba54b6ea00a73012d84b3a6aee80bc31f496f895e345fab8c9e451fcc49b80094798804b18889b732801d6aec030de541cddea634d57d28045884b12 juk-19.08.0.tar.xz" +sha512sums="3d47aaa303c6de290231936f6f85a3433a34978ad826237320a67ee4ed4162cfb3d2a3482be59ea10c43209ede3d648c67c33c0880e7971873a5c66ff84b569b juk-19.08.1.tar.xz" diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD index 5c2ef4d5f..f2b1f5b2a 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Graph calculator and plotter" url="https://www.kde.org/applications/education/kalgebra/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3d5c5ecb8746378333537eca96d6cf409cfecc35fcb71cd6ffbca2bc489e196f28a9a153590b1111c4928084660120c374242ee3020c0b58071dbceb241c3188 kalgebra-19.08.0.tar.xz" +sha512sums="381256c3ee3b774d0e2ada3c08ad97174c64e58b56e31b212ce4bcc943be83565edc3310435b2a21c438b424a4295ec4d0af651218c54f054efc18751ae1e0f1 kalgebra-19.08.1.tar.xz" diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD index 708b40b76..8cbcd7102 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Periodic table of elements (PSE) with calculators" url="https://www.kde.org/applications/education/kalzium/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="042f6613c2f8312db4a9268f27d040d9a885739d3dd3e47536e465ee94080634e4851721464be8025bf0f381f215bdc89980a5bcfed7439010360cfade02da1f kalzium-19.08.0.tar.xz" +sha512sums="bd2b9d0163c387d85b745d5b38b5c8a6381544f6b475e3256f2213b9a4d49cc422434f354eeaf2a05ce63f1b189334f17312660e6863010cbdca143763595273 kalzium-19.08.1.tar.xz" diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD index 808d95bb3..899aec6fb 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Letter order (anagram) game" url="https://www.kde.org/applications/education/kanagram/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="763e905f536e82b36566ec5ee142bf3f4f11a7ebd08ef53558d244035a1260fa579662ef685bf1317bb0160a93a0391913d9cf46ef93c7cae4fb95bc39b2dcf7 kanagram-19.08.0.tar.xz" +sha512sums="74e4c66df1038b45678de16710a8c07b4d22a89e8ae5f22781af03867b9637e172aa422cf43089a11075d137daa9d14c9a9bb7a34c30e7feea8a73e3ca16815d kanagram-19.08.1.tar.xz" diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD index 20ea0639c..00a2bd62e 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Pac-Man clone" url="https://www.kde.org/applications/games/kapman/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="82ad6875c0b15376033a5afc52f6d566707de669f78e956fa2deb975f5f0b073ced58cb46c08c93f8b05868f1438b7ac4ed74aa4522af63cf8fb32f105b2af2c kapman-19.08.0.tar.xz" +sha512sums="9b0ecf176a36c6410ca35887deee91a087c097fdcd8e7c751a889701a3d05a4e3f6caaf813683b9719cf3fbe1b5b458a60d7a02617cda73f2638fe0e5418557b kapman-19.08.1.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index 67650d6f1..ed9695e3f 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more" url="https://kate-editor.org/" @@ -92,4 +92,4 @@ kwrite_lang() { done } -sha512sums="5fea2010fd18585ebc8fc99e01a5815655f835a9a03528f236eefe3995977013d0610cf525bf99d8ae307ee3d9b107d0dae1491cb9ce1a46ac0f92de90da6d28 kate-19.08.0.tar.xz" +sha512sums="08ee7dda2e7ff7db7f3195bc62c7e9cbd156bd4d0164318e9f12a6c9d958ed63b106abf048df374bffc0858e2a88df46acdeb2a5c4d520e75137e4d5a2f7f511 kate-19.08.1.tar.xz" diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD index ed8c225e3..43df82148 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Fun, educational game involving molecular geometry" url="https://games.kde.org/game.php?game=katomic" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="93dfa19358cc582857e18982144da887ba4369ab1413cec4a1a17cac673219b983ba16be4c78f60651590e42ef8b76a266ac72ea91c39e017f2201006518e301 katomic-19.08.0.tar.xz" +sha512sums="061ae4bc1a897d7218e132bc8fd3a6dbda6e0f7a3665bac8a420d83fa1fb3e34e1eb91537bc5cfa589c5ed1b6ee5063a30329fba61a17b9420d6f839bb4942e6 katomic-19.08.1.tar.xz" diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD index 0cc5b4aad..c20c04af9 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Hide-and-seek logic game" url="https://www.kde.org/applications/games/kblackbox/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ec6c30e4b58386db45baf44f072a5805563c85d3f30ab7ade222e4012f1c025c2f339436888f0b8b309e91e9ed744c7b3a5db76304837dba8f28d2f0780070d kblackbox-19.08.0.tar.xz" +sha512sums="9ef9928c4e958f7cac06a096a386e1aacea261088f72f5db320aee8a0e397ec65924ff38edacf43e3f4ecd33bf996f6e3d3c37e0e0cb43770026b53221e98eff kblackbox-19.08.1.tar.xz" diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD index 0fea5720c..fd7984b3c 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Falling blocks game" url="https://www.kde.org/applications/games/kblocks/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b99b590a4fcd0b04fbe7763b05d90e78ab35f1a7e2938d7043d132b4060c22b98c0bb067e677416517dbddbee4c71edd1c8be76fb563fa03c5d5b50113bd7e2e kblocks-19.08.0.tar.xz" +sha512sums="3f53ad643770bbc54e3bd91d93b3ac3f0b1874975e4d148afeffca68b75cf821393986f1239614187a36d9bc0fdfa016e943a184d52ae166986ad6154e77a483 kblocks-19.08.1.tar.xz" diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD index e6c2e7eb0..39208c7d0 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Puzzle/arcade game to build walls" url="https://games.kde.org/game.php?game=kbounce" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2cd3d911bc6bda60cbcbb11de1bbb48faa90a42a7cd32361b40bf05334bc2b2abf346cf91bfcf9fe5a85d1b135e0e4f01bee4b8ef9063f764edd1cba28b96e30 kbounce-19.08.0.tar.xz" +sha512sums="b846a1740a5e7c8e85c9e744505d0e4e352aa1c66e839ee9a16587fc6c842366fcceba112ef78989cade388843a6be338756b30556dc00bd40ae76b2a186fefa kbounce-19.08.1.tar.xz" diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD index f5b1a632a..08a3511bd 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Break-Out like game with a ball and paddle" url="https://games.kde.org/game.php?game=kbreakout" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e3fe508b82d804b4f5468e097e1da36cf0a4bcde4706c4b80fae2cd8295cdc2632d13e6d856c3638d70e1bb1d1a8a4d5e8f4662a69ba18c96f5306ae6d318d56 kbreakout-19.08.0.tar.xz" +sha512sums="09f5746ec8d760814a8e9d99dc57224a0c5246c6ef9b4ab7cd27109f6ae86c9d3666759033f87dbb71885902922de386dcc7ca2b59127cf77bb8337d92b3e36d kbreakout-19.08.1.tar.xz" diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD index 42fa92c2f..3b3823962 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Practice calculating percentages and fractions" url="https://www.kde.org/applications/education/kbruch/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="da21c2c96dc0949acd9aae14c34d6f38c8daf5df304e00e7bc742fcc009d47689ef53a0f3843f22a6a89f8efa21ccc6a849e7cbd18036d21bafc94f1e77712e1 kbruch-19.08.0.tar.xz" +sha512sums="d1b88f1765da506fb3a409f6a578cac4afc0a4bb182fbeef7ad96c72b1b35c27314d0906c4acbadabb0ddd81ea77f86a45b1aaa1c00d3f7639ff46c86e2ae510 kbruch-19.08.1.tar.xz" diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD index a3b376dc3..95c38e6e1 100644 --- a/user/kcachegrind/APKBUILD +++ b/user/kcachegrind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcachegrind -pkgver=19.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Profile data visualisation tool and call graph viewer" url="https://kcachegrind.github.io/html/Home.html" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3f86c1ec245f69cb36021498166ea3c05919131fd5b26507642702242801c96923040407dd3eafa6a1878ed227c8c66c0425c5252912237c6f3502995d448dc4 kcachegrind-19.08.0.tar.xz" +sha512sums="0283528e3252b04c611843c99d70b2206b6d590332234dc24c1a3de0057f407212a73d0e30c32049a061de41e8664e24b4ef7766036046f93bbfbff2d4a6f9a2 kcachegrind-19.08.1.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index 528924830..0f46321c7 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Calculator with many mathematical, scientific, and logic functions" url="https://utils.kde.org/projects/kcalc/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4d07c3ddc07f0226f00b4f5bf76b042a4ee13dbfbd208f50c01c22a1580436207e1e5d7ee315c1359b740fee200e7f1b3738f38056745a2a64062de4876057a3 kcalc-19.08.0.tar.xz" +sha512sums="6a4aae7569165d291518613005c71f54b74b17f747b003bfd1fc71f938c7676903d2a83adb742b938aff3e1ba8e71dcaa56d6a8c76a37398d2a7a602e3b90a5e kcalc-19.08.1.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index fb76c343c..8fd327ff9 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Tool to select special characters from all installed fonts" url="https://utils.kde.org/projects/kcharselect/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1428e1a88ce4de91fb151c6acf70ef073d6c68be0d8690a41dc0f1606a065f0f326ccfa9eeeda4bd642249690bf46b0181a63e5d81957c916e801698d3bf77f3 kcharselect-19.08.0.tar.xz" +sha512sums="d6685688d4168e8283d07844b5b32669dda405079931740babfbb3c348294cbdd0b8659b368c83b97d6b4905a1031c1dfde167d632c88828cd8af7a0878d054a kcharselect-19.08.1.tar.xz" diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD index 47d57341c..60ac5c0ef 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Simple application to choose a colour from the screen" url="https://www.kde.org/applications/graphics/kcolorchooser/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="12fd9829707ef004f61fc21bffb65d50830f445d470b83228d53a3cdd992256e1b6e6d9b462dd56041934d8d018e32a24b943d902e99ab63c1f4c8a9a1b061a8 kcolorchooser-19.08.0.tar.xz" +sha512sums="c00ab2eb6539ee006da4f5ac6355544883ea64f3390ac5cc8f70ab324f2188fc6d37b19e84a9453740e1604eddbbee173f738d40f94835de2eba9022ddd24490 kcolorchooser-19.08.1.tar.xz" diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index e5db786a6..f110d5d45 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Educational software from the KDE Software Collection" url="https://www.kde.org/applications/education/" diff --git a/user/kde-games/APKBUILD b/user/kde-games/APKBUILD index 598abed8f..4020a99fc 100644 --- a/user/kde-games/APKBUILD +++ b/user/kde-games/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-games -pkgver=19.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="The KDE games collection" url="https://www.kde.org/applications/games/" diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD index 81286dd65..330fe4281 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Graphics software from the KDE Software Collection" url="https://www.kde.org/applications/graphics/" diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD index a01fd7d0e..142e010fd 100644 --- a/user/kde-multimedia/APKBUILD +++ b/user/kde-multimedia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-multimedia -pkgver=19.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Multimedia software from the KDE Software Collection" url="https://www.kde.org/applications/multimedia/" diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD index 82a97290e..c2beaa270 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.08.0 +pkgver=19.08.1 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 2914c46b4..10da83615 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Desktop utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/utilities/" diff --git a/user/kdegraphics-thumbnailers/APKBUILD b/user/kdegraphics-thumbnailers/APKBUILD index fe5d9ac88..96e06bf4e 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="KDE thumbnailing sofware" url="https://www.KDE.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7eb27cc6132a80e25be61fa87d70157f6863424aa9586886e51969a0c1d089c0c6558c6ccb7cea6c6f1182cc720cfc46802120cdfc5253318f5dc8633a78c982 kdegraphics-thumbnailers-19.08.0.tar.xz" +sha512sums="294ca87db7d38496e9b87a0cfb5516f2295bb94fd29cc1c1260a8c281d097ae1b6b6f02a6a03cf0c82dfc248126fb2524211663673201d562e73e122c3dfa76d kdegraphics-thumbnailers-19.08.1.tar.xz" diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index 8e1f507cd..b9903e868 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Libre video editor" url="https://kdenlive.org/" @@ -48,4 +48,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7d4cef7af14735476481b29849d4e5decd6b618af2249736a842eec1470a99abce77fdde499e43dd15cc644a0ea639a5aeb42d62eb4f5f99ccdf153980f4d631 kdenlive-19.08.0.tar.xz" +sha512sums="74f007ecdfe2368a1dee9d7b2331e45a56adc157a4d20127659b833e3f045a6edce680593232b9be43e50d16a5222e275af61a4c3a7e4c420ad6721b2e93b502 kdenlive-19.08.1.tar.xz" diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD index 596cdf0e0..ed97a6adc 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="View disk usage information" url="https://utils.kde.org/projects/kdf/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ab3540220e18f55889ac71723c18526b8c7a1a65beb847f6c5afd81f54294e6f718c0f98c662e4618f59a56bf6f6a217b314609f129e6f97a4c605179a351f41 kdf-19.08.0.tar.xz" +sha512sums="a88d1622e8e36d0f2e9b0c2061fff88d19f171e11b2df38249504ff53f240cac3c735cc077cc132049fc492b9cbeaba9713207c69e6b6e4c02eb16348c635fc6 kdf-19.08.1.tar.xz" diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD index 76d596f51..0564f1230 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Three-in-a-row game" url="https://games.kde.org/game.php?game=kdiamond" @@ -40,5 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2215cb386ee8617e8d88df8f31782de9e36ccf7680c8f59e6215ddaa86e403a222d778a6a2e2f15f26543a9d9ec3986e5a5448d034b810de1b210bad2f8dc6fd kdiamond-19.08.0.tar.xz +sha512sums="707822816eeb8a0d10bceeb05672809e14ea65eb894bde02704189abe9a9465218a37ec0edefec57f7a15d46027dc5a834d7abdc87dddc6e5cfd48dae6d74b00 kdiamond-19.08.1.tar.xz b29c091b45376fa83192b0cd2876de7323648caa597e610c3d13d883ee0df269e9aa9e5367469e0d787a147ade590e6cd1b2c04162da0e8405220067d4e44129 ridiculous-qt.patch" diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index 23cde7e1a..0b17a5bad 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Standalone search utility for KDE" url="https://www.kde.org/applications/utilities/kfind/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8df128f61af4066b5d2bd78731e37d160faa321f1b5823d04d84ecf8af35e02959273ba3af2591c064c440fcb364d9368ac372bcda704996cb37fd6a168b43a8 kfind-19.08.0.tar.xz" +sha512sums="d38929c1aaa7b0df5ffa106dc3460f902b9bf65d1783a29787b29e4bf26ce4d25c47c5c2084f6941bd62961cc43e91aca92d4874c849533b911c88661f927834 kfind-19.08.1.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index 92e1dd47b..b10127bc5 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Utility for formatting floppy diskettes" url="https://utils.kde.org/projects/kfloppy/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="63a9da751f87c8a68e6f434dacac64728981a496b43675dfcf975fd150af9cb1b70b45390075cd665aa76c5e831879a5c18bae66f7bcf6f4e6d3d08e7e8fcc41 kfloppy-19.08.0.tar.xz" +sha512sums="0849417e8c0d8b2c5dbf47ecb3428cee2705fd151e73ab1451d881ed927fde033d0ba811b15fb8ac937029a22dcd0080974da960f050d24c9f17e694213b0166 kfloppy-19.08.1.tar.xz" diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD index 890758e96..5fc8f3031 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Two player board game based on Connect Four" url="https://games.kde.org/game.php?game=kfourinline" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b561a85daf31a7dbe97dea15a0dc92031a15df02926e43a443679a741ddc605fbde5bdf526755a30604da7714859359866b2ab8f7f0b0e6f05db7518b8c01ada kfourinline-19.08.0.tar.xz" +sha512sums="179d57ad6ef1037b2afedcc0dcc74f8a380a6dcd52c101725863ba689e214c7edf93c73efbbf3470a885ead35903c8fac6379635a1d8d6771f3b96dbaf2a50d3 kfourinline-19.08.1.tar.xz" diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD index 23998cf3c..b38b7341f 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Geography learning tool and trainer" url="https://www.kde.org/applications/education/kgeography/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="92583c1b7e07b1bb8d99ff1631f7be64c7d63c176d96bb2f72e230a830ec1470b014c32b3d0b8ac34a0666f0aa5b4ad9bb97869e01623f581bc066a46ef5581e kgeography-19.08.0.tar.xz" +sha512sums="b40051c664b62d6bc3c1886801557a2823027ce9d9a14d280aaf590a62aa770ad57a04a319c2a8d74939bc9468b62e08b2a6f4c0dcacd37b16113a2d4aee1946 kgeography-19.08.1.tar.xz" diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD index 32dab2ddd..1177df46f 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Versatile download manager" url="https://www.kde.org/applications/internet/kget/" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="65f843d626f5164e2c391bae222079c8208a4df5d654a570dad852c30ecbf68323afcf4cbb988e15f0c03fd016f50fbede2a51d182c292a14e945fece3ef572f kget-19.08.0.tar.xz +sha512sums="bd13ada5269b9658ffc921b0718d6690f3de73ed7ebd2a112cbfadda71491f8f2557e4e8c82b5af2e1ecd21f5b7085e4dfff705141c605fee03348ab50261521 kget-19.08.1.tar.xz d66fb3988aa26c2cb9e243ef446679e715cb3bd10ee8cb1b0b39a68d424ab9fca71428fa0c6004a1671093201e71e371331b069d6bb0325d0e7b936a9b95a73c kf5.patch" diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD index 8a24940fd..01bab73c2 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around" url="https://games.kde.org/game.php?game=kgoldrunner" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59243aeca07bc191f5dbf367cce8ccdc765dd6dca147df690e7110bcaa023d7f76eb26b33f33bf39746f3bdf4abe4699e8f16c12d10444d26b69321a1f0166ba kgoldrunner-19.08.0.tar.xz" +sha512sums="9abb8a855cf03748912173f1e14148cf0472e8de9815282d015d6137520d53c231f32467ee8c21942f67f20653e4f77613c94cdbd703a3ee799e4110bfe55b97 kgoldrunner-19.08.1.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index 73d9409eb..2fb6d7686 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Simple interface for GnuPG, a powerful encryption utility" url="https://utils.kde.org/projects/kgpg/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a90a78556bbe26279917b55f582d3bb9d8376aec7f70e55ff10ed9f6a769d77ee2d2bd6ab1ef4c9aec27d20a098bd6d8c0e37db2fe57af8ad781ceb7493c1bc6 kgpg-19.08.0.tar.xz" +sha512sums="e6c3bdaf07d17f47edcc7324c576f0412936c04f94ab0509b3a5323d9128108b8166d7ecf6c86dbfbf5946d861c996788ef2e086461d2d2a59082adc4e8df1a6 kgpg-19.08.1.tar.xz" diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD index 240cad137..6e525649c 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Hangman word game" url="https://www.kde.org/applications/education/khangman/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="99a93c9bc815a31ad03e76c7862909b42951507f44c440d61e353afa706f88580e85343566cb38d2633ffd320583e7399e9c4b431d10ba8e3509822972a25b4c khangman-19.08.0.tar.xz" +sha512sums="a8724c05660941894553d2acf548404c4ffe77a75812a8a7a0d7b046f87054527241cada222fb5a957af455c1b54f1699068298dc7475079874b4ae45b9e7040 khangman-19.08.1.tar.xz" diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD index 1b991a2e0..d0d41190e 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Graphical documentation viewer" url="https://www.kde.org/applications/system/khelpcenter/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e14b61a8a77bc300d0aed5ec6e4f14a7288cd7418beb6e3751326bff366bf0f68fdbd7083ce8c4f1d4f743139b05fce2625763b8703ba3373ca8cb553dd0ad1e khelpcenter-19.08.0.tar.xz" +sha512sums="d6fb1d331ac4f6c7889375191909b069580cc77d948558def2c7e970d2a1d5b75d501533ec7f3239e99ab9827af979140904ef7a4e180fa817fad6f02c6d6849 khelpcenter-19.08.1.tar.xz" diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD index e44b2a97b..61b09f056 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Interactive geometry learning and exploration tool" url=" https://www.kde.org/applications/education/kig/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b08c5b795b9e570ae0380c04bfeb1dcbc6b670a585ce5dcc70710cc8e914766f57d0561dffb8e6ca69a5a56ef734d41d9e59049340a73034f3f52801597df458 kig-19.08.0.tar.xz" +sha512sums="a5a63cead1fd5e1231a17b1ad205daa681ca4c1281ae88de813e4827166198e8a47901e0b774c1939b647331acfedcc0ea0ccd4169ea7ffbf213f2829d00354a kig-19.08.1.tar.xz" diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD index 1733a2d81..b90fb416e 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Go or Igo game for KDE" url="https://www.kde.org/applications/games/kigo/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9deb21a6e16e47ba77eaefb5f79ae3db8cde22ca2d77f7334ca027ae9432af908398f6ddf98bf028cfa5fa3fcdebfb82429171149bc7e03c55028984fc0b5eee kigo-19.08.0.tar.xz" +sha512sums="f45c89902f443cd4c36e16a2bbb27a229fdc4ab9763f3165aa03faca8a9a9696de07ab4cfd79fb49c5e7b164a22d91e7c3a7880aa1795ef59ecc372f833a0f4d kigo-19.08.1.tar.xz" diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD index bff752525..4116f61ab 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Simple game of evading killer robots" url="https://www.kde.org/applications/games/killbots/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dd02cb050c065cfd3af0efa850c9ddce6ab852d96254a861e924321df6c316f0803ab6abe6c6d61dd7aa254653a625a973f52889381346a0e4229eac09693044 killbots-19.08.0.tar.xz" +sha512sums="5a2324222dedfb343990d31260f28d76d81409ca93291d75f12921b1d862166aa14c5d4631e8a9c427b39524635e5c402e9484c064ce5bfd7ceb8408eefc120e killbots-19.08.1.tar.xz" diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index 1644caa71..68ce2a9a6 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="61687ee7f57f880e0e205267643292a19581985b4fd42936d0cc10999306754d1f30f9ab1a7494844f53742956007520811149ffacc27273985ed44c666c6766 kio-extras-19.08.0.tar.xz" +sha512sums="cd13862d63769496511d286eae3f11d7de52c2335e3706b16d0e32991b1443ad34d10ec25a1d7968b771b4cf02dc6075fc69d44f2c905a912a65389c197c6d24 kio-extras-19.08.1.tar.xz" diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD index 1719a6f64..3a1ccdf2c 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Yahtzee-like dice game for one or more players" url="https://games.kde.org/game.php?game=kiriki" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bddae10f0d934d39b652d7b5b37858297fc63263ec2dc5d5d1bb473a88bf6608d56e117032f55117077bc70b4f0dc8dd48c1ac5c19e088b6f9d5bff31ffb8d49 kiriki-19.08.0.tar.xz" +sha512sums="b360eec3d0f501d81cf28190cc236991dd07a2d5cb8d936c80684137373f563be7a08b28893631fa2d49f6d8d2f8a3c5fd3255e108993231bbc5e962bacbc0fc kiriki-19.08.1.tar.xz" diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD index 2302c1791..740f84fa1 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Japanese reference and study tool" url="https://www.kde.org/applications/education/kiten/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="998016a0e61185efa4d9b2a8c50b803ede5c36ab71ad1ab6cff3693fe6c6709432d04a3ea92c8a5e247e7fa13c9b7572e96a0919b812130675059debe3ba12b8 kiten-19.08.0.tar.xz" +sha512sums="89b022c32b0add0e4a978f9aa105a939d4ce00c74db22a9a58bc7d50f23e9e0e91ebdd478bd90ade32de2be487b206a056ff880668f352edcb327088236de862 kiten-19.08.1.tar.xz" diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD index 47c5af9ea..dd7abca1a 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Dice-driven tactical game" url="https://games.kde.org/game.php?game=kjumpingcube" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9260b5fe328a217d78426811e889bfc533a8d1f0d7537fb05d3d8b27bd85a3bd705de134a7b70cf028dc911045fdf2674b32c4e506383d5d979f5d9b5411d0c4 kjumpingcube-19.08.0.tar.xz" +sha512sums="d2aa9c0c4df85696cbbf066764b50e8bf6d449adc27833aacb4848cb0cb7cf0b6c2e2048ffc3f58d08fe8f727cb5635898a4e9b811760c878640d1bedda85bdf kjumpingcube-19.08.1.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index 8544f53a8..a60b18165 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f154e3b03c581a391ce6647e5c1e7c116e73368971fa325c132f4bd890f225c4ac95379c59c70cf538285820be9d93b92631ca51303cac00df80f0a838b7a8d0 kleopatra-19.08.0.tar.xz -ecd9a044202d66d9cd561301072a4738fbabfb816da64839efeaae14ea479b7e0d3feb956a17a3769ab673ea5e242170b2549358544c736536ac0db582e25e72 qt5.9.patch" +sha512sums="90e1f544d1fc37ae019b2211c835d5f00d4d0727d0d576bcc222bc8ed1247644ef8c13ba14c62249e0b18c25fbc649c083fc38981815ae71eda0e2e250c2856b kleopatra-19.08.1.tar.xz +4f1330881b582d3b730ee8001eedd6cd18ba14d21d7e80056c8bec1052691f580fd055fa762565449e2c820dbdcd133077ab61f98de8215f88459e32afd609bd qt5.9.patch" diff --git a/user/kleopatra/qt5.9.patch b/user/kleopatra/qt5.9.patch index 2489ab686..b6f182029 100644 --- a/user/kleopatra/qt5.9.patch +++ b/user/kleopatra/qt5.9.patch @@ -67,8 +67,8 @@ cgit v1.1 # Standalone build. Find / include everything necessary. -set(KF5_MIN_VERSION "5.60.0") +set(KF5_MIN_VERSION "5.54.0") - set(KMIME_VERSION "5.12.0") - set(LIBKLEO_VERSION "5.12.0") + set(KMIME_VERSION "5.12.1") + set(LIBKLEO_VERSION "5.12.1") -set(QT_REQUIRED_VERSION "5.11.0") +set(QT_REQUIRED_VERSION "5.9.0") set(GPGME_REQUIRED_VERSION "1.8.0") diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD index cf8978e12..3c9b1a165 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Learn alphabets for multiple languages" url="https://www.kde.org/applications/education/klettres/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2d9fef7673dc2b9623823e14fe96173c5274281e03bfc6bc6fbc8d6dbe29788f43359ec9f13c2a8cfced2e52f71fa9fda71edc152a8689009c3eb2a5b8b142bd klettres-19.08.0.tar.xz" +sha512sums="d58e6d710f26f7638d9d2414188011365ece942eee21654ad28a3487ae8b700f74912754ee5db781ab319899776d302f12f61aaed8f13b923f81751d3fcb3a48 klettres-19.08.1.tar.xz" diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD index 6854844bc..afde3c3e7 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Fun, simple colour matching game" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4b4fa6df65f998765e6973416c4928cc8862448f933d7fca88ab51048c44ad486b902104b8128220c99bce23ea83b618f50a9c511a5ba8066715cef027ff1874 klickety-19.08.0.tar.xz" +sha512sums="3230fe7998b7fb21b6eadf8e59c9bb586a4862df6f9171351957930234a32783abbf21924545a677b02f510627c035cad9144f1e4b8a192eede01b1e531708f5 klickety-19.08.1.tar.xz" diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD index bd602936c..cf6055a12 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Simple yet addictive single-player game" url="https://games.kde.org/game.php?game=klines" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8404c230869f10e1815f40b02166d108a8720bd7c64799cb4a54afd2526a25b7af68eb998fb591e7e31a29fc9cc3d21ecb54ba5086eb035f84749ad4ec193fe4 klines-19.08.0.tar.xz" +sha512sums="fe110598e4684fa7ff28c060ee2dc4aa025e35565474104202e5dba4c09d2a2192ad827ff2bbd2c48dbf83480395a65352d69aba08dae5ad30766265876b4271 klines-19.08.1.tar.xz" diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index 7e35a891a..78d42c34b 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dec8a5c863ba6e9cedaa1f1953841533adc3accf2270441e5e5c7ac217822eb23908fb0000c98a7fd967a8d25c47285455d365f3aa106a294c0bcd7678f7d6b3 kmag-19.08.0.tar.xz" +sha512sums="c4e202c42008652cef0cf804c74e20676ad0e09fc80a481b22ed54400b13492723f96851ba30d2adce4188ada5ece65fd99e9be29f50d63329411fdf344cefeb kmag-19.08.1.tar.xz" diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD index 317fb3035..ccb0c80cc 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Mah Jongg desktop game" url="https://games.kde.org/game.php?game=kmahjongg" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="980afbd2be31944c37634a2a574662fabac0db1404a2c45b21397e5d6b605e34cd55d5585d684ac18976f0bbe91f92368bcbb2099156949b2688cbc0ae2b34fa kmahjongg-19.08.0.tar.xz" +sha512sums="b3fdef38e42a856f5f95339f59ba70fe720cc6f46569d5503cc37fe03d89ddd97b030c14030ff76f030f2c3bc26ecca9a8ccce6d76ffbee41e7d032e33cf2068 kmahjongg-19.08.1.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index d5074ccae..278b80d65 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="90f5b049c8a7e1a4b283ebda982b6a92296591544f8bd8f50f4e57daa99e9aca0821ca2df3b4a2baf7649c2982c8c340c0c65c2005d854eca747c3fa437d14be kmime-19.08.0.tar.xz +sha512sums="d1cdb8e7626e2071a95edadd1257255bb3f6318358736154d9d07897cd15388a433e4879affaadd4b5e67f5d35294ed17a4acd5ba2b9a9da3ab1ce5094bbeea6 kmime-19.08.1.tar.xz ae8e5836cefbf19f2aa5c775e3189a24b558840799c93fefc4d3863567d152bd14a2597241fcf0967d134cefedcf2c258f75f3c3bda4ec2cd2623f81a9c37c9f egregious-versions.patch" diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD index 9a201f144..7e88d3783 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Classic Minesweeper game" url="https://games.kde.org/game.php?game=kmines" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="23c8225081897dd8c3cdd4431c782c5caa9f0464a88b09b142514d5d7e67542b56f1303b730a4eaf9f59eb4aaee929f290d32d13babbda836ae26874de2eae0b kmines-19.08.0.tar.xz" +sha512sums="f2459218e76a53bc80896e6f627e6387812e0a29618861afb6ceb570e57b674b028f94a36faa94734018a718965d727a7a9cdbab3252bff7c3336283a24a36ee kmines-19.08.1.tar.xz" diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD index 507b53b13..78088f792 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="KDE sound mixer" url="https://www.kde.org/applications/multimedia/kmix/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a2d7793cd9a8ee456287b484f7dca5abc04868728f1073bddc3d75b75a754d62b923464d2a2ea4d01e7dc7a825cf30f06ca067948d2b457987bc763b0fc1be1f kmix-19.08.0.tar.xz" +sha512sums="84e3224bcb9fed06e2a8f0dd61c85e8684579d89078114a5ef2b6fc5f740598d05d0ad20dc7df0a77473d47b265a5bd49f12f3630911fa8bf294cae6b0e51481 kmix-19.08.1.tar.xz" diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index dd905aef2..d25b231da 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Tool to assist with clicking the mouse button" url="https://userbase.kde.org/KMouseTool" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5bbb2a0894f8c4921c4b1cb13c0007adb4baa8dc6afa0411016aa993ec567b7610138eb0ec2a93e702a7de2009cf2e8e9ed173bd5a75c5dd79ddbc3c3e256212 kmousetool-19.08.0.tar.xz" +sha512sums="d91a4715ead5ccb16c22558490f071db1ede11b91a564a2a85f19fc5e8424425e99df2bfe3142ff52d813b826614fd2ee54b76797379bcc368d6cca2e3e4f413 kmousetool-19.08.1.tar.xz" diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD index 6501731b1..6b94bc633 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Mathematical function plotter" url="https://www.kde.org/applications/education/kmplot/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2f2f43e361293220614d600c1276c2b7ab48799ffdc0f753a303f7c44ff32138d82ffdac2afe03a1b154b651bd1f9ce4c12c689f9594647b6660370544615813 kmplot-19.08.0.tar.xz" +sha512sums="dd76ff8a23a100f106fd7895db1058c2d9df631f9f79b38ba58ffbf0577429dc78676904bb21f0bbb11128d76b5dac2d4cb3fdc70ad831716dcd908e5208e93f kmplot-19.08.1.tar.xz" diff --git a/user/knavalbattle/APKBUILD b/user/knavalbattle/APKBUILD index f4e21d334..e46317adb 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Ship sinking game from KDE" url="https://www.kde.org/applications/games/knavalbattle/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3a890a6ed16783bd985bc50f5045ddc0c99190dc9a8970f75db8ed8e70a297327a68898f67b537e32d39fcd2dfea7041fd938f911b42e19b809873ebda3657c1 knavalbattle-19.08.0.tar.xz" +sha512sums="e74d41cc2d3265f481c22b55d34b050b14ec911b0df1c4fae36ac88379e45bdd3e18340bd7dee9c268160a4b02295960b4c3823f47ffb29bff650718213b5aa6 knavalbattle-19.08.1.tar.xz" diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD index a93ed9859..e7ee998fa 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Build up a computer network by placing the wires correctly" url="https://www.kde.org/applications/games/knetwalk/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ce33b798f6e6ff5828d654e608b540dcc8858994d7c540bc61c03bea98d595d11adf823fa916676ec82d7291c3bb4e71bccea3acf6ee3b020a9fb8b35cbe568f knetwalk-19.08.0.tar.xz" +sha512sums="7044da62503614ea0c83783d50994b28778fb9d8fdf288ce423e8573c46cd85d5fba0bcce91092870f069c8ea252b67945584ede91fe6a280ee348edc4365a52 knetwalk-19.08.1.tar.xz" diff --git a/user/kolf/APKBUILD b/user/kolf/APKBUILD index 888f2d1b7..b54c7249d 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="2D miniature golf game from KDE" url="https://www.kde.org/applications/games/kolf/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="be97c5d15a9755d4a915ce6d2f4062c5002d98e09405677cc692f1af0843063d940f162464a1ec3369580ad6fd75d9d136b44b132a7143dc5f811f472bc96dc4 kolf-19.08.0.tar.xz" +sha512sums="84714c55251297baa399c7ca0ef59d7aebe9f3ba7689c6f0e624c91336cd4aaea22e3ade2047ccbefbb0dbea889f1098c558013e631556a988dfaf844a1f7de6 kolf-19.08.1.tar.xz" diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD index a6bde2847..b62f77a52 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Simple ball dodging game" url="https://games.kde.org/game.php?game=kollision" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2a48c07b94089df9845150b22b58643a94d0e7ba21c7c9654ea6faffcd92ca1a40f3db33371ee09178a71858138c1fef87cb291c95afaefcb2cbe1d09f60f60e kollision-19.08.0.tar.xz" +sha512sums="6b4de067a9111db7ff3b9ef16b1d46def4889ff137ccc04456851252522bb5177de98858e6333bd715828fe82f8939115a9cb4362b053b1c13865e0f80ba64ea kollision-19.08.1.tar.xz" diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD index 65ed20f8d..30f25a37c 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Simple painting program for KDE" url="http://kolourpaint.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="63f0c4947a618e07ba53cb3771cd184957942a000986ab9317b892d076643908705c779658bf6c9b7376afb89122d71c160c851d52dff86231e2fb4852a39c74 kolourpaint-19.08.0.tar.xz" +sha512sums="63b874c5a3db5673902f6a6d1c7c25d9a732ada3b4c4a7d02293d0a46eea5557abc6f44dd3e5a20edfa66a8bf36fa3f0bbdc1a4f1943c6c8cf959e9b94ba9447 kolourpaint-19.08.1.tar.xz" diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD index 7f48e0d3a..6384d0b5d 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Galactic strategy game" url="https://games.kde.org/game.php?game=konquest" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="05d9092058e46e7a484449e633b1cbc7f2ceed36a75265067236a59f88b1d90896f714379dffb984edd03dfc9b21d79d46ddc57fa7c4d1db12b6591725a216e1 konquest-19.08.0.tar.xz" +sha512sums="6cca8adfbbf2f7d10bf4815ace3db921182047c7758956a96b2d9cf6f3a45da9ee827e018e1b2890061667361a90a6a4fa1f2a6fd982f922acf1fbccb9a45fc0 konquest-19.08.1.tar.xz" diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD index 9ce7e7c5f..17b822b25 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Terminal emulator for Qt/KDE" url="https://konsole.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9f1b17c62236fd28615cc083d5d33b2360e8a9c903d4076628018064b3240b012f6bd719fe1697f7d52c68a14f88fcfc6281986e251b62cf2571fbfdc777a412 konsole-19.08.0.tar.xz" +sha512sums="e68d51f6307c68f3e0ac2df9f2ab6eedac4984e04154bbc29d67ad6955c6210ebfb659488aac44a797e7e26d4cef0fa0e069e25a1d17a250b73a8cf0aca01696 konsole-19.08.1.tar.xz" diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD index 58ae2d96d..ad6dd95d7 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Collection of card games for KDE" url="https://games.kde.org/game.php?game=kpat" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d6c05dfa62d7beeb1f023221a986dfd0b3520d260ad3cf91eedecd15da662ff9ba8ba3fb0ea9ec08ec02474b1dcbac70757113702b052fb8b55053f83d7fcddb kpat-19.08.0.tar.xz" +sha512sums="6d67adc4de94911f37c872acdef02aa8b2e0c401ea8545cae3b0358d501d0e94f72de47039c9a9b55adac3aead59d77307bb0742b9ea079049c997b91f535219 kpat-19.08.1.tar.xz" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index f5b0ea729..2e60041fe 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Text editor for Personal Information Managers (PIMs)" url="https://pim.kde.org/" @@ -46,5 +46,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="834922261edc9470e41b8baaf2ecf10fa5b521d0315e5b4cfbba89e0f1f8f3167091cf2c089a83066e4b1cbd0cb193b3e278fdbc80f6fce491d933c9082c9cca kpimtextedit-19.08.0.tar.xz +sha512sums="6a7ab5f2a8656f1c6195d081f4d9b9da66e4c503c9fedd1ecba7c25f23cfffc259cfd08e2824e8d4b212cc3869cb3ba10c8bee09babf6e721d1b671f40e733a4 kpimtextedit-19.08.1.tar.xz 3cf800dfc537029588a4701faa2dd1fceb9e0b851c7d7675d468414d45dc2c07aadd4eb687a6b8cfeea4068e1e81b2fe2ad3de7c3c183650d43ab13cf20f4645 qt5.9.patch" diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD index 691ca74e6..61e325551 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="View and control remote desktops (RDP and VNC)" url="https://www.kde.org/applications/internet/krdc/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b7ac7ea37e64057b242b031ea0e000347b32628fe7b349fac70eb4ceee804a70169ce1736069fd6b8519fe963f6986c2853e4193b543a44e9f57b1fb7197c2b6 krdc-19.08.0.tar.xz" +sha512sums="eb6a9642f2a686a9f68440b5fb601703918a67bc0882bcda7a27a65bb394a9877d063704ebb151aec535a6da3a0ac2f622b9c4040db9402f1bdb226f724f6025 krdc-19.08.1.tar.xz" diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD index 435a51363..902aa8d1e 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Reversi game" url="https://games.kde.org/game.php?game=kreversi" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="69dea62ba598dbd0251bba8939d9d15418b2dd929d069e599eed4fb886aae99a06c8200f22b99a9df7b52306289972d2025ef6ae349c3b96a9cb4494978dc1bc kreversi-19.08.0.tar.xz" +sha512sums="d60330d2a7e5eadbd57642ac0649571327f2dd26fd46cdda39541bcbe9a8ba2e0d7680f7eb72c78a940ac17ad0a1b81ca3da55ed37b204e75038ab74609d9649 kreversi-19.08.1.tar.xz" diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD index 6014268ab..eb088fbdb 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Share your screen with others for remote watching or assistance" url="https://www.kde.org/applications/system/krfb/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="442c2d52d577eb9d95949da464d0a1541f24cd6a91aea07aa59c519170bee9729b989fa3678e4ac464f6710b8c384fe9d98d1b430e5250975c58e858033cff4e krfb-19.08.0.tar.xz" +sha512sums="fe07163ec15f42314d7f1e1035de36fe8a9b292bf14ad28c2cbb5865bf1063f04f1392f3b574a34942831b0e54b0f6ff54194eae2c98e06d5b93973018d20fb9 krfb-19.08.1.tar.xz" diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD index 8fc592ba8..448b4561c 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.5 +pkgver=4.2.7.1 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" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/krita/$pkgver/krita-$pkgver.tar.gz" +source="https://download.kde.org/stable/krita/4.2.7/krita-$pkgver.tar.gz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -46,4 +46,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="113bbea7cda7c97ba22da5ab78eef8fe6b8db48b54380ee12d93d28fc00e3f93ee1e5f3dbd7c1d257a577206486235ac75f3d3ef1e21f8ffcd1c5e3aa6f3b224 krita-4.2.5.tar.gz" +sha512sums="e1ce1eb9e38d4dc9de3fb6d48a6b5364dad8da1782f3e5780949bed4d819ad1c70be62d5d61748bec04e18c7b46279d393e976e8f8209f35587eacd96b1a84ef krita-4.2.7.1.tar.gz" diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD index c36e3bfbb..86213f37e 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Screen ruler" url="https://www.kde.org/applications/graphics/kruler/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ccee65f0d4915f3ad6ab3eb394edb294ca7dc8707e11be7548aaf907a6fd8d161f8c316ffe9910491e5b3f9c65be9a5f538618d9d7d372e8776788c9270591f4 kruler-19.08.0.tar.xz" +sha512sums="b355838781ed9838cd412c64db845fad7f7d396d6c4b95554398b81358f85baccdad2dae3c9a6398f20548d401a83e20ddf32e08c14a69beb7544db16b07804e kruler-19.08.1.tar.xz" diff --git a/user/krusader/APKBUILD b/user/krusader/APKBUILD index 5e586643b..d518e2996 100644 --- a/user/krusader/APKBUILD +++ b/user/krusader/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krusader -pkgver=2.7.1 +pkgver=2.7.2 pkgrel=0 pkgdesc="Advanced, twin-panel (commander style) file manager" url="https://krusader.org/" @@ -18,7 +18,6 @@ source="https://download.kde.org/stable/krusader/$pkgver/krusader-$pkgver.tar.xz posix-headers.patch" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -34,14 +33,12 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="860908fd960ae45d298ade30bd4962eea44d126b5a3bb28d04540a0e4fbc0645de2394490fdb624b5fcc7005841c0ce392cda896dc4b1d3d2de3a1e44171222d krusader-2.7.1.tar.xz +sha512sums="8af90a9067c7c92abc9dcc866e1eb1e1f1bd2a4c45968c260b6b01cc079d3125d6db6d49b530d90a2f91d3c99c577fa7f1ff47d12abc3400a75e2d52e7ae477b krusader-2.7.2.tar.xz 6df1a858c896d91d2f09a0cf49a90177655cf21bd7fe18c5b82e0805f81d3c121978b932a2f139d2e0e4ca8d9741d181274b968628e905f87557b6ad43f05a59 posix-headers.patch" diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD index 6f2035e3f..f8d15fa9a 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Mixture of Solitaire and Mah Jongg" url="https://games.kde.org/game.php?game=kshisen" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ad6e5f2c32c5363371c81b9ddec10d8a33f5bb839625138e067901e1f5729ece17920e9573a75af0b679e772eb9b16780069bf06cf990346ff7ad0294aac97bc kshisen-19.08.0.tar.xz" +sha512sums="4ce2e776762657eadfd2e38f88b8d1e6c31b20b27aeb4f01c359329ba8403a499e5854de90b7e51c8ef0fa0ede533600376a45e9510e57e314bff3cd78729a52 kshisen-19.08.1.tar.xz" diff --git a/user/ksirk/APKBUILD b/user/ksirk/APKBUILD index 73565f540..7b9c86754 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Strategy game from KDE" url="https://www.kde.org/applications/games/ksirk/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a19fdc310f1481bf4642c4d249ffe59c7a0ab5f921f51feb7debbba5df3317defe08c93df1327a0a5dc570a47b0b27e649cf898d17776f7aac3f73c0bd82e423 ksirk-19.08.0.tar.xz" +sha512sums="5cfde86eb1c0cf8c1a413ad57529c8f38e57489f3fd5ab1d1dea9ddf4ca2f9413bc509847fc895e13ed83f33786025438ae49595433047cd5e63662ddfa00b57 ksirk-19.08.1.tar.xz" diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD index 990da0b75..20f92008f 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Tron-like game" url="https://www.kde.org/applications/games/ksnakeduel/" @@ -40,5 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="91eb1d9b7fdb7350a43282b422df5b66dd5cce636545c41d9d08beb2438d820e034e46bfe61d42ea29fa9ea43b05bb928d349cdc92c1eee857a66eca52e6551b ksnakeduel-19.08.0.tar.xz +sha512sums="d3657d49d05cbb6bc9f42de0f4573795d87044ece513156a4c081df230e255d1ced99fa04ec60aa01e0d7ea30be20cf263329012f78b90f262a07abcc71eabd7 ksnakeduel-19.08.1.tar.xz 8f21639ca5b17f6b0bd5d76c65fb59e29c9e8b6cceb95d2c86795b9f20d6d282926c75e0eaba2b1878a0bd9698c1d7326b549e4a2f8c7802254a1d516672fcbb ridiculous-qt.patch" diff --git a/user/kspaceduel/APKBUILD b/user/kspaceduel/APKBUILD index 62e0ef233..d3dc8adcf 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Space arcade game from KDE" url="https://www.kde.org/applications/games/kspaceduel/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b364b5da191adfe7adf29b5fc5cafbc5e2236475fbacd69f9368d98054135a29ea65f7bcfc5237c7a1b24d8e2b266ee817d707f3a94f630ca217e554f7eb6372 kspaceduel-19.08.0.tar.xz" +sha512sums="84e861f618103ced6269947dc282c971090951569a62856751756066dc8da0ae0786635ca1c7a9a0caa0c0c9184092fa516aa878cfaede17482f435999876cef kspaceduel-19.08.1.tar.xz" diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD index be8dc2b68..495592265 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Fun and exciting game of Dots and Boxes" url="https://games.kde.org/game.php?game=ksquares" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="27061110c3f28a8742fe218799d684777c4ccb05cf143203833b14fe32a3e142affb1c0a5d199c5c39b379fc817396ddb5050f4fbd8d3449040eda8fc2d07ce7 ksquares-19.08.0.tar.xz" +sha512sums="a5760aab66b70bd7374d197aa6e7e2bbe22ccdda00b7860e0c57a8d4fbfe7329ed95596219220f570dd2adc42b355bdfb78670a213a0db7d982a2803a16500b0 ksquares-19.08.1.tar.xz" diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD index 000cc3d5f..d631f8629 100644 --- a/user/kstars/APKBUILD +++ b/user/kstars/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kstars -pkgver=3.3.4 +pkgver=3.3.6 pkgrel=0 pkgdesc="Desktop planetarium" url="https://www.kde.org/applications/education/kstars/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="91f3bcda48c194f5141f2f315bd3d89652ae4002a8fb0b765714358cb97e2093b13c8712ff1c16cf2e3a82024c8d1a1f136eaa0861387897ccd6cb123d137766 kstars-3.3.4.tar.xz" +sha512sums="07371c343456d60b3d5e7dd2fb13983926db811dc0ffedb56364c1a02783db501189328c7476762ac0535f43d372ace81d39f90cd0c170ce36385f8e5a185bf3 kstars-3.3.6.tar.xz" diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD index a76952b07..a0d262c03 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Desktop Sudoku (symbol placement / logic) game" url="https://games.kde.org/game.php?game=ksudoku" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bdc839e829c5254a7b5687d6de359dca3d16ac1f21ed6141b475c6fe8f96e1baa8ca4c7ea4053599144275fe7f3a2c8c59f81f2b51883c3227451d7df93a54e0 ksudoku-19.08.0.tar.xz" +sha512sums="3efb3c978c6ff83a50b2688e70b64ea9784e1897a17f1bab813ec9dcc034b5b46d4902d916a70df7d50dab2e03465d7c52ee7fbc985047b71aed767463fc00ee ksudoku-19.08.1.tar.xz" diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD index a36f1f8a9..147d1d560 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Friendly, powerful system log viewer tool" url="https://www.kde.org/applications/system/ksystemlog/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e7d42ef42bb2fd20d33e4dc6457e680ffa9ee4ee0dbf6ac7a15f85018392ae9172091c0fe2416bc446c3a592a78fa5bb0b19354e7d0bc05105ef7c9152d82778 ksystemlog-19.08.0.tar.xz" +sha512sums="518dc5b77f31e4200decb1c011d7bb09e4e3c92871ada3c47a43e1df2b434c1f48ce0c467b5ac7cea9958a84b83de6b691a19a0a29ff4d530706d189540ea2f5 ksystemlog-19.08.1.tar.xz" diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD index 5d1d77854..28478a5d3 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Steep responsibly" url="https://www.kde.org/applications/games/kteatime/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="10d1d136b5bf6c12401948768fb30aef4075a5207d5b10c13e851dea84010bd43bfecbeba6dd74759083dff6ec63d014014f0e8d7cee8b12ccddbc2fe266aa7a kteatime-19.08.0.tar.xz" +sha512sums="be87b18b1f6fd3f60b67335bd2492e169821ec9a98f39be257aa0ee841839d6aeb3b62648a7cc7056d1f8022149b45fac0b945c63c4fe5cd492b8f0bbe0dac5b kteatime-19.08.1.tar.xz" diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index 3fb8549c5..3c1c1cf9d 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Tool to execute programs after some time" url="https://www.kde.org/applications/utilities/ktimer/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b8dbbc6c928690dff3f5dedf42ff0c3e75c0b2fdeb812cc010409de8bab8e95ec1b8477482ef04d45ec44fa575360ee6a1929bc247734edd3f9da6af85f51098 ktimer-19.08.0.tar.xz" +sha512sums="4331807eaf0e0001f369383c2b10b12da68d515da9983150d5301ca08b9b97270491dfa5ea225f71e79b882a32dad75de892a3f9b0c6c3c4376f78638aaf8d8e ktimer-19.08.1.tar.xz" diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD index 0f816ab37..0a5a81798 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.1 +pkgver=5.1.2 pkgrel=0 pkgdesc="BitTorrent client by KDE" url="https://www.kde.org/applications/internet/ktorrent/" @@ -19,7 +19,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/ktorrent/$pkgver/ktorrent-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -35,13 +34,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06 ktorrent-5.1.1.tar.xz" +sha512sums="b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621 ktorrent-5.1.2.tar.xz" diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD index 6b90bfc03..1cc54ed01 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Touch typing tutor" url="https://www.kde.org/applications/education/ktouch/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fac0072441345fa7a85e70817f9f65e73995628f1f92c0bba9ad28bc996fdd997976df3995578ba5b9d34b494d04fde0be3179161b27ad6fc310282bf238623a ktouch-19.08.0.tar.xz" +sha512sums="ee1b4da2419c6acd0ebd6285ebe5338a37c751ea61f24bd3f8ec26bb70a5ebc5f4fc845b65c7cbc1ede70bbf961887e01386abb9975416e79d5e2ab236ac6b30 ktouch-19.08.1.tar.xz" diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD index db45c6aae..0c2c0f89c 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Simple constructor game" url="https://games.kde.org/game.php?game=ktuberling" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9822d9f58692d248493a7b9f7e4bdb033ca28444261820c303e7ec8eca16e2827ae6bcd244c5890e9fc289daf2ba726d5ffd7255cb897dab167efd665fec6b62 ktuberling-19.08.0.tar.xz +sha512sums="2defc44e93f08e036d78b8cb594ececba4d60df443957198cf5a3eb910d9a848fb1345344e5cfdecc7964ff7ff2f25bfbcd5d9df98c9ee6cd0884cec1d5dac31 ktuberling-19.08.1.tar.xz a8c723302d141ff74a10cc38245524d59a51d476159c2ac46a1694747ddcb078abc42cea80cf5a5d3910c96c0c90fb7dbf82786496f03b4438a23a736a784e76 frameworks.patch" diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD index 93a6a2966..d05c8c649 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Educational programming environment" url="https://www.kde.org/applications/education/kturtle/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e9de0110bcbc14aeb5ab76d7d8aaa204712c66bdbc21b4960f4b78d16a5459fa6fffdd7e16bf0e8e735ca417c34f68925b0e8eb7f9328aa7ec065d76745fba86 kturtle-19.08.0.tar.xz" +sha512sums="ffa25feca9ec74e509ec81ef762f598450ff62b5646785a1cf4aa7f2aa9bb9a5e6326dcc99b6b2c741828deae3a77f6c3d01621ec459b254f14a6bdda771119c kturtle-19.08.1.tar.xz" diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD index 92142001b..e6f5b78bb 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="3D cube puzzle solving game" url="https://www.kde.org/applications/games/kubrick/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c6f8acbd325d255bafe83bd4f00a385c154987c11d3da48f48edaae162415f4f1a749a8f74b894b8b865be7ed4acd9e758034c7a47b982b7916980baa3a07f0a kubrick-19.08.0.tar.xz" +sha512sums="a2aa6f299b9a17ba4fdcd4fa9b9a2e48e62e4fad45a196d50680a563e61f073b71632467542a5093b722c3c8340bf5e869e1be4e64b689bce170432fc0ed1e44 kubrick-19.08.1.tar.xz" diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index c7c4df7c1..ab71630f5 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Manage KDE wallets" url="https://www.kde.org/applications/system/kwalletmanager5" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b8221ee4e082e4ea7bf32499dcf435d29de752f683da2c71599c006c5e29b68128fe35cb9b39bf9f96191cf3403373be96ea30e7de4462e2ce3fe81f16bc02d8 kwalletmanager-19.08.0.tar.xz" +sha512sums="327bec90dda7bd4fd19356e811c71ca75fc306abb945daadaa8caf83bea699fc2bd815e8afccda6cb9700c1a9bd119cae9c50342762d0617d6d59ed5e604c105 kwalletmanager-19.08.1.tar.xz" diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD index 0004d278c..c9ad68360 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Sound editor built for KDE" url="http://kwave.sourceforge.net/" @@ -47,6 +47,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="66b7707a4ff0757c166b8ea56f2681258b7c0b501ccd9e2bb9f7b6fd826a396e24bf50c3eaadfb41a3a59bc3b96ff35230b105f2a7bd52a07249b6e8a7d91ff4 kwave-19.08.0.tar.xz +sha512sums="e5fce0de859b8a421229e6877b4c7a64672f25be44ddb936b9f39c79a6cb89f4d580960e83c106189ed1c63988406b78c89b0a45b721975ebf7dd44da6c12c23 kwave-19.08.1.tar.xz 63afd083727fd28436c2a8071429ba95fe4342c11669a4e27afc30b8a088b981f284fcff13861d5ef01a6f97152b25eec1fbeb303c9bdd76707e44ff5978dab8 es-doc-fix.patch 43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch" diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD index b9d7c8b8d..f976ae507 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Flash card trainer for KDE" url="https://www.kde.org/applications/education/kwordquiz/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7299bbf3f573a92fe6ef0ddc5515bca1c9c7a08189e41493a2f9f0a941d8ee1de6137a34285f635ebec1a57b0583bc8a621af2c53aafb6cfa07e4a9872bd946d kwordquiz-19.08.0.tar.xz" +sha512sums="f81b2b2d8f3abaefe91eb028ddbb702da8a663ddf01941c5e927cda5f2f473b73192b850a7349c18b1bac79ea835da0bf96e90714124604a50aa58410543c962 kwordquiz-19.08.1.tar.xz" diff --git a/user/libblockdev/APKBUILD b/user/libblockdev/APKBUILD index a3ab3dff7..934c901f8 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.22 +pkgver=2.23 pkgrel=0 pkgdesc="Library for manipulating block devices" url="http://storaged.org/libblockdev/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="69bbd5afbd8abb0e22ef72d80375e32db653f21cf3063cf69fff71ad069ee0e6119adf6918a63e7ba9ec4ca02ffe3337be3edeeafdd3e73e4e53d85e90bf2f45 libblockdev-2.22.tar.gz" +sha512sums="ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3 libblockdev-2.23.tar.gz" diff --git a/user/libdvbpsi/APKBUILD b/user/libdvbpsi/APKBUILD index 9f818977d..a61855055 100644 --- a/user/libdvbpsi/APKBUILD +++ b/user/libdvbpsi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libdvbpsi -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=0 pkgdesc="Library decoding and generating MPEG TS and DVB PSI tables" url="https://www.videolan.org/developers/libdvbpsi.html" @@ -14,7 +14,6 @@ source="https://download.videolan.org/pub/libdvbpsi/$pkgver/$pkgname-$pkgver.tar " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,14 +23,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309 libdvbpsi-1.3.2.tar.bz2 +sha512sums="70f9e783a947e026ea50afe98ad2b3bfce075bd8d76932f73a6253b077a3a180aa632e9a1fff20308e2f0f3f881d727b4e4aad9b8da2b384edf9a3a0f9eacc69 libdvbpsi-1.3.3.tar.bz2 f612bf80b07ec37a83477a37d78971c4bd4331eec86686a8bc7b247f43df2c047c89de419d5cef0b960de2032daedc81a4c380802c76b4dc081e1c09ad364dcb fix-includes.patch" diff --git a/user/libevdev/APKBUILD b/user/libevdev/APKBUILD index aac737a91..8e9083d17 100644 --- a/user/libevdev/APKBUILD +++ b/user/libevdev/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libevdev -pkgver=1.7.0 +pkgver=1.8.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="bc43723fd1ca251a77ee549022609f73c15a33ae470fc843ac687542fb1938fba4d046d3ee1dc814bc38a4292a7f2ad9e71fcce45525b518a4f4a5bef099aa6f libevdev-1.7.0.tar.xz" +sha512sums="8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4 libevdev-1.8.0.tar.xz" diff --git a/user/libgd/APKBUILD b/user/libgd/APKBUILD index 13f07cfe0..27de81126 100644 --- a/user/libgd/APKBUILD +++ b/user/libgd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=libgd pkgver=2.2.5 -pkgrel=0 +pkgrel=1 pkgdesc="Library for dynamic image creation" url="http://libgd.github.io/" arch="all" @@ -15,10 +15,20 @@ subpackages="$pkgname-dev" replaces="gd" source="https://github.com/$pkgname/$pkgname/releases/download/gd-$pkgver/$pkgname-$pkgver.tar.xz CVE-2016-7568.patch + CVE-2018-5711.patch + CVE-2018-1000222.patch + CVE-2019-6977.patch + CVE-2019-6978.patch " +# secfixes: +# 2.2.5-r1: +# - CVE-2018-5711 +# - CVE-2018-1000222 +# - CVE-2019-6977 +# - CVE-2019-6978 + build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +41,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -48,4 +56,8 @@ dev() { } sha512sums="e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b libgd-2.2.5.tar.xz -8310d11a2398e8617c9defc4500b9ce3897ac1026002ffa36000f1d1f8df19336005e8c1f6587533f1d787a4a54d7a3a28ad25bddbc966a018aedf4d8704a716 CVE-2016-7568.patch" +8310d11a2398e8617c9defc4500b9ce3897ac1026002ffa36000f1d1f8df19336005e8c1f6587533f1d787a4a54d7a3a28ad25bddbc966a018aedf4d8704a716 CVE-2016-7568.patch +d6577566814cbe2d93b141a4216b32acdeb2989dc1712eb137565081b913151bbb4c69911c96b2bb7c90695078a85152d368aad183de494d1283fde25021751b CVE-2018-5711.patch +d12462f1b159d50b9032435e9767a5d76e1797a88be950ed33dda7aa17005b7cb60560d04b9520e46d8111e1669d42ce28cb2c508f9c8825d545ac0335d2a10b CVE-2018-1000222.patch +df84e469515f684d79ebad163e137401627310a984ac1ae6a4d31b739b3dc6d9144f101e9bfc3211af1d7cdbaa827721d21a9fe528e69b9b60a943ec8a7ab74b CVE-2019-6977.patch +3bf31941365a878bef899afa14a89e4ad0fbfb3280d34b2118c8484698e15eff600751ae3ce146a4f006e6c21730cb18899bae3538f6cc2651025274b40cf1ca CVE-2019-6978.patch" diff --git a/user/libgd/CVE-2018-1000222.patch b/user/libgd/CVE-2018-1000222.patch new file mode 100644 index 000000000..80f9712bf --- /dev/null +++ b/user/libgd/CVE-2018-1000222.patch @@ -0,0 +1,73 @@ +From ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 14 Jul 2018 13:54:08 -0400 +Subject: [PATCH] bmp: check return value in gdImageBmpPtr + +Closes #447. +--- + src/gd_bmp.c | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/gd_bmp.c b/src/gd_bmp.c +index bde0b9d3..78f40d9a 100644 +--- a/src/gd_bmp.c ++++ b/src/gd_bmp.c +@@ -47,6 +47,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp + static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header); + static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info); + ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression); ++ + #define BMP_DEBUG(s) + + static int gdBMPPutWord(gdIOCtx *out, int w) +@@ -87,8 +89,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageBmpCtx(im, out, compression); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageBmpCtx(im, out, compression)) ++ rv = gdDPExtractData(out, size); ++ else ++ rv = NULL; + out->gd_free(out); + return rv; + } +@@ -141,6 +145,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) + compression - whether to apply RLE or not. + */ + BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) ++{ ++ _gdImageBmpCtx(im, out, compression); ++} ++ ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + { + int bitmap_size = 0, info_size, total_size, padding; + int i, row, xpos, pixel; +@@ -148,6 +157,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL; + FILE *tmpfile_for_compression = NULL; + gdIOCtxPtr out_original = NULL; ++ int ret = 1; + + /* No compression if its true colour or we don't support seek */ + if (im->trueColor) { +@@ -325,6 +335,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + out_original = NULL; + } + ++ ret = 0; + cleanup: + if (tmpfile_for_compression) { + #ifdef _WIN32 +@@ -338,7 +349,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + if (out_original) { + out_original->gd_free(out_original); + } +- return; ++ return ret; + } + + static int compress_row(unsigned char *row, int length) diff --git a/user/libgd/CVE-2018-5711.patch b/user/libgd/CVE-2018-5711.patch new file mode 100644 index 000000000..dff2b9ea2 --- /dev/null +++ b/user/libgd/CVE-2018-5711.patch @@ -0,0 +1,61 @@ +From a11f47475e6443b7f32d21f2271f28f417e2ac04 Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" <cmbecker69@gmx.de> +Date: Wed, 29 Nov 2017 19:37:38 +0100 +Subject: [PATCH] Fix #420: Potential infinite loop in gdImageCreateFromGifCtx + +Due to a signedness confusion in `GetCode_` a corrupt GIF file can +trigger an infinite loop. Furthermore we make sure that a GIF without +any palette entries is treated as invalid *after* open palette entries +have been removed. + +CVE-2018-5711 + +See also https://bugs.php.net/bug.php?id=75571. +--- + src/gd_gif_in.c | 12 ++++++------ + tests/gif/.gitignore | 1 + + tests/gif/CMakeLists.txt | 1 + + tests/gif/Makemodule.am | 2 ++ + tests/gif/php_bug_75571.c | 28 ++++++++++++++++++++++++++++ + tests/gif/php_bug_75571.gif | Bin 0 -> 1731 bytes + 6 files changed, 38 insertions(+), 6 deletions(-) + create mode 100644 tests/gif/php_bug_75571.c + create mode 100644 tests/gif/php_bug_75571.gif + +diff --git a/src/gd_gif_in.c b/src/gd_gif_in.c +index daf26e79..0a8bd717 100644 +--- a/src/gd_gif_in.c ++++ b/src/gd_gif_in.c +@@ -335,11 +335,6 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd) + return 0; + } + +- if(!im->colorsTotal) { +- gdImageDestroy(im); +- return 0; +- } +- + /* Check for open colors at the end, so + * we can reduce colorsTotal and ultimately + * BitsPerPixel */ +@@ -351,6 +346,11 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd) + } + } + ++ if(!im->colorsTotal) { ++ gdImageDestroy(im); ++ return 0; ++ } ++ + return im; + } + +@@ -447,7 +447,7 @@ static int + GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP) + { + int i, j, ret; +- unsigned char count; ++ int count; + + if(flag) { + scd->curbit = 0; diff --git a/user/libgd/CVE-2019-6977.patch b/user/libgd/CVE-2019-6977.patch new file mode 100644 index 000000000..4cfb9ab98 --- /dev/null +++ b/user/libgd/CVE-2019-6977.patch @@ -0,0 +1,21 @@ +Bug: https://bts.adelielinux.org/show_bug.cgi?id=159 +Backported-From: http://git.php.net/?p=php-src.git;a=commit;h=7a12dad4dd6c370835b13afae214b240082c7538 +Author: A. Wilcox <awilfox@adelielinux.org> +Bug: https://bugs.php.net/bug.php?id=77270 +Author: Christoph M. Becker <cmbecker69@gmx.de> +Committer: Stanislav Malyshev <stas@php.net> +Upstream-Status: unknown + +--- libgd-2.2.5/src/gd_color_match.c.old 2017-08-30 11:05:54.000000000 +0000 ++++ libgd-2.2.5/src/gd_color_match.c 2019-10-03 16:17:55.842322245 +0000 +@@ -31,8 +31,8 @@ + return -4; /* At least 1 color must be allocated */ + } + +- buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * im2->colorsTotal); +- memset (buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal ); ++ buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * gdMaxColors); ++ memset( buf, 0, sizeof(unsigned long) * 5 * gdMaxColors ); + + for (x=0; x < im1->sx; x++) { + for( y=0; y<im1->sy; y++ ) { diff --git a/user/libgd/CVE-2019-6978.patch b/user/libgd/CVE-2019-6978.patch new file mode 100644 index 000000000..0cfdda919 --- /dev/null +++ b/user/libgd/CVE-2019-6978.patch @@ -0,0 +1,216 @@ +From 553702980ae89c83f2d6e254d62cf82e204956d0 Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" <cmbecker69@gmx.de> +Date: Thu, 17 Jan 2019 11:54:55 +0100 +Subject: [PATCH] Fix #492: Potential double-free in gdImage*Ptr() + +Whenever `gdImage*Ptr()` calls `gdImage*Ctx()` and the latter fails, we +must not call `gdDPExtractData()`; otherwise a double-free would +happen. Since `gdImage*Ctx()` are void functions, and we can't change +that for BC reasons, we're introducing static helpers which are used +internally. + +We're adding a regression test for `gdImageJpegPtr()`, but not for +`gdImageGifPtr()` and `gdImageWbmpPtr()` since we don't know how to +trigger failure of the respective `gdImage*Ctx()` calls. + +This potential security issue has been reported by Solmaz Salimi (aka. +Rooney). +--- + src/gd_gif_out.c | 18 +++++++++++++++--- + src/gd_jpeg.c | 20 ++++++++++++++++---- + src/gd_wbmp.c | 21 ++++++++++++++++++--- + tests/jpeg/.gitignore | 1 + + tests/jpeg/CMakeLists.txt | 1 + + tests/jpeg/Makemodule.am | 3 ++- + tests/jpeg/jpeg_ptr_double_free.c | 31 +++++++++++++++++++++++++++++++ + 7 files changed, 84 insertions(+), 11 deletions(-) + create mode 100644 tests/jpeg/jpeg_ptr_double_free.c + +diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c +index 298a5812..d5a95346 100644 +--- a/src/gd_gif_out.c ++++ b/src/gd_gif_out.c +@@ -99,6 +99,7 @@ static void char_init(GifCtx *ctx); + static void char_out(int c, GifCtx *ctx); + static void flush_char(GifCtx *ctx); + ++static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out); + + + +@@ -131,8 +132,11 @@ BGD_DECLARE(void *) gdImageGifPtr(gdImagePtr im, int *size) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageGifCtx(im, out); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageGifCtx(im, out)) { ++ rv = gdDPExtractData(out, size); ++ } else { ++ rv = NULL; ++ } + out->gd_free(out); + return rv; + } +@@ -220,6 +224,12 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile) + + */ + BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) ++{ ++ _gdImageGifCtx(im, out); ++} ++ ++/* returns 0 on success, 1 on failure */ ++static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) + { + gdImagePtr pim = 0, tim = im; + int interlace, BitsPerPixel; +@@ -231,7 +241,7 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) + based temporary image. */ + pim = gdImageCreatePaletteFromTrueColor(im, 1, 256); + if(!pim) { +- return; ++ return 1; + } + tim = pim; + } +@@ -247,6 +257,8 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) + /* Destroy palette based temporary image. */ + gdImageDestroy( pim); + } ++ ++ return 0; + } + + +diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c +index fc058420..96ef4302 100644 +--- a/src/gd_jpeg.c ++++ b/src/gd_jpeg.c +@@ -123,6 +123,8 @@ static void fatal_jpeg_error(j_common_ptr cinfo) + exit(99); + } + ++static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality); ++ + /* + * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality + * QUALITY. If QUALITY is in the range 0-100, increasing values +@@ -237,8 +239,11 @@ BGD_DECLARE(void *) gdImageJpegPtr(gdImagePtr im, int *size, int quality) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageJpegCtx(im, out, quality); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageJpegCtx(im, out, quality)) { ++ rv = gdDPExtractData(out, size); ++ } else { ++ rv = NULL; ++ } + out->gd_free(out); + return rv; + } +@@ -259,6 +264,12 @@ void jpeg_gdIOCtx_dest(j_compress_ptr cinfo, gdIOCtx *outfile); + + */ + BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) ++{ ++ _gdImageJpegCtx(im, outfile, quality); ++} ++ ++/* returns 0 on success, 1 on failure */ ++static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + { + struct jpeg_compress_struct cinfo; + struct jpeg_error_mgr jerr; +@@ -293,7 +304,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + if(row) { + gdFree(row); + } +- return; ++ return 1; + } + + cinfo.err->emit_message = jpeg_emit_message; +@@ -334,7 +345,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + if(row == 0) { + gd_error("gd-jpeg: error: unable to allocate JPEG row structure: gdCalloc returns NULL\n"); + jpeg_destroy_compress(&cinfo); +- return; ++ return 1; + } + + rowptr[0] = row; +@@ -411,6 +424,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + jpeg_finish_compress(&cinfo); + jpeg_destroy_compress(&cinfo); + gdFree(row); ++ return 0; + } + + +diff --git a/src/gd_wbmp.c b/src/gd_wbmp.c +index f19a1c96..a49bdbec 100644 +--- a/src/gd_wbmp.c ++++ b/src/gd_wbmp.c +@@ -88,6 +88,8 @@ int gd_getin(void *in) + return (gdGetC((gdIOCtx *)in)); + } + ++static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out); ++ + /* + Function: gdImageWBMPCtx + +@@ -100,6 +102,12 @@ int gd_getin(void *in) + out - the stream where to write + */ + BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) ++{ ++ _gdImageWBMPCtx(image, fg, out); ++} ++ ++/* returns 0 on success, 1 on failure */ ++static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) + { + int x, y, pos; + Wbmp *wbmp; +@@ -107,7 +115,7 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) + /* create the WBMP */ + if((wbmp = createwbmp(gdImageSX(image), gdImageSY(image), WBMP_WHITE)) == NULL) { + gd_error("Could not create WBMP\n"); +- return; ++ return 1; + } + + /* fill up the WBMP structure */ +@@ -123,11 +131,15 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) + + /* write the WBMP to a gd file descriptor */ + if(writewbmp(wbmp, &gd_putout, out)) { ++ freewbmp(wbmp); + gd_error("Could not save WBMP\n"); ++ return 1; + } + + /* des submitted this bugfix: gdFree the memory. */ + freewbmp(wbmp); ++ ++ return 0; + } + + /* +@@ -271,8 +283,11 @@ BGD_DECLARE(void *) gdImageWBMPPtr(gdImagePtr im, int *size, int fg) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageWBMPCtx(im, fg, out); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageWBMPCtx(im, fg, out)) { ++ rv = gdDPExtractData(out, size); ++ } else { ++ rv = NULL; ++ } + out->gd_free(out); + return rv; + } diff --git a/user/libical/APKBUILD b/user/libical/APKBUILD index 4d03d3c27..cb6ba3fcd 100644 --- a/user/libical/APKBUILD +++ b/user/libical/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libical -pkgver=3.0.5 +pkgver=3.0.6 pkgrel=0 pkgdesc="Reference implementation of the iCalendar format" url="https://libical.github.io/libical/" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656 libical-3.0.5.tar.gz" +sha512sums="d1a3397071c2989983893e3bbaeb088f7cb9a3639dca39709e9422c334dd1e9a869bba9292a250f83eb2a5b6727bd91b73c8e420bd1814422d97aff9fc6b26fc libical-3.0.6.tar.gz" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 666516c77..5ed7e4e7b 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.14.0 +pkgver=1.14.1 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" @@ -31,4 +31,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="e501c5b8a58bb287c175692af0e59ff766a8613eb576aaa0700686dfbb6c6ab63b7a5d3f148fce75397c8170bc49871068861d93c352355ab5d0d9e7f1b059ec libinput-1.14.0.tar.xz" +sha512sums="8416bab51ba1aab924fa1b41360bc2ad101fb60d3a82c73584bb1e2454554524716673e3eac7f08c18bd6a1ecdfa52ea3cfe09c7a866c59fcd47d75960e82d4c libinput-1.14.1.tar.xz" diff --git a/user/libjpeg-turbo/APKBUILD b/user/libjpeg-turbo/APKBUILD index e35ca14b9..f64e03452 100644 --- a/user/libjpeg-turbo/APKBUILD +++ b/user/libjpeg-turbo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libjpeg-turbo -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=0 pkgdesc="Accelerated JPEG compression and decompression library" url="https://libjpeg-turbo.org/" @@ -47,4 +47,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="204b6d083e99488c975c75efb08699e4dc1c409556e4dee4f21e3ee67e9c6682eb342f2e5712816b0342c00399fbe6e43fbce30c3d22f30f7ef91db006b3be08 libjpeg-turbo-2.0.2.tar.gz" +sha512sums="ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36 libjpeg-turbo-2.0.3.tar.gz" diff --git a/user/libkdcraw/APKBUILD b/user/libkdcraw/APKBUILD index 1544525fd..50d074973 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="RAW image file format support for KDE" url="https://www.KDE.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="04a46cc06373e7bbac7fca24cffc3a34bdf382615152bce2ce263c99c47421be60a567be5e170f2096ee2d09e54312ad40a3613a6b4e0a5d6600383c23d9db5e libkdcraw-19.08.0.tar.xz" +sha512sums="90ff0c3a9719df4ae97dc401592adc29cdbde0bd7aabe13b468cfc3d8045d50b20d670903274f7960039ca6a4c912dc877b314ed160d07fb8b5b96912a0bf115 libkdcraw-19.08.1.tar.xz" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index 787073ad0..18b1d16a4 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Library for common routines shared between KDE games" url="https://www.kde.org/applications/games/" @@ -63,4 +63,4 @@ carddecks() { mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/ } -sha512sums="4596fa69729f742a2c621993020e11056762daae0dad15dbfc4b09e559a6ec5dd551ea0e13a731337f7c09aba99b9d062c98a2de0a988845d813fa709b38bf2e libkdegames-19.08.0.tar.xz" +sha512sums="faeaae49c05b4892de81a024bd26248792f3e49587798f06c4e9cb22e5209afe9dfee4ff1b598f0886c47347ad56a4cc6e495bd0b5e7e9c966e4ff26bb07f601 libkdegames-19.08.1.tar.xz" diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD index 61580cff9..b961224e9 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Library for manipulating KVTML files" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="82eedb6b4fde4c75cd97e96532f158510b446056bfd5c96766f72e731718c4d62157bc4862e11d1d50a19e6a782d57cf5661f689c57eab6c65fab54b79b77973 libkeduvocdocument-19.08.0.tar.xz" +sha512sums="5cfa97e990dac017d9986ad60bd7594d5518ec8daabbb06c3594ba2dd63117ec816fa41b98f690a3c9e9625eb5d3f87992eeb980a932f61860aab8e0796a7de3 libkeduvocdocument-19.08.1.tar.xz" diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD index 7486460ce..b3f0d267c 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.08.0 +pkgver=19.08.1 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="5fcbf637b40607e6244dea2672571ff9fa80363e178964e4e118f41b3c5cf2866b9e0fc2a47a9d3dd957dfee770068adbd40f9e4fcf84a0dc6a04b56fe1398bd libkexiv2-19.08.0.tar.xz" +sha512sums="a37ddc9a2b2e18e6d9171a769de0936caf93065b38a06534080a3b5615d42b69940210e57fcf38b4eb1ff74a89fe4a1c2553e9d2bddda7f3ce48e5af8b42d1da libkexiv2-19.08.1.tar.xz" diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD index 4963e89b2..6d1b5c4eb 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="KDE Image Plugin Interface library" url="https://www.digikam.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7e043f3542fb11fb0f25b4422956b6751d9d20d4ff859c34d1588fb93dda039fdca9774793b773eeec9067ca06ad219e93a4a70c505220e29d7de2c18f37eed8 libkipi-19.08.0.tar.xz" +sha512sums="5cde296b18b395739198a99762c42e511a647f37e38136d3529fe490dc5cecc040c5f9f1a6a61f5d074e0142940682230645c3640c2d1166c442f0caebe082bb libkipi-19.08.1.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index e181b6e6a..2f5543f5c 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="02bc542ff7f9ecf5741039def5d884d52c4009f98ca9fc27d58b794d2028443a511a71f6080d3e958b4ca72bdb5c10b5537253204118139469f0199f865f1ccf libkleo-19.08.0.tar.xz -57c2c0a2588bd40ccb1c0e197d41087e347126f56761e426198b9e38eab9bd8bc8a1c2344db36fabbc3f714c90912ec3d837fccbe36ac284b4f07d4a41c2dae3 egregious-versions.patch" +sha512sums="c956093662ac79544694a136203eda4a77600fdeabe8a88a55be47ba29f56b914dff28f355f07fc83e6e231e87686bccddab105089ff36755705c48b28c768c2 libkleo-19.08.1.tar.xz +5a10a4de59fc4e89295488c88f6f21f88f58f47679c666e0909bbd7bb6b3b867091292d807c2786da4864043d22c84e4f7cd7757fc47c9e046bedb8289c3c7b6 egregious-versions.patch" diff --git a/user/libkleo/egregious-versions.patch b/user/libkleo/egregious-versions.patch index db713dc6c..27822b608 100644 --- a/user/libkleo/egregious-versions.patch +++ b/user/libkleo/egregious-versions.patch @@ -11,18 +11,18 @@ libKleo uses no new APIs. find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -@@ -24,7 +24,7 @@ +@@ -26,7 +26,7 @@ set(LIBKLEO_LIB_VERSION ${PIM_VERSION}) -set(QT_REQUIRED_VERSION "5.11.0") +set(QT_REQUIRED_VERSION "5.9.0") - set(KDEPIMTEXTEDIT_VERSION "5.12.0") + set(KDEPIMTEXTEDIT_VERSION "5.12.1") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets) --- libkleo-19.08.0/CMakeLists.txt.old 2019-08-15 15:03:03.464693272 +0000 +++ libkleo-19.08.0/CMakeLists.txt 2019-08-15 15:05:18.800204812 +0000 -@@ -90,6 +90,6 @@ +@@ -92,6 +92,6 @@ add_subdirectory(src) diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD index 636429a5f..47624aa2e 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Library with Mah Jongg logic" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8926e885a0792dc1c0604e0415db9fb02a7e18ddfdd054f56ceb606af6e41b3289f1d9d39aeddd02b95af6614997094c99e2b9c7380e9cdf1415d743c85d527b libkmahjongg-19.08.0.tar.xz" +sha512sums="0e17247e84348c4916eb59b9b6575295642ce8b1016ea973c47478a4b3441fa97f659ce0f7a0f5fe5edc0e9419606758515760808206d33e54abde0b58cebe91 libkmahjongg-19.08.1.tar.xz" diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD index 204cdce4f..b84919f63 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="KDE scanning library" url="https://www.kde.org" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="66f0bb488f086fd7702008368e094bf420c9fb1540c2a3e6e2b2a932cd299a30d04c87e6def1dcf9e3867452dfb0fc98c2de27b664c170da04d495cec881e558 libksane-19.08.0.tar.xz +sha512sums="52f5bb900d935ae2b5f74f16fc9260ea999a0ca6e9166e229c7feff902708cf530d444061f20748cd4cc45281b82201ac380be4a934675e91d0ffdd355d844a7 libksane-19.08.1.tar.xz 60e0e8b073499e932d626a65c5cc23f58d2701921da547733d2736b58c6d412c8d6e782884916390ff16e02183a53ad283712f0bcf2cdcf5a0eb0d7029bb1ba8 frameworks.patch" diff --git a/user/libktorrent/APKBUILD b/user/libktorrent/APKBUILD index 575fca74b..c226584a7 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 +pkgver=2.1.1 pkgrel=0 pkgdesc="Torrent handling library for KDE" url="https://www.kde.org/" @@ -13,10 +13,9 @@ 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 ki18n-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/ktorrent/5.1/libktorrent-$pkgver.tar.xz" +source="https://download.kde.org/stable/ktorrent/5.1.2/libktorrent-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,13 +31,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="28d7a4b8ee45ddcbadb3ca9d6e568120803081b0ecd3e9436ed721860717b98538c522653ea47975123f0819548d0cabe1973baffed887fcbbca11d84ea5ebe4 libktorrent-2.1.tar.xz" +sha512sums="5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37 libktorrent-2.1.1.tar.xz" diff --git a/user/liblangtag/APKBUILD b/user/liblangtag/APKBUILD index f46f49f9b..5c97a2aec 100644 --- a/user/liblangtag/APKBUILD +++ b/user/liblangtag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=liblangtag -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=0 pkgdesc="Interface library to access tags for identifying languages" url="https://bitbucket.org/tagoh/liblangtag" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://bitbucket.org/tagoh/$pkgname/downloads/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="812e00d0a26eedc1fa9bee6d0b9da53b8faca8d1fc5f93a0423106b5b777c7b1ec5854da7d02606c215ad1a1248de93016559c7a55288a4b427857fb1ed1ad8f liblangtag-0.6.2.tar.bz2" +sha512sums="3dcfc20704dfaff05aeecdeef74fa81639fb70f930ebc0895fe4707ecd1d5b6221fe889449772811924d0c38329977c9d5fc751c3accbc272834b29c461f1fcf liblangtag-0.6.3.tar.bz2" diff --git a/user/libmateweather/APKBUILD b/user/libmateweather/APKBUILD index 3d6f9573d..da65670d9 100644 --- a/user/libmateweather/APKBUILD +++ b/user/libmateweather/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libmateweather -pkgver=1.22.0 +pkgver=1.22.1 pkgrel=0 pkgdesc="Weather library for the MATE desktop environment" url="https://mate-desktop.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="43371fc615dda2b9042633a63ac4c1fb0b1ea43b20c783e443b0f57e10ad8fddedbd593f03bd6c942729f0a9c80484266fe1ef900d128fa4b02f80d6a80ae9bd libmateweather-1.22.0.tar.xz" +sha512sums="c7f5214c14fa3bf6bbb55442ea450c0f3c0a2849e29f72821c22db88baf3763c72dd6d2a27795c23d8ecc69d190a55313f6cfd18dc2a41c233a7e1e5653a0868 libmateweather-1.22.1.tar.xz" diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD index 538c2ad0d..7301a17b2 100644 --- a/user/libnftnl/APKBUILD +++ b/user/libnftnl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=libnftnl -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=0 pkgdesc="Netfilter library providing interface to the nf_tables subsystem" url="https://netfilter.org/projects/libnftnl" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe libnftnl-1.1.3.tar.bz2" +sha512sums="6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6 libnftnl-1.1.4.tar.bz2" diff --git a/user/libogg/APKBUILD b/user/libogg/APKBUILD index fc41e6f74..c452d7890 100644 --- a/user/libogg/APKBUILD +++ b/user/libogg/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Maintainer: pkgname=libogg -pkgver=1.3.3 -pkgrel=2 +pkgver=1.3.4 +pkgrel=0 pkgdesc="Ogg bitstream and framing library" url="https://xiph.org/ogg/" arch="all" @@ -32,4 +32,4 @@ package() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="16f9cbc7f5b77c1719d80e666995ad825a3d4b6facfa51e3df3b1a9678cca7dc3c4f6ee15096c394c97ed5e67fced1aaedacc563cddfe4e0c748dd39940b099e libogg-1.3.3.tar.gz" +sha512sums="aabe5de063a1963729ce0c055d538612d242b360d13f032d1508f0e82ad23f61d89d0b00386b358a87aba43317bb7a67b8e52361a41a079a1fc2bc6df61917d9 libogg-1.3.4.tar.gz" diff --git a/user/libpcap/APKBUILD b/user/libpcap/APKBUILD index f1c3cd9d7..714e098f2 100644 --- a/user/libpcap/APKBUILD +++ b/user/libpcap/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libpcap -pkgver=1.9.0 +pkgver=1.9.1 pkgrel=0 pkgdesc="System-independent interface for user-level packet capture" url="http://www.tcpdump.org/" @@ -14,8 +14,16 @@ source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz add-missing-header.patch " +# secfixes: +# 1.9.1-r0: +# - CVE-2018-16301 +# - CVE-2019-15161 +# - CVE-2019-15162 +# - CVE-2019-15163 +# - CVE-2019-15164 +# - CVE-2019-15165 + build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,9 +41,8 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install install-shared } -sha512sums="0ff25641f1e9d29082766caef45888c19214f770c4f378818caa73fcbc4ae54ad9195549c2499d4879ff46e35741d93b2b02cc5f3d6aa99e85a32194cf10bfe7 libpcap-1.9.0.tar.gz +sha512sums="ae0d6b0ad8253e7e059336c0f4ed3850d20d7d2f4dc1d942c2951f99a5443a690f0cc42c6f8fdc4a0ccb19e9e985192ba6f399c4bde2c7076e420f547fddfb08 libpcap-1.9.1.tar.gz d9bee430f26e647c4a7ddd5b1ddd588fadefd3a034710e9bdfa9ff1d8c18ad8f6c0be1c29c2261e7be89db7d7e545e30c7910f09f3f53701ce04421449328be2 add-missing-header.patch" diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD index 172a0003d..ed8bb27f2 100644 --- a/user/libpeas/APKBUILD +++ b/user/libpeas/APKBUILD @@ -1,35 +1,31 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libpeas -pkgver=1.22.0 -pkgrel=1 +pkgver=1.24.0 +pkgrel=0 pkgdesc="GObject-based plugin framework" url="https://gnome.org" arch="all" +options="!check" # With Meson, you can't disable individual tests. + # Three require X11. Complain to Meson, not me. license="LGPL-2.1+" depends="" -makedepends="intltool glib-dev gobject-introspection-dev gtk+3.0-dev - py3-pygobject py3-pygobject-dev python3-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +makedepends="glib-dev gobject-introspection-dev gtk+3.0-dev + meson ninja py3-pygobject py3-pygobject-dev python3-dev" +subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/libpeas/${pkgver%.*}/libpeas-$pkgver.tar.xz" build() { - LIBS="-lintl" ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make + meson -Dprefix=/usr build + ninja -C build } check() { - DISPLAY= make check + DISPLAY= ninja -C build test } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91 libpeas-1.22.0.tar.xz" +sha512sums="b4baa03ded9d787e7a1ee2be943617f5c84564bf299699934c47ded6c60ff62a7f27ab2594cd0ffba2d8979d8b72113d1b5e910eebd80305f3aa538db0d45314 libpeas-1.24.0.tar.xz" diff --git a/user/libpwquality/APKBUILD b/user/libpwquality/APKBUILD index 8b0c98a81..af76e2f49 100644 --- a/user/libpwquality/APKBUILD +++ b/user/libpwquality/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libpwquality -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=0 pkgdesc="Password quality checking library" url=" " @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py3-pwquality:py3" source="https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$pkgver/libpwquality-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -43,4 +40,4 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="b8049f8b71bbfd4d345dbd4c4cffd29e9029b0fca4c95527af54d11a3b06e4708236b630df6c66738368298679c96cb3bf26b1b5d95cb3c5f7e1073cab8a98d9 libpwquality-1.4.0.tar.bz2" +sha512sums="0bbec7e79a4db56c2cbda65c36003758a1044eee2ac8c678447d96d3cddf034a3196a7d8cd7972e9f50701391b8b81e2c3769fd81c4e4605fed96efd120ff257 libpwquality-1.4.1.tar.bz2" diff --git a/user/libraw/APKBUILD b/user/libraw/APKBUILD index 843c95427..d280c6402 100644 --- a/user/libraw/APKBUILD +++ b/user/libraw/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libraw -pkgver=0.19.4 +pkgver=0.19.5 pkgrel=0 pkgdesc="Read RAW image files from digital cameras" url="https://www.libraw.org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e9f0b18b8be52119ff504d2645a011eca391a62bf651064dcbec4b6e16b3b09fda49e632453b051d3aae2ac3a8be021e5b71d7202913759ad1d61641d3318c4c LibRaw-0.19.4.tar.gz" +sha512sums="4560045f75e6d2ab0d1d8686075f3a0e26a5d7ce693b48508110a2c31d19055d58983c24852da0abb64fa90db5e20f24b87aa7537ed04d958c38c8b265a7e826 LibRaw-0.19.5.tar.gz" diff --git a/user/libusb/APKBUILD b/user/libusb/APKBUILD index f163c64ab..649c84c6a 100644 --- a/user/libusb/APKBUILD +++ b/user/libusb/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libusb -pkgver=1.0.22 -pkgrel=1 +pkgver=1.0.23 +pkgrel=0 pkgdesc="Library for USB device communication" url="https://libusb.info/" arch="all" @@ -11,7 +11,6 @@ makedepends="eudev-dev linux-headers" source="https://github.com/libusb/libusb/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -20,13 +19,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4 libusb-1.0.22.tar.bz2" +sha512sums="73430ad31dd405e76a9c6c55086961003989c44964e2735b5076f9ca849e3f6fe71d10a66b74b111f0c34a0d2cb744b9ca105863c552123fce4ec0bbdd2ec15b libusb-1.0.23.tar.bz2" diff --git a/user/libvdpau/APKBUILD b/user/libvdpau/APKBUILD index 6becf5507..4560d319c 100644 --- a/user/libvdpau/APKBUILD +++ b/user/libvdpau/APKBUILD @@ -1,35 +1,29 @@ # Contributor: Carlo Landmeter # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvdpau -pkgver=1.2 +pkgver=1.3 pkgrel=0 pkgdesc="Hardware-accelerated video playback library" url="https://cgit.freedesktop.org/~aplattner/libvdpau" arch="all" license="MIT" depends="" -makedepends="libx11-dev libxext-dev xorgproto-dev" +makedepends="libx11-dev libxext-dev meson ninja xorgproto-dev" subpackages="$pkgname-dev" -source="https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/libvdpau-1.2.tar.bz2" +source="https://cgit.freedesktop.org/~aplattner/libvdpau/snapshot/libvdpau-$pkgver.tar.xz" build() { - LIBS="-lX11" \ - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info - make + meson -Dprefix=/usr \ + build + ninja -C build } check() { - make check + ninja -C build test } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="86aa3f2a39cb73a597bf417da2eeef73ff01160ed9f54dff3725785ff5a289f47040496de44e2f5292d59657d4746e369b3fa307c4f83a32f7cc28e4cd8bce6f libvdpau-1.2.tar.bz2" +sha512sums="a839ed06ac3bb1ceaa8020e38f40f6dd1d1af066878effbc02e3b02f0917ccdad4059ac2a4428ca39265bda3ba02885d905231f365b86151bae28d135d8de3d5 libvdpau-1.3.tar.xz" diff --git a/user/libxfont2/APKBUILD b/user/libxfont2/APKBUILD index 3ebe3e051..dd9d5aeed 100644 --- a/user/libxfont2/APKBUILD +++ b/user/libxfont2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxfont2 -pkgver=2.0.3 -pkgrel=1 +pkgver=2.0.4 +pkgrel=0 pkgdesc="X11 font library from X.Org" url="https://www.X.Org/" arch="all" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="648b664e2aa58cbc7366a1b05873aa06bd4a38060f64085783043388244af8ceced77b29a22c3ac8b6d34cd226e093bbbcc785ea1748ea65720fe7ea05b4b44b libXfont2-2.0.3.tar.bz2" +sha512sums="7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106 libXfont2-2.0.4.tar.bz2" diff --git a/user/libxvmc/APKBUILD b/user/libxvmc/APKBUILD index 9953618d2..daabfc36e 100644 --- a/user/libxvmc/APKBUILD +++ b/user/libxvmc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxvmc -pkgver=1.0.11 +pkgver=1.0.12 pkgrel=0 pkgdesc="X11 Video Motion Compensation extension library" url="https://www.X.Org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4fe49e956ac97a45d851292cbba7bf242706aaf3bd9eb7ea4d2fc50e40745115d857a4fe179d2b87bc7cb6f9ac93911e89a167f02f6d1ae25a59df9a517a2476 libXvMC-1.0.11.tar.bz2" +sha512sums="62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955 libXvMC-1.0.12.tar.bz2" diff --git a/user/links/APKBUILD b/user/links/APKBUILD index 5761ea7be..b942c40b0 100644 --- a/user/links/APKBUILD +++ b/user/links/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=links -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=0 pkgdesc="Text Web browser, similar to Lynx" url="http://links.twibright.com/" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c7258e303a2012e9016385abd1e8882ffec47dd3baf479a54448742e41b03508d874387af6ea97c7ef9c4d37f2eecbe7bc0121d923df79b0f455f4f466747ca2 links-2.20.1.tar.bz2" +sha512sums="82be459856f49f45c9b824589b78c0f58b039b09802e077420053e9449bc1ded272bb8ad57ea10522d8b3305ceb212a5dd08b01052538cd5b4f0447d0ba02152 links-2.20.2.tar.bz2" diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD index 62a60c313..c72f3807e 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Lieutenant Skat is an interactive two-player card game" url="https://games.kde.org/game.php?game=lskat" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bde0b69c99f319dc03c9edcffd2777cb1fe0df2e338174085ea4858a709f19549508fa400ab77d615b8d5842b6e2179b608fd608e6e915ae4c7079110bba9f3b lskat-19.08.0.tar.xz" +sha512sums="111862869cdc7b3b0dc44b0fa5218d802ae14b486cf93d7626bf6ce9254ece1bccf75a4098e7f6a7b2357393bc1ab440341778688c36a4a42ef1c9def10a727d lskat-19.08.1.tar.xz" diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index 76266edc9..a5bd50e6a 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Free, open-source map and virtual globe" url="https://marble.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a99decc1d7017dbe3e276d44347c19c10e6fd107e4e0f9178e173eb5b4338ff22d4500cdf8a08984b745a3c695ac41285a3f46bbd0519859c3658c96bd41c15b marble-19.08.0.tar.xz" +sha512sums="4488ae8a99d999dd17ba6d73cb88b84dab509e70a027b87c22948602fb9b04bacedaa448ea1bd1234a076373bd3fa5ea65d5e738e7febecf7aa75f6c7a0c6890 marble-19.08.1.tar.xz" diff --git a/user/meson/APKBUILD b/user/meson/APKBUILD index 555799dab..487888387 100644 --- a/user/meson/APKBUILD +++ b/user/meson/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=meson -pkgver=0.51.1 +pkgver=0.51.2 pkgrel=0 pkgdesc="Fast, user-friendly build system" url="https://mesonbuild.com/" @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="b0b220de2a20c355cbd2f63aff195374ad8b2dae64f0dc4efb7abf84d7a9e70b6d4239d3d94b2b8ba2de5dd6e871589848b057c842c8f256016c666e9aa882f1 meson-0.51.1.tar.gz" +sha512sums="5d6bc5c59c026b67d065b28a5ce8c7901ffb9663d3cb1609ef1714ace50e3b1e0fc116466a34ba5ae8dbfb2337b7848008f3d865832ea537422221f1a6793ddd meson-0.51.2.tar.gz" diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD index 6f84a8dc4..acfb12396 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Music education software" url="https://minuet.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bffe36bae1d2f2d39a402f9758cf4a6307909bf8a6d56576c3986c97e3b51088a5e72c5e409188b5039026d6a675881c40177bec143ae78d96a12bdb76c94c38 minuet-19.08.0.tar.xz" +sha512sums="c4f26a1ffebf9a5b2519d404051ce1d39c9916bfd86bde49f50bd1870ccbb018c678e3266a5a0fd8b7b281d5f81647666ac9d3869540386ed2029b3a82ff483b minuet-19.08.1.tar.xz" diff --git a/user/modemmanager/APKBUILD b/user/modemmanager/APKBUILD index ad0c17e63..5a5804d96 100644 --- a/user/modemmanager/APKBUILD +++ b/user/modemmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=modemmanager -pkgver=1.10.4 +pkgver=1.10.6 pkgrel=0 pkgdesc="Software to control mobile broadband modems" url="https://www.freedesktop.org/wiki/Software/ModemManager/" @@ -43,6 +43,6 @@ package() { "$srcdir"/01-org.freedesktop.ModemManager.rules } -sha512sums="ead9826efbd360cb47e52a8f8e8b44e92d2d93c6058f099e4bc2358c4ef03bec0b2631b6b4b552d75ff41ec9b6154b4f614c1be5a31e684c69cf3c04c9866dd7 ModemManager-1.10.4.tar.xz +sha512sums="9d0cdca7413c1ad7e44a0c65d620e3c36204919b896290878180c73d7843d217f7c759bcba1007cbed2ec75f615b7ab196989e90afddbcbbf38a1b4cd04a8e3a ModemManager-1.10.6.tar.xz 78e1c2ef604fb8b204618b9ecdc741ed7087fcc46ee563dbaaf6c9c0185165be58abfc3bf8ba89129fce7570c172cd1ac1e191e6d1200e3029c14a585ff40b83 no-translit.patch 31ded548acc8ccfcca5cd54384819b73ad9ac83556b754fa03a1a9c08aed7f913c7f066000abef0e52310721ef8c00ca8f48f1f762faaa5792420f62b5201881 01-org.freedesktop.ModemManager.rules" diff --git a/user/networkmanager/APKBUILD b/user/networkmanager/APKBUILD index 0b1935ebe..6fb844bf9 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.20.0 +pkgver=1.20.4 pkgrel=0 pkgdesc="Network management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" @@ -90,7 +90,7 @@ openrc() { "$subpkgdir"/etc/NetworkManager/dispatcher.d/ } -sha512sums="825c56a7530d813ba7ea2ec57034def560f4b0fb65a09dc70cd94dc897e2aabde11f18c6c4843da9c520531683e963037ce42270a6ffa5c7c5e9502bb80bdf1b NetworkManager-1.20.0.tar.xz +sha512sums="d08f7e8f5ea8f8567834a53a68ff7aeff09839658b73dc17b31dbdd7dd5c36b09f4e563c2ebc52d1e1574a84163e66e0bfee01c3762a222aa7154d18c09660cb NetworkManager-1.20.4.tar.xz a849f8172b88370f48217e04f2fafb4431db32415df52af7d4a388f604f7d03c4c21b6ad37afb57e52700a38a7e78365025da99991bc8d179c73dabb31e05256 editline.patch 0006d9c538a72673746b6aede8c61e0b7a23b055f8276fa2dde6e70f8c00d60854cf49678c996764f83b40cf06c5c2cd24c8c382d900aaf97fc840342e29500f errno.patch 313e57823ffa49bd7b76355f8cea6932737ae4b38cb00eb183b12093a8109e079dc7439b2b35fa6bf9b83f2937729cca847a2bf31857382e9c3ae0b945c2dd6b musl.patch diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD index 8cec71ded..8d0f0d8a0 100644 --- a/user/okular/APKBUILD +++ b/user/okular/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okular -pkgver=19.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Universal document reader developed by KDE" url="https://okular.kde.org/" @@ -45,6 +45,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5abebfa223085c6e89e9e1fbb34f340c6888dfdb0415873d86dd5f7e64a3002cb6ba5a859c95eb1e68fe24b3aa29be49ad333acc4811e9360b3ebaa8f79e6934 okular-19.08.0.tar.xz +sha512sums="ba157b51137404357844315757c851dffa691e1192272107464bb2cc1f39c0880127e1ee669d5e65f0927a22c0e273718202d758b9fa857a67b2eb3cd772bfc9 okular-19.08.1.tar.xz d82dd9de666a28ef605d8a81e74851f265be4ccaeaa39a1cdee9eb1db830fcd0d581d01d6e89a1d36b8ea5c9c8113f1016090dc0e9f17070d388166d9e967458 es-doc-fix.patch 43daf92826a87b58fbafdaf282af4c2fddbf2a7d8c8c6491418ee962e4bccd6dcbbf8ff36b63f7b1ead181b957ba0f66e08e73c3e755397aafdbf99f3397da1e pt-doc-fix.patch" diff --git a/user/opal-utils/APKBUILD b/user/opal-utils/APKBUILD index d6eddcd70..f65d278ca 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.3.1 +pkgver=6.5 pkgrel=0 pkgdesc="Tools for IBM FSP and OpenPOWER systems" url="https://lists.ozlabs.org/listinfo/skiboot" @@ -39,6 +39,6 @@ package() { done } -sha512sums="ad2156d864cedcf3d19e8ff094d12059703aaf9a5ea8403e230ecf33d331dae45e0f28a89c65ad05f94605e493bc8d42df92698847600810d5609bc56ade24b8 skiboot-6.3.1.tar.gz +sha512sums="f756307403ec49f24e5dbc06dbe8fe52898da27f2a0fa761164b1d85efd33dae8a8f96de3859eb7b11f85f43a790c9c213f9ebf0c7f4a859b590dcfb35e38571 skiboot-6.5.tar.gz e7480f16b6eb41fd65b40ea1f20031118030f24681b7b8afcfdebb8cde7625e45902683cfb5fe0af3259060fb1b92b9c2f5d62354de356e7706a7f08ad9f772e musl.patch -944dd564a2c846a675544c8ecdb2fa4714235f3fd974e135a71220379640f94883811399fe03d2d697fcb49e219504af264af0f201a6a7b37029687dea6a28cf opal-prd.patch" +692206f60727041c070c7f75eb66325607d00261e8dd7f47111fd59c7495c744ac356b0c94c6139c76bacbe403f1e9e6819f8bce2d13ac10d1cacc6e351cc25e opal-prd.patch" diff --git a/user/opal-utils/opal-prd.patch b/user/opal-utils/opal-prd.patch index 29b38cd43..90a23e333 100644 --- a/user/opal-utils/opal-prd.patch +++ b/user/opal-utils/opal-prd.patch @@ -1,6 +1,6 @@ --- skiboot-6.3.1/external/opal-prd/thunk.S.old 2019-05-10 06:50:45.000000000 +0000 +++ skiboot-6.3.1/external/opal-prd/thunk.S 2019-06-04 08:01:00.851806263 +0000 -@@ -1,4 +1,4 @@ +@@ -3,4 +3,4 @@ -#include <endian.h> +#define __BYTE_ORDER __BIG_ENDIAN #include <asm/unistd.h> diff --git a/user/openttd/APKBUILD b/user/openttd/APKBUILD index 026091d77..c5cf85a3a 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.9.2 +pkgver=1.9.3 pkgrel=0 pkgdesc="Simulation game based on Transport Tycoon Deluxe" url="https://www.openttd.org/en/" @@ -28,4 +28,4 @@ package() { make install } -sha512sums="a84a219c049147e9566967f96a01c84dde587e38da37b34ef756da99a2d14f1d418492030098f63c4ac60cb0db553f474aaf3b8a00c8abfd98f66adc14f523e4 openttd-1.9.2-source.tar.xz" +sha512sums="e2208f730cf26c2df9b1950e885e20471060217dd47f2483db3f1cc86b40658d71208f27caab38a9fa513cfddb33c791a0972336dfa902a6d110ef246d936a34 openttd-1.9.3-source.tar.xz" diff --git a/user/orc/APKBUILD b/user/orc/APKBUILD index de40d3f31..fc760912f 100644 --- a/user/orc/APKBUILD +++ b/user/orc/APKBUILD @@ -2,37 +2,30 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=orc -pkgver=0.4.29 +pkgver=0.4.30 pkgrel=0 pkgdesc="The Oil Run-time Compiler" url="https://gstreamer.freedesktop.org/modules/orc.html" arch="all" license="BSD-2-Clause AND BSD-3-Clause" -makedepends="linux-headers" -subpackages="$pkgname-dev $pkgname-doc $pkgname-compiler" -source="https://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.xz" +makedepends="linux-headers meson ninja" +subpackages="$pkgname-dev $pkgname-compiler" +source="https://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.xz + ppc-fixes.patch + " build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var - make + meson -Dprefix=/usr \ + build + ninja -C build } check() { - cd "$builddir" - make check + ninja -C build test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } dev() { @@ -47,4 +40,5 @@ compiler() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="57aa75bbefa9ba9ffcce97affd504c13c57612e2409863c011555bed6ff6ba224d38ed66b715bf103679a8ee28ddae427db3d78c7b4a2ddfa7dbd72a4fa81726 orc-0.4.29.tar.xz" +sha512sums="da254347f5ebb278f0932a7bfa878adc2a14c42c7e6a20a4e6bb68c0883e307fef57bef867d54e150bd1d875f79eee27f9d34aede410d3eddd4093e5b055cd22 orc-0.4.30.tar.xz +b049e4ab9e2ee71013cc1f387dfc24df97c25fcf72dd3fd0502d891ee5e1e305dd710a639839ac64f6a58383b18d49ccffd32645dc64255b15945920acaf56d6 ppc-fixes.patch" diff --git a/user/orc/ppc-fixes.patch b/user/orc/ppc-fixes.patch new file mode 100644 index 000000000..ab4aecd40 --- /dev/null +++ b/user/orc/ppc-fixes.patch @@ -0,0 +1,990 @@ +diff --git a/orc-test/orctest.c b/orc-test/orctest.c +index 614421b..d9cb9d5 100644 +--- a/orc-test/orctest.c ++++ b/orc-test/orctest.c +@@ -523,14 +523,14 @@ float_compare (OrcArray *array1, OrcArray *array2, int i, int j) + if (isnan(*(float *)ptr1) && isnan(*(float *)ptr2)) return TRUE; + if (*(float *)ptr1 == *(float *)ptr2) return TRUE; + if ((*(float *)ptr1 < 0.0) == (*(float *)ptr2 < 0.0) && +- abs((orc_int32)(*(orc_uint32 *)ptr1 - *(orc_uint32 *)ptr2) <= 2)) ++ abs((orc_int32)(*(orc_uint32 *)ptr1 - *(orc_uint32 *)ptr2)) <= 2) + return TRUE; + return FALSE; + case 8: + if (isnan(*(double *)ptr1) && isnan(*(double *)ptr2)) return TRUE; + if (*(double *)ptr1 == *(double *)ptr2) return TRUE; + if ((*(double *)ptr1 < 0.0) == (*(double *)ptr2 < 0.0) && +- llabs((orc_int64)(*(orc_uint64 *)ptr1 - *(orc_uint64 *)ptr2) <= 2)) ++ llabs((orc_int64)(*(orc_uint64 *)ptr1 - *(orc_uint64 *)ptr2)) <= 2) + return TRUE; + return FALSE; + } +diff --git a/orc/orcpowerpc.c b/orc/orcpowerpc.c +index e054d07..ed98437 100644 +--- a/orc/orcpowerpc.c ++++ b/orc/orcpowerpc.c +@@ -208,7 +208,7 @@ powerpc_emit_srawi (OrcCompiler *compiler, int regd, int rega, int shift, + powerpc_get_regname(regd), + powerpc_get_regname(rega), shift); + +- insn = (31<<26) | (powerpc_regnum (regd)<<21) | (powerpc_regnum (rega)<<16); ++ insn = (31<<26) | (powerpc_regnum (rega)<<21) | (powerpc_regnum (regd)<<16); + insn |= (shift<<11) | (824<<1) | record; + + powerpc_emit (compiler, insn); +@@ -233,7 +233,7 @@ powerpc_emit_D (OrcCompiler *compiler, const char *name, + ORC_ASM_CODE(compiler," %s %s, %s, %d\n", name, + powerpc_get_regname(regd), + powerpc_get_regname(rega), imm); +- insn |= (powerpc_regnum (regd)<<21) | (powerpc_regnum (rega)<<16); ++ insn |= (powerpc_regnum (rega)<<21) | (powerpc_regnum (regd)<<16); + insn |= imm&0xffff; + + powerpc_emit (compiler, insn); +@@ -543,7 +543,7 @@ powerpc_load_constant (OrcCompiler *p, int i, int reg) + { + unsigned int insn; + +- ORC_ASM_CODE(p," addi %s, %s, %db - %s\n", ++ ORC_ASM_CODE(p," addi %s, %s, %df - %s\n", + powerpc_get_regname(greg), + powerpc_get_regname(greg), p->constants[i].label, p->program->name); + insn = (14<<26) | (powerpc_regnum (greg)<<21) | (powerpc_regnum (greg)<<16); +@@ -740,3 +740,42 @@ void powerpc_emit_label (OrcCompiler *compiler, int label) + powerpc_add_label (compiler, compiler->codeptr, label); + } + ++void ++powerpc_load_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg) ++{ ++ if (IS_POWERPC_BE (compiler)) { ++ ORC_ASM_CODE(compiler," lvsl %s, %s, %s\n", ++ powerpc_get_regname (vector_reg), ++ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), ++ powerpc_get_regname (src_reg)); ++ powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(vector_reg), ++ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); ++ } else { ++ ORC_ASM_CODE(compiler," lvsr %s, %s, %s\n", ++ powerpc_get_regname (vector_reg), ++ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), ++ powerpc_get_regname (src_reg)); ++ powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(vector_reg), ++ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); ++ } ++} ++ ++void ++powerpc_store_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg) ++{ ++ if (IS_POWERPC_BE (compiler)) { ++ ORC_ASM_CODE(compiler," lvsr %s, %s, %s\n", ++ powerpc_get_regname (vector_reg), ++ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), ++ powerpc_get_regname (src_reg)); ++ powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(vector_reg), ++ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); ++ } else { ++ ORC_ASM_CODE(compiler," lvsl %s, %s, %s\n", ++ powerpc_get_regname (vector_reg), ++ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), ++ powerpc_get_regname (src_reg)); ++ powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(vector_reg), ++ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); ++ } ++} +diff --git a/orc/orcpowerpc.h b/orc/orcpowerpc.h +index e6b315a..ba824b2 100644 +--- a/orc/orcpowerpc.h ++++ b/orc/orcpowerpc.h +@@ -138,6 +138,9 @@ void powerpc_emit_full_constants (OrcCompiler* p); + void powerpc_emit_load_address (OrcCompiler* compiler, int regd, int rega, int imm); + void powerpc_load_constant (OrcCompiler* p, int i, int reg); + ++void powerpc_load_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg); ++void powerpc_store_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg); ++ + /* instructions */ + #define powerpc_emit_vand(p,a,b,c) powerpc_emit_VX_2 (p, "vand", 0x10000404, a, b, c) + #define powerpc_emit_vandc(p,a,b,c) powerpc_emit_VX_2 (p, "vandc", 0x10000444, a, b, c) +@@ -159,8 +162,10 @@ void powerpc_load_constant (OrcCompiler* p, int i, int reg); + + #define powerpc_emit_vmrghb(p,a,b,c) powerpc_emit_VX_2 (p, "vmrghb", 0x1000000c, a, b, c) + #define powerpc_emit_vmrghh(p,a,b,c) powerpc_emit_VX_2 (p, "vmrghh", 0x1000004c, a, b, c) ++#define powerpc_emit_vmrghw(p,a,b,c) powerpc_emit_VX_2 (p, "vmrghw", 0x1000008c, a, b, c) + #define powerpc_emit_vmrglb(p,a,b,c) powerpc_emit_VX_2 (p, "vmrglb", 0x1000010c, a, b, c) + #define powerpc_emit_vmrglh(p,a,b,c) powerpc_emit_VX_2 (p, "vmrglh", 0x1000014c, a, b, c) ++#define powerpc_emit_vmrglw(p,a,b,c) powerpc_emit_VX_2 (p, "vmrglw", 0x1000018c, a, b, c) + + #define powerpc_emit_vpkshss(p,a,b,c) powerpc_emit_VX_2 (p, "vpkshss", 0x1000018e, a, b, c) + #define powerpc_emit_vpkshus(p,a,b,c) powerpc_emit_VX_2 (p, "vpkshus", 0x1000010e, a, b, c) +diff --git a/orc/orcprogram-altivec.c b/orc/orcprogram-altivec.c +index 659115e..808b4e1 100644 +--- a/orc/orcprogram-altivec.c ++++ b/orc/orcprogram-altivec.c +@@ -18,6 +18,8 @@ static void orc_compiler_powerpc_init (OrcCompiler *compiler); + static unsigned int orc_compiler_powerpc_get_default_flags (void); + static void orc_compiler_powerpc_assemble (OrcCompiler *compiler); + static const char* powerpc_get_flag_name (int shift); ++static int orc_powerpc_assemble_copy_check (OrcCompiler *compiler); ++static void orc_powerpc_assemble_copy (OrcCompiler *compiler); + + + static void +@@ -199,8 +201,8 @@ powerpc_load_constants_outer (OrcCompiler *compiler) + } + } + +- orc_compiler_emit_invariants (compiler); +- ++ /* Load constants first, as they may be used by invariants */ ++ ORC_ASM_CODE(compiler,"# load constants\n"); + for(i=0;i<compiler->n_constants;i++) { + if (compiler->constants[i].is_long && + !compiler->constants[i].alloc_reg) { +@@ -212,6 +214,9 @@ powerpc_load_constants_outer (OrcCompiler *compiler) + } + } + } ++ ++ ORC_ASM_CODE(compiler,"# load invariants\n"); ++ orc_compiler_emit_invariants (compiler); + } + + static void +@@ -219,6 +224,7 @@ powerpc_load_inner_constants (OrcCompiler *compiler) + { + int i; + ++ ORC_ASM_CODE(compiler,"# load inner constants\n"); + for(i=0;i<ORC_N_COMPILER_VARIABLES;i++){ + if (compiler->vars[i].name == NULL) continue; + switch (compiler->vars[i].vartype) { +@@ -305,6 +311,11 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) + int label_leave; + int set_vscr = FALSE; + ++ if (orc_powerpc_assemble_copy_check (compiler)) { ++ orc_powerpc_assemble_copy (compiler); ++ return; ++ } ++ + label_outer_loop_start = orc_compiler_label_new (compiler); + label_loop_start = orc_compiler_label_new (compiler); + label_leave = orc_compiler_label_new (compiler); +@@ -312,6 +323,8 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) + { + int i; + ++ /* Emit invariants also to check for constants */ ++ orc_compiler_emit_invariants (compiler); + orc_powerpc_emit_loop (compiler, 0); + + compiler->codeptr = compiler->code; +@@ -486,3 +499,199 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) + powerpc_do_fixups (compiler); + } + ++static ++int orc_powerpc_assemble_copy_check (OrcCompiler *compiler) ++{ ++ if (compiler->program->n_insns == 1 && ++ compiler->program->is_2d == FALSE && ++ (strcmp (compiler->program->insns[0].opcode->name, "copyb") == 0 || ++ strcmp (compiler->program->insns[0].opcode->name, "copyw") == 0 || ++ strcmp (compiler->program->insns[0].opcode->name, "copyl") == 0 || ++ strcmp (compiler->program->insns[0].opcode->name, "copyq") == 0) && ++ (compiler->program->insns[0].flags & ++ (ORC_INSTRUCTION_FLAG_X2 | ORC_INSTRUCTION_FLAG_X4)) == 0 && ++ compiler->program->n_param_vars == 0 && ++ compiler->program->n_const_vars == 0) { ++ /* TODO: add param & const support if this turns out to be faster */ ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++static ++void orc_powerpc_assemply_copy_loop (OrcCompiler *compiler, int size, ++ int shift, int next_label) ++{ ++ const int src = POWERPC_R5; ++ const int dst = POWERPC_R6; ++ const int count = POWERPC_R7; ++ const int tmp = POWERPC_R0; ++ const int vtmp = POWERPC_V0; ++ const int vperm = POWERPC_V1; ++ int label_copy; ++ ++ label_copy = orc_compiler_label_new (compiler); ++ ++ ORC_ASM_CODE(compiler," cmplwi %s, %d\n", ++ powerpc_get_regname(count), size); ++ powerpc_emit(compiler, 0x28000000|(powerpc_regnum(count)<<16)|(size&0xffff)); ++ ++ ORC_ASM_CODE(compiler," blt %d%c\n", next_label, ++ (compiler->labels[next_label]!=NULL) ? 'b' : 'f'); ++ powerpc_add_fixup (compiler, 0, compiler->codeptr, next_label); ++ powerpc_emit (compiler, 0x41800000); ++ ++ powerpc_emit_D(compiler, "andi.", 0x70000000, tmp, src, size-1); ++ ORC_ASM_CODE(compiler," bgt %d%c\n", next_label, ++ (compiler->labels[next_label]!=NULL) ? 'b' : 'f'); ++ powerpc_add_fixup (compiler, 0, compiler->codeptr, next_label); ++ powerpc_emit (compiler, 0x41810000); ++ ++ powerpc_emit_D(compiler, "andi.", 0x70000000, tmp, dst, size-1); ++ ORC_ASM_CODE(compiler," bgt %d%c\n", next_label, ++ (compiler->labels[next_label]!=NULL) ? 'b' : 'f'); ++ powerpc_add_fixup (compiler, 0, compiler->codeptr, next_label); ++ powerpc_emit (compiler, 0x41810000); ++ ++ powerpc_emit_srawi (compiler, tmp, count, shift, 0); ++ ++ ORC_ASM_CODE (compiler, " mtctr %s\n", powerpc_get_regname(tmp)); ++ powerpc_emit (compiler, 0x7c0903a6 | (powerpc_regnum (tmp)<<21)); ++ ++ powerpc_emit_label (compiler, label_copy); ++ if (size == 16) { ++ ORC_ASM_CODE(compiler," lvx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (src)); ++ powerpc_emit_X (compiler, 0x7c0000ce, powerpc_regnum(vtmp), ++ 0, powerpc_regnum(src)); ++ ORC_ASM_CODE(compiler," stvx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (dst)); ++ powerpc_emit_X (compiler, 0x7c0001ce, ++ powerpc_regnum(vtmp), ++ 0, powerpc_regnum(dst)); ++ } else { ++ switch (size) { ++ case 1: ++ ORC_ASM_CODE(compiler," lvebx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (src)); ++ powerpc_emit_X (compiler, 0x7c00000e, powerpc_regnum(vtmp), ++ 0, powerpc_regnum(src)); ++ break; ++ case 2: ++ ORC_ASM_CODE(compiler," lvehx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (src)); ++ powerpc_emit_X (compiler, 0x7c00004e, powerpc_regnum(vtmp), ++ 0, powerpc_regnum(src)); ++ break; ++ case 4: ++ ORC_ASM_CODE(compiler," lvewx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (src)); ++ powerpc_emit_X (compiler, 0x7c00008e, powerpc_regnum(vtmp), ++ 0, powerpc_regnum(src)); ++ break; ++ } ++ powerpc_load_align (compiler, vperm, 0, src); ++ powerpc_emit_vperm (compiler, vtmp, vtmp, vtmp, vperm); ++ powerpc_store_align (compiler, vperm, 0, dst); ++ powerpc_emit_vperm (compiler, vtmp, vtmp, vtmp, vperm); ++ switch (size) { ++ case 1: ++ ORC_ASM_CODE(compiler," stvebx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (dst)); ++ powerpc_emit_X (compiler, 0x7c00010e, ++ powerpc_regnum(vtmp), ++ 0, powerpc_regnum(dst)); ++ break; ++ case 2: ++ ORC_ASM_CODE(compiler," stvehx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (dst)); ++ powerpc_emit_X (compiler, 0x7c00014e, ++ powerpc_regnum(vtmp), ++ 0, powerpc_regnum(dst)); ++ break; ++ case 4: ++ ORC_ASM_CODE(compiler," stvewx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (dst)); ++ powerpc_emit_X (compiler, 0x7c00018e, ++ powerpc_regnum(vtmp), ++ 0, powerpc_regnum(dst)); ++ break; ++ } ++ } ++ ++ powerpc_emit_addi (compiler, src, src, size); ++ powerpc_emit_addi (compiler, dst, dst, size); ++ powerpc_emit_addi (compiler, count, count, -size); ++ powerpc_emit_bne (compiler, label_copy); ++ ++ powerpc_emit_label (compiler, next_label); ++} ++ ++static ++void orc_powerpc_assemble_copy (OrcCompiler *compiler) ++{ ++ const int src = POWERPC_R5; ++ const int dst = POWERPC_R6; ++ const int count = POWERPC_V7; ++ OrcInstruction *insn; ++ int shift = 0; ++ int label_word; ++ int label_halfword; ++ int label_byte; ++ int label_done; ++ ++ insn = compiler->program->insns + 0; ++ ++ if (strcmp (insn->opcode->name, "copyw") == 0) { ++ shift = 1; ++ } else if (strcmp (insn->opcode->name, "copyl") == 0) { ++ shift = 2; ++ } else if (strcmp (insn->opcode->name, "copyq") == 0) { ++ shift = 3; ++ } ++ ++ label_word = orc_compiler_label_new (compiler); ++ label_halfword = orc_compiler_label_new (compiler); ++ label_byte = orc_compiler_label_new (compiler); ++ label_done = orc_compiler_label_new (compiler); ++ ++ powerpc_emit_prologue (compiler); ++ ++ powerpc_emit_load_address (compiler, ++ dst, ++ POWERPC_R3, ++ (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[insn->dest_args[0]])); ++ powerpc_emit_load_address (compiler, ++ src, ++ POWERPC_R3, ++ (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[insn->src_args[0]])); ++ powerpc_emit_lwz (compiler, count, POWERPC_R3, ++ (int)ORC_STRUCT_OFFSET(OrcExecutor, n)); ++ ++ powerpc_emit_addi (compiler, POWERPC_R0, 0, shift); ++ ORC_ASM_CODE(compiler, " slw %s, %s, %s\n", ++ powerpc_get_regname(count), ++ powerpc_get_regname(count), ++ powerpc_get_regname(POWERPC_R0)); ++ powerpc_emit (compiler, (31<<26) | ++ (powerpc_regnum (count)<<21) | ++ (powerpc_regnum (count)<<16) | ++ (powerpc_regnum (POWERPC_R0)<<11) | (24<<1)); ++ ++ orc_powerpc_assemply_copy_loop (compiler, 16, 4, label_word); ++ orc_powerpc_assemply_copy_loop (compiler, 4, 2, label_halfword); ++ orc_powerpc_assemply_copy_loop (compiler, 2, 1, label_byte); ++ orc_powerpc_assemply_copy_loop (compiler, 1, 0, label_done); ++ ++ powerpc_emit_epilogue (compiler); ++ powerpc_do_fixups (compiler); ++} +diff --git a/orc/orcrules-altivec.c b/orc/orcrules-altivec.c +index fa40ac3..7729b69 100644 +--- a/orc/orcrules-altivec.c ++++ b/orc/orcrules-altivec.c +@@ -15,26 +15,6 @@ + + /* rules */ + +-static void +-powerpc_load_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg) +-{ +- if (IS_POWERPC_BE (compiler)) { +- ORC_ASM_CODE(compiler," lvsl %s, %s, %s\n", +- powerpc_get_regname (vector_reg), +- offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), +- powerpc_get_regname (src_reg)); +- powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(vector_reg), +- offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); +- } else { +- ORC_ASM_CODE(compiler," lvsr %s, %s, %s\n", +- powerpc_get_regname (vector_reg), +- offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), +- powerpc_get_regname (src_reg)); +- powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(vector_reg), +- offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); +- } +-} +- + static inline int + powerpc_select_value (OrcCompiler *compiler, int be_value, int le_value) + { +@@ -322,19 +302,7 @@ powerpc_rule_storeX (OrcCompiler *compiler, void *user, OrcInstruction *insn) + int perm = orc_compiler_get_temp_reg (compiler); + int tmp = orc_compiler_get_temp_reg (compiler); + +- if (IS_POWERPC_BE (compiler)) { +- ORC_ASM_CODE(compiler," lvsr %s, 0, %s\n", +- powerpc_get_regname (perm), +- powerpc_get_regname (dest->ptr_register)); +- powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(perm), +- 0, powerpc_regnum(dest->ptr_register)); +- } else { +- ORC_ASM_CODE(compiler," lvsl %s, 0, %s\n", +- powerpc_get_regname (perm), +- powerpc_get_regname (dest->ptr_register)); +- powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(perm), +- 0, powerpc_regnum(dest->ptr_register)); +- } ++ powerpc_store_align (compiler, perm, 0, dest->ptr_register); + powerpc_emit_vperm (compiler, tmp, src->alloc, src->alloc, perm); + + switch (size) { +@@ -370,8 +338,7 @@ powerpc_rule_storeX (OrcCompiler *compiler, void *user, OrcInstruction *insn) + powerpc_regnum(tmp), + 0, powerpc_regnum(dest->ptr_register)); + +- powerpc_emit_D (compiler, "addi", 0x38000000, compiler->gp_tmpreg, +- 0, 4); ++ powerpc_emit_addi (compiler, compiler->gp_tmpreg, 0, 4); + + ORC_ASM_CODE(compiler," stvewx %s, %s, %s\n", + powerpc_get_regname (tmp), +@@ -397,6 +364,48 @@ powerpc_rule_storeX (OrcCompiler *compiler, void *user, OrcInstruction *insn) + } + } + ++static void ++powerpc_denormalize_sp_full(OrcCompiler *p, int reg, int zero, int mask) ++{ ++ int tmp = p->tmpreg; ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, reg, mask); ++ powerpc_emit_VX_2(p, "vcmpequw", 0x10000086, tmp, tmp, zero); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp, reg, zero, tmp); ++ powerpc_emit_VX_2(p, "xvcpsgnsp", 0xf0000687, reg, reg, tmp); ++} ++ ++static void ++powerpc_denormalize_sp_zero(OrcCompiler *p, int reg, int zero) ++{ ++ int mask = powerpc_get_constant_full (p, 0x7f800000, 0x7f800000, ++ 0x7f800000, 0x7f800000); ++ powerpc_denormalize_sp_full(p, reg, zero, mask); ++} ++ ++static void ++powerpc_denormalize_sp(OrcCompiler *p, int reg) ++{ ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_sp_zero(p, reg, zero); ++} ++ ++static void ++powerpc_denormalize_dp_full(OrcCompiler *p, int reg, int zero, int mask) ++{ ++ int tmp = p->tmpreg; ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, reg, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, zero); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp, reg, zero, tmp); ++ powerpc_emit_VX_2(p, "xvcpsgndp", 0xf0000787, reg, reg, tmp); ++} ++ ++static void ++powerpc_denormalize_dp_zero(OrcCompiler *p, int reg, int zero) ++{ ++ int mask = powerpc_get_constant_full (p, 0x7ff00000, 0x00000000, ++ 0x7ff00000, 0x00000000); ++ powerpc_denormalize_dp_full(p, reg, zero, mask); ++} + + + #define RULE(name, opcode, code) \ +@@ -409,6 +418,33 @@ powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ + powerpc_emit_VX_2 (p, opcode, code , dest, src1, src2);\ + } + ++#define RULE_DP(name, opcode, code) \ ++static void \ ++powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ ++{ \ ++ int src1 = ORC_SRC_ARG (p, insn, 0); \ ++ int src2 = ORC_SRC_ARG (p, insn, 1); \ ++ int dest = ORC_DEST_ARG (p, insn, 0); \ ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); \ ++ powerpc_denormalize_dp_zero (p, src1, zero); \ ++ powerpc_denormalize_dp_zero (p, src2, zero); \ ++ powerpc_emit_VX_2 (p, opcode, code , dest, src1, src2); \ ++ powerpc_denormalize_dp_zero (p, dest, zero); \ ++} ++ ++#define RULE_DP_SRC(name, opcode, code) \ ++static void \ ++powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ ++{ \ ++ int src1 = ORC_SRC_ARG (p, insn, 0); \ ++ int src2 = ORC_SRC_ARG (p, insn, 1); \ ++ int dest = ORC_DEST_ARG (p, insn, 0); \ ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); \ ++ powerpc_denormalize_dp_zero (p, src1, zero); \ ++ powerpc_denormalize_dp_zero (p, src2, zero); \ ++ powerpc_emit_VX_2 (p, opcode, code , dest, src1, src2); \ ++} ++ + #define RULE_SHIFT(name, opcode, code) \ + static void \ + powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ +@@ -503,13 +539,11 @@ RULE(maxf, "vmaxfp", 0x1000040a) + RULE(minf, "vminfp", 0x1000044a) + RULE(cmpeqf, "vcmpeqfp", 0x100000c6) + +-RULE(addd, "xvadddp", 0xf0000307) +-RULE(subd, "xvsubdp", 0xf0000347) +-RULE(muld, "xvmuldp", 0xf0000387) +-RULE(divd, "xvdivdp", 0xf00003c7) +-RULE(mind, "xvmindp", 0xf0000747) +-RULE(maxd, "xvmaxdp", 0xf0000707) +-RULE(cmpeqd, "xvcmpeqdp", 0xf000031f) ++RULE_DP(addd, "xvadddp", 0xf0000307) ++RULE_DP(subd, "xvsubdp", 0xf0000347) ++RULE_DP(muld, "xvmuldp", 0xf0000387) ++RULE_DP(divd, "xvdivdp", 0xf00003c7) ++RULE_DP_SRC(cmpeqd, "xvcmpeqdp", 0xf000031f) + + RULE(addq, "vaddudm", 0x100000c0) + RULE(subq, "vsubudm", 0x100004c0) +@@ -541,13 +575,12 @@ powerpc_rule_mullb (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x11011303, 0x15051707, ++ 0x19091b0b, 0x1d0d1f0f); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesb (p, dest, src1, src2); +- powerpc_emit_vsldoi (p, dest, dest, dest, 1); +- } else { +- powerpc_emit_vmulosb (p, dest, src1, src2); +- } ++ powerpc_emit_vmulesb (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosb (p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -556,15 +589,12 @@ powerpc_rule_mulhsb (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x10001202, 0x14041606, ++ 0x18081a0a, 0x1c0c1e0e); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesb (p, dest, src1, src2); +- } else { +- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); +- +- powerpc_emit_vmulosb (p, dest, src1, src2); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, src1, tmp); +- } ++ powerpc_emit_vmulesb (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosb (p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -573,15 +603,12 @@ powerpc_rule_mulhub (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x10001202, 0x14041606, ++ 0x18081a0a, 0x1c0c1e0e); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmuleub (p, dest, src1, src2); +- } else { +- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); +- +- powerpc_emit_vmuloub (p, dest, src1, src2); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- } ++ powerpc_emit_vmuleub (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmuloub (p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -590,16 +617,12 @@ powerpc_rule_mulhsw (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x10110001, 0x14150405, ++ 0x18190809, 0x1c1d0c0d); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesh (p, dest, src1, src2); +- } else { +- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); +- +- powerpc_emit_vmulosh (p, dest, src1, src2); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- } ++ powerpc_emit_vmulesh (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosh (p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -608,16 +631,12 @@ powerpc_rule_mulhuw (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x10110001, 0x14150405, ++ 0x18190809, 0x1c1d0c0d); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmuleuh (p, dest, src1, src2); +- } else { +- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); +- +- powerpc_emit_vmulouh (p, dest, src1, src2); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- } ++ powerpc_emit_vmuleuh(p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulouh(p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -765,10 +784,12 @@ powerpc_rule_mulsbw (OrcCompiler *p, void *user, OrcInstruction *insn) + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); + ++ powerpc_emit_vmulesb (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosb (p, dest, src1, src2); + if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesb (p, dest, src1, src2); ++ powerpc_emit_vmrghh (p, dest, p->tmpreg, dest); + } else { +- powerpc_emit_vmulosb (p, dest, src1, src2); ++ powerpc_emit_vmrglh (p, dest, p->tmpreg, dest); + } + } + +@@ -779,10 +800,12 @@ powerpc_rule_mulubw (OrcCompiler *p, void *user, OrcInstruction *insn) + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); + ++ powerpc_emit_vmuleub (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmuloub (p, dest, src1, src2); + if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmuleub (p, dest, src1, src2); ++ powerpc_emit_vmrghh (p, dest, p->tmpreg, dest); + } else { +- powerpc_emit_vmuloub (p, dest, src1, src2); ++ powerpc_emit_vmrglh (p, dest, p->tmpreg, dest); + } + } + +@@ -793,10 +816,12 @@ powerpc_rule_mulswl (OrcCompiler *p, void *user, OrcInstruction *insn) + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); + ++ powerpc_emit_vmulesh (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosh (p, dest, src1, src2); + if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesh (p, dest, src1, src2); ++ powerpc_emit_vmrghw (p, dest, p->tmpreg, dest); + } else { +- powerpc_emit_vmulosh (p, dest, src1, src2); ++ powerpc_emit_vmrglw (p, dest, p->tmpreg, dest); + } + } + +@@ -807,10 +832,12 @@ powerpc_rule_muluwl (OrcCompiler *p, void *user, OrcInstruction *insn) + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); + ++ powerpc_emit_vmuleuh (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulouh (p, dest, src1, src2); + if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmuleuh (p, dest, src1, src2); ++ powerpc_emit_vmrghw (p, dest, p->tmpreg, dest); + } else { +- powerpc_emit_vmulouh (p, dest, src1, src2); ++ powerpc_emit_vmrglw (p, dest, p->tmpreg, dest); + } + } + +@@ -848,17 +875,13 @@ powerpc_rule_mulll (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int tmp = orc_compiler_get_temp_reg(p); ++ int perm = powerpc_get_constant_full(p, 0x14151617, 0x04050607, ++ 0x1c1d1e1f, 0x0c0d0e0f); + +- if (IS_POWERPC_BE (p)) { +- int perm; +- +- powerpc_emit_vmuleuw (p, dest, src1, src2); +- perm = powerpc_get_constant_full (p, 0x04050607, 0x04050607, +- 0x0c0d0e0f, 0x0c0d0e0f); +- powerpc_emit_vperm (p, dest, dest, dest, perm); +- } else { +- powerpc_emit_vmulouw (p, dest, src1, src2); +- } ++ powerpc_emit_vmulouw (p, tmp, src1, src2); ++ powerpc_emit_vmuleuw (p, dest, src1, src2); ++ powerpc_emit_vperm (p, dest, tmp, dest, perm); + } + + static void +@@ -1428,20 +1451,11 @@ powerpc_rule_divf (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); +- int y = orc_compiler_get_temp_reg (p); +- int t = orc_compiler_get_temp_reg (p); +- int c1; +- int c0; +- +- c1 = powerpc_get_constant (p, ORC_CONST_SPLAT_L, 0x3f800000); /* 1.0 */ +- +- powerpc_emit_VX_db (p, "vrefp", 0x1000010a, y, src2); +- +- powerpc_emit_VA_acb (p, "vnmsubfp", 0x1000002f, t, y, c1, src2); +- powerpc_emit_VA_acb (p, "vmaddfp", 0x1000002e, y, y, y, t); +- +- c0 = powerpc_get_constant (p, ORC_CONST_SPLAT_L, 0x00000000); /* 0.0 */ +- powerpc_emit_VA_acb (p, "vmaddfp", 0x1000002e, dest, y, c0, src1); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_sp_zero (p, src1, zero); ++ powerpc_denormalize_sp_zero (p, src2, zero); ++ powerpc_emit_VX_2(p, "xvdivsp", 0xf00002c7, dest, src1, src2); ++ powerpc_denormalize_sp_zero (p, dest, zero); + } + + static void +@@ -1521,8 +1535,10 @@ powerpc_rule_sqrtf(OrcCompiler* p, void* user, OrcInstruction* insn) + { + int src1 = ORC_SRC_ARG(p, insn, 0); + int dest = ORC_DEST_ARG(p, insn, 0); +- ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_sp_zero (p, src1, zero); + powerpc_emit_VX_db(p, "xvsqrtsp", 0xf000022f, dest, src1); ++ powerpc_denormalize_sp_zero (p, dest, zero); + } + + static void +@@ -1530,18 +1546,65 @@ powerpc_rule_sqrtd(OrcCompiler* p, void* user, OrcInstruction* insn) + { + int src1 = ORC_SRC_ARG(p, insn, 0); + int dest = ORC_DEST_ARG(p, insn, 0); +- ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_dp_zero (p, src1, zero); + powerpc_emit_VX_db(p, "xvsqrtdp", 0xf000032f, dest, src1); ++ powerpc_denormalize_dp_zero (p, dest, zero); + } + + static void +-powerpc_rule_cmpltd (OrcCompiler *p, void *user, OrcInstruction *insn) ++powerpc_rule_mind (OrcCompiler *p, void *user, OrcInstruction *insn) + { + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ int mask = powerpc_get_constant_full (p, 0x7ff80000, 0x00000000, ++ 0x7ff80000, 0x00000000); ++ int tmp2 = orc_compiler_get_temp_reg(p); ++ int tmp = p->tmpreg; ++ powerpc_denormalize_dp_zero (p, src1, zero); ++ powerpc_denormalize_dp_zero (p, src2, zero); ++ powerpc_emit_VX_2(p, "xvmindp", 0xf0000747, tmp2, src2, src1); ++ // Handle QNaN ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src1, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, mask); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, dest, tmp2, src1, tmp); ++} + +-// powerpc_emit_VXR (p, "vcmpgtfp", 0x100002c6, dest, src2, src1, FALSE); ++static void ++powerpc_rule_maxd (OrcCompiler *p, void *user, OrcInstruction *insn) ++{ ++ int src1 = ORC_SRC_ARG (p, insn, 0); ++ int src2 = ORC_SRC_ARG (p, insn, 1); ++ int dest = ORC_DEST_ARG (p, insn, 0); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ int mask = powerpc_get_constant_full (p, 0x7ff80000, 0x00000000, ++ 0x7ff80000, 0x00000000); ++ int tmp2 = orc_compiler_get_temp_reg(p); ++ int tmp3 = orc_compiler_get_temp_reg(p); ++ int tmp = p->tmpreg; ++ powerpc_denormalize_dp_zero (p, src1, zero); ++ powerpc_denormalize_dp_zero (p, src2, zero); ++ powerpc_emit_VX_2(p, "xvmaxdp", 0xf0000707, tmp2, src2, src1); ++ // Handle QNaN ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src2, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, mask); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp3, tmp2, src2, tmp); ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src1, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, mask); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, dest, tmp3, src1, tmp); ++} ++ ++static void ++powerpc_rule_cmpltd (OrcCompiler *p, void *user, OrcInstruction *insn) ++{ ++ int src1 = ORC_SRC_ARG (p, insn, 0); ++ int src2 = ORC_SRC_ARG (p, insn, 1); ++ int dest = ORC_DEST_ARG (p, insn, 0); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_dp_zero (p, src1, zero); ++ powerpc_denormalize_dp_zero (p, src2, zero); + powerpc_emit_VX_2(p, "xvcmpgtdp", 0xf000035f, dest, src2, src1); + } + +@@ -1551,8 +1614,9 @@ powerpc_rule_cmpled (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); +- +-// powerpc_emit_VXR (p, "vcmpgefp", 0x100001c6, dest, src2, src1, FALSE); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_dp_zero (p, src1, zero); ++ powerpc_denormalize_dp_zero (p, src2, zero); + powerpc_emit_VX_2(p, "xvcmpgedp", 0xf000039f, dest, src2, src1); + } + +@@ -1561,11 +1625,13 @@ powerpc_rule_convld (OrcCompiler *p, void *user, OrcInstruction *insn) + { + int src1 = ORC_SRC_ARG (p, insn, 0); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); + + if (IS_POWERPC_LE (p)) { + powerpc_emit_vsldoi(p, src1, src1, src1, 4); + } + powerpc_emit_VX_db (p, "xvcvsxddp", 0xf00003e3, dest, src1); ++ powerpc_denormalize_dp_zero (p, dest, zero); + } + + static void +@@ -1573,8 +1639,19 @@ powerpc_rule_convdl (OrcCompiler *p, void *user, OrcInstruction *insn) + { + int src1 = ORC_SRC_ARG (p, insn, 0); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int mask = powerpc_get_constant_full (p, 0xfff00000, 0x00000000, ++ 0xfff00000, 0x00000000); ++ int nan = powerpc_get_constant_full (p, 0x7ff00000, 0x00000000, ++ 0x7ff00000, 0x00000000); ++ int maxint = powerpc_get_constant_full (p, 0x7fffffff, 0x7fffffff, ++ 0x7fffffff, 0x7fffffff); ++ int tmp = p->tmpreg; + ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src1, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, nan); + powerpc_emit_VX_db (p, "xvcvdpsxws", 0xf0000363, dest, src1); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, dest, dest, maxint, tmp); ++ + if (IS_POWERPC_LE (p)) { + int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 32); + powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +@@ -1586,11 +1663,23 @@ powerpc_rule_convfd (OrcCompiler *p, void *user, OrcInstruction *insn) + { + int src1 = ORC_SRC_ARG (p, insn, 0); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int tmp2 = orc_compiler_get_temp_reg(p); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ int mask = powerpc_get_constant_full (p, 0x7f800000, 0x00000000, ++ 0x7f800000, 0x00000000); ++ int tmp = p->tmpreg; + + if (IS_POWERPC_LE (p)) { +- powerpc_emit_vsldoi(p, src1, src1, src1, 4); ++ powerpc_emit_vsldoi(p, tmp2, src1, src1, 4); ++ } else { ++ powerpc_emit_vor(p, tmp2, src1, src1); + } +- powerpc_emit_VX_db (p, "xvcvspdp", 0xf0000727, dest, src1); ++ powerpc_emit_VX_db (p, "xvcvspdp", 0xf0000727, dest, tmp2); ++ ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, tmp2, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, zero); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp, dest, zero, tmp); ++ powerpc_emit_VX_2(p, "xvcpsgndp", 0xf0000787, dest, dest, tmp); + } + + static void +@@ -1604,6 +1693,7 @@ powerpc_rule_convdf (OrcCompiler *p, void *user, OrcInstruction *insn) + int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 32); + powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); + } ++ powerpc_denormalize_sp(p, dest); + } + + +@@ -1757,7 +1847,6 @@ orc_compiler_powerpc_register_rules (OrcTarget *target) + REG(cmplef); + REG(cmpltf); + REG(mulf); +- REG(divf); + REG(convfl); + REG(convlf); + +@@ -1789,6 +1878,7 @@ orc_compiler_powerpc_register_rules (OrcTarget *target) + + rule_set = orc_rule_set_new(orc_opcode_set_get("sys"), target, ORC_TARGET_POWERPC_VSX); + ++ REG(divf); + REG(sqrtf); + REG(addd); + REG(subd); +diff --git a/orc/orctarget.h b/orc/orctarget.h +index 642bfe3..53000b3 100644 +--- a/orc/orctarget.h ++++ b/orc/orctarget.h +@@ -19,7 +19,7 @@ enum { + ORC_TARGET_FAST_DENORMAL = (1<<31) + }; + +-enum { ++typedef enum { + ORC_TARGET_POWERPC_64BIT = (1<<0), + ORC_TARGET_POWERPC_LE = (1<<1), + ORC_TARGET_POWERPC_ALTIVEC = (1<<2), +diff --git a/testsuite/exec_parse.c b/testsuite/exec_parse.c +index 0858413..859ad4e 100644 +--- a/testsuite/exec_parse.c ++++ b/testsuite/exec_parse.c +@@ -20,6 +20,7 @@ main (int argc, char *argv[]) + char *code; + int n; + int i; ++ int ret; + OrcProgram **programs; + const char *filename = NULL; + +@@ -45,7 +46,11 @@ main (int argc, char *argv[]) + + for(i=0;i<n;i++){ + if (verbose) printf("%s\n", programs[i]->name); +- orc_test_compare_output_full (programs[i], 0); ++ ret = orc_test_compare_output_full (programs[i], 0); ++ if (!ret) { ++ printf("failed %s\n", programs[i]->name); ++ error = TRUE; ++ } + orc_program_free (programs[i]); + } + +diff --git a/testsuite/memcpy_speed.c b/testsuite/memcpy_speed.c +index a1a69f1..4cf1c39 100644 +--- a/testsuite/memcpy_speed.c ++++ b/testsuite/memcpy_speed.c +@@ -102,7 +102,7 @@ main(int argc, char *argv[]) + max = 140; + } + +- for(i=0;i<max;i++){ ++ for(i=0;i<max;i+=2){ + double x = i*0.1 + 6.0; + int size = pow(2.0, x); + diff --git a/user/palapeli/APKBUILD b/user/palapeli/APKBUILD index ad7e78132..3eabd1f83 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Jigsaw puzzle game by KDE" url="https://www.kde.org/applications/games/palapeli/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="23dae3cfba1429b604a07ab1ddb520910fc2244d34231709a1d06ab53e47df3e18e6260178d6198a019ff592bae665cb588fddb3381d938045cc23559b49f402 palapeli-19.08.0.tar.xz" +sha512sums="319e14d887678a243f55dd9f06cea6437a91b46e85f508eeeca22b8eeaa529af1df7b8e7ca594b2a23d530face26f9c4ad9869440d849827ae59dd95d5940078 palapeli-19.08.1.tar.xz" diff --git a/user/papirus-icons/APKBUILD b/user/papirus-icons/APKBUILD index f87f1c988..3e0bab284 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=20190802 +pkgver=20190919 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="880681502d0b405e8a7962d6978d0a6cac3aec386723b69655d97157f8c5140fc88b711d7983e91b2900841e420af73a58f3ecb13f5e6122cd754a6ca26d84db papirus-icons-20190802.tar.gz" +sha512sums="183765db87863f46d5036ea020ef5f4da5f74b6b519bdf9409f95e904209ba308abf46af29d5d8e86a1abe95e18975bd9114cfc929cd4620a9cef49e6a5c939b papirus-icons-20190919.tar.gz" diff --git a/user/perl-carp-clan/APKBUILD b/user/perl-carp-clan/APKBUILD index 0a2586220..3a404d9f9 100644 --- a/user/perl-carp-clan/APKBUILD +++ b/user/perl-carp-clan/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alyx Wolcott <alyx@leuhta.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-carp-clan -pkgver=6.07 +pkgver=6.08 pkgrel=0 pkgdesc="Report modules as a 'clan' in Perl" url="https://metacpan.org/pod/Carp::Clan" @@ -26,4 +26,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="0180c2bd2ffe9f2b6c23d7e76bf3dd8ceeacfc842b09c2dab2f81d002ff7235ce2d145e53c55e375cb889291577cfcd4cb9be34b5445ae532cb9768979c57e41 Carp-Clan-6.07.tar.gz" +sha512sums="bc7f74d75e1eae0f528d530b47f1841493aae7eecdeeb58f85f5d8ef7a5b4d92c479b45468d0e7175f228056295d3d7159a7b404fecd542cf04c75ddc3a9886f Carp-Clan-6.08.tar.gz" diff --git a/user/perl-datetime-timezone/APKBUILD b/user/perl-datetime-timezone/APKBUILD index 1c862ef14..356fd3289 100644 --- a/user/perl-datetime-timezone/APKBUILD +++ b/user/perl-datetime-timezone/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-datetime-timezone _pkgname=DateTime-TimeZone -pkgver=2.36 +pkgver=2.37 pkgrel=0 pkgdesc="Time zone object class and factory for Perl" url="https://metacpan.org/release/DateTime-TimeZone" @@ -30,4 +30,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="6958d4ac21f1ed641e31d86dad83153bf4ad763e499cb062d918ac292d3ed7339486470d9812d7c5fc27040bc8d39fa73fd9f34bf2fd72404743cb1e9cf18a85 DateTime-TimeZone-2.36.tar.gz" +sha512sums="9cc26cb9e1563ad86dcee2c83dc7f745631903a370e28ba14211671d905d2fe1a9ef3f72ee51777fdc6999b9ffb4f9d58b50c48655dd6b9ab9fee3fa97df701f DateTime-TimeZone-2.37.tar.gz" diff --git a/user/perl-file-find-object-rule/APKBUILD b/user/perl-file-find-object-rule/APKBUILD index 498f0358e..ecc1db115 100644 --- a/user/perl-file-find-object-rule/APKBUILD +++ b/user/perl-file-find-object-rule/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-file-find-object-rule -pkgver=0.0310 +pkgver=0.0311 pkgrel=0 pkgdesc="Alternative Perl interface to File::Find::Object" url="https://metacpan.org/release/File-Find-Object-Rule" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="d77f600a43a45fddf84fd9689666fb90d3dc87fb444e575a111bcebec482d570201e591764513f345941983935f1761bf4e2704d1a70babd6b3ba12ba3d8a74d File-Find-Object-Rule-0.0310.tar.gz" +sha512sums="ac187c22e05b736245ba8acecd4845d036580ba12be478254a9e74d3c397f1b3e97c1041eb8da256bb147dffd3943d9286a8955f94594a3e426a6ec8f9acc3be File-Find-Object-Rule-0.0311.tar.gz" diff --git a/user/perl-file-find-object/APKBUILD b/user/perl-file-find-object/APKBUILD index b404a5cac..800800d01 100644 --- a/user/perl-file-find-object/APKBUILD +++ b/user/perl-file-find-object/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-file-find-object -pkgver=0.3.2 +pkgver=0.3.4 pkgrel=0 pkgdesc="Object-oriented File::Find replacement for Perl" url="https://metacpan.org/release/File-Find-Object" @@ -10,24 +10,21 @@ license="Artistic-2.0" depends="perl-class-xsaccessor" makedepends="perl-dev perl-module-build" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/File-Find-Object-v$pkgver.tar.gz" -builddir="$srcdir/File-Find-Object-v$pkgver" +source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/File-Find-Object-$pkgver.tar.gz" +builddir="$srcdir/File-Find-Object-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="58ca07083da520aee03945259ac89b6b584728d89ad52aea1a6f19a14da73fc92fcfc46c01656130d64fbc9fc9e4b1c5ef56274f30ebe3711972235dd8945956 File-Find-Object-v0.3.2.tar.gz" +sha512sums="88d69158ecc2fafb8d2bd7f0173b1e204fd8c96f3c0fefa491db4240f8fa9db52707a8d65aaa76f8459269619e6f91755c877f2a491f1eab78d043abc90f9b3f File-Find-Object-0.3.4.tar.gz" diff --git a/user/perl-file-slurp/APKBUILD b/user/perl-file-slurp/APKBUILD index cec87b5ac..9364216f1 100644 --- a/user/perl-file-slurp/APKBUILD +++ b/user/perl-file-slurp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-file-slurp -pkgver=9999.27 +pkgver=9999.28 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="24a5e2b93f7fda65cbdf0e54687de3af511cfd3909dcf4c79610882bf4f119afdf2bd60de28fcb8d9155b94a29ca4f901e28930a810949e490ba1c584d7a6ee0 File-Slurp-9999.27.tar.gz" +sha512sums="4e4f6ee3f1563eff230a4d3db8e71647e41f58be523c60d023763c94b41a850c24873ac2b0f27e192a47afc77cc20e2e09d7b83ffef34b465601ef64ec9cd4ef File-Slurp-9999.28.tar.gz" diff --git a/user/perl-html-scrubber/APKBUILD b/user/perl-html-scrubber/APKBUILD index cbfd27679..b01070acc 100644 --- a/user/perl-html-scrubber/APKBUILD +++ b/user/perl-html-scrubber/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-html-scrubber _pkgname=HTML-Scrubber -pkgver=0.17 +pkgver=0.19 pkgrel=0 pkgdesc="Perl HTML sanitiser" url="https://metacpan.org/release/HTML-Scrubber" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="d6e04374d4da390d22cc4d51bfe2910078effc30d6d2ddc36dbc1b94ada12333c2f9c7acb1f444f777f9e268aed90ba8ea15c4c74a8b5ab955fe97ef04469ba7 HTML-Scrubber-0.17.tar.gz" +sha512sums="6894c58315f38e81d645b999cca180b1e86a64e8ae913df5891a6293c9c4950d99f1d1c5a03b7d584aff381afc49c16fe2e06541203c8dea881479cc981ee262 HTML-Scrubber-0.19.tar.gz" diff --git a/user/perl-mouse/APKBUILD b/user/perl-mouse/APKBUILD index f53fc11f2..ed16c6d74 100644 --- a/user/perl-mouse/APKBUILD +++ b/user/perl-mouse/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-mouse -pkgver=2.5.7 +pkgver=2.5.9 pkgrel=0 pkgdesc="Moose minus the antlers" url="https://metacpan.org/pod/Mouse" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="c9781ccdeee6cfd0a97bc2337c29358f51a22a32c4f9e1c01c4b094691e211ba455513d4ff9ee33320e689c2bfeb233418d7a1e5e51efec43f34e91480ecec6c Mouse-v2.5.7.tar.gz" +sha512sums="e817eecaeccb979c1b78819b61724ebaad9f938d82b76ad7b73a8bfe2f5e1c63a2cd8e8439bcededd17be4770af6bfa98b594e58278e0388272dbd5d416ea6c0 Mouse-v2.5.9.tar.gz" diff --git a/user/perl-namespace-autoclean/APKBUILD b/user/perl-namespace-autoclean/APKBUILD index 77163cc96..d7cd55c29 100644 --- a/user/perl-namespace-autoclean/APKBUILD +++ b/user/perl-namespace-autoclean/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-namespace-autoclean -pkgver=0.28 +pkgver=0.29 pkgrel=0 pkgdesc="Keep imports out of your Perl namespace" url="https://metacpan.org/release/namespace-autoclean" @@ -9,7 +9,7 @@ arch="noarch" license="Artistic-1.0-Perl" depends="perl-b-hooks-endofscope perl-namespace-clean perl-sub-identify" makedepends="perl-dev" -checkdepends="perl-moo perl-moose perl-mouse perl-test-requires" +checkdepends="perl-moo perl-moose perl-mouse perl-test-requires perl-test-needs" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/namespace-autoclean-$pkgver.tar.gz" builddir="$srcdir/namespace-autoclean-$pkgver" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="2541f69862b334fcfe30059d025668175de1b182a5c8ee8f2619bf1d661c316a38fe2014f274bb23e887cd36959f98abb297154ac8ceb600e2e93cbd4a75e28d namespace-autoclean-0.28.tar.gz" +sha512sums="64dee8009c8ab587c1aef504c0b429248a9069e6cfbfcb4062b83ddf56c82121be66f821013f3251e6863935429e0663aec82202352904983db600a79348732c namespace-autoclean-0.29.tar.gz" diff --git a/user/perl-parallel-forkmanager/APKBUILD b/user/perl-parallel-forkmanager/APKBUILD new file mode 100644 index 000000000..77fe566db --- /dev/null +++ b/user/perl-parallel-forkmanager/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-parallel-forkmanager +pkgver=2.02 +pkgrel=0 +pkgdesc="Perl library for managing fork()-based parallelization" +url="https://metacpan.org/pod/Parallel::ForkManager" +arch="noarch" +license="Artistic-1.0-Perl OR GPL-2.0-only" +depends="perl perl-moo" +checkdepends="perl-test-warn" +makedepends="" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/Y/YA/YANICK/Parallel-ForkManager-$pkgver.tar.gz" +builddir="$srcdir/Parallel-ForkManager-$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="2b390ec8f252e7bf2b6be8d602b231b1fd347bc5256bf7f16a6d56f67256938f3d96b7a28c92c662d8b91441b7fa4cb5922c655e64a7a4a9332eb58f19b6bcfb Parallel-ForkManager-2.02.tar.gz" diff --git a/user/perl-regexp-common/APKBUILD b/user/perl-regexp-common/APKBUILD new file mode 100644 index 000000000..91cff6808 --- /dev/null +++ b/user/perl-regexp-common/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-regexp-common +_pkgname=Regexp-Common +pkgver=2017060201 +pkgrel=0 +pkgdesc="Perl library for common regular expression utilities" +url="https://metacpan.org/pod/Regexp::Common" +arch="noarch" +license="Artistic-1.0-Perl OR Artistic-2.0 OR BSD-3-Clause OR MIT" +depends="perl" +makedepends="" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/A/AB/ABIGAIL/Regexp-Common-$pkgver.tar.gz" +builddir="$srcdir/Regexp-Common-$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="fd046d775214bdca42f868557559595360b069121a75fc119f45e064091000968d9d84154f8a0f06072ecff169dccecf68be58f99a7196932fcb4ffcbd678608 Regexp-Common-2017060201.tar.gz" diff --git a/user/perl-test-trailingspace/APKBUILD b/user/perl-test-trailingspace/APKBUILD index ccaf8e873..30937fcc2 100644 --- a/user/perl-test-trailingspace/APKBUILD +++ b/user/perl-test-trailingspace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-trailingspace -pkgver=0.0301 +pkgver=0.0302 pkgrel=0 pkgdesc="Test for trailing spaces in Perl source files" url="https://metacpan.org/release/Test-TrailingSpace" @@ -30,4 +30,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="9ec511759b12265c2a98a06a54081e0ca0377e707b29174fb874fd505330e0abfafebe910f7ceba9f8a6bcbfcf5d74fc8ffdca2e17b9cad15c207213449085d4 Test-TrailingSpace-0.0301.tar.gz" +sha512sums="00ebea59fd55a7c296944bb74eba1ac8bc55ca9a92c7cb6a548fdd150d049bfe1496fb9e54007929219af85673dc5bb20881e52dc25945d437c0ebf772eaba95 Test-TrailingSpace-0.0302.tar.gz" diff --git a/user/perl-test-warnings/APKBUILD b/user/perl-test-warnings/APKBUILD index 9b65d822e..2eca09a20 100644 --- a/user/perl-test-warnings/APKBUILD +++ b/user/perl-test-warnings/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-warnings -pkgver=0.026 +pkgver=0.027 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="510e182299173fa01482cde642fe5d84a77ea2f3b1761c7d8bf855caed963f276134357b4d7662bb3fbf09621ac6e11451fe19bf0ba2cf96bc841c280a624cd4 Test-Warnings-0.026.tar.gz" +sha512sums="d8e5d2bbddd7119e0b5a45cb23451f664936e120ecb8c579ee5cdeada0aa20592d4f8aaeefce99c4e85052520edd75ccf095580a5a02979a33910ccf4ec57da9 Test-Warnings-0.027.tar.gz" diff --git a/user/perl-test2-suite/APKBUILD b/user/perl-test2-suite/APKBUILD index 0440b6ccb..fbf282461 100644 --- a/user/perl-test2-suite/APKBUILD +++ b/user/perl-test2-suite/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test2-suite -pkgver=0.000124 +pkgver=0.000126 pkgrel=0 pkgdesc="Collection of Perl modules in the Test2 namespace" url="https://metacpan.org/pod/Test2::Suite" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="d624edd8170fe3901fb5491c5fcff90a7b700cd725b911a70ae6058801888a75c0b9d74e05dec1c257f692ecdbc776098d3a065cd6bc2938bdeb82a2d2ed2552 Test2-Suite-0.000124.tar.gz" +sha512sums="3359bc8071edbeb2ea004648a6ed2da78cc4abdcc8198eb4019f99c7083c85740f3bf2bdf230e80fa72b667e52eab57d4e524b887b37842889a74142c73c6fbd Test2-Suite-0.000126.tar.gz" diff --git a/user/perl-text-template/APKBUILD b/user/perl-text-template/APKBUILD index 626bce6e5..aa5f63cf2 100644 --- a/user/perl-text-template/APKBUILD +++ b/user/perl-text-template/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-text-template -pkgver=1.56 +pkgver=1.58 pkgrel=0 pkgdesc="Perl module for expanding embedded Perl in templates" url="https://metacpan.org/pod/Text::Template" @@ -27,4 +27,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="873a03fc436cc22342310fcc0ab7963d5a69a06bb2fe9f2b7866ccca5c18b2eccef76cdcdf58f2465553a8b6088b28373f19d046157d78a062e056901a411add Text-Template-1.56.tar.gz" +sha512sums="23bf03529c7607806c16573b5c0d08ba0b87cf7eb859538d1944bc13952741a88c15588e8de173053a51640c5bdad99c5cc246a67cc05be7eff32853887fbb11 Text-Template-1.58.tar.gz" diff --git a/user/perl-xml-parser/APKBUILD b/user/perl-xml-parser/APKBUILD index 92367af8b..730415122 100644 --- a/user/perl-xml-parser/APKBUILD +++ b/user/perl-xml-parser/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-xml-parser _pkgreal=XML-Parser -pkgver=2.44 -pkgrel=5 +pkgver=2.46 +pkgrel=0 pkgdesc="Perl module for parsing XML documents" url="https://metacpan.org/release/XML-Parser" arch="all" @@ -37,4 +37,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="4790d20d89478880b18255679727e5b2fb2860bb4de67d5032c805fd44c9f90697a240a612aba51255325192253aa578b346d658b29f631a4e92ad96e7d65b61 XML-Parser-2.44.tar.gz" +sha512sums="c4609495cc5ca34952f61876a690ef76d42eee6689d1bedb8036c9eab918525ec5213f1639c7178c029ee0f8765a2ca5eb0197f6e39b8be6d5dbc3f3c1d0b389 XML-Parser-2.46.tar.gz" diff --git a/user/perl-yaml-libyaml/APKBUILD b/user/perl-yaml-libyaml/APKBUILD index c196a7506..ac8808a72 100644 --- a/user/perl-yaml-libyaml/APKBUILD +++ b/user/perl-yaml-libyaml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-yaml-libyaml -pkgver=0.79 +pkgver=0.80 pkgrel=0 pkgdesc="Perl YAML Serialization using XS and libyaml" url="https://metacpan.org/pod/YAML::LibYAML" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="47b0f2d42ff972224af6fffa09631c7bcf221867cba3a0f9d56ce48f5a34bde56f3fdedbf15c47843ef24aba65676bfc7df5ce3d26b8f50011f2730071ca4877 YAML-LibYAML-0.79.tar.gz" +sha512sums="01decde5b5b4576c89ad00985605a77e15201ad492e2122b0e64eb2ff9f8bdee520f15d0302c282339dc0a1806e31265a9c4847d5daadd909cade3e94ef1d98c YAML-LibYAML-0.80.tar.gz" diff --git a/user/polkit-qt-1/APKBUILD b/user/polkit-qt-1/APKBUILD index bbfcde4f2..4a109e7d7 100644 --- a/user/polkit-qt-1/APKBUILD +++ b/user/polkit-qt-1/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=polkit-qt-1 -pkgver=0.112.0 +pkgver=0.113.0 pkgrel=0 pkgdesc="Qt wrapper library for PolicyKit" url="https://www.kde.org/" @@ -12,10 +12,9 @@ depends="" depends_dev="polkit-dev glib-dev" makedepends="$depends_dev cmake qt5-qtbase-dev" subpackages="$pkgname-dev" -source="https://download.kde.org/stable/apps/KDE4.x/admin/polkit-qt-1-$pkgver.tar.bz2" +source="https://download.kde.org/stable/$pkgname/polkit-qt-1-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,8 +31,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4cb17389b54a09c53052f6d72aa5cbfe09ccb19f7fd4edf8b43ccd4751f5e88609c5f89777f4af92167d32eb2ce1e78537cea7bcfb60a90072d1fe02d6a59b50 polkit-qt-1-0.112.0.tar.bz2" +sha512sums="deea5d75f547eaa0279c664ec9608b65f464db97fd5fdea27437f8ed4ec033de2b9f91d967deacb28bf0a1e54f131f997acb862cc3e1f8dfcb1f6c337e719b38 polkit-qt-1-0.113.0.tar.xz" diff --git a/user/prosody/APKBUILD b/user/prosody/APKBUILD index 89849d5a5..95b728b76 100644 --- a/user/prosody/APKBUILD +++ b/user/prosody/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=prosody -pkgver=0.11.2 -pkgrel=1 +pkgver=0.11.3 +pkgrel=0 pkgdesc="Lua based Jabber/XMPP server" url="http://prosody.im/" arch="all" @@ -52,6 +52,6 @@ package() { install -D -m755 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/"$pkgname" } -sha512sums="22e55a551a40c92f38a1ed1de5fdcad574d699d58c2e27f93c3d465b55487b8e923c2ba088daf93c7140cbafb0d429687e0b662c8bb1c1aba4b79ac1ea271cd1 prosody-0.11.2.tar.gz +sha512sums="07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb prosody-0.11.3.tar.gz a6ca168fe3d11ee3b05295fb36dfaf8240c60a85507032b2502f9a97d3fd055f7eee38ba6efbb8f79472fc7cdd3556922194d0bd7099f7fb809be01890acc511 prosody.cfg.lua.patch 24360603dbd5d2a92758e6c4b4aab4f02cbd05373580cba2df76df98b6045891e8108e8c2d16af9508e93968ed5880db952e7a21b2742ebeec6f14b167968c2c prosody.initd" diff --git a/user/py3-certifi/APKBUILD b/user/py3-certifi/APKBUILD index 53eada11d..8b9f2def3 100644 --- a/user/py3-certifi/APKBUILD +++ b/user/py3-certifi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=py3-certifi _pkgname=${pkgname#py3-} -pkgver=2019.6.16 +pkgver=2019.9.11 pkgrel=0 pkgdesc="Python package for providing Mozilla's CA Bundle" url="https://pypi.org/project/certifi" @@ -25,5 +25,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="4641626bc5073cd0b3a520855ddef1007dcb42933baa7a3469856f936e725581042bcbd5b67e984ba9748e7faa62b9125cba7dc160dcc5db2eafe46461a29f5e certifi-2019.6.16.tar.gz +sha512sums="aab5734bf65cbad12772bb120153b0325a5c3226339e0a03fdf4c3413303feb930b6d53d1d9dab93bd4f3cf00d2bfbe86419c4c462570340f1a4aa143a31373c certifi-2019.9.11.tar.gz f9c7d953b08d6ef87bae07605e2c09e9de1d1e60285fa1f5043beeae1d9f00f3b70fdf598585cd350df2632e22c0197ea2e8b76127e2927ad53880b60b349c9c use-system-certs.patch" diff --git a/user/py3-pbr/APKBUILD b/user/py3-pbr/APKBUILD index 0b45bbf34..77c687851 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.2 +pkgver=5.4.3 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="fd1ff768ed589760a1c9d339f3ddaaa0f13723a196913b0524659085333bbb3485506998875b9e293935ece2bb2ea042fba317822ac171ef99bdd43103525bed pbr-5.4.2.tar.gz" +sha512sums="546a24a84152f7e6929e456de08302fbc0a6f736d2b6a88078c4e07eb1c12736c88d5319a3e756c14ad11e879fd9efbcd5f14b4159f11526080561534543e2df pbr-5.4.3.tar.gz" diff --git a/user/py3-pysocks/APKBUILD b/user/py3-pysocks/APKBUILD index b6ad62c26..aaefdb947 100644 --- a/user/py3-pysocks/APKBUILD +++ b/user/py3-pysocks/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-pysocks _pkgname=PySocks _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=0 pkgdesc="SOCKS client module for Python" url="https://github.com/Anorov/PySocks" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="cc08ecbf65b59b6c4d4a24e01490dba19d93f2deb2860a49c4fc5679a9ceaba1860f05faaf8e299cf195e184a844f11989595e5046b07e2b30f9f3c682950e52 PySocks-1.7.0.tar.gz" +sha512sums="cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016 PySocks-1.7.1.tar.gz" diff --git a/user/py3-recommonmark/APKBUILD b/user/py3-recommonmark/APKBUILD index a0b15b675..2286dc298 100644 --- a/user/py3-recommonmark/APKBUILD +++ b/user/py3-recommonmark/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-recommonmark _pkgname=recommonmark _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.5.0 +pkgver=0.6.0 pkgrel=0 pkgdesc="Bridge between CommonMark and docutils" url="https://pypi.org/project/recommonmark/" @@ -30,4 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="581b3492e082ab4f0a53e50df0c9cfa3badda7ba9ee28dadbea85c55de96304257790e6aa06ebc793fba1d9ac399ce470fe821492106150b3a0db10dc734ee4b recommonmark-0.5.0.tar.gz" +sha512sums="f94f1ee426015478a95c2ed4b6ea87a75012447ae65d6623445f923d9d616b34efb055bcfde157862fcce38749c827905b839194fa1af3a1fe1cb7e11f18835a recommonmark-0.6.0.tar.gz" diff --git a/user/py3-transitions/APKBUILD b/user/py3-transitions/APKBUILD index 255e631d5..b877992d3 100644 --- a/user/py3-transitions/APKBUILD +++ b/user/py3-transitions/APKBUILD @@ -4,10 +4,10 @@ pkgname=py3-transitions _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.6.9 +pkgver=0.7.1 pkgrel=0 pkgdesc="Python state machine library" -url="https://pypi.org/project/passlib/" +url="https://pypi.org/project/transitions/" arch="noarch" options="!check" # requires nose, pygraphviz license="MIT" @@ -30,4 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="0cef11d547ae631afcb3dad557ab81b425f825028639787337f700f19073d7cb4c69ba9b6284155b3be85fb3eac4c4abd5b0cf3104dff8d2098c219729de4352 transitions-0.6.9.tar.gz" +sha512sums="4802e6a914270a183f66e70cf648c5f09c25b63e9233fdeb65b231ad24847d023182c6a45eaa1d47780d1f5d7f6f23695a6e578d4eaae55bf7a7ff121561e06b transitions-0.7.1.tar.gz" diff --git a/user/py3-urllib3/APKBUILD b/user/py3-urllib3/APKBUILD index ed6442453..bde1340a1 100644 --- a/user/py3-urllib3/APKBUILD +++ b/user/py3-urllib3/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=py3-urllib3 _pkgname=${pkgname#py3-} -pkgver=1.25.3 +pkgver=1.25.6 pkgrel=0 pkgdesc="HTTP library with thread-safe connection pooling, file post, and more" url="https://github.com/shazow/urllib3" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="86556d486c5aac9c3c7875d1440317c3be3924f67f4377a99e15892a39f532330d07f9dec5c5a1ed8b20957d2c611e78a97bd9d1684acff3069cd7debbbaa001 py3-urllib3-1.25.3.tar.gz" +sha512sums="02457492406fff3a61143d695df8304fc66a31f2646ca05ccacd9f2e5f86560e4c68a1f7f4702d6402b9d4d899145b15b125e56b3bc273012b0306ca4d0d7927 py3-urllib3-1.25.6.tar.gz" diff --git a/user/qastools/APKBUILD b/user/qastools/APKBUILD index 1e35fe052..0161221f4 100644 --- a/user/qastools/APKBUILD +++ b/user/qastools/APKBUILD @@ -1,22 +1,21 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qastools -pkgver=0.21.0 +pkgver=0.22.0 pkgrel=0 pkgdesc="ALSA mixer and utilities for Qt" -url="https://xwmw.org/qastools/index.html" +url="https://gitlab.com/sebholt/qastools" arch="all" -license="GPL-3.0-only" +license="MIT" depends="bash" makedepends="alsa-lib-dev cmake eudev-dev qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://downloads.sourceforge.net/qastools/qastools_$pkgver.tar.xz" -builddir="$srcdir/${pkgname}_${pkgver}" +source="https://gitlab.com/sebholt/qastools/-/archive/v$pkgver/qastools-v$pkgver.tar.bz2" +builddir="$srcdir/$pkgname-v$pkgver" langdir="/usr/share/qastools/l10n" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,13 +30,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="17c837ef508a5bf1853f597abd38c3c950914c8cefe98f83a47a911462e1da11f410e3fe3f8426e3f17a3aac8980ee6459f50de2480120813202b342a1e3509b qastools_0.21.0.tar.xz" +sha512sums="5f4c845df00e00236d61ad1009fc6aa529996e02a03aeb92211a12facf9bdce5e1626f4c97d96d88827dfe689bd961d1a2fd3f9164dca6947c08b4fc1d78483d qastools-v0.22.0.tar.bz2" diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD index 94a69c6ce..472b5e90e 100644 --- a/user/qemu/APKBUILD +++ b/user/qemu/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qemu pkgver=3.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="Machine emulator and virtualisation software" url="https://www.qemu.org/" arch="all" diff --git a/user/recode/APKBUILD b/user/recode/APKBUILD index fc95087c1..274706d9a 100644 --- a/user/recode/APKBUILD +++ b/user/recode/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=recode -pkgver=3.7.2 +pkgver=3.7.6 pkgrel=0 pkgdesc="Character set conversion utilities" url=" " @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b5371c41cc0f08c5a15b4682b777b5dbf754aecea6fe61a90661ec0020ca6325c7a11cb04b21b87e08d1da51ee4e226fd84cbb74d61bbca9d181e51d9bb17042 recode-3.7.2.tar.gz" +sha512sums="ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f recode-3.7.6.tar.gz" diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index 551580c5f..c05576b11 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Graph theory IDE" url="https://www.kde.org/applications/education/rocs/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="918fea2a0d63c19e43e05f74b76a75fa9eb1386e26b8f325c200e470290b05c570146a3d98f1e3ca4dd6b564c77f0b8bd12fb3e671863580a8b9bcc952246b54 rocs-19.08.0.tar.xz" +sha512sums="53de9beba9baaf28ea7354ddf73f942e75c3a7fbc3f5fed7ed7c940f54d0647305a4bf57df66b4cc3e23a7e6c2da8d8e2803a5c9131edc702d667df0472f9f47 rocs-19.08.1.tar.xz" diff --git a/user/rsibreak/APKBUILD b/user/rsibreak/APKBUILD index 0757ad517..fd3864d48 100644 --- a/user/rsibreak/APKBUILD +++ b/user/rsibreak/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rsibreak -pkgver=0.12.10 +pkgver=0.12.11 pkgrel=0 pkgdesc="Helps you avoid wrist injury by telling you when to stop for a rest" url="https://www.kde.org/applications/utilities/rsibreak/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0e5c5dabe0efa05f53b5a0b5823ef856ca6806ac1a3a1a45f57f236789190718b2ab73af35ee6617a42eb672e06554687dd41f3ab02e9c37d25ef926fee2240c rsibreak-0.12.10.tar.xz" +sha512sums="78498b747eeef842e40170236ace9d1ddd8b1f4bcc378134f2935cd2cf1c6933d44fa232f2f9b0724ee6b2638a34e4f71ebee2eac7664946093ed4df8eeb12ec rsibreak-0.12.11.tar.xz" diff --git a/user/shared-mime-info/APKBUILD b/user/shared-mime-info/APKBUILD index 3e132dee4..4c5f6198b 100644 --- a/user/shared-mime-info/APKBUILD +++ b/user/shared-mime-info/APKBUILD @@ -1,24 +1,23 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=shared-mime-info -pkgver=1.12 +pkgver=1.14 pkgrel=0 pkgdesc="MIME database for desktop software" url="https://freedesktop.org/wiki/Software/shared-mime-info" arch="all" license="GPL-2.0+" depends="" -makedepends="glib-dev intltool libxml2-dev libxml2-utils" +makedepends="glib-dev itstool libxml2-dev libxml2-utils" 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/80c7f1afbcad2769f38aeb9ba6317a51/$pkgname-$pkgver.tar.xz" +source="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/aee9ae9646cbef724bbb1bd2ba146556/shared-mime-info-1.14.tar.xz" build() { ac_cv_func_fdatasync=no ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ - --enable-default-make-check \ --disable-update-mimedb make -j1 } @@ -31,4 +30,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="c9db138586fe4c789b5a89d3cdcf865d5b3258241accd254deecd7665e8b51fc538adeaeeda4fe332474f7d7ffa84f101cba26539a58e134201673d6d1495a2f shared-mime-info-1.12.tar.xz" +sha512sums="c25a4cec2e5aaa1e6aaef14f48f5910de5ccff1a5f3605da07fffea63e13624b945d7f40dfbe74fbfafd5364f143de88541c7fc5336d000ee16ad2eb06701c11 shared-mime-info-1.14.tar.xz" diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index 653b3487f..9592e765f 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -16,7 +16,6 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/spectacle-$pkgver.tar.xz qt5.9.patch - kconfig.patch " build() { @@ -43,6 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3581db1a0135e0942c3ddddeb8b8bf7d913e0bb45576a5a3982d24793bfab75f9ae66dc40db5708cdcadd950bd977a7c85ad44e20d8c8b50c2cf0e219cb89a97 spectacle-19.08.0.tar.xz -781e1611026a45232fa117b90a1520bed380e512ae2e0690785a960f897342284ce0c553d8fb22caf10fd34c3823ee7dacb770815c871808345c1bb05126b74f qt5.9.patch -9119ea6e7662f92a6daa37f16fbc634668cc179b872bc07173227b44821a2ebfbe15f083e3203a4abebd5380fffbb647e506c56466b743a8dd29e798cebd84e3 kconfig.patch" +sha512sums="0ebaff47cbb3406747a49d7f814f154b4e139a7f4461da389fcf65b347f9272e2c85a772886fb0819cfc539d1d878e5acda622331cf5220ef263412663f24fa6 spectacle-19.08.1.tar.xz +781e1611026a45232fa117b90a1520bed380e512ae2e0690785a960f897342284ce0c553d8fb22caf10fd34c3823ee7dacb770815c871808345c1bb05126b74f qt5.9.patch" diff --git a/user/spectacle/kconfig.patch b/user/spectacle/kconfig.patch deleted file mode 100644 index 2d1860f2e..000000000 --- a/user/spectacle/kconfig.patch +++ /dev/null @@ -1,40 +0,0 @@ -From cab0844fef8bc6e7491978307245aadf65d64409 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Thu, 15 Aug 2019 09:05:28 -0500 -Subject: [PATCH] Define QT_NO_FOREACH only if KConfig > 5.56.0 - -Spectacle cannot be compiled with KConfig <= 5.56.0 otherwise, because -KConfig uses Q_FOREACH in its public headers. - -Tested on: KConfig 5.54.0 / Qt 5.9.7 ---- - CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 78eae41..79eb869 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,7 +40,7 @@ include(FeatureSummary) - include(ECMQtDeclareLoggingCategory) - include(ECMAddTests) - --add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH) -+add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII) - - find_package( - Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED -@@ -67,6 +67,10 @@ find_package( - XmlGui - ) - -+if(${KF5Config_VERSION} STRGREATER "5.56.0") -+ add_definitions(-DQT_NO_FOREACH) -+endif() -+ - # optional components - - find_package(KF5Kipi) --- -2.22.0 - diff --git a/user/squashfs-tools/0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch b/user/squashfs-tools/0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch deleted file mode 100644 index 51f588818..000000000 --- a/user/squashfs-tools/0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch +++ /dev/null @@ -1,60 +0,0 @@ -From de03266983ceb62e5365aac84fcd3b2fd4d16e6f Mon Sep 17 00:00:00 2001 -From: Phillip Lougher <phillip@squashfs.org.uk> -Date: Thu, 18 Sep 2014 01:28:11 +0100 -Subject: [PATCH] mksquashfs: fix rare race in fragment waiting in filesystem - finalisation - -Fix a rare race condition in fragment waiting when finalising the -filesystem. This is a race condition that was initially fixed in 2009, -but inadvertantly re-introduced in the latest release when the code -was rewritten. - -Background: - -When finalising the filesystem, the main control thread needs to ensure -all the in-flight fragments have been queued to the writer thread before -asking the writer thread to finish, and then writing the metadata. - -It does this by waiting on the fragments_outstanding counter. Once this -counter reaches 0, it synchronises with the writer thread, waiting until -the writer thread reports no outstanding data to be written. - -However, the main thread can race with the fragment deflator thread(s) -because the fragment deflator thread(s) decrement the fragments_outstanding -counter and release the mutex before queueing the compressed fragment -to the writer thread, i.e. the offending code is: - - fragments_outstanding --; - pthread_mutex_unlock(&fragment_mutex); - queue_put(to_writer, write_buffer); - -In extremely rare circumstances, the main thread may see the -fragments_outstanding counter is zero before the fragment -deflator sends the fragment buffer to the writer thread, and synchronise -with the writer thread, and finalise before the fragment has been written. - -The fix is to ensure the fragment is queued to the writer thread -before releasing the mutex. - -Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk> ---- - squashfs-tools/mksquashfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index 87b7d86..f1fcff1 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -2419,8 +2419,8 @@ void *frag_deflator(void *arg) - write_buffer->block = bytes; - bytes += compressed_size; - fragments_outstanding --; -- pthread_mutex_unlock(&fragment_mutex); - queue_put(to_writer, write_buffer); -+ pthread_mutex_unlock(&fragment_mutex); - TRACE("Writing fragment %lld, uncompressed size %d, " - "compressed size %d\n", file_buffer->block, - file_buffer->size, compressed_size); --- -2.10.2 - diff --git a/user/squashfs-tools/APKBUILD b/user/squashfs-tools/APKBUILD index 227faf11d..e33b06b16 100644 --- a/user/squashfs-tools/APKBUILD +++ b/user/squashfs-tools/APKBUILD @@ -1,35 +1,33 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=squashfs-tools -pkgver=4.3 -pkgrel=5 +pkgver=4.4 +pkgrel=0 pkgdesc="Tools for SquashFS, a highly compressed read-only filesystem" url="http://squashfs.sourceforge.net" arch="all" options="!check" # No test suite. license="GPL-2.0+" -depends= -makedepends="zlib-dev xz-dev lzo-dev lz4-dev attr-dev" -source="http://downloads.sourceforge.net/sourceforge/squashfs/squashfs$pkgver.tar.gz +depends="" +makedepends="attr-dev lz4-dev lzo-dev xz-dev zlib-dev" +source="https://downloads.sourceforge.net/squashfs/squashfs$pkgver.tar.gz fix-compat.patch - vla-overlow.patch - CVE-2015-4645.patch - 0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch -" -builddir="$srcdir/squashfs$pkgver" + " +builddir="$srcdir/squashfs$pkgver/$pkgname" + +# secfixes: +# 4.3-r5: +# - CVE-2015-4645 +# 4.4-r0: +# - CVE-2015-4646 build() { - cd "$builddir"/$pkgname make XZ_SUPPORT=1 LZO_SUPPORT=1 LZ4_SUPPORT=1 } package() { - cd "$builddir"/$pkgname mkdir -p "$pkgdir"/sbin cp -a mksquashfs unsquashfs "$pkgdir"/sbin } -sha512sums="854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 squashfs4.3.tar.gz -868e3923f98a7f8bb980fe8ab0d648e9ae9a55e324bea3830d6047aa348a4302dcb96d65bf59c6e04665891d822e18fad367a37c6704505b8492f64d749fc140 fix-compat.patch -975d09d047f4122866e83c4322ce3a15795c051b850d14a85a615c3beef970378e5a620ee16058b9c5104c53f973f9b3804d96c3ba1ab4f622f1e096c04e0360 vla-overlow.patch -77431a0a4a529ce63f1613a65a23af2fb8683a16d14ad1a5cfed3a9fac4df6a1212f081d1879ede188a25b77e860445058012131423c546657fb562069865d2c CVE-2015-4645.patch -1b2338a448ec8a2b75880ddc8c13f99392451847ab26277e1bc82b49a3a804796934e212dd1ba54a502940537a61891ee0103e913d0bda65cff0ca2827b8b41c 0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch" +sha512sums="e7119f82cea0eda8dffcbf15c9ee511ad457e004bfc0c5a5685e84785e49cf34f3c053036449af6bba0012cef48426f65958c97b9958d58f1b31175cb0bbbe24 squashfs4.4.tar.gz +12f5739aa32b9e15ba3d22e5953034f17867a8837475f13bde5bbc378dbded0483cde42c0cdfc5d33ab3723b9de752c71b5ba8f4301ca7b59aa4054d669c262d fix-compat.patch" diff --git a/user/squashfs-tools/CVE-2015-4645.patch b/user/squashfs-tools/CVE-2015-4645.patch deleted file mode 100644 index f69025f18..000000000 --- a/user/squashfs-tools/CVE-2015-4645.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/squashfs-tools/unsquash-4.c b/squashfs-tools/unsquash-4.c -index ecdaac796f09..2c0cf63daf67 100644 ---- a/squashfs-tools/unsquash-4.c -+++ b/squashfs-tools/unsquash-4.c -@@ -31,9 +31,9 @@ static unsigned int *id_table; - int read_fragment_table_4(long long *directory_table_end) - { - int res, i; -- int bytes = SQUASHFS_FRAGMENT_BYTES(sBlk.s.fragments); -- int indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments); -- long long fragment_table_index[indexes]; -+ size_t bytes = SQUASHFS_FRAGMENT_BYTES(sBlk.s.fragments); -+ size_t indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments); -+ long long *fragment_table_index; - - TRACE("read_fragment_table: %d fragments, reading %d fragment indexes " - "from 0x%llx\n", sBlk.s.fragments, indexes, -@@ -44,6 +44,11 @@ int read_fragment_table_4(long long *directory_table_end) - return TRUE; - } - -+ fragment_table_index = malloc(indexes*sizeof(long long)); -+ if(fragment_table_index == NULL) -+ EXIT_UNSQUASH("read_fragment_table: failed to allocate " -+ "fragment table index\n"); -+ - fragment_table = malloc(bytes); - if(fragment_table == NULL) - EXIT_UNSQUASH("read_fragment_table: failed to allocate " diff --git a/user/squashfs-tools/fix-compat.patch b/user/squashfs-tools/fix-compat.patch index 2a3b33ca9..e93b6b827 100644 --- a/user/squashfs-tools/fix-compat.patch +++ b/user/squashfs-tools/fix-compat.patch @@ -1,6 +1,6 @@ ---- squashfs4.3.orig/squashfs-tools/action.c -+++ squashfs4.3/squashfs-tools/action.c -@@ -1905,6 +1905,9 @@ +--- squashfs-tools/action.c ++++ squashfs-tools/action.c +@@ -2236,6 +2236,9 @@ return 1; } @@ -10,9 +10,9 @@ TEST_FN(name, ACTION_ALL_LNK, \ return fnmatch(atom->argv[0], action_data->name, ---- squashfs4.3.orig/squashfs-tools/mksquashfs.c -+++ squashfs4.3/squashfs-tools/mksquashfs.c -@@ -4391,6 +4391,9 @@ +--- squashfs-tools/mksquashfs.c ++++ squashfs-tools/mksquashfs.c +@@ -4665,6 +4665,9 @@ return paths; } @@ -22,19 +22,9 @@ int excluded_match(char *name, struct pathname *path, struct pathnames **new) { ---- squashfs4.3.orig/squashfs-tools/pseudo.c -+++ squashfs4.3/squashfs-tools/pseudo.c -@@ -32,6 +32,7 @@ - #include <stdlib.h> - #include <sys/types.h> - #include <sys/wait.h> -+#include <sys/stat.h> - #include <ctype.h> - - #include "pseudo.h" ---- squashfs4.3.orig/squashfs-tools/unsquashfs.c -+++ squashfs4.3/squashfs-tools/unsquashfs.c -@@ -1410,6 +1410,9 @@ +--- squashfs-tools/unsquashfs.c ++++ squashfs-tools/unsquashfs.c +@@ -1457,6 +1457,9 @@ free(paths); } diff --git a/user/squashfs-tools/vla-overlow.patch b/user/squashfs-tools/vla-overlow.patch deleted file mode 100644 index a9840fe01..000000000 --- a/user/squashfs-tools/vla-overlow.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ./squashfs-tools/unsquashfs.c.orig -+++ ./squashfs-tools/unsquashfs.c -@@ -2099,7 +2099,9 @@ - */ - void *inflator(void *arg) - { -- char tmp[block_size]; -+ char *tmp = malloc(block_size); -+ if(tmp == NULL) -+ EXIT_UNSQUASH("Out of memory allocating block buffer\n"); - - while(1) { - struct cache_entry *entry = queue_get(to_inflate); -@@ -2122,6 +2124,7 @@ - */ - cache_block_ready(entry, res == -1); - } -+ free(tmp); - } - - diff --git a/user/step/APKBUILD b/user/step/APKBUILD index d73c5c22d..96a9e5799 100644 --- a/user/step/APKBUILD +++ b/user/step/APKBUILD @@ -1,13 +1,13 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=step -pkgver=19.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Interactive physics simulation" url="https://www.kde.org/applications/education/step/" arch="all" license="GPL-2.0-only" -depends="" +depends="shared-mime-info" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kdoctools-dev qt5-qtsvg-dev kcrash-dev khtml-dev kconfig-dev eigen-dev kdelibs4support-dev knewstuff-dev kplotting-dev gsl-dev @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f3a7f13117cd99b843b9ef99dc38a50baa50a3757319b74e804688c31abdbe6bc6251afae39d73d4af67b8d82dcda2df42f3c8fa91e5d20e8860fa0430710bff step-19.08.0.tar.xz" +sha512sums="aca5492c5f6a56acfe20ce09d3ba0e469fe2bb53def0ae5c5645891699fe589cdf85340615a2dc2a5ed58ecfb7353b10f05d7dcb7fe1d97cf756f9c98bcc8da0 step-19.08.1.tar.xz" diff --git a/user/tcpdump/APKBUILD b/user/tcpdump/APKBUILD index d273d4acc..f39d5c9d5 100644 --- a/user/tcpdump/APKBUILD +++ b/user/tcpdump/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=tcpdump -pkgver=4.9.2 -pkgrel=2 +pkgver=4.9.3 +pkgrel=0 pkgdesc="A tool for network monitoring and data acquisition" url="http://www.tcpdump.org" arch="all" @@ -11,7 +11,6 @@ depends="" makedepends="libpcap-dev openssl-dev perl" subpackages="$pkgname-doc" source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz - CVE-2017-16808.patch CVE-2018-19519.patch " @@ -20,9 +19,35 @@ source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz # - CVE-2018-19519 # 4.9.2-r2: # - CVE-2017-16808 +# 4.9.3-r0: +# - CVE-2018-10103 +# - CVE-2018-10105 +# - CVE-2018-14461 +# - CVE-2018-14462 +# - CVE-2018-14463 +# - CVE-2018-14464 +# - CVE-2018-14465 +# - CVE-2018-14466 +# - CVE-2018-14467 +# - CVE-2018-14468 +# - CVE-2018-14469 +# - CVE-2018-14470 +# - CVE-2018-14879 +# - CVE-2018-14880 +# - CVE-2018-14881 +# - CVE-2018-14882 +# - CVE-2018-16227 +# - CVE-2018-16228 +# - CVE-2018-16229 +# - CVE-2018-16230 +# - CVE-2018-16300 +# - CVE-2018-16301 +# - CVE-2018-16451 +# - CVE-2018-16452 +# - CVE-2019-15166 +# - CVE-2019-15167 build () { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,16 +59,13 @@ build () { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -f "$pkgdir"/usr/sbin/tcpdump.4* } -sha512sums="e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b tcpdump-4.9.2.tar.gz -d7f4761bee96ec69cdb93602ea59518f238089967d1ede4e91d139febe0ffe0818d49ad19b96c741a379938c369952405dadd3be2766b6524c43c70066cb4fc4 CVE-2017-16808.patch +sha512sums="3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 tcpdump-4.9.3.tar.gz eb4232e434064ec59b07840aa394cfcc05c89e817f2d4ebeb4da1dbb1c910fe1805857356d6304ebdb16e32aa6476ce90f164aabc60501b493fd5601b380af7e CVE-2018-19519.patch" diff --git a/user/tcpdump/CVE-2017-16808.patch b/user/tcpdump/CVE-2017-16808.patch deleted file mode 100644 index 6b41aad8c..000000000 --- a/user/tcpdump/CVE-2017-16808.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 28f610026d901660dd370862b62ec328727446a2 Mon Sep 17 00:00:00 2001 -From: Denis Ovsienko <denis@ovsienko.info> -Date: Thu, 31 Aug 2017 21:15:37 +0100 -Subject: [PATCH] CVE-2017-16808/AoE: Add a missing bounds check. - -In aoev1_reserve_print() check bounds before trying to print an Ethernet -address. - -This fixes a buffer over-read discovered by Bhargava Shastry, -SecT/TU Berlin. ---- - print-aoe.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/print-aoe.c b/print-aoe.c -index 97e93df2e..2c78a55d3 100644 ---- a/print-aoe.c -+++ b/print-aoe.c -@@ -325,6 +325,7 @@ aoev1_reserve_print(netdissect_options *ndo, - goto invalid; - /* addresses */ - for (i = 0; i < nmacs; i++) { -+ ND_TCHECK2(*cp, ETHER_ADDR_LEN); - ND_PRINT((ndo, "\n\tEthernet Address %u: %s", i, etheraddr_string(ndo, cp))); - cp += ETHER_ADDR_LEN; - } diff --git a/user/tmux/APKBUILD b/user/tmux/APKBUILD index ebd0a38c0..12caf643d 100644 --- a/user/tmux/APKBUILD +++ b/user/tmux/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=tmux -pkgver=2.7 -pkgrel=2 +pkgver=2.9a +pkgrel=0 pkgdesc="Tool to control multiple terminals from a single terminal" url="https://tmux.github.io/" arch="all" @@ -10,8 +10,7 @@ license="MIT" depends="ncurses-terminfo" makedepends="bsd-compat-headers libevent-dev libutempter-dev ncurses-dev" subpackages="$pkgname-doc" -source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz - xterm-DECLRMM.patch" +source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" build() { ./configure \ @@ -38,5 +37,4 @@ package() { done } -sha512sums="7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37 tmux-2.7.tar.gz -7fb006f8f24d60614fcaeadace933c2ad6674d2476980736a830f63a40d7110638942478322336849d47707c99ab7de0cb01ff39806a4c9144650daf2f666773 xterm-DECLRMM.patch" +sha512sums="aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713 tmux-2.9a.tar.gz" diff --git a/user/tmux/xterm-DECLRMM.patch b/user/tmux/xterm-DECLRMM.patch deleted file mode 100644 index b9bef3455..000000000 --- a/user/tmux/xterm-DECLRMM.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 26f274011096b9eacfd2753d8f7afcb63e796ab9 Mon Sep 17 00:00:00 2001 -From: nicm <nicm> -Date: Thu, 1 Aug 2019 11:45:34 +0000 -Subject: [PATCH] xterm 348 now disables margins when resized, so send DECLRMM - again. - ---- - tty.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tty.c b/tty.c -index ab1da9fd3..024aef271 100644 ---- a/tty.c -+++ b/tty.c -@@ -1879,6 +1879,8 @@ tty_invalidate(struct tty *tty) - tty->rlower = tty->rright = UINT_MAX; - - if (tty->flags & TTY_STARTED) { -+ if (tty_use_margin(tty)) -+ tty_puts(tty, "\033[?69h"); /* DECLRMM */ - tty_putcode(tty, TTYC_SGR0); - - tty->mode = ALL_MODES; diff --git a/user/ttc-iosevka/APKBUILD b/user/ttc-iosevka/APKBUILD index 4d0ea71b1..c73630ad9 100644 --- a/user/ttc-iosevka/APKBUILD +++ b/user/ttc-iosevka/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ttc-iosevka -pkgver=2.2.1 +pkgver=2.3.1 pkgrel=0 pkgdesc="Monospace sans-serif typeface" url="https://typeof.net/Iosevka/" @@ -16,9 +16,8 @@ source="https://github.com/be5invis/Iosevka/releases/download/v$pkgver/ttc-iosev builddir="$srcdir" package() { - cd "$builddir" install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttc } -sha512sums="61c43613f687edea1fe5b1cd2545c7b18a3a274b6106d6c6d083322ebd40f7da8f5a1f6ed84410108f099c55dab988b340c516e87476ee71567a5a034b988abb ttc-iosevka-2.2.1.zip -80aafe3b6e1d708abf5dd6922b3ce735c8f4b17afefbcd14bcc65e27f8463cff8392ea90bbb40f872369ee5f096fd391fcb4a1fafc166e96f689d59b56c909cb ttc-iosevka-slab-2.2.1.zip" +sha512sums="09897ca5d7234c552ee1b9121b9a2f7879625a60cc2973cbf486ad30cb1758d4c7fcf1e7ccad882fa966ad3b35fba5ffd16e9c7b8fbb9b8983b0425bff6ee006 ttc-iosevka-2.3.1.zip +6bcb5db07f49db6dd4e6ecf271c203a53293c9f517dcb373c6a7cd9d6c351ee11c59fad99b46197ae705df9801072dd1ee3d2825d32675a05829c2573af82396 ttc-iosevka-slab-2.3.1.zip" diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD index 4d0afa0b8..eaa6f99d8 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.08.0 +pkgver=19.08.1 pkgrel=0 pkgdesc="Software modelling tool and code generator" url="https://umbrello.kde.org/" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="46f95eba5b5880e1df7bbc952c35fbf93959a03aed4e9b2247e54b1cfcc65388a38c85e596a080c70f750f9ffeff17089e186ed7ea9a4dfb1248ba8118f9ecda umbrello-19.08.0.tar.xz +sha512sums="a960cd47f5a6df91354d143345aedc1212810bad90de3f11387e848f65db6d1c0814ca6034c44ad130082ffe68cad5585f25e9cf710e9b4332f6218f2d2fd3fb umbrello-19.08.1.tar.xz fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch" diff --git a/user/upower/APKBUILD b/user/upower/APKBUILD index ea8652b3e..376ca208c 100644 --- a/user/upower/APKBUILD +++ b/user/upower/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=upower -pkgver=0.99.10 +pkgver=0.99.11 pkgrel=0 pkgdesc="Power Management Services" url="https://upower.freedesktop.org" @@ -10,8 +10,8 @@ license="GPL-2.0+" depends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" makedepends="dbus-glib-dev docbook-xsl gobject-introspection-dev gtk+-dev - intltool libgudev-dev libusb-dev libxslt linux-headers polkit-dev" -source="https://gitlab.freedesktop.org/upower/upower/uploads/c438511024b9bc5a904f8775cfc8e4c4/upower-0.99.10.tar.xz" + libgudev-dev libusb-dev libxslt linux-headers polkit-dev" +source="https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-0.99.11.tar.xz" build() { DATADIRNAME=share ./configure \ @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aefe1b2ff5a390f1ea9676fe7e753750bebc56034365a9183e946a8463904047da0a4ac71340eb2efedc16bce6f6d9ef4609ddca37dc1fc31b56bcdbfbbfa59d upower-0.99.10.tar.xz" +sha512sums="67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803 upower-0.99.11.tar.xz" diff --git a/user/viewres/APKBUILD b/user/viewres/APKBUILD index 0185ca839..c7117860f 100644 --- a/user/viewres/APKBUILD +++ b/user/viewres/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=viewres -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=0 pkgdesc="View widget class trees in software using Athena widgets (Xaw)" url="https://www.X.Org/" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/viewres-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="fe573e9b5ae679b65eee95733cbea20c86c92089c3a2dadfe977bc9c54d1f58c5e5f4663e51a1cf206543a43592b3a3c266da1769279f08be85c66b0aa5b0f7f viewres-1.0.5.tar.bz2" +sha512sums="3f4cfc61608bc6c9b35ef66ceb473661ca01946d3306d54040d32803e8e0eec506a0ce37ea22bfe514544a6ba9645fd30f39b20c063aff696b3c0fda3fe95dff viewres-1.0.6.tar.bz2" diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD index 695bd9368..8632458d9 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.14.0 +pkgver=4.14.1 pkgrel=0 pkgdesc="Panel for the XFCE desktop environment" url="https://xfce.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="47a91b9ce7277612848fd1b48f9c0d6e5169cd0405a99863d685e7a9c5aa3cb8f30694ecdbf657e0f289278dc0c003c8b0784ff03e41e82c1886847ad292972f xfce4-panel-4.14.0.tar.bz2" +sha512sums="1c86362489677f2e04cf3b98dbc1a80b4998335c00a47d256e741446f00437ad04539041648848eca1f45fa1fa70974ca6cf65cb7f762a79a46c16484557e400 xfce4-panel-4.14.1.tar.bz2" diff --git a/user/xfce4-screenshooter/APKBUILD b/user/xfce4-screenshooter/APKBUILD index 1443db9dd..094922574 100644 --- a/user/xfce4-screenshooter/APKBUILD +++ b/user/xfce4-screenshooter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-screenshooter -pkgver=1.9.5 +pkgver=1.9.6 pkgrel=0 pkgdesc="Screenshot tool for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e5797a6defa4df94c552e8ff39b21f4203b6795669e8145ea5ef609fc7b29bcfa846b19b253b39b12ab0e6c130c7f9e67dd5aa628cefe9b063fb9f74dd2c3ee1 xfce4-screenshooter-1.9.5.tar.bz2" +sha512sums="17d4afb346f09f97225c0fe65ed2389733e98d58729f15f7ec2b601682d7e15a6d9c67b85840593c17298fc32c250d8eb2e8d349ccd355507f4c18b5e312ae35 xfce4-screenshooter-1.9.6.tar.bz2" diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD index 92c875785..1246a51a8 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.14.0 +pkgver=4.14.1 pkgrel=0 pkgdesc="GUI settings application for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ab5979d24327e009e3641f75ba37dca7bb4f5bf8bc3a85da4c8355c3d07893b2dd81be1b616c75349e1e33d2fef774c099a47aedcd1bf10d8b245aa9418fe05b xfce4-settings-4.14.0.tar.bz2" +sha512sums="d854ca93199ce99d63e83ad38d654b86d883ebef5fb62a5c444f08b481df8f29a7ff27c60053c071e887be8d7ea0c51e9691a6209ca515a4e396e2c7405593b5 xfce4-settings-4.14.1.tar.bz2" diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index d1d870a8a..27760f670 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xterm -pkgver=348 -pkgrel=3 +pkgver=349 +pkgrel=0 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" arch="all" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="852896c0aba885bafc80baad899fc56910dce66bf5df6b3fef3f998efc33af9d30b68cfb0c92c7028365ac4944af3d3c198bc0e408ca09e949b993a79c1e6dd9 xterm-348.tgz +sha512sums="d350671a262973b6486dd9785f84c1f09b6a5e52898ce38d39ed2b11cd8208c473c63c3504533e7e9004af4e690d9032828a14fe6c5474523cfb8ec4badcbd0f xterm-349.tgz e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch" diff --git a/user/yakuake/APKBUILD b/user/yakuake/APKBUILD index 96b474ab5..5e5c5788f 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.08.0 +pkgver=19.08.1 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="bb6471058c3961899c658af7c6b3c22f621e781b6b87e101ad344b39b7942275e1f5801cd73cd838badd6fea5994a237336f128c58061ff2033e732d0d14e2f2 yakuake-19.08.0.tar.xz" +sha512sums="282004eca226a31554cf7a32825a82cac85e52bd694c4db11a37934cb4bdd4aa77da13c49bdf32a5b1efe3e404d64503b981914f9e9a51cec861ba538bb5a304 yakuake-19.08.1.tar.xz" diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD index 5e72cbe9c..490c9a3e9 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.5 +pkgver=4.8.6 pkgrel=0 pkgdesc="Mathematical theorem prover" url=" " @@ -10,8 +10,8 @@ license="MIT" depends="" makedepends="gmp-dev python3-dev cmd:which" subpackages="$pkgname-dev py3-$pkgname:py3:noarch" -source="https://github.com/Z3Prover/z3/archive/Z3-$pkgver.tar.gz" -builddir="$srcdir/z3-Z3-$pkgver" +source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz" +builddir="$srcdir/z3-z3-$pkgver" build() { PYTHON=python3 ./configure \ @@ -37,4 +37,4 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309 Z3-4.8.5.tar.gz" +sha512sums="d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1 z3-4.8.6.tar.gz" |