diff options
Diffstat (limited to 'user')
519 files changed, 6479 insertions, 4723 deletions
diff --git a/user/.rootbld-repositories b/user/.rootbld-repositories index dd670b51f..1f6b7e3cc 100644 --- a/user/.rootbld-repositories +++ b/user/.rootbld-repositories @@ -1,2 +1,2 @@ -https://distfiles.adelielinux.org/adelie/1.0-beta1/system/ -https://distfiles.adelielinux.org/adelie/1.0-beta1/user/ +https://distfiles.adelielinux.org/adelie/current/system/ +https://distfiles.adelielinux.org/adelie/current/user/ diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD index b4a0a598a..1be4e8974 100644 --- a/user/akonadi-contacts/APKBUILD +++ b/user/akonadi-contacts/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-contacts pkgver=18.12.3 -pkgrel=0 +pkgrel=1 pkgdesc="Library for integrating contact lists with Akonadi" url="https://www.kde.org/" arch="all" diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD index 9892edd68..6ff117f02 100644 --- a/user/akonadi-mime/APKBUILD +++ b/user/akonadi-mime/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-mime pkgver=18.12.3 -pkgrel=0 +pkgrel=1 pkgdesc="Libraries to implement basic MIME message handling" url="https://www.kde.org/" arch="all" diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD index b6fe014e0..349967d5a 100644 --- a/user/akonadi/APKBUILD +++ b/user/akonadi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi pkgver=18.12.3 -pkgrel=0 +pkgrel=1 pkgdesc="Libraries and storage system for PIM data" url="https://community.kde.org/KDE_PIM/Akonadi" arch="all" @@ -17,7 +17,9 @@ makedepends="$depends_dev cmake extra-cmake-modules libxslt-dev qt5-qttools-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/akonadi-$pkgver.tar.xz - akonadiserverrc" + akonadiserverrc + attributes.patch + " build() { cd "$builddir" @@ -50,4 +52,5 @@ package() { } sha512sums="f97e716be612001a8176f20afbe80a1cf4c78c6d348d92e542307ea951e1ff74189d2f0847675ed44ad65845b52a5180346b3866f5a8d82b55ed613d107ac346 akonadi-18.12.3.tar.xz -b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc" +b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc +63a26cf5c20583a372146d11050f5003242997743fe9470fb2b7556d5aebb58c06dfeefc0c14c86a435f7172126dac0d52b1701c6bd872f10531bf1d99625e93 attributes.patch" diff --git a/user/akonadi/attributes.patch b/user/akonadi/attributes.patch new file mode 100644 index 000000000..a49db7f37 --- /dev/null +++ b/user/akonadi/attributes.patch @@ -0,0 +1,153 @@ +From 1d8851495bcfa6ff5d3fa35882b68fdf68b21a7f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org> +Date: Thu, 21 Mar 2019 13:22:58 +0100 +Subject: Fix a regression when updating attributes + +This fixes a regression introduced in 3a062e6a and 6054e42d where some +attributes were not sent to the Akonadi server in update job even though +they were modified. This was due to a bad API design which returns a +non-const pointer to an attribute from a const method, so callers sometimes +modify the returned attribute on a const object. Since the method itself +is const though, it did not mark the attribute as modified. + +Proper fix is to introduce a purely const and non-const overloads for +the attribute accessors, unfortunatelly this requires fixing a lot of our code +in many places first to not abuse the non-constness of the returned +attribute. + +Note that since the code is in an inlined method, all clients should be +recompiled. + +CCMAIL: faure@kde.org +--- + src/core/collection.h | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/src/core/collection.h b/src/core/collection.h +index 50c0926..b5a496c 100644 +--- a/src/core/collection.h ++++ b/src/core/collection.h +@@ -584,14 +584,19 @@ inline T *Akonadi::Collection::attribute(Collection::CreateOption option) + template <typename T> + inline T *Akonadi::Collection::attribute() const + { +- const T dummy; +- if (hasAttribute(dummy.type())) { +- T *attr = dynamic_cast<T *>(attribute(dummy.type())); ++ const QByteArray type = T().type(); ++ if (hasAttribute(type)) { ++ T *attr = dynamic_cast<T *>(attribute(type)); + if (attr) { ++ // FIXME: This method returns a non-const pointer, so callers may still modify the ++ // attribute. Unfortunately, just making this function return a const pointer and ++ // creating a non-const overload does not work, as many users of this function abuse the ++ // non-const pointer and modify the attribute even on a const object. ++ const_cast<Collection*>(this)->markAttributesChanged(); + return attr; + } + //reuse 5250 +- qWarning() << "Found attribute of unknown type" << dummy.type() ++ qWarning() << "Found attribute of unknown type" << type + << ". Did you forget to call AttributeFactory::registerAttribute()?"; + } + +-- +cgit v1.1 + +From 53ad3b6d73d92ea289cf0183c10e2b8a35c8127a Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Thu, 21 Mar 2019 23:37:36 +0100 +Subject: Fix collection detaching at the wrong time in attribute() + +Summary: +Found in FatCRM where changes to collection attributes were not stored +anymore. + +Test Plan: +New unittest to ensure that we get the attribute from the +detached collection, not from the original one. + +Reviewers: dvratil + +Reviewed By: dvratil + +Subscribers: kde-pim + +Tags: #kde_pim + +Differential Revision: https://phabricator.kde.org/D19741 +--- + autotests/libs/collectionattributetest.cpp | 15 +++++++++++++++ + autotests/libs/collectionattributetest.h | 1 + + src/core/collection.h | 8 ++------ + 3 files changed, 18 insertions(+), 6 deletions(-) + +diff --git a/autotests/libs/collectionattributetest.cpp b/autotests/libs/collectionattributetest.cpp +index e264a37..9c46561 100644 +--- a/autotests/libs/collectionattributetest.cpp ++++ b/autotests/libs/collectionattributetest.cpp +@@ -240,3 +240,18 @@ void CollectionAttributeTest::testCollectionIdentificationAttribute() + QCOMPARE(parsed.identifier(), id); + QCOMPARE(parsed.collectionNamespace(), ns); + } ++ ++void CollectionAttributeTest::testDetach() ++{ ++ // GIVEN a collection with an attribute ++ Collection col; ++ col.attribute<TestAttribute>(Akonadi::Collection::AddIfMissing); ++ Collection col2 = col; // and a copy, so that non-const access detaches ++ ++ // WHEN ++ TestAttribute *attr = col2.attribute<TestAttribute>(Akonadi::Collection::AddIfMissing); ++ TestAttribute *attr2 = col2.attribute<TestAttribute>(); ++ ++ // THEN ++ QCOMPARE(attr, attr2); ++} +diff --git a/autotests/libs/collectionattributetest.h b/autotests/libs/collectionattributetest.h +index 420df78..2afa9eb 100644 +--- a/autotests/libs/collectionattributetest.h ++++ b/autotests/libs/collectionattributetest.h +@@ -32,6 +32,7 @@ private Q_SLOTS: + void testDefaultAttributes(); + void testCollectionRightsAttribute(); + void testCollectionIdentificationAttribute(); ++ void testDetach(); + }; + + #endif +diff --git a/src/core/collection.h b/src/core/collection.h +index b5a496c..9c19cc9 100644 +--- a/src/core/collection.h ++++ b/src/core/collection.h +@@ -565,10 +565,10 @@ inline T *Akonadi::Collection::attribute(Collection::CreateOption option) + Q_UNUSED(option); + + const T dummy; ++ markAttributesChanged(); + if (hasAttribute(dummy.type())) { + T *attr = dynamic_cast<T *>(attribute(dummy.type())); + if (attr) { +- markAttributesChanged(); + return attr; + } + //Reuse 5250 +@@ -585,14 +585,10 @@ template <typename T> + inline T *Akonadi::Collection::attribute() const + { + const QByteArray type = T().type(); ++ const_cast<Collection*>(this)->markAttributesChanged(); + if (hasAttribute(type)) { + T *attr = dynamic_cast<T *>(attribute(type)); + if (attr) { +- // FIXME: This method returns a non-const pointer, so callers may still modify the +- // attribute. Unfortunately, just making this function return a const pointer and +- // creating a non-const overload does not work, as many users of this function abuse the +- // non-const pointer and modify the attribute even on a const object. +- const_cast<Collection*>(this)->markAttributesChanged(); + return attr; + } + //reuse 5250 +-- +cgit v1.1 diff --git a/user/alsa-lib/APKBUILD b/user/alsa-lib/APKBUILD index 61a771373..94add5098 100644 --- a/user/alsa-lib/APKBUILD +++ b/user/alsa-lib/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=alsa-lib -pkgver=1.1.8 +pkgver=1.1.9 pkgrel=0 pkgdesc="Linux sound support system" url="https://www.alsa-project.org/wiki/Main_Page" @@ -14,7 +14,6 @@ source="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2 " prepare() { - update_config_sub rm src/compat/hsearch_r.c && touch src/compat/hsearch_r.c default_prepare } @@ -43,6 +42,6 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="50ae107c6efe8200b4c41e0463e099d16e149332f1d3a22c3e81d3e7d980b7f93f3610fc9711ef62067caeb1054e7ea612ba3903bf8a91ebeffa48687cf80eed alsa-lib-1.1.8.tar.bz2 +sha512sums="402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49 alsa-lib-1.1.9.tar.bz2 3b37652d50809443b5f8e80f8d447108195b0cd66fd917805bb393fc091584b6f3dad4414f568742b61745617e7a695862058a0a0f93dcc31e4c97177a520352 ucm_add_limits_h.patch -8ef518517647b702da7f3573f4f3f10be8bbac3f092834b38c59521f7236acae258a9afe65eebfa415828135ac8a1836e3dce83ee3f0eaf4403158a48802144d remove-test.patch" +388443e7d9c90339b273a40205c5cbb14033ec16d357b52b0eaeb97e2f074fab100439f8cb2972011ac1580712448a4861ab2dec26653b55badf1caaaf207a59 remove-test.patch" diff --git a/user/alsa-lib/remove-test.patch b/user/alsa-lib/remove-test.patch index e52cad42a..ba0d78498 100644 --- a/user/alsa-lib/remove-test.patch +++ b/user/alsa-lib/remove-test.patch @@ -61,20 +61,21 @@ namehint_LDADD = ../src/libasound.la client_event_filter_LDADD = ../src/libasound.la @@ -444,9 +440,6 @@ - namehint$(EXEEXT): $(namehint_OBJECTS) $(namehint_DEPENDENCIES) $(EXTRA_namehint_DEPENDENCIES) @rm -f namehint$(EXEEXT) $(AM_V_CCLD)$(LINK) $(namehint_OBJECTS) $(namehint_LDADD) $(LIBS) + -oldapi$(EXEEXT): $(oldapi_OBJECTS) $(oldapi_DEPENDENCIES) $(EXTRA_oldapi_DEPENDENCIES) - @rm -f oldapi$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(oldapi_OBJECTS) $(oldapi_LDADD) $(LIBS) + pcm$(EXEEXT): $(pcm_OBJECTS) $(pcm_DEPENDENCIES) $(EXTRA_pcm_DEPENDENCIES) @rm -f pcm$(EXEEXT) - $(AM_V_CCLD)$(pcm_LINK) $(pcm_OBJECTS) $(pcm_LDADD) $(LIBS) @@ -488,7 +481,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/latency.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midiloop.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/namehint.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldapi.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm-multi-thread.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm_min.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/latency.Po@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midiloop.Po@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/namehint.Po@am__quote@ # am--include-marker +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldapi.Po@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm-multi-thread.Po@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm.Po@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm_min.Po@am__quote@ # am--include-marker + diff --git a/user/alsa-plugins/APKBUILD b/user/alsa-plugins/APKBUILD index be384caa8..1dee01738 100644 --- a/user/alsa-plugins/APKBUILD +++ b/user/alsa-plugins/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Taner Tas <taner76@gmail.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=alsa-plugins -pkgver=1.1.8 +pkgver=1.1.9 pkgrel=0 pkgdesc="Advanced Linux Sound Architecture (ALSA) plugins" url="https://www.alsa-project.org/main/index.php/Main_Page" @@ -13,11 +13,6 @@ makedepends="linux-headers alsa-lib-dev speexdsp-dev ffmpeg-dev subpackages="$pkgname-lavcrate $pkgname-pulse $pkgname-a52" source="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2" -prepare() { - default_prepare - update_config_sub -} - build() { ./configure \ --build=$CBUILD \ @@ -64,4 +59,4 @@ a52() { "$subpkgdir"/usr/share/alsa/alsa.conf.d/ } -sha512sums="bb1a4411921ec332f47b43515f6d3b4c03a01568854950b9b5c3f0d8172d9a0c4a5b3652bc64c62eae5ea3aaa5d95fe3d32c0a213fe99adf490a9807bcb58ecd alsa-plugins-1.1.8.tar.bz2" +sha512sums="1969dfe8f2bb4283e81a18da73d2f7f86d8788d1a8764d7195b4830b2f4704c208eacb50a1e26e20c9fe57e7d5bb06a004112d84cc86b4682b4180d2fec4d5d9 alsa-plugins-1.1.9.tar.bz2" diff --git a/user/alsa-utils/APKBUILD b/user/alsa-utils/APKBUILD index f956cc10a..835c37b43 100644 --- a/user/alsa-utils/APKBUILD +++ b/user/alsa-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=alsa-utils -pkgver=1.1.8 +pkgver=1.1.9 pkgrel=0 pkgdesc="Advanced Linux Sound Architecture (ALSA) utilities" url="https://www.alsa-project.org/wiki/Main_Page" @@ -16,12 +16,7 @@ source="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$pkgver.tar.bz2 alsaconf.patch alsa.initd alsa.confd -" - -prepare() { - default_prepare - update_config_sub -} + " build() { ./configure \ @@ -41,7 +36,7 @@ package() { install -Dm644 ../alsa.confd "$pkgdir"/etc/conf.d/alsa } -sha512sums="f877b491840126420dd9847347d0af865b6d03eccac2e2c3853cdbc76e91899f5a5139753cc41a4db942e7999c8d53cf9bd57d2fd5e1d32c872871b2d25146d9 alsa-utils-1.1.8.tar.bz2 +sha512sums="92fa689ea5897150972d5376e7999ff060cad09cb0b06991d81c87b61a243ecec944e2a4c7ad38878596cd8b4246e44c5a3a35e5bc6452c02ebf35c9bed91970 alsa-utils-1.1.9.tar.bz2 817215be6e9f103a8a187df5b1142c4d2e952f547a64579a9b8cfa58bd762d6a55bde75c0f66f018c0597744d07ccdb08216f7b368db464e36667cecedcc00f3 alsaconf.patch 8a52e6363d5dcfb16e1e607e1af3e46a2148989689e5ab04caf05f84dc68b34cc003b1cf0945ce2c3670cc7f3ef0e40824f689f1efa2d09177c82b13571a7168 alsa.initd 6e716e6230fd3d2c33e3cb2dbf572d632c9ac6452c1768388bea7d3ca22f7c72cf6bcd702580f45cb9089983582011c8b04cbdb4420d14fb988167b1391ea547 alsa.confd" diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD index e5cf07800..f50cc6c60 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.04.1 +pkgver=19.04.2 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="c0ba20b6776dbf40bdf3a30231a6230f2b5ec0aa632235b09353a30f9f9f8b38da703c58736ee943239d0541b149100be2eaf924d8f435a4367a1e3072720a3b analitza-19.04.1.tar.xz" +sha512sums="208df8b0c1a47dcddfa5dc19cab96d4686b8ead8c674ad246819e3920bde4ae41ab26b656322e99996de5bc393bf9952223663e6b5f72929bd2a1619524d6c79 analitza-19.04.2.tar.xz" diff --git a/user/ant/APKBUILD b/user/ant/APKBUILD new file mode 100644 index 000000000..8afaf5929 --- /dev/null +++ b/user/ant/APKBUILD @@ -0,0 +1,58 @@ +# Contributor: Steeve Chailloux <steeve@chaahk.com> +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=ant +pkgver=1.10.6 +pkgrel=0 +pkgdesc="Java-based build tool" +url="http://ant.apache.org/" +arch="noarch" +license="Apache-2.0" +makedepends="" +depends="openjdk8" +source="https://www-eu.apache.org/dist/ant/source/apache-$pkgname-$pkgver-src.tar.gz + ant.sh + imageio_fix_java_test.patch + imageio_fix_test.patch" +builddir="$srcdir/apache-$pkgname-$pkgver" + +_anthome="/usr/lib/java/$pkgname" + +build() { + sh ./bootstrap.sh + ./bootstrap/bin/ant dist-lite +} + +check() { + ./bootstrap/bin/ant test +} + +package() { + local destdir="$pkgdir/$_anthome" + + install -dm755 "$destdir"/bin + rm dist/bin/*.bat dist/bin/*.cmd + install -m755 dist/bin/* "$destdir"/bin + + install -dm755 "$pkgdir"/usr/bin + ln -sf $_anthome/bin/ant "$pkgdir"/usr/bin/ant + + install -dm755 "$destdir"/lib + install -m644 dist/lib/*.jar "$destdir"/lib + + # symlink to junit so it's on the javac build path for ant + # matches behavior on ubuntu 9 and makes sense for compatibility + ln -sf ../../junit.jar "$destdir"/lib/junit.jar + + # The license says the NOTICE file should be redistributed for + # derivative works, so lets supply it. + install -m644 -D NOTICE "$pkgdir"/usr/share/licenses/$pkgname/NOTICE + + install -m644 -D $srcdir/$pkgname.sh "$pkgdir"/etc/profile.d/$pkgname.sh +} + +sha512sums="2bef0cf5f53ce9fa6e9dc7a673745f75bcd0df027f9ff07442cf66bc8d7d99e022153b08d20d314061b497763e85d587c3087952b3f5730e5a19b2656f3236fb apache-ant-1.10.6-src.tar.gz +955fe52b415d57716df1338eff6d667d80e06a67bffd53def7d63d96f1224157b724a92df647afe8b3243dea749e221aec1e86d5be01060408fa000ec1132374 ant.sh +9a698041a06ccc6db7765133fc6fabc6f2d0e70b96ff9de594bd836fc05ac33f489968a4fdd12fe044458eb3b99e905ca1e2a62a55acdbacebff9782c82a27de imageio_fix_java_test.patch +1457c7415df1e80c8763b4db9f41cbdebfa58e17bcd263dae9ce31f9ee601650b51a893e4e0a324c974b60a6c2076fddfd78180baca0bcdbff65e9e88b30e063 imageio_fix_test.patch" diff --git a/user/ant/ant.sh b/user/ant/ant.sh new file mode 100644 index 000000000..bab7b972d --- /dev/null +++ b/user/ant/ant.sh @@ -0,0 +1,3 @@ +#!/bin/sh +ANT_HOME="/usr/share/java/ant" +export ANT_HOME diff --git a/user/ant/imageio_fix_java_test.patch b/user/ant/imageio_fix_java_test.patch new file mode 100644 index 000000000..4fa856e73 --- /dev/null +++ b/user/ant/imageio_fix_java_test.patch @@ -0,0 +1,26 @@ +diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java +index c96691d..e8cfd29 100644 +--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java ++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java +@@ -86,21 +86,6 @@ public class ImageIOTest { + assertTrue("File was not overwritten.", lastModified < overwrittenLastModified); + } + +- @Test +- public void testDrawOverwriteTrue() { +- buildRule.executeTarget("testSimpleScale"); +- assertThat(buildRule.getLog(), containsString("Processing File")); +- File f = new File(buildRule.getOutputDir(), LARGEIMAGE); +- assumeTrue("Could not change file modification date", +- f.setLastModified(f.lastModified() - FILE_UTILS.getFileTimestampGranularity() * 2)); +- long lastModified = f.lastModified(); +- buildRule.executeTarget("testDrawOverwriteTrue"); +- assertThat(buildRule.getLog(), containsString("Processing File")); +- f = new File(buildRule.getOutputDir(), LARGEIMAGE); +- long overwrittenLastModified = f.lastModified(); +- assertTrue("File was not overwritten.", lastModified < overwrittenLastModified); +- } +- + @Test + public void testOverwriteFalse() { + buildRule.executeTarget("testSimpleScale"); diff --git a/user/ant/imageio_fix_test.patch b/user/ant/imageio_fix_test.patch new file mode 100644 index 000000000..ad3cc3e67 --- /dev/null +++ b/user/ant/imageio_fix_test.patch @@ -0,0 +1,23 @@ +diff --git a/src/etc/testcases/taskdefs/optional/image/imageio.xml b/src/etc/testcases/taskdefs/optional/image/imageio.xml +index a7d6a23..0f0318b 100644 +--- a/src/etc/testcases/taskdefs/optional/image/imageio.xml ++++ b/src/etc/testcases/taskdefs/optional/image/imageio.xml +@@ -59,18 +59,6 @@ + </imageio> + </target> + +- <!-- this should produce a single file in the dest dir, overwriting any existing file --> +- <target name="testDrawOverwriteTrue" depends="setUp"> +- <imageio includes="*.jpg" srcdir="${src.dir}" destdir="${output}" +- overwrite="yes" failonerror="no"> +- <scale width="300" proportions="width"/> +- <draw xloc="10" yloc="10"> +- <rectangle height="50" width="50" strokewidth="2"/> +- <text string="Test"/> +- </draw> +- </imageio> +- </target> +- + <!-- this should not overwrite the existing file --> + <target name="testOverwriteFalse" depends="setUp"> + <imageio includes="*.jpg" srcdir="${src.dir}" destdir="${output}" diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index d83b3f1ce..050dbcdb1 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.04.1 +pkgver=19.04.2 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="6a053239dfa0cfc0b96aad087d0912114a96a1de3f77ac8b720477c775a088d0df78531372f105cd982c9f7009d1fdeec03a06ada743142f2d2eddbe38f652de ark-19.04.1.tar.xz" +sha512sums="a6991ce707294436520ba1cac0ed8c6125f88ce7448d7dff5dbfdd1ebf116a302f9d434793db08eb712681b16aee6ee826af027bb608be66ef08de5df8d222da ark-19.04.2.tar.xz" diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD index 0fe94ed73..cb966a817 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Pronunciation trainer for languages" url="https://www.kde.org/applications/education/artikulate/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0d0195bfd85250cafd37be0d91fa6650fb3322b32abdde877090d29593e3ff918adc7f2577d223d3283583229d4a4eb00d57677438b60b7e1a6a9bc54a1e3642 artikulate-19.04.1.tar.xz" +sha512sums="69f6e509c753fd104fb0895728e3b8ee1b5f02b268f161676d2b46146fab9afb49535fcc3aea79f3b2ddf6a3b6ba1e3d672bbb3d0a873ddc42731b0c86977291 artikulate-19.04.2.tar.xz" diff --git a/user/atril/APKBUILD b/user/atril/APKBUILD index ac04541d5..5fd885123 100644 --- a/user/atril/APKBUILD +++ b/user/atril/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=atril pkgver=1.22.1 -pkgrel=0 +pkgrel=1 pkgdesc="Document viewer for the MATE desktop environment" url="https://mate-desktop.org" arch="all" @@ -12,7 +12,7 @@ depends="" makedepends="caja-dev djvulibre-dev gobject-introspection-dev gtk+3.0-dev intltool itstool libgxps-dev libsecret-dev libsm-dev libspectre-dev libxml2-dev libxml2-utils poppler-dev python3 tiff-dev" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/1.22/atril-$pkgver.tar.xz" build() { diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD index d5800d48a..e175d9b74 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Widgets that utilise the Baloo desktop indexing engine" url="https://www.KDE.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e797b4f878f1382cd58d91e61a5a846e2f47adb1a2f718f9c5f686a6978031b8c6ce061ae55948c3beed16d4798e3f8abeb70c428a91ce602c94adf423616eaa baloo-widgets-19.04.1.tar.xz +sha512sums="5f8bdac98886a13fc6790ec52c5c006f02f10bd8fccb6233460c16894d0747fa9b7313ad2cd3712011d3741f321af3ede856880fecc16fd551b9c35b30d97daa baloo-widgets-19.04.2.tar.xz b8de7699919edb1ecc64aa733b8a937fc0c1b06e3e03fc5f2ea1d78ca190a0bdbf4b6011c57de464ad657103981aa337f3a04953da3a02b6c161f47eda5d7372 frameworks.patch" diff --git a/user/bash-completion/APKBUILD b/user/bash-completion/APKBUILD index 42575f687..ef73c5b7c 100644 --- a/user/bash-completion/APKBUILD +++ b/user/bash-completion/APKBUILD @@ -1,6 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=bash-completion pkgver=2.8 pkgrel=0 diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD index 7e0b38e15..41eca142e 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.13.3 +pkgver=9.14.3 _p=${pkgver#*_p} _ver=${pkgver%_p*} _major=${pkgver%%.*} @@ -24,7 +24,7 @@ options="!check" license="ISC AND Apache-2.0 AND OpenSSL AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause" pkgusers="named" pkggroups="named" -makedepends="bash openssl-dev libcap-dev perl linux-headers bsd-compat-headers libxml2-dev json-c-dev" +makedepends="bash openssl-dev libcap-dev perl linux-headers bsd-compat-headers libxml2-dev json-c-dev py3-ply" install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc $pkgname-tools" source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz @@ -40,6 +40,13 @@ source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz builddir="$srcdir/$pkgname-$_ver" # secfixes: +# 9.14.3: +# - CVE-2018-5744 +# - CVE-2018-5745 +# - CVE-2019-6465 +# - CVE-2018-5743 +# - CVE-2019-6467 +# - CVE-2019-6471 # 9.13.3: # - CVE-2018-5741 # - CVE-2018-5740 @@ -147,7 +154,7 @@ tools() { done } -sha512sums="980f294ef7b75c9a0917212e26300037ad6a33ff3565c099a6bad15350f0738491396a22a40dd552efd7fd25634f82f236abca4f83b4c8a9c580099851dd3c83 bind-9.13.3.tar.gz +sha512sums="46974be2adea512c58b82184566ea5e8a9faf67aeb78ea33356861f0a7edce37eac05c21e8fbbc7f7db4e87404fe71ed59d9eac46e6e4758d95139a21891f437 bind-9.14.3.tar.gz 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015 named.initd 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD index 516818484..00632ff11 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Memory enhancement game" url="https://www.kde.org/applications/education/blinken/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a6f6f552df473872e25ec854d956581966b8e763d4d02fb9355e2b57da7565ace856a83175cb71878602e1aefa256b4ead6d5f936ebeeb99405c1194143dd83d blinken-19.04.1.tar.xz" +sha512sums="84113e835b0b5134cea4e4548d953d34b2b0815cbf505d4b8644b443f7d1a33a56da0b6d6e5dcd2c933e83b6c17261f1dcbd024af4597f96105de8b6b6a85b39 blinken-19.04.2.tar.xz" diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD index 270520353..71b5fa2de 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Arcade bombing game" url="https://www.kde.org/applications/games/bomber/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c407dc51a137e1c5242bc4b3d9d10b855e36cb0c1988bcc3b93aeca79a147dcb039c72984b91426373523bceefdd4269880737e41d0ce2fc0e147ba8216b1504 bomber-19.04.1.tar.xz" +sha512sums="f75df93a95d23ef80b36c0ad5d474a5e17d2e74cac6f88d27384026a7b402a41e6780d406798c5a3d2d539c5434e20c61645c3976224daa8d4a99971d455504a bomber-19.04.2.tar.xz" diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD index 9b99e296f..54e67b08b 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.04.1 +pkgver=19.04.2 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="4fbf5334a7f7a3cd86736d762818d4259aa148b238ff65e8d79b02d2caa3a0d33c30da4ced7d14464d2559aaabd95a8b72ac8d11e5f1f03a3141a39c9d589938 bovo-19.04.1.tar.xz" +sha512sums="e3b8cd1d071f74e944231376d6bd63212154c1fde3bff38aa87ddf7649d65145a21fe2a7c924e8268c153f8fd2d8b0f863f3548142e79161efac9381944ef8af bovo-19.04.2.tar.xz" diff --git a/user/btrfs-progs/APKBUILD b/user/btrfs-progs/APKBUILD index 5e30eb457..6c0ed7c7d 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=4.20.2 +pkgver=5.1.1 pkgrel=0 pkgdesc="File system utilities for Btrfs" url="https://btrfs.wiki.kernel.org/index.php/Main_Page" @@ -9,35 +9,26 @@ arch="all" license="GPL-2.0-only" depends="" makedepends="asciidoctor attr-dev e2fsprogs-dev libexecinfo-dev lzo-dev - python3-dev util-linux-dev xmlto zlib-dev zstd-dev" -subpackages="$pkgname-doc $pkgname-python" + util-linux-dev xmlto zlib-dev zstd-dev" +subpackages="$pkgname-doc" source="https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar.xz" builddir="$srcdir"/$pkgname-v$pkgver build() { - cd "$builddir" LIBS="-lexecinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr + --prefix=/usr \ + --disable-python # --enable-python doesn't work. make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -python() { - pkgdesc="$pkgdesc (Python 3 bindings)" - - cd "$builddir" - make DESTDIR="$subpkgdir" install_python -} - -sha512sums="a542423589e7ee35b9a1791ef13e4c8ea4be56b33d6119a18d046233cfc04678c525cad545387aeb48e0dbd8249c5a501100fdee8f6d6882c906e0a737a1778a btrfs-progs-v4.20.2.tar.xz" +sha512sums="0f7582893e76d73ac7c0061dd43f65c465ca6308d3447a4e12f95397edcf3b74cc4dd3fad4a139739322650a0d228c4b2d43eb6eb9a09eb92f8fa2a5ef1519cd btrfs-progs-v5.1.1.tar.xz" diff --git a/user/cairo/APKBUILD b/user/cairo/APKBUILD index 36e88f395..bfb290d7b 100644 --- a/user/cairo/APKBUILD +++ b/user/cairo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=cairo pkgver=1.16.0 -pkgrel=0 +pkgrel=1 pkgdesc="A vector graphics library" url="https://cairographics.org/" arch="all" @@ -18,10 +18,14 @@ _ultver="2016-04-23" source="https://cairographics.org/releases/$pkgname-$pkgver.tar.xz fontconfig-ultimate-$_ultver.tar.gz::https://github.com/bohoomil/fontconfig-ultimate/archive/$_ultver.tar.gz musl-stacksize.patch + CVE-2018-19876.patch " +# secfixes: +# 1.16.0-r1: +# - CVE-2018-19876 + prepare() { - cd "$builddir" default_prepare # infinality @@ -32,7 +36,6 @@ prepare() { } build() { - cd "$builddir" autoreconf -vif ./configure \ --build=$CBUILD \ @@ -58,7 +61,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -78,4 +80,5 @@ tools() { sha512sums="9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f cairo-1.16.0.tar.xz d8185f4ec74f44c4746acf7e79bba7ff7ffd9d35bdabeb25e10b4e12825942d910931aa857f1645e5c8185bcb40a1f1ffe1e7e647428e9ea66618b2aec52fac3 fontconfig-ultimate-2016-04-23.tar.gz -86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch" +86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch +9020c596caa54a2ac435d5dae0f121d36d3c3f34d487b9c1032665b1bd15813506adf31984e34b5dd328ee0e068de0627e1d061230758328cae4fa993c3a9209 CVE-2018-19876.patch" diff --git a/user/cairo/CVE-2018-19876.patch b/user/cairo/CVE-2018-19876.patch new file mode 100644 index 000000000..33731e4fc --- /dev/null +++ b/user/cairo/CVE-2018-19876.patch @@ -0,0 +1,30 @@ +From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos <cgarcia@igalia.com> +Date: Mon, 19 Nov 2018 12:33:07 +0100 +Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in + cairo_ft_apply_variations + +Fixes a crash when using freetype >= 2.9 +--- + src/cairo-ft-font.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c +index 325dd61b4..981973f78 100644 +--- a/src/cairo-ft-font.c ++++ b/src/cairo-ft-font.c +@@ -2393,7 +2393,11 @@ skip: + done: + free (coords); + free (current_coords); ++#if HAVE_FT_DONE_MM_VAR ++ FT_Done_MM_Var (face->glyph->library, ft_mm_var); ++#else + free (ft_mm_var); ++#endif + } + } + +-- +2.21.0 + diff --git a/user/calligra/APKBUILD b/user/calligra/APKBUILD index a17bf9711..306299ae0 100644 --- a/user/calligra/APKBUILD +++ b/user/calligra/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=calligra pkgver=3.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Office suite" url="https://www.calligra.org/" arch="all" diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD index 015945e99..05d13a182 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.04.1 +pkgver=19.04.2 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="a6ae43ace5761a12157f2cfdd2dafeb5ac5cf0f0e96b4328cd7913d9168976b75133c122604f8296fb9baaae252e786a16128c2c9e1f2df4403f1bbef507493b cantor-19.04.1.tar.xz" +sha512sums="5792df774f6b961024b1bf484186eebc8175ec8d95e9edc8f88445c8e52f74eb08e3feb6279bb1ecab9c82d62938eb7959fed34cfb4dfd02e949b42887359f65 cantor-19.04.2.tar.xz" diff --git a/user/cbindgen/APKBUILD b/user/cbindgen/APKBUILD new file mode 100644 index 000000000..56652dda1 --- /dev/null +++ b/user/cbindgen/APKBUILD @@ -0,0 +1,122 @@ +# Contributor: Leo <thinkabit.ukim@gmail.com> +# Contributor: Gentoo Rust Maintainers <rust@gentoo.org> +# Contributor: Samuel Holland <samuel@sholland.org> +# Maintainer: Molly Miller <adelie@m-squa.red> +pkgname=cbindgen +pkgver=0.8.7 +pkgrel=0 +pkgdesc="Tool to generate C bindings from Rust code" +url="https://github.com/eqrion/cbindgen" +arch="all" +license="MPL-2.0" +makedepends="cargo" +source="" + +# dependencies taken from Cargo.lock +cargo_deps="$pkgname-$pkgver ansi_term-0.11.0 atty-0.2.11 autocfg-0.1.4 + bitflags-1.1.0 cfg-if-0.1.9 clap-2.33.0 cloudabi-0.0.3 + fuchsia-cprng-0.1.1 itoa-0.4.4 libc-0.2.58 log-0.4.6 numtoa-0.1.0 + proc-macro2-0.4.30 quote-0.6.12 rand-0.6.5 rand_chacha-0.1.1 + rand_core-0.3.1 rand_core-0.4.0 rand_hc-0.1.0 rand_isaac-0.1.1 + rand_jitter-0.1.4 rand_os-0.1.3 rand_pcg-0.1.2 rand_xorshift-0.1.1 + rdrand-0.4.0 redox_syscall-0.1.54 redox_termios-0.1.1 + remove_dir_all-0.5.2 ryu-0.2.8 serde-1.0.92 serde_derive-1.0.92 + serde_json-1.0.39 strsim-0.8.0 syn-0.15.36 tempfile-3.0.8 termion-1.5.3 + textwrap-0.11.0 toml-0.4.10 unicode-width-0.1.5 unicode-xid-0.1.0 + vec_map-0.8.1 winapi-0.3.7 winapi-i686-pc-windows-gnu-0.4.0 + winapi-x86_64-pc-windows-gnu-0.4.0" + +source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+)-([0-9.]+(-(alpha|beta|rc)[0-9.]+)?)#&.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" + +prepare() { + export CARGO_HOME="$srcdir/cargo-home" + export CARGO_VENDOR="$CARGO_HOME/adelie" + + (builddir=$srcdir; default_prepare) + + mkdir -p "$CARGO_VENDOR" + cat <<- EOF > "$CARGO_HOME/config" + [source.adelie] + directory = "${CARGO_VENDOR}" + + [source.crates-io] + replace-with = "adelie" + local-registry = "/nonexistant" + EOF + + for _dep in $cargo_deps; do + ln -s "$srcdir/$_dep" "$CARGO_VENDOR/$_dep" + _sum=$(sha256sum "$srcdir/$_dep.tar.gz" | cut -d' ' -f1) + cat <<- EOF > "$CARGO_VENDOR/$_dep/.cargo-checksum.json" + { + "package":"$_sum", + "files":{} + } + EOF + done +} + +build() { + export CARGO_HOME="$srcdir/cargo-home" + cargo build -j $JOBS --release +} + +check() { + export CARGO_HOME="$srcdir/cargo-home" + + # Failing tests + rm -rf tests/rust/expand* + cargo test -j $JOBS --release +} + +package() { + export CARGO_HOME="$srcdir/cargo-home" + cargo install --path . --root="$pkgdir"/usr + rm "$pkgdir"/usr/.crates.toml +} + +sha512sums="0238fa87100f1792cbb2b2c977bdc13a9a8a3e916f841ee112f69335a8ecb2a9fc99d3a0ce5eda16c9eead7ccbe8e7b3b8248d4ceaa218bbea0ac9a6a20e805d cbindgen-0.8.7.tar.gz +a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa ansi_term-0.11.0.tar.gz +9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79 atty-0.2.11.tar.gz +811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce autocfg-0.1.4.tar.gz +e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3 bitflags-1.1.0.tar.gz +45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c cfg-if-0.1.9.tar.gz +f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz +691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c cloudabi-0.0.3.tar.gz +ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 fuchsia-cprng-0.1.1.tar.gz +f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d itoa-0.4.4.tar.gz +9127ad9a94f75655740fc3a2278c7a17d5f03c4cd12c8833c1a1ecb7a860ec8581fbc969f5c2e23b8eecb9131d9d8271131ad6a675b785f18fb55d830bcc0491 libc-0.2.58.tar.gz +3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb log-0.4.6.tar.gz +41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354 numtoa-0.1.0.tar.gz +73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0 proc-macro2-0.4.30.tar.gz +5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798 quote-0.6.12.tar.gz +2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 rand-0.6.5.tar.gz +200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b rand_chacha-0.1.1.tar.gz +5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz +f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845 rand_core-0.4.0.tar.gz +808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f rand_hc-0.1.0.tar.gz +9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e rand_isaac-0.1.1.tar.gz +fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a rand_jitter-0.1.4.tar.gz +01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 rand_os-0.1.3.tar.gz +6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c rand_pcg-0.1.2.tar.gz +3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 rand_xorshift-0.1.1.tar.gz +6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz +38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e redox_syscall-0.1.54.tar.gz +201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981 redox_termios-0.1.1.tar.gz +d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd remove_dir_all-0.5.2.tar.gz +15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4 ryu-0.2.8.tar.gz +a8a33cf76a4f899205b2ede5e91859e03d038b178f685a36991c1836ab0c37f91ff50db4145e825838ac0fb4c526c9f496d00f87ac1790d101f4e83779fc5124 serde-1.0.92.tar.gz +37da456bb1392e4eacad07118dd8a6590552f455151f35bf4b350305772eddc8b232b61c36940c287df85b61ccc9867602cfc7012f7b7b645ab97cff45baeaab serde_derive-1.0.92.tar.gz +7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036 serde_json-1.0.39.tar.gz +1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 strsim-0.8.0.tar.gz +7cd22f17d3740223d94b64405ba6283fb90a4ec170bd55de652a409a537b5355717dfb09dab991e1bbb799e57d1d48fc07c061adbe35f5b7da3bcdcdc8723ddf syn-0.15.36.tar.gz +88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00 tempfile-3.0.8.tar.gz +1cbe60f97d5f8b95e6a57ec9b7cfcf37459bc8dbcf8424b055f04b2ecdaf069e1bb52222364a2f380dc3f63039fe3823d424228af1c212a8b3790b7dd55d5deb termion-1.5.3.tar.gz +f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz +15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160 toml-0.4.10.tar.gz +bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2 unicode-width-0.1.5.tar.gz +cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d unicode-xid-0.1.0.tar.gz +026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 vec_map-0.8.1.tar.gz +6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134 winapi-0.3.7.tar.gz +a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz +4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz" diff --git a/user/ccache/APKBUILD b/user/ccache/APKBUILD new file mode 100644 index 000000000..52cf944e4 --- /dev/null +++ b/user/ccache/APKBUILD @@ -0,0 +1,49 @@ +# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=ccache +pkgver=3.7.1 +pkgrel=0 +pkgdesc="A fast C/C++ compiler cache" +url="https://ccache.dev/" +arch="all" +license="GPL-3.0+" +makedepends="zlib-dev" +checkdepends="bash perl" +subpackages="$pkgname-doc" +source="https://github.com/ccache/ccache/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2" + +prepare() { + default_prepare + update_config_sub +} + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make test +} + +package() { + install -Dm 755 ccache "$pkgdir"/usr/bin/ccache + install -Dm 644 doc/ccache.1 "$pkgdir"/usr/share/man/man1/ccache.1 + + local link= + mkdir -p "$pkgdir"/usr/lib/ccache/bin + + for link in cc gcc g++ cpp c++ ${CHOST}-cc ${CHOST}-gcc \ + ${CHOST}-g++ ${CHOST}-cpp ${CHOST}-c++; do + ln -sf /usr/bin/ccache "$pkgdir"/usr/lib/ccache/bin/$link + done +} + +sha512sums="68a716a91519020c1cd7efe07a36a7d8c040a8f26f627341e74fb6dffbf985389f949dad0b2cc35a78b37f5efdf1c112ccb3d23d8f379210c9adbaba6064763b ccache-3.7.1.tar.bz2" diff --git a/user/certbot/APKBUILD b/user/certbot/APKBUILD index 1ff38841e..53a0eb287 100644 --- a/user/certbot/APKBUILD +++ b/user/certbot/APKBUILD @@ -1,5 +1,5 @@ # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=certbot pkgver=0.32.0 pkgrel=0 diff --git a/user/cgit/APKBUILD b/user/cgit/APKBUILD index 70be3a769..abd773d44 100644 --- a/user/cgit/APKBUILD +++ b/user/cgit/APKBUILD @@ -1,6 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=cgit pkgver=1.2.1 pkgrel=1 diff --git a/user/chrony/APKBUILD b/user/chrony/APKBUILD index dc2fe5d4f..46516b598 100644 --- a/user/chrony/APKBUILD +++ b/user/chrony/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=chrony -pkgver=3.4 -pkgrel=1 +pkgver=3.5 +pkgrel=0 _ver=${pkgver/_/-} pkgdesc="NTP client and server programs" url="https://chrony.tuxfamily.org" @@ -20,7 +20,6 @@ subpackages="$pkgname-doc $pkgname-openrc" source="https://download.tuxfamily.org/$pkgname/$pkgname-$_ver.tar.gz fix-tests.patch max_resolve_interval.patch - chrony-include-util.patch chronyd.confd chronyd.initd chrony.logrotate @@ -90,10 +89,9 @@ package() { chown -R $pkgusers:$pkggroups "$pkgdir"/var/lib/chrony } -sha512sums="4fbb0311c8d363a87edd6f5d1be3d8554da169f260ba23c1ad9e8c567808258c6fd7513ba630d6fa27453ecfd81f0ece0e26d5ee2f98ca47fbc9887181a36918 chrony-3.4.tar.gz +sha512sums="c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c chrony-3.5.tar.gz 067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e fix-tests.patch b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247 max_resolve_interval.patch -30f1ed28e0d956c994abd770c68634c7d5c69ded04a2fbfd387bbd8009bc0102ce57934ce41e468fc6b2c7f8fefdab73d97f6d6ff39ec93fffa6575fa1451fbd chrony-include-util.patch 1ebb72341b4421060a43d6db164d743de9144f1c23370e052f0db92a17e5e34f24ac98baddeb5dbfef27f67479142d448c4401d927394e55024760730a27e8de chronyd.confd 9a18c9744d7b78d9b9be3f0ae0b43cb988b294c342764802e0d5df835d450e748584c0b345f7161f14d84e15c8bbd491514ee9dc45e4a65f1276c52124d2e312 chronyd.initd ab38f06bf45888846778ad935e24abb30d13b6805e9a750bc694ff953695fa8c5b33aac560f5f7f96dc46031c1a38660e5c418b6fce6fb34a87908a9a3c99357 chrony.logrotate diff --git a/user/chrony/chrony-include-util.patch b/user/chrony/chrony-include-util.patch deleted file mode 100644 index 20b43c187..000000000 --- a/user/chrony/chrony-include-util.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- chrony-3.4/hash_intmd5.c.old 2018-09-27 19:29:57.386348229 -0700 -+++ chrony-3.4/hash_intmd5.c 2018-09-27 19:30:07.696494803 -0700 -@@ -29,6 +29,7 @@ - #include "sysincl.h" - #include "hash.h" - #include "memory.h" -+#include "util.h" - - #include "md5.c" - diff --git a/user/clang/APKBUILD b/user/clang/APKBUILD index 78db7102c..e5ed50d06 100644 --- a/user/clang/APKBUILD +++ b/user/clang/APKBUILD @@ -19,8 +19,11 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs source="https://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz 0001-Add-support-for-Ad-lie-Linux.patch 0008-Fix-ClangConfig-cmake-LLVM-path.patch - use-llvm-lit.patch + cfe-005-ppc64-dynamic-linker-path.patch + pmmx-musl.patch + ppc64-elfv2.patch secure-plt.patch + use-llvm-lit.patch " builddir="$srcdir/cfe-$pkgver.src" @@ -108,5 +111,8 @@ analyzer() { sha512sums="98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3 cfe-8.0.0.src.tar.xz c3218a1622f53bb6bef65f844e32e1b048a1ed7d5aa444a7592f9b8e8543d41438a0ac032674adb2c1bf0ef8c6fbd6880c34f8c8e778a8fd31bb542968a3547e 0001-Add-support-for-Ad-lie-Linux.patch 9485fe4fd6182df543735ed8f4ce618693d0faeafa86d3f9574a6c7abf50978e2d56e0a94be3ed94d515cc937c388d66ceff1bbc9bb120d371b6d3e95340da00 0008-Fix-ClangConfig-cmake-LLVM-path.patch -8a596e7369b5791e7e9c3278320aa5bac30d91f27d9a0df335ea862c359623869353d12145c3b64730f721600522f3acc5abe706428091482e0209e4ff308175 use-llvm-lit.patch -9dad6dfb0097f79939b743dbe7ed20274c463d9c41f061a957841c60070247a4760b676465652e2e844fc75aab9a5b7f9f4dd7632f2ff5dd5b0a335fcbd29312 secure-plt.patch" +e24b0eb5f0f2b58f8d18d7d191dccc76510a179738db1f42624bd68c6de92ea57d323e28f9ee1e4df59e44a2c00a23527ba21c1c1fce9ac5858db9b3049914f2 cfe-005-ppc64-dynamic-linker-path.patch +1a76a74c193ea59b0114b116c5a9a7807b40a449e9c601263379fd7252867adb8ea8d4720f9fc8d801748176976d968990be29323bff9d5f3a03c4cfe80c61c4 pmmx-musl.patch +26b6cb952a77e15f113c88f2417e510ddd496f5c3c3de2e51c1a7cf14a78d0b25cd881f40c5c7e95dde3b2b63bbd3d485544097eed8673669a755b456a1dcd71 ppc64-elfv2.patch +9dad6dfb0097f79939b743dbe7ed20274c463d9c41f061a957841c60070247a4760b676465652e2e844fc75aab9a5b7f9f4dd7632f2ff5dd5b0a335fcbd29312 secure-plt.patch +8a596e7369b5791e7e9c3278320aa5bac30d91f27d9a0df335ea862c359623869353d12145c3b64730f721600522f3acc5abe706428091482e0209e4ff308175 use-llvm-lit.patch" diff --git a/user/clang/cfe-005-ppc64-dynamic-linker-path.patch b/user/clang/cfe-005-ppc64-dynamic-linker-path.patch new file mode 100644 index 000000000..d559d949b --- /dev/null +++ b/user/clang/cfe-005-ppc64-dynamic-linker-path.patch @@ -0,0 +1,17 @@ +--- a/lib/Driver/ToolChains/Linux.cpp ++++ b/lib/Driver/ToolChains/Linux.cpp +@@ -590,12 +590,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { + Loader = "ld.so.1"; + break; + case llvm::Triple::ppc64: +- LibDir = "lib64"; ++ LibDir = "lib"; + Loader = + (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1"; + break; + case llvm::Triple::ppc64le: +- LibDir = "lib64"; ++ LibDir = "lib"; + Loader = + (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2"; + break; diff --git a/user/clang/pmmx-musl.patch b/user/clang/pmmx-musl.patch new file mode 100644 index 000000000..7286c0ab8 --- /dev/null +++ b/user/clang/pmmx-musl.patch @@ -0,0 +1,12 @@ +--- cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp.old 2018-11-29 18:52:22.000000000 +0000 ++++ cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp 2019-06-01 23:22:27.015221397 +0000 +@@ -528,6 +528,9 @@ + ArchName = "armeb"; + IsArm = true; + break; ++ case llvm::Triple::x86: ++ ArchName = "i386"; ++ break; + default: + ArchName = Triple.getArchName().str(); + } diff --git a/user/clang/ppc64-elfv2.patch b/user/clang/ppc64-elfv2.patch new file mode 100644 index 000000000..59f300ebc --- /dev/null +++ b/user/clang/ppc64-elfv2.patch @@ -0,0 +1,38 @@ +--- cfe-8.0.0.src/lib/Basic/Targets/PPC.h.old 2019-02-12 11:19:21.000000000 +0000 ++++ cfe-8.0.0.src/lib/Basic/Targets/PPC.h 2019-06-01 23:18:07.613180102 +0000 +@@ -367,7 +367,7 @@ + ABI = "elfv2"; + } else { + resetDataLayout("E-m:e-i64:64-n32:64"); +- ABI = "elfv1"; ++ ABI = (Triple.getEnvironment() == llvm::Triple::Musl) ? "elfv2" : "elfv1"; + } + + switch (getTriple().getOS()) { +@@ -375,6 +375,15 @@ + LongDoubleWidth = LongDoubleAlign = 64; + LongDoubleFormat = &llvm::APFloat::IEEEdouble(); + break; ++ default: ++ break; ++ } ++ ++ switch (getTriple().getEnvironment()) { ++ case llvm::Triple::Musl: ++ LongDoubleWidth = LongDoubleAlign = 64; ++ LongDoubleFormat = &llvm::APFloat::IEEEdouble(); ++ break; + default: + break; + } +--- cfe-8.0.0.src/lib/Driver/ToolChains/Clang.cpp.old 2019-01-25 00:15:41.000000000 +0000 ++++ cfe-8.0.0.src/lib/Driver/ToolChains/Clang.cpp 2019-06-01 23:19:33.973868618 +0000 +@@ -1745,7 +1745,7 @@ + break; + } + +- ABIName = "elfv1"; ++ ABIName = (getToolChain().getTriple().isMusl()) ? "elfv2" : "elfv1"; + break; + } + case llvm::Triple::ppc64le: diff --git a/user/consolekit2/APKBUILD b/user/consolekit2/APKBUILD index 3325c3cb1..3c7e5035b 100644 --- a/user/consolekit2/APKBUILD +++ b/user/consolekit2/APKBUILD @@ -3,7 +3,7 @@ pkgbase=ConsoleKit2 pkgname=consolekit2 pkgver=1.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="Framework for defining and tracking users, login sessions, and seats" provides="consolekit=$pkgver" replaces="consolekit" @@ -18,7 +18,8 @@ checkdepends="libxml2-utils" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc" source="https://github.com/ConsoleKit2/$pkgbase/releases/download/$pkgver/$pkgbase-$pkgver.tar.bz2 consolekit2.initd - pam-foreground-compat.ck" + pam-foreground-compat.ck + poweroff.patch" # Capital "ConsoleKit" builddir="$srcdir"/$pkgbase-$pkgver @@ -54,4 +55,5 @@ package() { sha512sums="31befe89f7fa604138bfb0722fc6cf12f0934bac004f98fc331004eb5a7f466ed7bd0dc9adc9869da739974208f9a3bc125068ff8a60d4b2badb58ef70a3eb10 ConsoleKit2-1.2.1.tar.bz2 8c16c452707475bdd4a50d3ade367d52ad92a6560be48b4e21e5b5eadef6e56c39d3d03d3a64f9b45a59eca50179cf5aa9c11978904d5d101db7498fb9bc0339 consolekit2.initd -3b114fbbe74cfba0bfd4dad0eb1b85d08b4979a998980c1cbcd7f44b8a16b0ceca224680d4f4a1644cd24698f8817e5e8bdfcdc4ead87a122d0e323142f47910 pam-foreground-compat.ck" +3b114fbbe74cfba0bfd4dad0eb1b85d08b4979a998980c1cbcd7f44b8a16b0ceca224680d4f4a1644cd24698f8817e5e8bdfcdc4ead87a122d0e323142f47910 pam-foreground-compat.ck +033595766671f545ba6c9f3fcb529547d20359cdd8eb901bb7a6c3b319b495038e8072e3b01f2fd264f592b0c7825a79282d8bc590f057a5f62e9fdfedde9c68 poweroff.patch" diff --git a/user/consolekit2/poweroff.patch b/user/consolekit2/poweroff.patch new file mode 100644 index 000000000..8ae9d21a5 --- /dev/null +++ b/user/consolekit2/poweroff.patch @@ -0,0 +1,22 @@ +Most users expect "shutdown" to also power off the machine when +requested from a graphical environment. "Actions after halting are +unspecified" when using -h (LSB 3.0) - sysvinit additionally tries to +power off when using -h, whereas s6-linux-init only halts. +Use the **non-standard** -P option (implemented by sysvinit and +s6-linux-init since 1.0.2.0) to request power off after halting. + +--- ConsoleKit2-1.2.1/tools/linux/ck-system-stop 2017-06-02 01:31:44.000000000 +0000 ++++ ConsoleKit2-1.2.1/tools/linux/ck-system-stop 2019-06-09 17:40:31.110006347 +0000 +@@ -2,10 +2,10 @@ + + #Try for common tools + if [ -x "/sbin/shutdown" ] ; then +- /sbin/shutdown -h now ++ /sbin/shutdown -hP now + exit $? + elif [ -x "/usr/sbin/shutdown" ] ; then +- /usr/sbin/shutdown -h now ++ /usr/sbin/shutdown -hP now + exit $? + else + exit 1 diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD index 7ebfd4e0d..db56726fe 100644 --- a/user/cups-filters/APKBUILD +++ b/user/cups-filters/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=cups-filters pkgver=1.22.5 -pkgrel=0 +pkgrel=1 pkgdesc="OpenPrinting CUPS filters and backends" url="https://wiki.linuxfoundation.org/openprinting/cups-filters" arch="all" diff --git a/user/dbus/APKBUILD b/user/dbus/APKBUILD index 087aa3b75..72b009f38 100644 --- a/user/dbus/APKBUILD +++ b/user/dbus/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dbus -pkgver=1.12.12 +pkgver=1.12.16 pkgrel=0 pkgdesc="IPC/message bus system, allowing user applications to communicate" url="http://www.freedesktop.org/wiki/Software/dbus/" @@ -21,6 +21,10 @@ source="http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz $pkgname.initd " +# secfixes: +# 1.12.16-r0: +# - CVE-2019-12749 + build() { ./configure \ --build=$CBUILD \ @@ -61,5 +65,5 @@ x11() { mv "$pkgdir"/usr/bin/dbus-launch "$subpkgdir"/usr/bin/ } -sha512sums="51af4e86ab7d36e1c9a861164e7cd7aa1605fdd82f90aed8728b34c45a87864a00671de9db00d88ea6f96be97459c7eb53d2517ea9d9687ae9ebf81c58c3a80f dbus-1.12.12.tar.gz +sha512sums="27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb dbus-1.12.16.tar.gz df74e7d6a4f76f777d356e94bd23422b17656aa51a5b2d3c655fcabb32c84f2f06b9f5cd8827920d51842f89e8c0d968a6e723315e4bf216e55711fcda9b0ee9 dbus.initd" diff --git a/user/ddrescue/APKBUILD b/user/ddrescue/APKBUILD index f1c42d607..6fd0c0a02 100644 --- a/user/ddrescue/APKBUILD +++ b/user/ddrescue/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ddrescue -pkgver=1.23 +pkgver=1.24 pkgrel=0 pkgdesc="Data recovery tool for block devices with errors" url="https://www.gnu.org/s/ddrescue/ddrescue.html" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4f0b27067966b71efaae809d4f38714863cf3663f3b8c3f26055d482debb15c0fab77752411a9d242f18dbb8e4edc68494f866721dae9c95cfc5354439eaa656 ddrescue-1.23.tar.lz" +sha512sums="2c6a86c80bad122e0c44d6f8da49239e10362fbfbdb70acf39055ce02637daa05cce4f24adac732a1bb3a6fc97cf6985dd20827e99ab3bf6bad4db015a00fbaa ddrescue-1.24.tar.lz" diff --git a/user/dhcpcd/APKBUILD b/user/dhcpcd/APKBUILD index e42405db5..7dc1343f9 100644 --- a/user/dhcpcd/APKBUILD +++ b/user/dhcpcd/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=dhcpcd -pkgver=7.0.8 +pkgver=7.2.2 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="https://roy.marples.name/projects/dhcpcd" @@ -47,6 +47,6 @@ package() { "$pkgdir"/etc/init.d/dhcpcd } -sha512sums="82cd845eb35670788b8f31b973945460f4c5f1a0a3025e3a452b79230dc30704e129d97140e6aec6d0281e0c89c333c0ce0af03c4767b2e5e66547ed3e071953 dhcpcd-7.0.8.tar.xz +sha512sums="a774c4788efbb9712be04d3f29943b801043f9ec1ea1925282330afa00b9f3db5c29a85969ef004bf85b20045b4cc6ab241ceaae050a18051079d396845845e8 dhcpcd-7.2.2.tar.xz 1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch e777432c2efc84285b41e63a4687f3bd543f6864218d037529ab78b5ad934de154f28f478bd9facb56628f2953aad8a932bc2eb8b1dfffa0ce2278ffcfc4d880 dhcpcd.initd" diff --git a/user/dmenu/APKBUILD b/user/dmenu/APKBUILD index 39a27bc5a..ec90c9934 100644 --- a/user/dmenu/APKBUILD +++ b/user/dmenu/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=dmenu -pkgver=4.8 +pkgver=4.9 pkgrel=0 pkgdesc="Dynamic menu for X" url="https://tools.suckless.org/dmenu/" @@ -33,4 +33,4 @@ package() { -C "$builddir" install } -sha512sums="fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77 dmenu-4.8.tar.gz" +sha512sums="c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65 dmenu-4.9.tar.gz" diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD index cd3d15501..1aa1f55da 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Lightweight desktop file manager" url="https://www.kde.org/applications/system/dolphin/" @@ -46,5 +46,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a967e5cb5606c7eba00d6a1eb88336b86e02c6a80cf04d5be3fe7ba573243c36a64275ca61c512bd5b212a9d647b1c3f59c9f5572cade57da3dc1fd031d3eabf dolphin-19.04.1.tar.xz +sha512sums="e1480c2f98f06a29048683180e1ab30992e57a4cefde1b3a1a0da1c1c654482cc2e57d23fb7a7b8102e76f86c2b09b09900d37dbddc753c85f545146d47c5574 dolphin-19.04.2.tar.xz 4ec4b440f5ed52439152fb6132448e674f8e357413ef1eae339cfefb602a82909bceba85f5f517b51a985e3101d6be42b25bee6a4dd338a190d995deef57c708 frameworks.patch" diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD index 2e9421b1e..f2e429ef3 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.04.1 +pkgver=19.04.2 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="80ba2e643b79e9f83edc01e0fe5def947e4d674950655795df7adc9760221e1d6b969f1e37d11d7ed6711bf26a56fd36807a5846b7f92973e63424abc5371aa6 dragon-19.04.1.tar.xz" +sha512sums="f46d949e44ae4014fcad9186f36de50068095154af9632fc6d5ba4b7285b078caa4d09e0f1d3d84edb08aace6335db2ec6c8f4771061e2e2932901fd198eca7d dragon-19.04.2.tar.xz" diff --git a/user/efivar/APKBUILD b/user/efivar/APKBUILD index c9283bbdb..bcfcc3a2a 100644 --- a/user/efivar/APKBUILD +++ b/user/efivar/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=efivar -pkgver=36 +pkgver=37 pkgrel=0 pkgdesc="Tools and library to manipulate EFI variables" url="https://github.com/rhboot/efivar" @@ -26,5 +26,5 @@ package() { make DESTDIR="$pkgdir" prefix="/usr" libdir="/usr/lib" install } -sha512sums="951feabe2d238826fdd6e74e8f7a24f04d705f9ef925cfcfb852944d2d7a4f04e3a6c23f276c40e5564da42614558941dbe7aaf21efa6a722a616e4d165aba2d efivar-36.tar.bz2 +sha512sums="305a82ed103c7e3d8f723934019d552677c73558768dd5341f87d0364f5c60824d24f5a8e1bf90075e825908085083d4ecdccec5ac757fd38ee6ac8fea28c3e4 efivar-37.tar.bz2 8a47abad5d6d2ceffb5effdd177d3e678256961294ff66df1158084e3f45f0bcb07105a1c3df35b3a5c503742c4e59148df740c40fa3b7149b1f609f8b51ebd3 0001-makeguids-Ensure-compatibility-with-other-libcs.patch" diff --git a/user/enchant/APKBUILD b/user/enchant/APKBUILD index 57b0bf6c1..fcc9c4ebb 100644 --- a/user/enchant/APKBUILD +++ b/user/enchant/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: pkgname=enchant -pkgver=2.2.3 +pkgver=2.2.4 pkgrel=0 -pkgdesc="A wrapper library for generic spell checking" +pkgdesc="Generic library for spell checking" url="https://abiword.github.io/enchant/" arch="all" options="!check" # Requires dictionary that it can't find @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6 enchant-2.2.3.tar.gz" +sha512sums="3860f04e276e1afa8969041b3f57411136d6b96ecf90996cdb122739e87be432f12219d2635c29d2e7ef3f2eeb366013026b6f8327a9749ffbc3a1dfafb4b870 enchant-2.2.4.tar.gz" diff --git a/user/encodings/APKBUILD b/user/encodings/APKBUILD index d5c5adbea..c535aba6a 100644 --- a/user/encodings/APKBUILD +++ b/user/encodings/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=encodings -pkgver=1.0.4 -pkgrel=3 +pkgver=1.0.5 +pkgrel=0 pkgdesc="Font encoding files for X11" url="https://www.X.Org/" arch="noarch" @@ -10,14 +10,7 @@ depends="" makedepends="cmd:gzip mkfontscale util-macros" source="https://www.X.Org/releases/individual/font/encodings-$pkgver.tar.bz2" -prepare() { - cd "$builddir" - update_config_sub - default_prepare -} - build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +19,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="838d1c9489e9880bf1982dc14d34a48b624b7bc2c0fffbf28e2c24e1546b0602357ca31afef100053481d6a18e357085ef74ac7a82261daa1ac1398bc1e05d17 encodings-1.0.4.tar.bz2" +sha512sums="920e49f0b3545f181a1574ca3280ac9adef1e68fe27566c195dd7013f728d355c0d759132789357fcf8fa7391fcbe1e17edf2bd85aa5611df5a4d99740011008 encodings-1.0.5.tar.bz2" diff --git a/user/erl-rebar/APKBUILD b/user/erl-rebar/APKBUILD new file mode 100644 index 000000000..c4fe28bb2 --- /dev/null +++ b/user/erl-rebar/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=erl-rebar +pkgver=2.6.4 +pkgrel=0 +pkgdesc="Legacy Erlang build tool" +url="https://github.com/rebar/rebar" +arch="noarch" +license="Apache-2" +options="!tracedeps" +depends="erlang" +makedepends="erlang-dev" +source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/rebar/rebar/tar.gz/$pkgver" +builddir="$srcdir/rebar-$pkgver" + +build() { + ./bootstrap +} + +check() { + ./rebar -v eunit +} + +package() { + install -d -m755 $pkgdir/usr/bin/ + install -m755 ./rebar $pkgdir/usr/bin/ +} + +sha512sums="4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa erl-rebar-2.6.4.tar.gz" diff --git a/user/erl-rebar3/APKBUILD b/user/erl-rebar3/APKBUILD new file mode 100644 index 000000000..a37633ae8 --- /dev/null +++ b/user/erl-rebar3/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=erl-rebar3 +pkgver=3.11.1 +pkgrel=0 +pkgdesc="Erlang build tool" +url="http://www.rebar3.org/" +arch="noarch" +license="Apache-2" +options="!tracedeps" +depends="erlang" +makedepends="erlang-dev" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/erlang/rebar3/tar.gz/$pkgver" +builddir="$srcdir/rebar3-$pkgver" + +build() { + ./bootstrap +} + +check() { + ./rebar3 ct +} + +package() { + install -d -m755 $pkgdir/usr/bin/ + install -m755 ./rebar3 $pkgdir/usr/bin/ + gzip -c ./manpages/rebar3.1 > ./manpages/rebar3.1.gz + install -d -m755 $pkgdir/usr/share/man/man1/ + install -m644 ./manpages/rebar3.1.gz $pkgdir/usr/share/man/man1/ +} + +sha512sums="749368c8c19641d0c1083f1750438cfc5f1c75e284bd74b4f8ae368103e79a376f4bd91e85db35e1619116cd2f3b1a8dc2d3d89db19da8f4440e0b58d3c0a37c erl-rebar3-3.11.1.tar.gz" diff --git a/user/erlang/APKBUILD b/user/erlang/APKBUILD new file mode 100644 index 000000000..e24353ac0 --- /dev/null +++ b/user/erlang/APKBUILD @@ -0,0 +1,59 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=erlang +pkgver=22.0 +pkgrel=0 +pkgdesc="Soft real-time system programming language" +url="https://www.erlang.org/" +arch="all" +license="Apache-2.0" +depends="" +makedepends="flex libxml2-utils libxslt-dev m4 ncurses-dev openssl-dev perl + unixodbc-dev" +subpackages="$pkgname-dev" +source="http://erlang.org/download/otp_src_$pkgver.tar.gz + fix-wx-linking.patch + safe-signal-handling.patch + " +builddir="$srcdir/otp_src_$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-shared-zlib \ + --enable-ssl=dynamic-ssl-lib \ + --enable-threads + make +} + +check() { + local _header + + cd "$builddir" + export ERL_TOP=$builddir + + make release_tests + + for _header in erl_fixed_size_int_types.h \ + ${CHOST}/erl_int_sizes_config.h \ + erl_memory_trace_parser.h; do + cp erts/include/$_header erts/emulator/beam/ + done + cd release/tests/test_server + $ERL_TOP/bin/erl -s ts install -s ts smoke_test batch -s init stop +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3f98697b59b33910fa461141fc4fe9635c4b6a53900dd90920add709dc10468aad7b9fde12419f05b27e038aee5a254319b1c5dc0e26ceabf29a7eb8020b5d23 otp_src_22.0.tar.gz +5f1b05d8be71d5e3d7e8c5ad019329af8f68174251b5b6e0a9ee9cb3da51a10983b8696e23b3954c19de5d54783ec16f38c80c74724341dbafb22fcac83c77d4 fix-wx-linking.patch +dc2fe08e40c73b48b356382c43c982f9f0091e601bbdf6e032358bd5c74c3573b423ef4df454b87c8534105fdbc19ce2245609cc7d5679109c15abaf56d3ef69 safe-signal-handling.patch" diff --git a/user/erlang/fix-wx-linking.patch b/user/erlang/fix-wx-linking.patch new file mode 100644 index 000000000..eb5649164 --- /dev/null +++ b/user/erlang/fix-wx-linking.patch @@ -0,0 +1,11 @@ +--- otp_src_21.2/lib/wx/configure.old 2018-12-10 20:11:00.000000000 +0000 ++++ otp_src_21.2/lib/wx/configure 2019-02-24 22:16:37.340000000 +0000 +@@ -5765,7 +5765,7 @@ + // it isn't in too old wxWidgets versions + wxString test = wxString::FromUTF8((const char *)"foo"); + wxStyledTextCtrl * foo = new wxStyledTextCtrl(); +- wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1, ++ wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1, NULL, + wxDefaultPosition,wxDefaultSize,0); + return true; + }; diff --git a/user/erlang/safe-signal-handling.patch b/user/erlang/safe-signal-handling.patch new file mode 100644 index 000000000..0996069ba --- /dev/null +++ b/user/erlang/safe-signal-handling.patch @@ -0,0 +1,22 @@ +--- 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/eudev/APKBUILD b/user/eudev/APKBUILD index 5b9aa2526..f2ed0a333 100644 --- a/user/eudev/APKBUILD +++ b/user/eudev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=eudev -pkgver=3.2.7 +pkgver=3.2.8 pkgrel=0 pkgdesc="OpenRC compatible fork of systemd-udev" url="https://wiki.gentoo.org/wiki/Project:Eudev" @@ -9,14 +9,13 @@ arch="all" options="!checkroot" license="GPL-2.0-only" depends="" -depends_dev="" -replaces="udev udev-init-scripts" -provides="udev=176" makedepends="gperf glib-dev linux-headers kmod-dev gobject-introspection-dev util-linux-dev" checkdepends="tree xz" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc $pkgname-netifnames::noarch" +provides="udev=176" +replaces="udev udev-init-scripts" source="http://dev.gentoo.org/~blueness/$pkgname/$pkgname-$pkgver.tar.gz default-rules.patch load-fbcon.patch @@ -29,10 +28,8 @@ source="http://dev.gentoo.org/~blueness/$pkgname/$pkgname-$pkgver.tar.gz udev-settle.confd udev-trigger.confd " -builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -50,17 +47,13 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" - make DESTDIR="$pkgdir" sharepkgconfigdir=/usr/lib/pkgconfig \ install - local i for i in udev udev-settle udev-trigger; do install -Dm755 "$srcdir"/$i.initd \ "$pkgdir"/etc/init.d/$i @@ -74,11 +67,6 @@ package() { "$pkgdir"/sbin/setup-udev } -dev() { - replaces="udev-dev" - default_dev -} - libs() { pkgdesc="Dynamic library to access udev device information" replaces="libudev" @@ -102,9 +90,16 @@ netifnames() { openrc() { replaces="udev-init-scripts-openrc" default_openrc + install -d "$subpkgdir"/usr/share/runlevels/openrc/sysinit + # https://bts.adelielinux.org/show_bug.cgi?id=51 + # if eudev is installed, it should be running in the sysinit runlevel + ln -s /etc/init.d/udev \ + "$subpkgdir"/usr/share/runlevels/openrc/sysinit/udev + ln -s /etc/init.d/udev-trigger \ + "$subpkgdir"/usr/share/runlevels/openrc/sysinit/udev-trigger } -sha512sums="e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40 eudev-3.2.7.tar.gz +sha512sums="13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42 eudev-3.2.8.tar.gz 683e3c26ca4f058303f8db7d4977e436d728386ee6866719c4f11ff31db27572d3f486f51d3173310e1ec2cf995fa4c396f2415bdf45dabdd80e6e55e798a314 default-rules.patch ff5928fd555e095d9f3234dd004ac4c5925405d308777e9b018e8e03112cd109935b51d75a3bc4a2a1018eb486e8a5e5ef6ee978860002a8fff93b116e9721f5 load-fbcon.patch 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 udev-postmount.initd diff --git a/user/evince/APKBUILD b/user/evince/APKBUILD index 9f8ba5d66..a98bf2cf9 100644 --- a/user/evince/APKBUILD +++ b/user/evince/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=evince pkgver=3.32.0 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME document viewer" url="https://wiki.gnome.org/Apps/Evince" arch="all" diff --git a/user/exiv2/0000-pthread-init-fix.patch b/user/exiv2/0000-pthread-init-fix.patch deleted file mode 100644 index ac69b14c1..000000000 --- a/user/exiv2/0000-pthread-init-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 620ef04e96f4c0d0894d976fc361588b6526a116 Mon Sep 17 00:00:00 2001 -From: clanmills <robin@clanmills.com> -Date: Tue, 20 Jun 2017 20:41:30 +0100 -Subject: [PATCH] https://github.com/Exiv2/exiv2/issues/9 Fix submitted. - ---- - src/actions.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/actions.cpp b/src/actions.cpp -index 0ebe8505..17444c5b 100644 ---- a/src/actions.cpp -+++ b/src/actions.cpp -@@ -2045,9 +2045,13 @@ namespace { - #else - /* Unix/Linux/Cygwin/MacOSX */ - #include <pthread.h> -+ /* This is the critical section object (statically allocated). */ - #if defined(__APPLE__) -- /* This is the critical section object (statically allocated). */ -- static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER; -+ #if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER) -+ static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER; -+ #else -+ static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER; -+ #endif - #else - static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; - #endif diff --git a/user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch b/user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch deleted file mode 100644 index 86412532d..000000000 --- a/user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d775683f579543c35463ab2a8d9425da10d2f016 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Wed, 4 Oct 2017 00:15:30 -0500 -Subject: [PATCH] Amend fix for #9 to apply to other Unix systems - -At least the musl libc on Linux has the same issue as Mac OS X: the -PTHREAD_RECURSIVE_* static initialiser does not exist. This is a -documented and purposeful omission: - -http://www.openwall.com/lists/musl/2017/02/20/3 - -This commit uses similar logic to the Apple test on other Unixes. ---- - src/actions.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/actions.cpp b/src/actions.cpp -index fe14de4..aa15ec7 100644 ---- a/src/actions.cpp -+++ b/src/actions.cpp -@@ -2051,7 +2051,11 @@ namespace { - static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER; - #endif - #else -- static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -+ #if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) -+ static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -+ #else -+ static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER; -+ #endif - #endif - #endif - --- -2.10.0 - diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD index 7cf8693fe..963fe871c 100644 --- a/user/exiv2/APKBUILD +++ b/user/exiv2/APKBUILD @@ -1,47 +1,101 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=exiv2 -pkgver=0.26 -pkgrel=2 +pkgver=0.27.1 +pkgrel=0 pkgdesc="Exif, IPTC and XMP metadata library and tools" url="https://www.exiv2.org/" arch="all" -options="!check" # No test suite. license="GPL-2.0+" depends="" depends_dev="expat-dev zlib-dev" -makedepends="$depends_dev bash" +makedepends="$depends_dev bash cmake" +checkdepends="python3 libxml2 cmd:which" subpackages="$pkgname-dev $pkgname-doc" -source="http://www.exiv2.org/builds/exiv2-$pkgver-trunk.tar.gz - 0000-pthread-init-fix.patch - 0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch - CVE-2018-19535.patch - " -builddir="$srcdir"/exiv2-trunk +source="http://www.exiv2.org/builds/exiv2-$pkgver-Source.tar.gz" +builddir="$srcdir/$pkgname-$pkgver-Source" # secfixes: # 0.26-r2: # - CVE-2018-19535 +# 0.27.1-r0: +# - CVE-2017-9239 +# - CVE-2017-9953 +# - CVE-2017-11336 +# - CVE-2017-11337 +# - CVE-2017-11338 +# - CVE-2017-11339 +# - CVE-2017-11340 +# - CVE-2017-11553 +# - CVE-2017-11591 +# - CVE-2017-11592 +# - CVE-2017-11683 +# - CVE-2017-12955 +# - CVE-2017-12956 +# - CVE-2017-12957 +# - CVE-2017-14857 +# - CVE-2017-14858 +# - CVE-2017-14859 +# - CVE-2017-14860 +# - CVE-2017-14861 +# - CVE-2017-14862 +# - CVE-2017-14863 +# - CVE-2017-14864 +# - CVE-2017-14865 +# - CVE-2017-14866 +# - CVE-2017-17669 +# - CVE-2017-17722 +# - CVE-2017-17723 +# - CVE-2017-17724 +# - CVE-2017-17725 +# - CVE-2017-18005 +# - CVE-2017-1000126 +# - CVE-2017-1000127 +# - CVE-2017-1000128 +# - CVE-2018-4868 +# - CVE-2018-5772 +# - CVE-2018-8976 +# - CVE-2018-8977 +# - CVE-2018-9145 +# - CVE-2018-10772 +# - CVE-2018-10780 +# - CVE-2018-10958 +# - CVE-2018-10998 +# - CVE-2018-10999 +# - CVE-2018-11037 +# - CVE-2018-11531 +# - CVE-2018-12264 +# - CVE-2018-12265 +# - CVE-2018-14046 +# - CVE-2018-14338 +# - CVE-2018-16336 +# - CVE-2018-17229 +# - CVE-2018-17230 +# - CVE-2018-17282 +# - CVE-2018-17581 +# - CVE-2018-19107 +# - CVE-2018-19108 prepare() { - cd "$builddir" default_prepare - update_config_sub + mkdir build } + build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr + cd "$builddir/build" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo .. make } +check() { + cd "$builddir/build" + make tests +} + package() { - cd "$builddir" + cd "$builddir/build" make DESTDIR="$pkgdir" install } -sha512sums="d1e9cab886e279b045768dd9ec781f07d2d36d573119403d0b76dc571442173aae6972f86ec55c3ea53fb3ee9ca3571eb8fd63a2a6643a970852813e88634a86 exiv2-0.26-trunk.tar.gz -9721d359708c385be7c86a8f8a63de43b05b2578a29b4339861e82873aa81a98a7ee7252847b6c55529341187d40f552c488589b416fd9d1e27418925929c018 0000-pthread-init-fix.patch -485bd340169f69a3ce356e59e9138250cc14592f4477bb73827c799fe465535954469634fc58a1856f690f0e0b4171cba6fdd3391d43c0efc5e89652b93eb3ce 0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch -ac145a9b4df21e7f5fdd3099e6ae4c1e12ae2cdccc455d0262c5d38b8e07ce6437036a19264bd04b1cb1fffd01d89672044ca82fddd5e71dcd0d84d48356ab12 CVE-2018-19535.patch" +sha512sums="038b51241f5bfb323eb298695b5397a7d88d5c7d7303828e5e20b3f82c3df2615cee3e7e3426ea17438ca05d5abea10984cfd41f0649ddab72df1d1415bf3529 exiv2-0.27.1-Source.tar.gz" diff --git a/user/exiv2/CVE-2018-19535.patch b/user/exiv2/CVE-2018-19535.patch deleted file mode 100644 index ba9355012..000000000 --- a/user/exiv2/CVE-2018-19535.patch +++ /dev/null @@ -1,239 +0,0 @@ -From 03173751b4d7053d6ddf52a15904e8f751f78f56 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com> -Date: Sun, 2 Sep 2018 14:39:52 +0200 -Subject: [PATCH 2/5] Fix bug in PngChunk::readRawProfile - -- Now it takes into account text.size_ when searching for a newline -char. ---- - src/pngchunk.cpp | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp -index 58281b3ff..755872c94 100644 ---- a/src/pngchunk.cpp -+++ b/src/pngchunk.cpp -@@ -629,11 +629,19 @@ namespace Exiv2 { - - - sp = (char*)text.pData_+1; -+ int pointerPos = 1; - - // Look for newline -- -- while (*sp != '\n') -+ while (*sp != '\n' && pointerPos < (text.size_ - 1)) -+ { - sp++; -+ pointerPos++; -+ } -+ -+ if (pointerPos == (text.size_ - 1)) -+ { -+ return DataBuf(); -+ } - - // Look for length - - -From cf3ba049a2792ec2a4a877e343f5dd9654da53dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com> -Date: Mon, 3 Sep 2018 08:51:08 +0200 -Subject: [PATCH 3/5] Fix more issues in PngChunk::readRawProfile - ---- - src/pngchunk.cpp | 36 +++++++++++++----------- - 1 file changed, 20 insertions(+), 16 deletions(-) - -diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp -index 755872c94..9b3faf1aa 100644 ---- a/src/pngchunk.cpp -+++ b/src/pngchunk.cpp -@@ -606,11 +606,6 @@ namespace Exiv2 { - DataBuf PngChunk::readRawProfile(const DataBuf& text,bool iTXt) - { - DataBuf info; -- register long i; -- register unsigned char *dp; -- const char *sp; -- unsigned int nibbles; -- long length; - unsigned char unhex[103]={0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0, -@@ -627,8 +622,7 @@ namespace Exiv2 { - return info; - } - -- -- sp = (char*)text.pData_+1; -+ const char *sp = (char*)text.pData_+1; - int pointerPos = 1; - - // Look for newline -@@ -638,20 +632,30 @@ namespace Exiv2 { - pointerPos++; - } - -+ // Look for length -+ while ((*sp == '\0' || *sp == ' ' || *sp == '\n') && pointerPos < (text.size_ - 1)) -+ { -+ sp++; -+ pointerPos++; -+ } -+ - if (pointerPos == (text.size_ - 1)) - { - return DataBuf(); - } - -- // Look for length -+ long length = (long) atol(sp); - -- while (*sp == '\0' || *sp == ' ' || *sp == '\n') -+ while (*sp != ' ' && *sp != '\n' && pointerPos < (text.size_ - 1)) -+ { - sp++; -+ pointerPos++; -+ } - -- length = (long) atol(sp); -- -- while (*sp != ' ' && *sp != '\n') -- sp++; -+ if (pointerPos == (text.size_ - 1)) -+ { -+ return DataBuf(); -+ } - - // Allocate space - -@@ -674,10 +678,10 @@ namespace Exiv2 { - - // Copy profile, skipping white space and column 1 "=" signs - -- dp = (unsigned char*)info.pData_; -- nibbles = length * 2; -+ unsigned char *dp = (unsigned char*)info.pData_; -+ unsigned int nibbles = length * 2; - -- for (i = 0; i < (long) nibbles; i++) -+ for (long i = 0; i < (long) nibbles; i++) - { - while (*sp < '0' || (*sp > '9' && *sp < 'a') || *sp > 'f') - { - -From 8b480bc5b2cc2abb8cf6fe4e16c24e58916464d2 Mon Sep 17 00:00:00 2001 -From: Robin Mills <robin@clanmills.com> -Date: Mon, 10 Sep 2018 20:54:53 +0200 -Subject: [PATCH 4/5] Fixes in PngChunk::readRawProfile - ---- - src/pngchunk.cpp | 55 ++++++++++++++++++++++---------------------- - 1 file changed, 27 insertions(+), 28 deletions(-) - -diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp -index 9b3faf1aa..f81b560aa 100644 ---- a/src/pngchunk.cpp -+++ b/src/pngchunk.cpp -@@ -607,11 +607,11 @@ namespace Exiv2 { - { - DataBuf info; - unsigned char unhex[103]={0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, -- 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, -- 0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0, -- 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, -- 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,10,11,12, -- 13,14,15}; -+ 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, -+ 0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0, -+ 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, -+ 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,10,11,12, -+ 13,14,15}; - if (text.size_ == 0) { - return DataBuf(); - } -@@ -622,52 +622,51 @@ namespace Exiv2 { - return info; - } - -- const char *sp = (char*)text.pData_+1; -- int pointerPos = 1; -+ const char *sp = (char*) text.pData_+1; // current byte (space pointer) -+ const char *eot = (char*) text.pData_+text.size_; // end of text - - // Look for newline -- while (*sp != '\n' && pointerPos < (text.size_ - 1)) -+ while (*sp != '\n' && sp < eot ) - { - sp++; -- pointerPos++; -+ if ( sp == eot ) -+ { -+ return DataBuf(); -+ } - } -+ sp++ ; // step over '\n' - - // Look for length -- while ((*sp == '\0' || *sp == ' ' || *sp == '\n') && pointerPos < (text.size_ - 1)) -+ while ( (*sp == '\0' || *sp == ' ' || *sp == '\n') && sp < eot ) - { - sp++; -- pointerPos++; -- } -- -- if (pointerPos == (text.size_ - 1)) -- { -- return DataBuf(); -+ if (sp == eot ) -+ { -+ return DataBuf(); -+ } - } - -- long length = (long) atol(sp); -- -- while (*sp != ' ' && *sp != '\n' && pointerPos < (text.size_ - 1)) -+ const char* startOfLength = sp; -+ while ( ('0' <= *sp && *sp <= '9') && sp < eot) - { - sp++; -- pointerPos++; -+ if (sp == eot ) -+ { -+ return DataBuf(); -+ } - } -+ sp++ ; // step over '\n' - -- if (pointerPos == (text.size_ - 1)) -- { -- return DataBuf(); -- } -+ long length = (long) atol(startOfLength); - - // Allocate space -- - if (length == 0) - { - #ifdef DEBUG - std::cerr << "Exiv2::PngChunk::readRawProfile: Unable To Copy Raw Profile: invalid profile length\n"; - #endif - } -- - info.alloc(length); -- - if (info.size_ != length) - { - #ifdef DEBUG -@@ -678,7 +677,7 @@ namespace Exiv2 { - - // Copy profile, skipping white space and column 1 "=" signs - -- unsigned char *dp = (unsigned char*)info.pData_; -+ unsigned char *dp = (unsigned char*)info.pData_; // decode pointer - unsigned int nibbles = length * 2; - - for (long i = 0; i < (long) nibbles; i++) - diff --git a/user/exo/APKBUILD b/user/exo/APKBUILD index 1752b8bbf..4f39d20a1 100644 --- a/user/exo/APKBUILD +++ b/user/exo/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=exo -pkgver=0.12.4 -pkgrel=0 +pkgver=0.12.6 +pkgrel=1 pkgdesc="Support library for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="LGPL-2.0+ AND GPL-2.0+" makedepends="intltool glib-dev gtk+2.0-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libice-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/exo/0.12/exo-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/exo/0.12/exo-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="8f84258aeb5c1fcfe91e775af1e5fed02f36b3d18aa72d497cd05294d54f050d679628cdb4339219c67b203a8cc663704a240fc18e6a918cef363cf4d9b94783 exo-0.12.4.tar.bz2" +sha512sums="468f8e95068135a08da58abd35e8b886864262550fe3860a8e61ed6376783491139ae837427e0cabfe9b46184b339e482f0e9a9c9c8439c695d4268c94b5e405 exo-0.12.6.tar.bz2" diff --git a/user/faad2/APKBUILD b/user/faad2/APKBUILD index c76894b27..3794942b9 100644 --- a/user/faad2/APKBUILD +++ b/user/faad2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=faad2 pkgver=2.8.8 -pkgrel=0 +pkgrel=1 pkgdesc="ISO AAC audio decoder" url="https://www.audiocoding.com/" arch="all" @@ -10,7 +10,9 @@ license="GPL-2.0+" subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="autoconf automake libtool" -source="https://downloads.sourceforge.net/sourceforge/faac/$pkgname-$pkgver.tar.gz" +source="https://downloads.sourceforge.net/sourceforge/faac/$pkgname-$pkgver.tar.gz + overflow.patch + " build() { cd "$builddir" @@ -26,4 +28,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af faad2-2.8.8.tar.gz" +sha512sums="3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af faad2-2.8.8.tar.gz +f9266ca424d1e4f5b46c2f6b4b1568caee86849d2b6edc3b6c1fb7cf08fd736c0a8fe2c096c3bc64674e4fa40619c24d45d6d6125f11360517feb09a5c996a34 overflow.patch" diff --git a/user/faad2/overflow.patch b/user/faad2/overflow.patch new file mode 100644 index 000000000..5a198f8d8 --- /dev/null +++ b/user/faad2/overflow.patch @@ -0,0 +1,25 @@ +--- faad2/libfaad/bits.c 2007-11-01 13:33:29.000000000 +0100 ++++ faad2.new/libfaad/bits.c 2019-03-25 17:29:26.134199188 +0100 +@@ -167,7 +167,10 @@ + int words = bits >> 5; + int remainder = bits & 0x1F; + +- ld->bytes_left = ld->buffer_size - words*4; ++ if (ld->buffer_size < words * 4) ++ ld->bytes_left = 0; ++ else ++ ld->bytes_left = ld->buffer_size - words*4; + + if (ld->bytes_left >= 4) + { +--- faad2/libfaad/syntax.c 2019-03-25 17:57:36.930937066 +0100 ++++ faad2.new/libfaad/syntax.c 2019-03-25 17:49:26.135368525 +0100 +@@ -2292,6 +2292,8 @@ + while ((drc->additional_excluded_chns[n-1] = faad_get1bit(ld + DEBUGVAR(1,104,"excluded_channels(): additional_excluded_chns"))) == 1) + { ++ if (i >= MAX_CHANNELS - num_excl_chan - 7) ++ return n; + for (i = num_excl_chan; i < num_excl_chan+7; i++) + { + drc->exclude_mask[i] = faad_get1bit(ld diff --git a/user/featherpad/APKBUILD b/user/featherpad/APKBUILD index fc73865e7..ce151d6be 100644 --- a/user/featherpad/APKBUILD +++ b/user/featherpad/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=featherpad -pkgver=0.9.4 +pkgver=0.10.0 pkgrel=0 pkgdesc="Featureful Qt-based text editor" url="https://github.com/tsujan/FeatherPad" @@ -31,4 +31,4 @@ package() { make INSTALL_ROOT="$pkgdir" PREFIX=/usr install } -sha512sums="95fe137ccc0de49bb464b15aec586287e46b04ff2fe636d6092e39a6c5e3d633ca0b809181a728a8931a6628cdcf51cd0b91d8dfa58eee6a551fb3ec4ff42280 FeatherPad-0.9.4.tar.gz" +sha512sums="63bde3a5b0febe2dc17700e5e789708696d842520dd1d69832cea19e5b7dc5e6498732cc20927bac4732fa20f516d5d035e38e77142c8e47c723a1b5a07bb901 FeatherPad-0.10.0.tar.gz" diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD index f49d6b865..dee0ca09f 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="KDE video thumbnail system using FFmpeg" url="https://www.KDE.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f91ea978fd3682e6bb1510e03a01e21be9b682d8b5aecd95bff47fb64028e798dba36111b18602c9144e2dfae42bbacb905b9ac3f9cc2e6bcd263cee6e169fd9 ffmpegthumbs-19.04.1.tar.xz" +sha512sums="6d07d8dac339d0f3274c85b205feac998ccfaa57b6fee816bdf75c631b6e321c22d9af7e057faeb7f721def09ddb2da239bc81c22582772a9d7d3e8720de24dd ffmpegthumbs-19.04.2.tar.xz" diff --git a/user/flac/APKBUILD b/user/flac/APKBUILD index 0588e8fc2..363d5b3ac 100644 --- a/user/flac/APKBUILD +++ b/user/flac/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=flac pkgver=1.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="Free Lossless Audio Codec" url="https://xiph.org/flac/" arch="all" @@ -11,11 +11,13 @@ subpackages="$pkgname-dev $pkgname-doc" depends= makedepends="libogg-dev" source="https://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz - " + CVE-2017-6888.patch" -build() { - cd "$builddir" +# secfixes: +# 1.3.2-r3: +# - CVE-2017-6888 +build() { local _arch_conf case "${CARCH}" in ppc*) _arch_conf="--enable-altivec" ;; @@ -37,16 +39,15 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -Dm0644 COPYING.Xiph \ "$pkgdir"/usr/share/licenses/$pkgname/COPYING.Xiph } -sha512sums="63910e8ebbe508316d446ffc9eb6d02efbd5f47d29d2ea7864da9371843c8e671854db6e89ba043fe08aef1845b8ece70db80f1cce853f591ca30d56ef7c3a15 flac-1.3.2.tar.xz" +sha512sums="63910e8ebbe508316d446ffc9eb6d02efbd5f47d29d2ea7864da9371843c8e671854db6e89ba043fe08aef1845b8ece70db80f1cce853f591ca30d56ef7c3a15 flac-1.3.2.tar.xz +ea241ba68a4e8d91d5db555ec8c459cff48ad8c3de511d0a92d4feb8b946a2173422015fdc9604240035ef315132fe4062ab3e6d4bc2d79aa1aed18defa32301 CVE-2017-6888.patch" diff --git a/user/flac/CVE-2017-6888.patch b/user/flac/CVE-2017-6888.patch new file mode 100644 index 000000000..080160bfb --- /dev/null +++ b/user/flac/CVE-2017-6888.patch @@ -0,0 +1,27 @@ +From 4f47b63e9c971e6391590caf00a0f2a5ed612e67 Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo <erikd@mega-nerd.com> +Date: Sat, 8 Apr 2017 18:34:49 +1000 +Subject: [PATCH] stream_decoder.c: Fix a memory leak + +Leak reported by Secunia Research. +--- + src/libFLAC/stream_decoder.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c +index 14d5fe7f..a5527511 100644 +--- a/src/libFLAC/stream_decoder.c ++++ b/src/libFLAC/stream_decoder.c +@@ -1753,6 +1753,9 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre + } + memset (obj->comments[i].entry, 0, obj->comments[i].length) ; + if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length)) { ++ /* Current i-th entry is bad, so we delete it. */ ++ free (obj->comments[i].entry) ; ++ obj->comments[i].entry = NULL ; + obj->num_comments = i; + goto skip; + } +-- +2.11.0 + diff --git a/user/fltk/APKBUILD b/user/fltk/APKBUILD index fe5c3d55f..886584625 100644 --- a/user/fltk/APKBUILD +++ b/user/fltk/APKBUILD @@ -1,8 +1,8 @@ # Contributor: ScrumpyJack <scrumpyjack@st.ilet.to> # Maintainer: pkgname=fltk -pkgver=1.3.4.2 -_realver=1.3.4-2 +pkgver=1.3.5 +_realver=1.3.5 pkgrel=0 pkgdesc="Cross-platform C++ GUI toolkit" url="https://www.fltk.org/" @@ -13,11 +13,10 @@ depends="" depends_dev="libx11-dev libxext-dev libxft-dev mesa-dev" makedepends="$depends_dev libjpeg-turbo-dev libpng-dev libxinerama-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-fluid" -source="https://fltk.org/pub/fltk/1.3.4/$pkgname-$_realver-source.tar.gz" +source="https://www.fltk.org/pub/fltk/1.3.5/$pkgname-$_realver-source.tar.gz" builddir="$srcdir"/$pkgname-$_realver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,7 +29,6 @@ build() { package() { - cd "$builddir" make DESTDIR="$pkgdir" install # remove static libs rm "$pkgdir"/usr/lib/*.a @@ -38,9 +36,9 @@ package() { fluid() { pkgdesc="Fast Light User Interface Designer" - depends= + depends="" mkdir -p "$subpkgdir"/usr/ mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="cc169449b71ca966b2043ceedc55e92220ccb6be07b0ac54eeec36bbed5d60e2f59c6faba2403b5292b9120f5255227880a066d98ac82e57d502522bc627fd4d fltk-1.3.4-2-source.tar.gz" +sha512sums="db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821 fltk-1.3.5-source.tar.gz" diff --git a/user/fontawesome/APKBUILD b/user/fontawesome/APKBUILD index a98397685..831f777a6 100644 --- a/user/fontawesome/APKBUILD +++ b/user/fontawesome/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fontawesome -pkgver=5.8.1 +pkgver=5.9.0 pkgrel=0 pkgdesc="Typeface for iconography" url="https://fontawesome.com" @@ -15,8 +15,7 @@ source="https://use.fontawesome.com/releases/v$pkgver/fontawesome-free-$pkgver-d builddir="$srcdir/fontawesome-free-$pkgver-desktop/otfs" package() { - cd "$builddir" install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf } -sha512sums="078b67e41d5161651e6571ca7cd92fe78a400c9e92108fe0ebc71b0339a1b758fed5f255d666f29c5f59934a949df209ba9159b0232822c7caee404714311135 fontawesome-free-5.8.1-desktop.zip" +sha512sums="3191185ce48b7afe4b37e90d4fe1860ce8911d7de94b11081df0222c38943717ead201dc87d770e53c1bd216c5386f91b0d0dc3339734a6ca2d9afb52a2b2760 fontawesome-free-5.9.0-desktop.zip" diff --git a/user/freetds/APKBUILD b/user/freetds/APKBUILD index 07145e5b9..16a305b18 100644 --- a/user/freetds/APKBUILD +++ b/user/freetds/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=freetds -pkgver=1.00.111 +pkgver=1.1.6 pkgrel=0 pkgdesc="Tabular Datastream Library" -url="http://www.freetds.org/" +url="https://www.freetds.org/" arch="all" license="LGPL-2.0+" depends="" @@ -36,5 +36,5 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="c7f0886aaa83ee626c9738486ebc256f6fbae297a1e152848c2fba8954661d3ee74278f40c781f2c25eb11f2df38e833031126017555b827115f6cd9163cf771 freetds-1.00.111.tar.gz +sha512sums="fcd3ed52ffbf482535d8d343b2d45c999875d2bfcbf13ef72a15f4440c791ff138b839798bad05593428c0839981e667133473f7d76570e0de3ebf9e474ea632 freetds-1.1.6.tar.gz d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6 fix-includes.patch" diff --git a/user/garcon/APKBUILD b/user/garcon/APKBUILD index 953bb230e..81886c47e 100644 --- a/user/garcon/APKBUILD +++ b/user/garcon/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=garcon pkgver=0.6.2 -pkgrel=0 +pkgrel=1 pkgdesc="freedesktop.org menu library for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="LGPL-2.0+" makedepends="intltool glib-dev libxfce4util-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/garcon/0.6/garcon-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/garcon/0.6/garcon-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/gconf/APKBUILD b/user/gconf/APKBUILD index 1e9b30856..ce91ec018 100644 --- a/user/gconf/APKBUILD +++ b/user/gconf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=gconf pkgver=3.2.6 -pkgrel=4 +pkgrel=5 pkgdesc="GNOME configuration system" url="http://projects.gnome.org/gconf" arch="all" @@ -12,14 +12,11 @@ depends_dev="gtk+3.0-dev libxml2-dev polkit-dev" makedepends="$depends_dev dbus-glib-dev glib-dev gobject-introspection-dev intltool orbit2-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="https://download.gnome.org/sources/GConf/${pkgver%.*}/GConf-${pkgver}.tar.xz" - builddir="$srcdir"/GConf-"$pkgver" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -28,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/glib-networking/APKBUILD b/user/glib-networking/APKBUILD index 83ee6af4a..f9e3fd7ce 100644 --- a/user/glib-networking/APKBUILD +++ b/user/glib-networking/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=glib-networking -pkgver=2.60.1 +pkgver=2.60.3 _ver=${pkgver%.*} pkgrel=0 pkgdesc="Networking support for GLib" @@ -12,31 +12,24 @@ depends="ca-certificates" makedepends="bash glib-dev gnutls-dev gsettings-desktop-schemas-dev intltool libgcrypt-dev libproxy-dev meson ninja p11-kit-dev" subpackages="$pkgname-lang" -source="https://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.xz - glib-networking-2.60-new-gnutls-cert-error-fix.patch" +source="https://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.xz" prepare() { - cd "$builddir" 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 rm -f "$pkgdir"/usr/lib/gio/modules/*.a } -sha512sums="a40a7e9678076db1a469f0d8ffdcb0c6658ef96ff1d9637299fbb07985f4c42bae3f1415f8df15242718420d20eb90de93253a00d1f6a347110b3f8a74bcc717 glib-networking-2.60.1.tar.xz -b9d3d744aec5337553e228ff1ee0616b1d79d1766ef9d87e644706a154f8e6151b15651b73a7073482e5cbe20b54ac78bd34f7ad77ebf0d34c42d969b4315241 glib-networking-2.60-new-gnutls-cert-error-fix.patch" +sha512sums="06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f glib-networking-2.60.3.tar.xz" diff --git a/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch b/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch deleted file mode 100644 index ab04dae3e..000000000 --- a/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1ce6b40da8ecbf997c5522a592a122e805aa81c4 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@igalia.com> -Date: Wed, 3 Apr 2019 18:00:55 -0500 -Subject: [PATCH] gnutls: Handle new GNUTLS_E_CERTIFICATE_REQUIRED - -This new error in GnuTLS 3.6.7 should correspond to -G_TLS_ERROR_CERTIFICATE_REQUIRED. This fixes our client auth tests when -run with GnuTLS 3.6.7. - -Fixes #70 ---- - tls/gnutls/gtlsconnection-gnutls.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c -index 27bbbcd..774d668 100644 ---- a/tls/gnutls/gtlsconnection-gnutls.c -+++ b/tls/gnutls/gtlsconnection-gnutls.c -@@ -1062,7 +1062,11 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls, - else - return 0; - } -- else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) -+ else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND -+#ifdef GNUTLS_E_CERTIFICATE_REQUIRED -+ || status == GNUTLS_E_CERTIFICATE_REQUIRED /* Added in GnuTLS 3.6.7 */ -+#endif -+ ) - { - g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_CERTIFICATE_REQUIRED, - _("TLS connection peer did not send a certificate")); diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index 52a6a4c3c..818172fd7 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.2 +pkgver=2.60.4 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" @@ -24,6 +24,10 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve " subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp:noarch" +# secfixes: +# 2.60.4-r0: +# - CVE-2019-12450 + build() { meson --default-library=both \ -Dprefix=/usr \ @@ -71,7 +75,7 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="38479c8e48fda5adaa5f7ac8e1f09c184be48adf38ab614eb69f8e11301a1b0235767abf556e09fd4d5df345822db5b3dc85d1c53d05fdba1c1b40f75b61777b glib-2.60.2.tar.xz +sha512sums="614d25652ec9e8387f7865777e128b7f6fd68ff4a1a000868117cbcf5210b5f6aa476eb2b795a6dde56b997906aeb2157c83308f1421a27c4e379522d0ed0afc glib-2.60.4.tar.xz 32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch 657d3fdf7f8ac7edd5bae572d00497f2236fbe5a91a577f3cb7ceb2ccf067f2944918b2b90308fc1061f45daf3d4910067b98642383ce8761da2a1faff6e9b4f broken-gio-tests.patch 0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998 fix-spawn.patch diff --git a/user/gnu-ghostscript/APKBUILD b/user/gnu-ghostscript/APKBUILD index 14ce2c5f6..0c09a5aa9 100644 --- a/user/gnu-ghostscript/APKBUILD +++ b/user/gnu-ghostscript/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnu-ghostscript pkgver=9.14.1 -pkgrel=2 +pkgrel=3 pkgdesc="PostScript utilities" url="https://www.gnu.org/software/ghostscript/" arch="all" @@ -14,6 +14,7 @@ makedepends="cups-dev dbus-dev fontconfig-dev freetype-dev lcms2-dev libice-dev subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-$pkgver.tar.xz do-not-use-sprintf.patch + locksafe.patch " build() { @@ -44,4 +45,5 @@ package() { } sha512sums="658f6ae14b29965c7959b9bd1463760d7fb03b35251446fc37101dbe7ee2866c74a0803e22b2f4488be3221d026578be1d6be7b562ff240036134fbf83edabf9 gnu-ghostscript-9.14.1.tar.xz -1c4d79633ecece9f4de7a672f2888939be7d1e0ba24f3a66500fdfbb37e081e0f323a5efa0d1547fed51206e5a95d3b0659c0ea845d0bc333f281dfb88fcc040 do-not-use-sprintf.patch" +1c4d79633ecece9f4de7a672f2888939be7d1e0ba24f3a66500fdfbb37e081e0f323a5efa0d1547fed51206e5a95d3b0659c0ea845d0bc333f281dfb88fcc040 do-not-use-sprintf.patch +ee06c1753147bcce85e3cdc6c254ef2c75b7f1dfdc0a9bce82bc24bb8d814470ba81be5372fb4bec3a999190f53c4615226fd3dbf05969c436b480eb2ec14f37 locksafe.patch" diff --git a/user/gnu-ghostscript/locksafe.patch b/user/gnu-ghostscript/locksafe.patch new file mode 100644 index 000000000..cc4bad2b5 --- /dev/null +++ b/user/gnu-ghostscript/locksafe.patch @@ -0,0 +1,25 @@ +Bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=840691 +Symptom: 'invalidaccess -7' opening PostScript files in Evince, Okular, etc + +--- gnu-ghostscript-9.14.1/Resource/Init/gs_init.ps.old 2016-11-06 17:40:19.000000000 +0000 ++++ gnu-ghostscript-9.14.1/Resource/Init/gs_init.ps 2019-06-26 02:22:56.825331976 +0000 +@@ -2018,7 +2018,7 @@ + + /.locksafe { + .locksafe_userparams +- systemdict /getenv {pop //false} put ++ systemdict /getenv {pop //false} .forceput + % setpagedevice has the side effect of clearing the page, but + % we will just document that. Using setpagedevice keeps the device + % properties and pagedevice .LockSafetyParams in agreement even +--- gnu-ghostscript-9.14.1/Resource/Init/gs_init.ps.in.old 2016-11-06 16:53:19.000000000 +0000 ++++ gnu-ghostscript-9.14.1/Resource/Init/gs_init.ps.in 2019-06-26 03:07:59.256491684 +0000 +@@ -2018,7 +2018,7 @@ + + /.locksafe { + .locksafe_userparams +- systemdict /getenv {pop //false} put ++ systemdict /getenv {pop //false} .forceput + % setpagedevice has the side effect of clearing the page, but + % we will just document that. Using setpagedevice keeps the device + % properties and pagedevice .LockSafetyParams in agreement even diff --git a/user/gnucobol/APKBUILD b/user/gnucobol/APKBUILD new file mode 100644 index 000000000..c95083a7f --- /dev/null +++ b/user/gnucobol/APKBUILD @@ -0,0 +1,55 @@ +# Contributor: Max Rees <maxcrees@me.com> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=gnucobol +pkgver=3.0_rc1 +_pkgver=3.0-rc1 +pkgrel=0 +pkgdesc="Free COBOL compiler" +url="https://sourceforge.net/projects/open-cobol/" +arch="all" +license="GPL-3.0+ AND LGPL-3.0+ AND GFDL-1.3" +# Since it compiles to C as an intermediate, the headers / libraries must +# always be present and thus there is no -dev subpackage. +depends="db-dev gmp-dev ncurses-dev" +makedepends="help2man texinfo" +subpackages="$pkgname-doc $pkgname-lang" +source="https://downloads.sourceforge.net/project/open-cobol/gnu-cobol/3.0/$pkgname-$_pkgver.tar.xz + https://dev.sick.bike/dist/newcob.val.Z + keep-debug-flags.patch + big-endian.patch + tests-are-fatal.patch" +builddir="$srcdir/$pkgname-$_pkgver" + +prepare() { + default_prepare + autoreconf -vif + # For "make test" + cp "$srcdir/newcob.val.Z" "$builddir/tests/cobol85" +} + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-debug + make +} + +check() { + make check + make test +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="da669f7bef0c6664723dc88c20e28236ea31d5c933d9129b0132e929eb66f723995d3428b056164cf105bc22b38b8bc5fbf9d0d5b76df4ce6c08045837930fa0 gnucobol-3.0-rc1.tar.xz +eb784866d1a335834074fbe103b5c5f5da810d847ae14a64316ecbb2c0f95ef751d2f2ec609b8fa21ef0b775817dc61115a574608ec89750d779ae0afbb95379 newcob.val.Z +f45611c1298680b0c763094af662b3d1925d32379d33faff77862d7eaa3bf6225f68d5160a39a0822f54b570c923a53bc72dec54cff4f04f1162515834a40be2 keep-debug-flags.patch +f7c1249db9d0f8d3a4eda732db93970f73fe649d1725b0b73c92af4885bc816d8727dbbcb8e9a1fb998997f3beed7de2812202749f05bbe1471b907737645648 big-endian.patch +ca5ba1e19e5ff8740008b45ffcea4c1e8e34fc62246f3e635424ae1ec374c5cd9d7cc94d371690c021ccf82e293db7235143ebcaadb20ae5e4fc258749ff56c4 tests-are-fatal.patch" diff --git a/user/gnucobol/big-endian.patch b/user/gnucobol/big-endian.patch new file mode 100644 index 000000000..848300e15 --- /dev/null +++ b/user/gnucobol/big-endian.patch @@ -0,0 +1,314 @@ +From 99cfa96676db1fcb6e4a5db89110c4991782eab6 Mon Sep 17 00:00:00 2001 +From: sf-mensch <sf-mensch@ed166372-6744-4ac0-a67f-bb1ae9efa102> +Date: Mon, 25 Mar 2019 21:34:35 +0000 +Subject: [PATCH] testsuite.src/run_misc.at: fixed test that expected + little-endian values in dump to not check the dump content *FIXME: still + expecting ASCII* + +git-svn-id: https://svn.code.sf.net/p/open-cobol/code/trunk@3054 ed166372-6744-4ac0-a67f-bb1ae9efa102 +--- + tests/testsuite.src/run_misc.at | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/tests/testsuite.src/run_misc.at b/tests/testsuite.src/run_misc.at +index 2ef4a86..173ac48 100644 +--- a/tests/testsuite.src/run_misc.at ++++ b/tests/testsuite.src/run_misc.at +@@ -6185,6 +6185,10 @@ AT_CLEANUP + AT_SETUP([MF FIGURATIVE to NUMERIC]) + AT_KEYWORDS([MOVE]) + ++# FIXME: This test will NOT work on EBCDIC machines, ++# either add it explicit here and split into two or add ++# a pre-test and check the expected "native" result ++ + AT_DATA([prog.cob], [ + IDENTIFICATION DIVISION. + PROGRAM-ID. prog. +@@ -6230,12 +6234,16 @@ AT_DATA([prog.cob], [ + DISPLAY "MOVE HIGH-VALUES TO BIGFLT" + MOVE HIGH-VALUES TO BIGFLT. + PERFORM SHOW-BIG. ++ CALL "dump" USING BIGFLT. + DISPLAY "MOVE QUOTE TO BIGFLT" + MOVE QUOTE TO BIGFLT. + PERFORM SHOW-BIG. ++ CALL "dump" USING BIGFLT. + DISPLAY "MOVE ALL * TO BIGFLT" + MOVE ALL '*' TO BIGFLT. + PERFORM SHOW-BIG. ++ *> Note: the next results are dependant on endianess ++ *> therefore no dump here + DISPLAY "MOVE ALL '21' TO BIGFLT" + MOVE ALL '21' TO BIGFLT. + PERFORM SHOW-BIG. +@@ -6244,7 +6252,6 @@ AT_DATA([prog.cob], [ + CALL "dump" USING MYFLD. + SHOW-BIG. + DISPLAY "BIGFLT is " BIGFLT. +- CALL "dump" USING BIGFLT. + ]) + + AT_DATA([cmod.c], [[ +@@ -6303,10 +6310,8 @@ BIGFLT is 2.1973164E-18 + 22222222 . + MOVE ALL * TO BIGFLT + BIGFLT is 5.4312347E+12 +-DA119E54 . + MOVE ALL '21' TO BIGFLT + BIGFLT is 2.1212121E+37 +-E5547F7D . + ], []) + + AT_CLEANUP +-- +2.15.3 + +From e0d02d05d50804d6fefe3f01d7eee8c943cb07e4 Mon Sep 17 00:00:00 2001 +From: sf-mensch <sf-mensch@ed166372-6744-4ac0-a67f-bb1ae9efa102> +Date: Mon, 25 Mar 2019 21:41:12 +0000 +Subject: [PATCH] testsuite.src/run_misc.at: fixed test that expected + little-endian values in dump to not check the dump content *FIXME: still + expecting ASCII* + +git-svn-id: https://svn.code.sf.net/p/open-cobol/code/trunk@3055 ed166372-6744-4ac0-a67f-bb1ae9efa102 + +diff --git a/tests/testsuite.src/run_misc.at b/tests/testsuite.src/run_misc.at +index 173ac48..51f4b84 100644 +--- a/tests/testsuite.src/run_misc.at ++++ b/tests/testsuite.src/run_misc.at +@@ -6275,7 +6275,7 @@ prog.cob:28: warning: numeric value is expected + prog.cob:6: warning: 'MYFLD' defined here as PIC 9(4) + prog.cob:34: warning: numeric value is expected + prog.cob:6: warning: 'MYFLD' defined here as PIC 9(4) +-prog.cob:50: warning: numeric value is expected ++prog.cob:52: warning: numeric value is expected + prog.cob:7: warning: 'BIGFLT' defined here as USAGE FLOAT + ]) + +-- +2.15.3 + +From 71b65c9fe2c6997e33c56457977d79fd10c3a8f2 Mon Sep 17 00:00:00 2001 +From: sf-mensch <sf-mensch@ed166372-6744-4ac0-a67f-bb1ae9efa102> +Date: Mon, 15 Apr 2019 21:29:54 +0000 +Subject: [PATCH] Partially merged r525 from branches/reportwriter and r3106 + from branches/pangaea: libcob/common.c (cob_sys_getopt_long_long): fix ENDIAN + problem with CBL_GC_GETOPT + +also applied minor reformatting to keep the function formatted consistently + + +git-svn-id: https://svn.code.sf.net/p/open-cobol/code/trunk@3115 ed166372-6744-4ac0-a67f-bb1ae9efa102 + +diff --git a/libcob/common.c b/libcob/common.c +index 5262282..d99c533 100644 +--- a/libcob/common.c ++++ b/libcob/common.c +@@ -5275,9 +5275,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo +
+ COB_CHK_PARMS (CBL_GC_GETOPT, 6);
+
+- /*
+- * Read in sizes of some parameters
+- */
++ /* read in sizes of some parameters */
+ if (COB_MODULE_PTR->cob_procedure_params[1]) {
+ lo_size = COB_MODULE_PTR->cob_procedure_params[1]->size;
+ }
+@@ -5288,9 +5286,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo
+ opt_val_size = COB_MODULE_PTR->cob_procedure_params[5]->size;
+ }
+
+- /*
+- * Buffering longoptions (COBOL), target format (struct option)
+- */
++ /* buffering longoptions (COBOL), target format (struct option) */
+ if (lo_size % sizeof (longoption_def) == 0) {
+ lo_amount = (int)lo_size / sizeof (longoption_def);
+ longoptions_root = (struct option*) cob_malloc (sizeof (struct option) * (lo_amount + 1U));
+@@ -5305,9 +5301,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo + }
+ longind = cob_get_int (COB_MODULE_PTR->cob_procedure_params[2]);
+
+- /*
+- * Add 0-termination to strings.
+- */
++ /* add 0-termination to strings */
+ shortoptions = cob_malloc (so_size + 1U);
+ if (COB_MODULE_PTR->cob_procedure_params[0]) {
+ cob_field_to_string (COB_MODULE_PTR->cob_procedure_params[0], shortoptions, so_size);
+@@ -5333,9 +5327,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo + longoptions = longoptions + 1;
+ }
+
+- /*
+- * Appending final record, so getopt can spot the end of longoptions
+- */
++ /* appending final record, so getopt can spot the end of longoptions */
+ longoptions->name = NULL;
+ longoptions->has_arg = 0;
+ longoptions->flag = NULL;
+@@ -5348,17 +5340,42 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo + return_value = cob_getopt_long_long (cob_argc, cob_argv, shortoptions, longoptions, &longind, long_only);
+ temp = (char *) &return_value;
+
+- /*
+- * Write data back to COBOL
+- */
+- if (temp[0] == '?' || temp[0] == ':' || temp[0] == 'W'
+- || temp[0] == -1 || temp[0] == 0) exit_status = return_value;
+- else exit_status = 3;
++ /* write data back to COBOL */
++#ifdef WORDS_BIGENDIAN
++ if (temp[3] == '?'
++ || temp[3] == ':'
++ || temp[3] == 'W'
++ || temp[3] == 0) {
++ exit_status = temp[3] & 0xFF;
++ } else if (return_value == -1) {
++ exit_status = -1;
++ } else {
++ exit_status = 3;
++ }
++ /* cob_getopt_long_long sometimes returns and 'int' value and sometimes a 'x ' in the int */
++ if (temp[0] == 0
++ && temp[1] == 0
++ && temp[2] == 0) {
++ /* Move option value to 1st byte and SPACE fill the 'int' */
++ temp[0] = temp[3];
++ temp[1] = temp[2] = temp[3] = ' ';
++ }
++#else
++ if (temp[0] == '?'
++ || temp[0] == ':'
++ || temp[0] == 'W'
++ || temp[0] == -1
++ || temp[0] == 0) {
++ exit_status = return_value;
++ } else {
++ exit_status = 3;
++ }
+
+ for (i = 3; i > 0; i--) {
+- if (temp[i] == 0x00) temp[i] = 0x20;
++ if (temp[i] == 0) temp[i] = ' ';
+ else break;
+ }
++#endif
+
+ cob_set_int (COB_MODULE_PTR->cob_procedure_params[2], longind);
+ memcpy (return_char, &return_value, 4);
+-- +2.15.3 + +From 9151800276cff454f11d250cb19d267def883978 Mon Sep 17 00:00:00 2001 +From: sf-mensch <sf-mensch@ed166372-6744-4ac0-a67f-bb1ae9efa102> +Date: Mon, 15 Apr 2019 21:38:53 +0000 +Subject: [PATCH] Partially merged r525 from branches/reportwriter: + libcob/fileio.c (cob_sys_create_file, cob_sys_open_file): fix ENDIAN problem + with CBL_CREATE_FILE, CBL_OPEN_FILE + +also applied minor reformatting to keep the function formatted consistently + + +git-svn-id: https://svn.code.sf.net/p/open-cobol/code/trunk@3116 ed166372-6744-4ac0-a67f-bb1ae9efa102 + +diff --git a/libcob/fileio.c b/libcob/fileio.c +index 885cd48..521e245 100644 +--- a/libcob/fileio.c ++++ b/libcob/fileio.c +@@ -5633,6 +5633,22 @@ cob_sys_open_file (unsigned char *file_name, unsigned char *file_access, +
+ COB_CHK_PARMS (CBL_OPEN_FILE, 5);
+
++#ifdef WORDS_BIGENDIAN
++ /* if value is passed as numeric literal, it becomes an 'int' so value is in 4th byte */
++ if (file_access[0] == 0
++ && file_access[1] == 0
++ && file_access[2] == 0)
++ file_access += 3;
++ if (file_lock[0] == 0
++ && file_lock[1] == 0
++ && file_lock[2] == 0)
++ file_lock += 3;
++ if (file_dev[0] == 0
++ && file_dev[1] == 0
++ && file_dev[2] == 0)
++ file_dev += 3;
++#endif
++
+ return open_cbl_file (file_name, file_access, file_handle, 0);
+ }
+
+@@ -5647,6 +5663,24 @@ cob_sys_create_file (unsigned char *file_name, unsigned char *file_access, + * @param: file_dev : not implemented, set 0
+ */
+
++ COB_CHK_PARMS (CBL_CREATE_FILE, 5);
++
++#ifdef WORDS_BIGENDIAN
++ /* if value is passed as numeric literal, it becomes an 'int' so value is in 4th byte */
++ if (file_access[0] == 0
++ && file_access[1] == 0
++ && file_access[2] == 0)
++ file_access += 3;
++ if (file_lock[0] == 0
++ && file_lock[1] == 0
++ && file_lock[2] == 0)
++ file_lock += 3;
++ if (file_dev[0] == 0
++ && file_dev[1] == 0
++ && file_dev[2] == 0)
++ file_dev += 3;
++#endif
++
+ if (*file_lock != 0) {
+ cob_runtime_warning (_("call to CBL_CREATE_FILE with wrong file_lock: %d"), *file_lock);
+ }
+@@ -5654,8 +5688,6 @@ cob_sys_create_file (unsigned char *file_name, unsigned char *file_access,
+ cob_runtime_warning (_("call to CBL_CREATE_FILE with wrong file_dev: %d"), *file_dev);
+ }
+
+- COB_CHK_PARMS (CBL_CREATE_FILE, 5);
+-
+ return open_cbl_file (file_name, file_access, file_handle, O_CREAT | O_TRUNC);
+ }
+
+-- +2.15.3 + +From f6ff480b71da490476abc84699558bddef6b9a56 Mon Sep 17 00:00:00 2001 +From: sf-mensch <sf-mensch@ed166372-6744-4ac0-a67f-bb1ae9efa102> +Date: Tue, 18 Jun 2019 20:09:46 +0000 +Subject: [PATCH] tests: * atlocal.in explicit disable BDB internal locking by + unsetting DB_HOME to work around issues in different environments and to not + pollute the users's general BDB locking files * skip UDF recursion test + previously marked as expected fail as the current implementation may or may + not work depending on the underlying C compiler/library in use (including the + exact version...) + +git-svn-id: https://svn.code.sf.net/p/open-cobol/code/trunk@3194 ed166372-6744-4ac0-a67f-bb1ae9efa102 + +diff --git a/tests/testsuite.src/run_functions.at b/tests/testsuite.src/run_functions.at +index 7c3c660..5ddbd58 100644 +--- a/tests/testsuite.src/run_functions.at ++++ b/tests/testsuite.src/run_functions.at +@@ -1,4 +1,4 @@ +-## Copyright (C) 2003-2012, 2014-2018 Free Software Foundation, Inc. ++## Copyright (C) 2003-2012, 2014-2019 Free Software Foundation, Inc. + ## Written by Keisuke Nishida, Roger While, Simon Sobisch, Edward Hart + ## + ## This file is part of GnuCOBOL. +@@ -4254,7 +4254,7 @@ AT_CLEANUP + AT_SETUP([UDF with recursion]) + AT_KEYWORDS([functions LOCAL-STORAGE]) + +-AT_XFAIL_IF(true) # see bug #222 and r2291 - postponed ++AT_SKIP_IF(true) # see bug #222 and r2291 - postponed + + AT_DATA([prog.cob], [ + IDENTIFICATION DIVISION. +-- +2.15.3 + diff --git a/user/gnucobol/keep-debug-flags.patch b/user/gnucobol/keep-debug-flags.patch new file mode 100644 index 000000000..40c188802 --- /dev/null +++ b/user/gnucobol/keep-debug-flags.patch @@ -0,0 +1,43 @@ +--- gnucobol-3.0-rc1/configure.ac 2018-04-22 22:00:19.000000000 +0000 ++++ gnucobol-3.0-rc1/configure.ac 2019-06-28 12:09:56.160772995 +0000 +@@ -1216,40 +1216,6 @@ + fi + + +-# Include CFLAGS / CPPFLAGS in COB_CFLAGS without optimization/debug options. +- +-if test "x$CFLAGS" != "x"; then +- cob_temp_flags="$CFLAGS" +-else +- cob_temp_flags="" +-fi +-if test "x$CPPFLAGS" != "x"; then +- if test "x$cob_temp_flags" != "x"; then +- cob_temp_flags="$CPPFLAGS $cob_temp_flags" +- else +- cob_temp_flags="$CPPFLAGS" +- fi +-fi +-if test "x$cob_temp_flags" != "x"; then +- cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-g3//' -e 's/-g//' -e 's/ $//' -e 's/^ //'` +- cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/@<:@+-@:>@O@<:@0-9s@:>@//' -e 's/ $//' -e 's/^ //'` +- cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-O//' -e 's/ $//' -e 's/^ //'` +- cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-fmessage-length=0//'` +- cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-D_FORTIFY_SOURCE=.//'` +- cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-fstack-protector-strong//'` +- cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-fstack-protector-all//'` +- cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-fstack-protector//'` +- cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-funwind-tables//'` +- cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/-fasynchronous-unwind-tables//'` +- cob_temp_flags=`echo "$cob_temp_flags" | sed -e 's/ */ /g' -e 's/ $//' -e 's/^ //'` +-fi +- +-if test "x$cob_temp_flags" != "x"; then +- COB_CFLAGS="$COB_CFLAGS $cob_temp_flags" +-fi +-unset cob_temp_flags +- +- + # Special stuff + + AH_VERBATIM([_XOPEN_SOURCE_EXTENDED], diff --git a/user/gnucobol/tests-are-fatal.patch b/user/gnucobol/tests-are-fatal.patch new file mode 100644 index 000000000..933c1128d --- /dev/null +++ b/user/gnucobol/tests-are-fatal.patch @@ -0,0 +1,22 @@ +Backport of r3183 + +--- gnucobol-3.0-rc1/tests/Makefile.am 2018-04-22 19:55:51.000000000 +0000 ++++ gnucobol-3.0-rc1/tests/Makefile.am 2019-06-28 16:49:23.740928336 +0000 +@@ -74,7 +74,7 @@ + check-local: $(TESTSUITE) + @echo testing for working diff && diff - "$(TESTSUITE)" < "$(TESTSUITE)" \ + || (echo "Error: no working 'diff' in PATH" && false) +- @$(TESTSUITE) $(TESTSUITEFLAGS) || rm -f testsuite.dir/at-job-fifo ++ @$(TESTSUITE) $(TESTSUITEFLAGS) || (rm -f testsuite.dir/at-job-fifo; exit 1) + @rm -f testsuite.dir/at-job-fifo + + clean-local: +@@ -84,7 +84,7 @@ + @cp $(srcdir)/run_prog_manual.sh.in $@ + + checkmanual: $(TESTSUITE_MANUAL) ./run_prog_manual.sh +- @$(TESTSUITE_MANUAL) $(TESTSUITEFLAGS) || rm -f testsuite_manual.dir/at-job-fifo ++ @$(TESTSUITE_MANUAL) $(TESTSUITEFLAGS) || (rm -f testsuite_manual.dir/at-job-fifo; exit 1) + @rm -f testsuite_manual.dir/at-job-fifo + + # targets that are only logical targets instead of files diff --git a/user/gnumeric/APKBUILD b/user/gnumeric/APKBUILD index 07c02e4ef..283227674 100644 --- a/user/gnumeric/APKBUILD +++ b/user/gnumeric/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnumeric -pkgver=1.12.44 +pkgver=1.12.45 pkgrel=1 pkgdesc="GNOME spreadsheet software" url="http://www.gnumeric.org/" @@ -14,14 +14,12 @@ depends="" makedepends="byacc gobject-introspection-dev goffice-dev gtk+3.0-dev intltool itstool libgda-dev libxml2-utils perl-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="https://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.12/gnumeric-$pkgver.tar.xz cs.patch " build() { - cd "$builddir" - YACC=yacc ./configure \ + LIBS="-lintl" YACC=yacc ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -33,14 +31,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ea21dcdf5fdf4e02bb9d83671675f2409f12ee928611604d7589e0047ce5d75bf6ac51e6a5322c4af520428acdccf4c2b3b8e3fc6530030e162268aea94a503f gnumeric-1.12.44.tar.xz +sha512sums="08933ce52abc15e3e690ceea4e617618db65936a482312af8d9e37f3eaec9946950f97f3967357668c7f66ca3cc568d4492e94aa17fe8432ca42adb8bbcd2508 gnumeric-1.12.45.tar.xz 24d74cec5a19f3f79a049b02b43369324fbb1432be4945988034a38d813cceeab54da67d3d9eb2eff49d248e449212d0877b20b593a8c1f70cecbdbd635cb517 cs.patch" diff --git a/user/gnupg/APKBUILD b/user/gnupg/APKBUILD index ac4c64ad7..1d6d41f94 100644 --- a/user/gnupg/APKBUILD +++ b/user/gnupg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnupg -pkgver=2.2.15 +pkgver=2.2.16 pkgrel=0 pkgdesc="GNU Privacy Guard 2 - PGP replacement" url="https://www.gnupg.org/" @@ -19,7 +19,6 @@ source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 install="$pkgname.pre-install $pkgname.pre-upgrade" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -37,19 +36,17 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install mkdir -p "$pkgdir"/lib/udev/rules.d install -Dm644 "$srcdir"/60-scdaemon.rules "$pkgdir"/lib/udev/rules.d } -sha512sums="7c6f0092d384fd71fc7a1c905ce23ae98df42ce131ee09fc190c275f9c8d0912be344b0782244cccb5b3938322ef3cfff8ed1ec7e949e761478b8c5110dde36a gnupg-2.2.15.tar.bz2 +sha512sums="0e0040905cc4d1d9d29e184cfeda520b43990e4ec459212537c0ce6092de987157e05b1d1a3022398d9b3cbaeea0f58a7e686745f96933e5ac26be4229162247 gnupg-2.2.16.tar.bz2 c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch 4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa870a9bb29687330854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402 60-scdaemon.rules" diff --git a/user/gnutls/APKBUILD b/user/gnutls/APKBUILD index 72e454003..78d9b6fdd 100644 --- a/user/gnutls/APKBUILD +++ b/user/gnutls/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: pkgname=gnutls -pkgver=3.6.7.1 +pkgver=3.6.8 pkgrel=0 pkgdesc="A TLS protocol implementation" url="http://www.gnutls.org/" @@ -10,10 +10,10 @@ arch="all" options="!check" # https://gitlab.com/gnutls/gnutls/issues/560 license="LGPL-2.1+" makedepends="libtasn1-dev libunistring-dev nettle-dev p11-kit-dev texinfo - zlib-dev" + unbound-dev cmd:which zlib-dev" checkdepends="diffutils" -subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-lang $pkgname-utils - $pkgname-c++:xx" +subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-lang + $pkgname-c++:xx $pkgname-dane $pkgname-utils" _v=${pkgver%.*} _v2=$pkgver case $pkgver in @@ -31,7 +31,6 @@ builddir="$srcdir/$pkgname-$_v2" # - CVE-2017-7507 build() { - cd "$builddir" LIBS="-lgmp" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -49,22 +48,25 @@ build() { --enable-manpages \ --enable-tests \ --disable-full-test-suite \ - --disable-sslv2-support \ - --with-zlib \ --with-p11-kit make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } +dane() { + pkgdesc="$pkgdesc (DNS DANE support library)" + mkdir -p "$subpkgdir"/usr/{bin,lib} + mv "$pkgdir"/usr/bin/danetool "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/lib/libgnutls-dane* "$subpkgdir"/usr/lib/ +} + utils() { pkgdesc="Command line tools for TLS protocol" mkdir -p "$subpkgdir"/usr/ @@ -77,5 +79,5 @@ xx() { mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/ } -sha512sums="c3c4178c8663e3d1207aaf771ceb43e7e75a9f11b4ea3a26fde9d04a23762b05bac8fe290b74d63b815a354b79fc3557cfc218c196e1f80eb1fbce762948a926 gnutls-3.6.7.1.tar.xz +sha512sums="71f0899de0ffb2a39b25928042114e2bbfde7fbf2029d9f91f60bf60794916d13f544fc97337e4e3282e7faa17e79a8012b0e08f98805bee543c0ba4e5d5a905 gnutls-3.6.8.tar.xz abc24ee59cc67805fe953535b0bae33080fc8b0bf788304377f6d10ec8c162c4cf203a69c98a4ba3483b4c60ed7a204433cc7db9b8190eddb0d68f6fb6dad52d gnulib-tests-dont-require-gpg-passphrase.patch" diff --git a/user/gobject-introspection/APKBUILD b/user/gobject-introspection/APKBUILD index 841a87d05..81dca7aed 100644 --- a/user/gobject-introspection/APKBUILD +++ b/user/gobject-introspection/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gobject-introspection -pkgver=1.60.1 +pkgver=1.60.2 pkgrel=0 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" @@ -46,4 +46,4 @@ dev() { replaces="gobject-introspection" } -sha512sums="01adbeffee08ff6487f11a303fd7a59a99c36714dce21be9bbae7fd2bf8f080665e830bc3a47566140a6081dc74f6c2f8d8232286759b761f70493545a9d90ea gobject-introspection-1.60.1.tar.xz" +sha512sums="8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e gobject-introspection-1.60.2.tar.xz" diff --git a/user/gpgme/APKBUILD b/user/gpgme/APKBUILD index 1f6f983d1..85d8bf6f2 100644 --- a/user/gpgme/APKBUILD +++ b/user/gpgme/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gpgme -pkgver=1.13.0 +pkgver=1.13.1 pkgrel=0 pkgdesc="GnuPG Made Easy" url="https://www.gnupg.org/related_software/gpgme/" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc gpgmepp qgpgme py3-gpg:_py" source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,18 +29,16 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } qgpgme() { pkgdesc="$pkgdesc (Qt 5 library)" - mkdir -p "$subpkgdir"/usr/lib/ + mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libqgpgme.so* "$subpkgdir"/usr/lib/ } @@ -55,8 +52,8 @@ _py() { pkgdesc="$pkgdesc (Python bindings)" depends="$pkgname=$pkgver-r$pkgrel python3" - mkdir -p "$subpkgdir/usr/lib/" - mv "$pkgdir/usr/lib/python"* "$subpkgdir/usr/lib/" + mkdir -p "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } -sha512sums="47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b gpgme-1.13.0.tar.bz2" +sha512sums="11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8 gpgme-1.13.1.tar.bz2" diff --git a/user/gprbuild/APKBUILD b/user/gprbuild/APKBUILD new file mode 100644 index 000000000..46cd8f81d --- /dev/null +++ b/user/gprbuild/APKBUILD @@ -0,0 +1,50 @@ +# Maintainer: Samuel Holland <samuel@sholland.org> +pkgname=gprbuild +pkgver=2019 +_pkgver=2019-20190517-194D8 +_xmlver=2019-20190429-19B9D +pkgrel=0 +pkgdesc="An advanced build system for multi-language systems" +url="https://github.com/AdaCore/gprbuild" +arch="all" +options="!check" # No test suite. +license="GPL-3.0+" +makedepends="gcc-gnat" +source="$pkgname-$_pkgver-src.tar.gz::http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093 + xmlada-$_xmlver-src.tar.gz::http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5 + foxkit.xml" +builddir="$srcdir/$pkgname-$_pkgver-src" + +build() { + xmlada="../xmlada-$_xmlver-src" + incflags="-Isrc -Igpr/src -I$xmlada/dom -I$xmlada/input_sources \ + -I$xmlada/sax -I$xmlada/schema -I$xmlada/unicode" + gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o + for bin in gprbuild gprconfig gprclean gprinstall gprls gprname; do + gnatmake -j$JOBS $incflags $ADAFLAGS $bin-main \ + -o $bin -cargs $CFLAGS -largs $LDFLAGS gpr_imports.o + done + for lib in gprlib gprbind; do + gnatmake -j$JOBS $incflags $ADAFLAGS $lib \ + -cargs $CFLAGS -largs $LDFLAGS gpr_imports.o + done +} + +package() { + mkdir -p "$pkgdir"/usr/bin + cp gprbuild gprconfig gprclean gprinstall gprls gprname \ + "$pkgdir"/usr/bin + mkdir -p "$pkgdir"/usr/libexec/gprbuild + cp gprlib gprbind \ + "$pkgdir"/usr/libexec/gprbuild + mkdir -p "$pkgdir"/usr/share/gpr + cp share/_default.gpr \ + "$pkgdir"/usr/share/gpr + mkdir -p "$pkgdir"/usr/share/gprconfig + cp share/gprconfig/* "$srcdir"/foxkit.xml \ + "$pkgdir"/usr/share/gprconfig +} + +sha512sums="0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b gprbuild-2019-20190517-194D8-src.tar.gz +f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 xmlada-2019-20190429-19B9D-src.tar.gz +e369c094963d3dcfb03d7ac0949825531bae6410ef9c4bec774cb0da70d2bd4a784bdec37db5151c0371ce769712ee02fc04f36896ccc8bddcdb585c1ee8dbbc foxkit.xml" diff --git a/user/gprbuild/foxkit.xml b/user/gprbuild/foxkit.xml new file mode 100644 index 000000000..d33cb33c2 --- /dev/null +++ b/user/gprbuild/foxkit.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" ?> +<gprconfig> + <configuration> + <targets> + <target name=".*foxkit-linux.*" /> + </targets> + <hosts> + <host name=".*foxkit-linux.*" /> + </hosts> + <config> + for Archive_Builder use ("ar", "cr"); + for Archive_Builder_Append_Option use ("q"); + for Archive_Indexer use ("ranlib"); + for Archive_Suffix use ".a"; + </config> + </configuration> +</gprconfig> diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD index 704954a28..fbccb9007 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.04.1 +pkgver=19.04.2 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="c43db1806e3efe3d45364688c465c0c7def2c2ab168e28c66dce3e56a88745b9e05a8db621191d3bcd2ffd382721669ddb570e55bc16dc68248e1c6e525e52bb granatier-19.04.1.tar.xz" +sha512sums="4f8ea77919e3e6027d5c06ddc4389f5db3f7248f5eb030192f30e120298a8c3a8c6bacbcd2996e8a7aaad826cb42291af0a89b622ff08e5853d93cd0401ad6ed granatier-19.04.2.tar.xz" diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD index 532b0aa48..00052daad 100644 --- a/user/grub/APKBUILD +++ b/user/grub/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=grub pkgver=2.02 -pkgrel=5 +pkgrel=6 pkgdesc="Bootloader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" arch="all !s390x" @@ -32,6 +32,7 @@ source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz grub2-accept-empty-module.patch grub-xen-host_grub.cfg the-arch-everyone-uses-and-nobody-loves.patch + x86_64_asm.patch default-grub " @@ -44,6 +45,9 @@ _build_flavor() { local flavor="$1" shift local _configure="$@" + case $CTARGET_ARCH in + ppc64) export CFLAGS="-O2 -ggdb -mcpu=970";; # Workaround for http://savannah.gnu.org/bugs/?52629 + esac msg "Building grub for platform $flavor" mkdir -p "$srcdir"/build-$flavor @@ -128,7 +132,7 @@ bios() { efi() { pkgdesc="$pkgdesc (EFI version)" - depends="$pkgname" + depends="$pkgname efibootmgr efivar" mkdir -p $subpkgdir/usr/lib/grub mv $pkgdir/usr/lib/grub/*-efi $subpkgdir/usr/lib/grub/ } @@ -158,4 +162,5 @@ f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857 098a1742aef131c85d63b934a9815879b991f2e73030cb90ac4b5dcd07d249fa0dd0a281e52ada0e10f05d59223493bd416eb47543242bf0ba336a0ebc9b2a1a grub2-accept-empty-module.patch 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg 088455205f2f397d60e43eab19ed73994880ea1f442661f7975846cceaf2b112d92fd1341119d7dbfad3af2174dfd4d4721f31dead1ac35f4a3cb7c0d92f8a04 the-arch-everyone-uses-and-nobody-loves.patch +271fdcfbdec567802b351e0a6c38a227ff4ad4eb17533cfa433398fa0929645671a2bfebcc7911d71c1fc3ced94985de148c153834bd2d62018f033eedfbdaf7 x86_64_asm.patch 048d061ac0aab0106f59a3d257739ff5de6c7dc08a4dc9b8b12e9bd2b1ec11f9bc6214013f3d1083b11c3ce41185fcbb5615beb2f290380abf392bb4c3f0d509 default-grub" diff --git a/user/grub/x86_64_asm.patch b/user/grub/x86_64_asm.patch new file mode 100644 index 000000000..9ce48165d --- /dev/null +++ b/user/grub/x86_64_asm.patch @@ -0,0 +1,73 @@ +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 +@@ -841,6 +841,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/gtk+2.0/APKBUILD b/user/gtk+2.0/APKBUILD index 962b80c4e..9fee775c2 100644 --- a/user/gtk+2.0/APKBUILD +++ b/user/gtk+2.0/APKBUILD @@ -1,58 +1,32 @@ -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gtk+2.0 pkgver=2.24.32 -pkgrel=1 -subpkg=gtk-update-icon-cache +pkgrel=2 pkgdesc="The GTK+ Toolkit (v2)" url="https://www.gtk.org/" arch="all" options="!check" # Requires xvfb, resulting in eventual circular dependency license="LGPL-2.0+" depends="shared-mime-info gtk-update-icon-cache" - -replaces="gtk+" -replaces_dev="gtk+-dev" -replaces_doc="gtk+-doc" - depends_dev="libxdamage-dev" # we add hicolor-icon-theme because the subpackage gtk-update-icon-cache # needs it. We need to force hicolor-icon-cache to be built before gtk+.2.0 -makedepends=" - autoconf automake libtool - $depends_dev - atk-dev - cairo-dev - cups-dev - expat-dev - gdk-pixbuf-dev - glib-dev - gnutls-dev - gobject-introspection-dev - gtk-doc - hicolor-icon-theme - libice-dev - libx11-dev - libxcomposite-dev - libxcursor-dev - libxext-dev - libxfixes-dev - libxrandr-dev - libxi-dev - pango-dev - zlib-dev" +makedepends="autoconf automake libtool $depends_dev + atk-dev cairo-dev cups-dev expat-dev gdk-pixbuf-dev glib-dev gnutls-dev + gobject-introspection-dev gtk-doc hicolor-icon-theme libice-dev + libx11-dev libxcomposite-dev libxcursor-dev libxext-dev libxfixes-dev + libxrandr-dev libxi-dev pango-dev zlib-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang + gtk-update-icon-cache:icon_cache" +install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" +triggers="gtk-update-icon-cache.trigger=/usr/share/icons/*" source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz xid-collision-debug.patch gtk2-fixdso.patch " - -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" -triggers="$subpkg.trigger=/usr/share/icons/*" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $subpkg:icon_cache" -langdir="/usr/lib/locale" builddir="$srcdir"/gtk+-$pkgver prepare() { - cd "$builddir" default_prepare libtoolize --force \ && aclocal -I m4 \ @@ -61,8 +35,7 @@ prepare() { } build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -80,7 +53,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -98,7 +70,7 @@ icon_cache() { depends="hicolor-icon-theme" mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/"$subpkg" "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/gtk-update-icon-cache "$subpkgdir"/usr/bin } sha512sums="8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696 gtk+-2.24.32.tar.xz diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index 57cbe384b..a3a5ff659 100644 --- a/user/gtk+3.0/APKBUILD +++ b/user/gtk+3.0/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gtk+3.0 -pkgver=3.24.8 +pkgver=3.24.9 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -53,4 +53,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="a988ca2e25f0f32e55b2931f16c72f9649ed98405579d217e8a5e7f0ac10bcd1969090c622c5d9eb7d75235813ff7ccb90e30e252afd71ba283c6172ee459fe5 gtk+-3.24.8.tar.xz" +sha512sums="b303db40d5e277841738982a97edd67076febe41b3a455344aeff05c6a5b149c6d3b953cc5db1a792b63cdcc44c2d28f955d81065cb2c6b3f00d0b133a555d7a gtk+-3.24.9.tar.xz" diff --git a/user/gtk-doc/0001-tests-Label-parts-with-decimals-not-roman-numerals.patch b/user/gtk-doc/0001-tests-Label-parts-with-decimals-not-roman-numerals.patch deleted file mode 100644 index f53d261db..000000000 --- a/user/gtk-doc/0001-tests-Label-parts-with-decimals-not-roman-numerals.patch +++ /dev/null @@ -1,76 +0,0 @@ -From a8475278880270a3bf682d9552e26651081330ce Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Fri, 11 Aug 2017 21:19:28 +0200 -Subject: [PATCH] tests: Label parts with decimals, not roman numerals - -dblatex (via gtkdoc-mkpdf) warns that labels must be integers: - - Warning: only an integer in @label can be processed: 'I' - Warning: only an integer in @label can be processed: 'II' - Warning: only an integer in @label can be processed: 'III' - -Make the labels decimal to placate dblatex. I'm not sure this is -actually the best solution, though. - -https://bugzilla.gnome.org/show_bug.cgi?id=786174 ---- - tests/annotations/docs/tester-docs.xml | 4 ++-- - tests/gobject/docs/tester-docs.xml | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/tests/annotations/docs/tester-docs.xml b/tests/annotations/docs/tester-docs.xml -index e2abf74..7d80f9d 100644 ---- a/tests/annotations/docs/tester-docs.xml -+++ b/tests/annotations/docs/tester-docs.xml -@@ -16,7 +16,7 @@ - </releaseinfo> - </bookinfo> - -- <reference label="II"> -+ <reference label="2"> - <title>API Reference</title> - <chapter id="main-api"> - <title>Tests</title> -@@ -24,7 +24,7 @@ - </chapter> - </reference> - -- <part label="III"> -+ <part label="3"> - <title>Appendix</title> - - <index id="api-index"> -diff --git a/tests/gobject/docs/tester-docs.xml b/tests/gobject/docs/tester-docs.xml -index a534c55..05117ef 100644 ---- a/tests/gobject/docs/tester-docs.xml -+++ b/tests/gobject/docs/tester-docs.xml -@@ -37,7 +37,7 @@ - </para> - </preface> - -- <part label="I" id="part.i"> -+ <part label="1" id="part.i"> - <title>Overview</title> - <chapter id="Overview-building"> - <title>How to build the library</title> -@@ -45,7 +45,7 @@ - </chapter> - </part> - -- <reference label="II" id="part.ii"> -+ <reference label="2" id="part.ii"> - <title>API Reference</title> - <chapter id="main-api"> - <title>Tests</title> -@@ -58,7 +58,7 @@ - </chapter> - </reference> - -- <part label="III" id="part.iii"> -+ <part label="3" id="part.iii"> - <title>Appendix</title> - - <chapter id="object-tree"> --- -2.13.0 - diff --git a/user/gtk-doc/APKBUILD b/user/gtk-doc/APKBUILD index 193cd2f50..4dda99f7e 100644 --- a/user/gtk-doc/APKBUILD +++ b/user/gtk-doc/APKBUILD @@ -1,28 +1,25 @@ # Maintainer: pkgname=gtk-doc -pkgver=1.29 -pkgrel=2 +pkgver=1.30 +pkgrel=0 pkgdesc="Documentation tool for public library API" url="https://www.gtk.org/gtk-doc/" arch="noarch" +# it does not seem to be possible to disable tests of pdf which requires dblatex or fop +# disable checks for now +options="!check" license="GFDL" depends="docbook-xsl perl python3 py3-six pkgconf glib-dev highlight" makedepends="rarian-dev py-libxml2 itstool autoconf automake libtool" checkdepends="bc" -source="https://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz - 0001-tests-Label-parts-with-decimals-not-roman-numerals.patch - " -# it does not seem to be possible to disable tests of pdf which requires dblatex or fop -# disable checks for now -options="!check" +source="https://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz" prepare() { - cd "$builddir" autoreconf -vif + default_prepare } build() { - cd "$builddir" export PYTHON="/usr/bin/python3" ./configure \ --build=$CBUILD \ @@ -33,14 +30,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="97e17be2563c2c12a04394633feaf6591918968a794c38e945a65be9c2de2bed5ce586592a7fe396a1874b8e43e63d6380c6d1a3193ccb7f9bb3d3a331526421 gtk-doc-1.29.tar.xz -a86438a9cbbf1bb60d2aea93f10a473f3fe7814cdbf0a454ff42bea88e79f21f9e748e063335aa6332878fa8f8a1c00ef288a44631b510471cc6bb806851b391 0001-tests-Label-parts-with-decimals-not-roman-numerals.patch" +sha512sums="8fde6aa89cdf0ce59999a17d7f1ecb51e63f93aa7514aeffac6504a357408151f8fb86431050285596e9da2a9612840969a42d7423e8df316e9dadddd5fc1612 gtk-doc-1.30.tar.xz" diff --git a/user/gtksourceview-3.0/APKBUILD b/user/gtksourceview-3.0/APKBUILD index 12ec22e9c..23f34a3c2 100644 --- a/user/gtksourceview-3.0/APKBUILD +++ b/user/gtksourceview-3.0/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gtksourceview-3.0 -pkgver=3.24.10 +pkgver=3.24.11 pkgrel=0 pkgdesc="Source viewer widget for GTK+ 3.0" url="https://gnome.org" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="990935ed7c3b10a1659cf22bd36eb71e76088768f7b70234b50465f542592720bb6b206746e0606c96ab99ba0208535fc6073b4f6c0f3427acd0ab5a43420d46 gtksourceview-3.24.10.tar.xz" +sha512sums="3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2 gtksourceview-3.24.11.tar.xz" diff --git a/user/gtkspell/APKBUILD b/user/gtkspell/APKBUILD index cd7b8f100..e76b7f813 100644 --- a/user/gtkspell/APKBUILD +++ b/user/gtkspell/APKBUILD @@ -1,14 +1,13 @@ # Maintainer: pkgname=gtkspell pkgver=2.0.16 -pkgrel=10 +pkgrel=11 pkgdesc="Highlighting and replacement of misspelled words in Gtk software" url="http://gtkspell.sourceforge.net/" arch="all" license="GPL-2.0-only" makedepends="gtk+2.0-dev enchant-dev intltool" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz enchant-2.patch " @@ -19,7 +18,7 @@ prepare() { } build() { - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr diff --git a/user/guile/APKBUILD b/user/guile/APKBUILD index 6013fd375..024ac6c22 100644 --- a/user/guile/APKBUILD +++ b/user/guile/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=guile -pkgver=2.2.4 +pkgver=2.2.5 pkgrel=0 pkgdesc="Portable, embeddable Scheme implementation written in C" url="https://www.gnu.org/software/guile/" @@ -17,7 +17,6 @@ source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,10 +27,9 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm "$pkgdir"/usr/lib/charset.alias } -sha512sums="a200b83a02ef23c8256d9bfb14a141bb6dbca01279a0587bfb672060429c49093088e4b765b7ee5c85cd587a1aeed77d9438d300d3e67cdd6cebbb794d88171e guile-2.2.4.tar.gz +sha512sums="1c07a6d16e00953d416bd8db5b1e9574c62751f745c203de5a910b9688cf93756fe2303ab084d9e9949bff11e6e14909304ecd1ef671be2a06c7c3f292f6380c guile-2.2.5.tar.gz b1c309cc07830ff1741ef88857f8099187b449580e8d57862886abc367ef1accc5a35636d81eee09247f13d3a751cdc8909fdea05368d3d509bd2039ce06d078 0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch" diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index 03d94659e..e195793cc 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gvim _pkgreal=vim -pkgver=8.1.1206 +pkgver=8.1.1635 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -74,4 +74,4 @@ package() { ln -s gvim rgvim } -sha512sums="2977716257033e0842f2ddbabf6636e51c5eba3c75bd4b33e6f497de85e1d59701aae8907ddace78debb306a17a9c2dbd18478aa0a0a3020a50f5d8119a0baec vim-8.1.1206.tar.gz" +sha512sums="41b79ff52438ecbf56366696d3a12d34531a835b64d2ea809597797531950f2f8eb73d753375d23e1411631afaa3f9413fad8af7b0a1fed1532a1714ec1dbb4b vim-8.1.1635.tar.gz" diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD index 292abf3ca..479d9ed1a 100644 --- a/user/gwenview/APKBUILD +++ b/user/gwenview/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gwenview -pkgver=19.04.1 -pkgrel=0 +pkgver=19.04.2 +pkgrel=1 pkgdesc="Fast and easy image viewer by KDE" url="https://www.kde.org/applications/graphics/gwenview/" arch="all" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="593db6ca0bc765d45ed6691c71d12bf06a9ff5dcf2fe23d7e839dde1ebd11ae60f466bb8af1e0b577df7fc7ba3cd9bf6ec0d51642eb75e6d4d50b3b8c42c5863 gwenview-19.04.1.tar.xz" +sha512sums="38592c6f456fa9d6627a4044b06da0688126fc2f0cffdd0c9cfcc9c31886981d73d4cc7c4c764385c05c0d1e39155ea2c7ff6c2c1c3e81361a3537d31b80907f gwenview-19.04.2.tar.xz" diff --git a/user/gxmessage/APKBUILD b/user/gxmessage/APKBUILD index 70d3a9573..249864821 100644 --- a/user/gxmessage/APKBUILD +++ b/user/gxmessage/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gxmessage pkgver=3.4.3 -pkgrel=0 +pkgrel=1 pkgdesc="Display simple messages using GTK+" url=" " arch="all" @@ -10,12 +10,10 @@ license="GPL-3.0+" depends="" makedepends="gtk+3.0-dev intltool" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="https://downloads.sourceforge.net/gxmessage/gxmessage-$pkgver.tar.gz" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/highlight/APKBUILD b/user/highlight/APKBUILD index cdce50580..d0289e95a 100644 --- a/user/highlight/APKBUILD +++ b/user/highlight/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=highlight -pkgver=3.50 +pkgver=3.52 pkgrel=0 pkgdesc="Fast and flexible source code highlighter" url="http://www.andre-simon.de/doku/highlight/highlight.html" @@ -13,13 +13,11 @@ subpackages="$pkgname-doc" source="http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" make cli } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="1911a29fea6a157ff237276673acf0ae2b5a931ad7beeacf26a67970fc5ec66abf6dc64ff1694bf0cf68414c29f597625700943da772823a025f7a139d606c3d highlight-3.50.tar.bz2" +sha512sums="4a44f6c4d29836c6f1af9db02c4e989c7ce155bcb387ca294170c361ae6c41b7441b03810ee27e7b7cdbd3ec73907fb5746ab545b7a44dfc482cc242a86681fe highlight-3.52.tar.bz2" diff --git a/user/i3wm/APKBUILD b/user/i3wm/APKBUILD index 59c94e802..7b8bd9469 100644 --- a/user/i3wm/APKBUILD +++ b/user/i3wm/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=i3wm -pkgver=4.15 +pkgver=4.16.1 pkgrel=0 pkgdesc="Improved dynamic tiling window manager" url="https://i3wm.org" @@ -43,7 +43,7 @@ package() { install -m644 man/*.1 "$pkgdir"/usr/share/man/man1/ } -sha512sums="60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4 i3-4.15.tar.bz2 -8ce7d00371c43b93dabbe0dadf9caf7c58a68f4a0079f5a9b9552c15c55bfa0df16d7e87a281595af2ac5254632ba28ccf82a467cea16159b41490f6f2910299 i3wm-musl-glob-tilde.patch +sha512sums="3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0 i3-4.16.1.tar.bz2 +6378e3619076c03345b4faa1f9d54cab2e7173068bc4d5f2f2894af9cc0e5792fe45ce95cb06328f5040f0ba6d43f3e49c523968732ac2d2046b698042338caa i3wm-musl-glob-tilde.patch 77224b994397b2e2487ae28dfd5781b3630654191813eb3c685f05ebf446e65c36e53a665ff3cc8323ea67e87f7cf977044025dade0a6ed22cbd84f0e6b4cbc7 i3wm-test-fix-off_t.patch a80384965dff62c51ce77e2baa3cf1b0b6db1df68994ce98383f96554bd296b4b59527fb5b1cb24b08c123699e294ba9b3baaa52afe88d87e7a76f0629194b1f i3wm-test-disable-branch-check.patch" diff --git a/user/i3wm/i3wm-musl-glob-tilde.patch b/user/i3wm/i3wm-musl-glob-tilde.patch index 82ad6195b..d4c2d832e 100644 --- a/user/i3wm/i3wm-musl-glob-tilde.patch +++ b/user/i3wm/i3wm-musl-glob-tilde.patch @@ -4,7 +4,7 @@ diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c @@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) { * */ - char *expand_path(char *path) { + static char *expand_path(char *path) { - static glob_t globbuf; - if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) { - ELOG("glob() failed\n"); @@ -28,11 +28,11 @@ diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c + return sstrdup(path); } - void print_usage(char *elf_name) { + static void print_usage(char *elf_name) { diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c --- i3-4.11/libi3/resolve_tilde.c 2015-09-30 07:55:10.000000000 +0100 +++ i3-4.11.new/libi3/resolve_tilde.c 2016-02-08 20:03:47.849230953 +0000 -@@ -19,27 +19,18 @@ +@@ -19,28 +19,18 @@ * */ char *resolve_tilde(const char *path) { @@ -53,9 +53,9 @@ diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c - } else { - head = globbuf.gl_pathv[0]; - result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1); -- strncpy(result, head, strlen(head)); -- if (tail) -- strncat(result, tail, strlen(tail)); +- strcpy(result, head); +- if (tail) { +- strcat(result, tail); + if (strncmp(path, "~/", 2) == 0) { + home = getenv("HOME"); + if (home != NULL) { @@ -64,7 +64,7 @@ diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c + strcpy(expanded, home); + strcat(expanded, path+1); + return expanded; -+ } + } } - globfree(&globbuf); diff --git a/user/icewm/APKBUILD b/user/icewm/APKBUILD index 47a6f63b5..d57231f43 100644 --- a/user/icewm/APKBUILD +++ b/user/icewm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=icewm -pkgver=1.5.4 +pkgver=1.5.5 pkgrel=0 pkgdesc="A window manager designed for speed, usability, and consistency" url="https://github.com/bbidulock/icewm" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7b5743872d328f937b49e2b79f7d6c0b8404326ef7e7a3b529c80138b36e8c2b30db79593125a8be76abe40282c779f79ca64b504f980ef2c87052448bdc076e icewm-1.5.4.tar.xz" +sha512sums="5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e icewm-1.5.5.tar.xz" diff --git a/user/imagemagick/APKBUILD b/user/imagemagick/APKBUILD index 77580a3aa..4fccc54cd 100644 --- a/user/imagemagick/APKBUILD +++ b/user/imagemagick/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=imagemagick -pkgver=7.0.8.42 +pkgver=7.0.8.48 _abiver=7 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 @@ -16,7 +16,7 @@ makedepends="zlib-dev libpng-dev libjpeg-turbo-dev freetype-dev fontconfig-dev libxml2-dev librsvg-dev libraw-dev" checkdepends="freetype fontconfig lcms2 graphviz" subpackages="$pkgname-doc $pkgname-dev $pkgname-c++:_cxx $pkgname-libs" -source="http://www.imagemagick.org/download/releases/ImageMagick-$_pkgver.tar.xz" +source="https://distfiles.adelielinux.org/source/ImageMagick-$_pkgver.tar.xz" builddir="$srcdir/ImageMagick-${_pkgver}" build() { @@ -81,4 +81,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="88f57b69ece3b93b0af41e85bacb0b232cf07e7d0aab34e1479ce6c5fe29b1cfcdcd8bc6b2b87773c2109122614a0f64847629029470d945409b08b19032d936 ImageMagick-7.0.8-42.tar.xz" +sha512sums="194773526b86762fbcd509a722114c88b23a7bdd96431f666581e11d2c13334e6f58c1edcecb6e9117a00ea873cca8657887f7962ccbb5748d1c692b7756c792 ImageMagick-7.0.8-48.tar.xz" diff --git a/user/imake/APKBUILD b/user/imake/APKBUILD index b2eb2284b..db1fd9f55 100644 --- a/user/imake/APKBUILD +++ b/user/imake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=imake -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="X Windows make utility" url="https://www.x.org" @@ -24,4 +24,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08 imake-1.0.7.tar.bz2" +sha512sums="5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728 imake-1.0.8.tar.bz2" diff --git a/user/iperf3/APKBUILD b/user/iperf3/APKBUILD index 1e1fad965..906d8cd30 100644 --- a/user/iperf3/APKBUILD +++ b/user/iperf3/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iperf3 _pkgname=iperf -pkgver=3.6 +pkgver=3.7 pkgrel=0 pkgdesc="A tool to measure IP bandwidth using UDP or TCP" url="https://software.es.net/iperf/" @@ -17,9 +17,7 @@ source="$pkgname-$pkgver.tar.gz::https://downloads.es.net/pub/$_pkgname/$_pkgnam $_pkgname.initd $_pkgname.confd - build-fixes.patch - remove-pg-flags.patch - " + build-fixes.patch" builddir="$srcdir/$_pkgname-$pkgver" build() { @@ -31,7 +29,8 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info + --infodir=/usr/share/info \ + --disable-profiling make } @@ -50,8 +49,7 @@ package() { "$pkgdir"/etc/conf.d/$_pkgname } -sha512sums="322a6893ad28c6ce9c9849e8a0326408ed76f09bbb13591c01c3d051bd4777a2acdb8f5032b9d1bb37d47ad3818d8b18ab6c0be4d40559040eb7e57bbfc06f39 iperf3-3.6.tar.gz +sha512sums="9b8d1ac6bdebb00e38e196db9a71ae6ff3b8b763cd4b1336d078c31f6d0a5ab53bbe70ba949c601af5efe674dbd032ed5d58a761d5159dae4e50122b68a8f086 iperf3-3.7.tar.gz 339fb04b41cce11e8ea8694d95c13af9c88e0d1143356d913ec810c9b11efa27212d585b5dcc49cc2eb860a6d8bc557092c8659d7d5cfe532c5afdb36f8eedf8 iperf.initd fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8 iperf.confd -126043503eebf84bccf26758f18715eaf81131e2fc9ef1fe829e55acb2f14e97db18e9b890b8bf13c230ac80c7537615272af4e072808e25bde8ddd6f326f198 build-fixes.patch -ed0fb3a3af0dae3e9f58ff6643cb15defdd31f65cf966a6013fdf2a7fd67a7f8ef522a7c8f3269bd43d5ca991a86d758526c384ebc0984b1403bb24f61a1779b remove-pg-flags.patch" +126043503eebf84bccf26758f18715eaf81131e2fc9ef1fe829e55acb2f14e97db18e9b890b8bf13c230ac80c7537615272af4e072808e25bde8ddd6f326f198 build-fixes.patch" diff --git a/user/iperf3/remove-pg-flags.patch b/user/iperf3/remove-pg-flags.patch deleted file mode 100644 index 1ed47eebf..000000000 --- a/user/iperf3/remove-pg-flags.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -50,9 +50,9 @@ - iperf3_profile_SOURCES = main.c \ - $(libiperf_la_SOURCES) - --iperf3_profile_CFLAGS = -pg -g -+iperf3_profile_CFLAGS = -g - iperf3_profile_LDADD = libiperf.la --iperf3_profile_LDFLAGS = -pg -g -+iperf3_profile_LDFLAGS = -g - - # Specify the sources and various flags for the test cases - t_timer_SOURCES = t_timer.c - ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -643,9 +643,9 @@ - iperf3_profile_SOURCES = main.c \ - $(libiperf_la_SOURCES) - --iperf3_profile_CFLAGS = -pg -g -+iperf3_profile_CFLAGS = -g - iperf3_profile_LDADD = libiperf.la --iperf3_profile_LDFLAGS = -pg -g -+iperf3_profile_LDFLAGS = -g - - # Specify the sources and various flags for the test cases - t_timer_SOURCES = t_timer.c diff --git a/user/iptables/APKBUILD b/user/iptables/APKBUILD new file mode 100644 index 000000000..c9b8f4715 --- /dev/null +++ b/user/iptables/APKBUILD @@ -0,0 +1,66 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Molly Miller <adelie@m-squa.red> + +pkgname=iptables +pkgver=1.8.3 +pkgrel=0 +pkgdesc="Linux kernel firewall, NAT and packet mangling tools" +url="https://www.netfilter.org/projects/iptables/index.html" +arch="all" +options="!check" # no test suite +license="GPL-2.0+" +depends_dev="linux-headers" +# extra functionality may be enabled in the future if libmnl and +# libnetfilter_conntrack are packaged. +makedepends="$depends_dev libnftnl-dev bison flex autoconf automake" +subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc" +source="https://www.netfilter.org/projects/iptables/files/iptables-$pkgver.tar.bz2 + iptables.initd + iptables.confd + ip6tables.confd + " + +build() { + export CFLAGS="$CFLAGS -D_GNU_SOURCE" + ./configure \ + --build="$CBUILD" \ + --host="$CHOST" \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sbindir=/sbin \ + --without-kernel \ + --disable-nftables \ + --enable-devel \ + --enable-libipq \ + --enable-shared + + # do not use rpath - iptables seems to use old libtool which requires + # these hacks + sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool + sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + + make +} + +package() { + make -j1 install DESTDIR="$pkgdir" + + mkdir -p "$pkgdir"/usr/include/libiptc \ + "$pkgdir"/usr/lib \ + "$pkgdir"/var/lib/iptables \ + "$pkgdir"/etc/iptables + + install -m644 include/iptables.h include/ip6tables.h \ + "$pkgdir"/usr/include/ + install include/libiptc/*.h "$pkgdir"/usr/include/libiptc/ + + install -D -m755 "$srcdir"/iptables.initd "$pkgdir"/etc/init.d/iptables + install -D -m755 "$srcdir"/iptables.initd "$pkgdir"/etc/init.d/ip6tables + install -D -m644 "$srcdir"/iptables.confd "$pkgdir"/etc/conf.d/iptables + install -D -m644 "$srcdir"/ip6tables.confd "$pkgdir"/etc/conf.d/ip6tables +} + +sha512sums="84b10080646077cbea78b7f3fcc58c6c6e1898213341c69862e1b48179f37a6820c3d84437c896071f966b61aa6d16b132d91948a85fd8c05740f29be3a0986d iptables-1.8.3.tar.bz2 +059b3bd8dd7dec60060ec5eb1e639fe8203207629f3a7dd4fdbe5ebca3f7e9b80df5592ebb27542e31830fd15a53cffac5772567053c104dfccf9b78613a31a1 iptables.initd +cb7fecd5cab2c78bd3f215a41f39ec11c37eb360efbe83982378a0e647e0aa9dc0b7ec915a5b5081aa2f7747464787e69404aa15ba15a063c32cb8fb7dd13d1e iptables.confd +0897a7a22f8b700f7f1f5c355ad6cbf39740e44d6c962af99e479978d8a2d556ca7fe4e31f238829046b4a871ce0b5fd52e2544f1361d15dd1ea3e33992646c4 ip6tables.confd" diff --git a/user/iptables/ip6tables.confd b/user/iptables/ip6tables.confd new file mode 100644 index 000000000..1fa63f33a --- /dev/null +++ b/user/iptables/ip6tables.confd @@ -0,0 +1,14 @@ +# /etc/conf.d/ip6tables + +# Location in which ip6tables initscript will save set rules on +# service shutdown +IP6TABLES_SAVE="/etc/iptables/rules6-save" + +# Options to pass to ip6tables-save and ip6tables-restore +SAVE_RESTORE_OPTIONS="-c" + +# Save state on stopping iptables +SAVE_ON_STOP="yes" + +# Enable/disable IPv6 forwarding with the rules +IPFORWARD="no" diff --git a/user/iptables/iptables.confd b/user/iptables/iptables.confd new file mode 100644 index 000000000..c9e5a685c --- /dev/null +++ b/user/iptables/iptables.confd @@ -0,0 +1,14 @@ +# /etc/conf.d/iptables + +# Location in which iptables initscript will save set rules on +# service shutdown +IPTABLES_SAVE="/etc/iptables/rules-save" + +# Options to pass to iptables-save and iptables-restore +SAVE_RESTORE_OPTIONS="-c" + +# Save state on stopping iptables +SAVE_ON_STOP="yes" + +# Enable/disable IPv4 forwarding with the rules +IPFORWARD="no" diff --git a/user/iptables/iptables.initd b/user/iptables/iptables.initd new file mode 100644 index 000000000..98b52d0cd --- /dev/null +++ b/user/iptables/iptables.initd @@ -0,0 +1,136 @@ +#!/sbin/openrc-run +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.11.init,v 1.2 2011/12/04 10:15:59 swegener Exp $ + +description="IPv4/IPv6 packet filtering and NAT" +description_save="Save firewall state" +description_panic="Drop all packets" +description_reload="Reload configuration" + +extra_commands="save panic" +extra_started_commands="reload" + +iptables_name=${SVCNAME} +if [ "${iptables_name}" != "iptables" -a "${iptables_name}" != "ip6tables" ] ; then + iptables_name="iptables" +fi + +iptables_bin="/sbin/${iptables_name}" +case ${iptables_name} in + iptables) iptables_proc="/proc/net/ip_tables_names" + iptables_save=${IPTABLES_SAVE} + sysctl_ipfwd=net.ipv4.ip_forward;; + ip6tables) iptables_proc="/proc/net/ip6_tables_names" + iptables_save=${IP6TABLES_SAVE} + sysctl_ipfwd=net.ipv6.conf.all.forwarding;; +esac + +depend() { + before net + after sysctl + use logger + provide firewall +} + +set_table_policy() { + local chains table=$1 policy=$2 + case ${table} in + nat) chains="PREROUTING POSTROUTING OUTPUT";; + mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";; + filter) chains="INPUT FORWARD OUTPUT";; + *) chains="";; + esac + local chain + for chain in ${chains} ; do + ${iptables_bin} -t ${table} -P ${chain} ${policy} + done +} + +checkkernel() { + if [ ! -e ${iptables_proc} ] ; then + eerror "Your kernel lacks ${iptables_name} support, please load" + eerror "appropriate modules and try again." + return 1 + fi + return 0 +} +checkconfig() { + if [ ! -f ${iptables_save} ] ; then + eerror "Not starting ${iptables_name}. First create some rules then run:" + eerror "/etc/init.d/${iptables_name} save" + return 1 + fi + return 0 +} + +start() { + checkconfig || return 1 + ebegin "Loading ${iptables_name} state and starting firewall" + ${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}" + eend $? + if yesno "${IPFORWARD}"; then + ebegin "Enabling forwarding" + /sbin/sysctl -w ${sysctl_ipfwd}=1 > /dev/null + eend $? + fi +} + +stop() { + if yesno "${IPFORWARD}"; then + ebegin "Disabling forwarding" + /sbin/sysctl -w ${sysctl_ipfwd}=0 > /dev/null + eend $? + fi + if yesno "${SAVE_ON_STOP}"; then + save || return 1 + fi + checkkernel || return 1 + ebegin "Stopping firewall" + local a + for a in $(cat ${iptables_proc}) ; do + set_table_policy $a ACCEPT + + ${iptables_bin} -F -t $a + ${iptables_bin} -X -t $a + done + eend $? +} + +reload() { + checkkernel || return 1 + ebegin "Flushing firewall" + local a + for a in $(cat ${iptables_proc}) ; do + ${iptables_bin} -F -t $a + ${iptables_bin} -X -t $a + done + eend $? + + start +} + +save() { + ebegin "Saving ${iptables_name} state" + touch "${iptables_save}" + chmod 0600 "${iptables_save}" + ${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}" + eend $? +} + +panic() { + checkkernel || return 1 + if service_started ${iptables_name}; then + rc-service ${iptables_name} stop + fi + + local a + ebegin "Dropping all packets" + for a in $(cat ${iptables_proc}) ; do + ${iptables_bin} -F -t $a + ${iptables_bin} -X -t $a + + set_table_policy $a DROP + done + eend $? +} diff --git a/user/iputils/APKBUILD b/user/iputils/APKBUILD index fc6b1b3e6..142a5ff2d 100644 --- a/user/iputils/APKBUILD +++ b/user/iputils/APKBUILD @@ -1,55 +1,36 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iputils -pkgver=20180629 +pkgver=20190515 pkgrel=0 pkgdesc="IP Configuration Utilities (and Ping)" url="https://github.com/iputils/iputils/" arch="all" +options="suid" license="BSD-3-Clause AND GPL-2.0-or-later" -makedepends="libcap-dev openssl-dev libxslt docbook-xsl" +makedepends="docbook-xsl docbook-xsl-ns libcap-dev libgcrypt-dev libxslt meson + openssl-dev" replaces="bbsuid" -subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tgz::https://github.com/$pkgname/$pkgname/archive/s$pkgver.tar.gz - time.patch - fix-init-of-cmsg.patch - fix-idn.patch - " -options="!check suid" # there is no testsuite for these applications +subpackages="$pkgname-doc $pkgname-lang $pkgname-openrc" +source="$pkgname-$pkgver.tgz::https://github.com/$pkgname/$pkgname/archive/s$pkgver.tar.gz" builddir="$srcdir/$pkgname-s$pkgver" build() { - cd "$builddir" # we're waiting for idn support in musl so that we can enable it here # https://wiki.musl-libc.org/functional-differences-from-glibc.html#Name-Resolver/DNS - make all ninfod USE_IDN=no USE_NETTLE=no KERNEL_INCLUDE=/usr/include - make man + meson --prefix /usr --buildtype=plain builddir -DUSE_IDN=false + ninja -v -C builddir } -package() { - local name - cd "$builddir" - - for name in arping clockdiff ipg rarpd rdisc tftpd tracepath; do - install -D -m755 $name "$pkgdir"/usr/sbin/$name - done - install -D -m755 ninfod/ninfod "$pkgdir"/usr/sbin/ninfod - - for name in ping traceroute6; do - install -D -m4755 $name "$pkgdir"/bin/$name - done +check() { + ninja -C builddir test +} - mkdir -p "$pkgdir"/usr/share/man/man8 - for doc in ./doc/*.8; do - gzip $doc - install -m644 "$doc".gz "$pkgdir"/usr/share/man/man8/ - done +package() { + DESTDIR=$pkgdir ninja -C builddir install - ln -s tracepath "$pkgdir"/usr/sbin/tracepath6 - ln -s ping "$pkgdir"/bin/ping6 + ln -s tracepath "$pkgdir"/usr/bin/tracepath6 + ln -s ping "$pkgdir"/usr/bin/ping6 } -sha512sums="16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476 iputils-20180629.tgz -530532d16574921d0789af6a82706915e8103e712195c4f2eb6379192cc7126ba6bc9f33e8454118628d59f8932ffd2bb5aaba3b61fa93df83088e3b0d93d227 time.patch -2779b9d987089a2a9a39c27a092f16da85881e9dfbc99edcca6baea42912b8a1a7e16b00c19684d2ea1a6123d66f78be12bef43398e63be7d7c97d3d6269a5bf fix-init-of-cmsg.patch -b3a5e5ef9ed1ed12a137f176db6a444f15db67dfaef3706514bc4d0cd2a332fb8aeeae0460fca8a1dfef2e0ce2ae0cf2218a74e3f61c46fcb27715a030425ac0 fix-idn.patch" +sha512sums="adb8831ca3a567b9a5f3762227c631aefa62eedbaa7578c2bfea90b6d494b9e0cccf49b68713912611ec56c352d6c517df9e8409c9c9478cfc5732371c8cf250 iputils-20190515.tgz" diff --git a/user/iputils/fix-idn.patch b/user/iputils/fix-idn.patch deleted file mode 100644 index 4aaae8e82..000000000 --- a/user/iputils/fix-idn.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- iputils-s20180629/ping.c.orig 2018-06-29 11:00:46.000000000 -0700 -+++ iputils-s20180629/ping.c 2018-07-06 01:09:10.479830175 -0700 -@@ -207,9 +210,10 @@ - - #ifdef USE_IDN - setlocale(LC_ALL, ""); --#endif -+ - if (!strcmp(setlocale(LC_ALL, NULL), "C")) - hints.ai_flags &= ~ AI_CANONIDN; -+#endif - - /* Support being called using `ping4` or `ping6` symlinks */ - if (argv[0][strlen(argv[0])-1] == '4') diff --git a/user/iputils/fix-init-of-cmsg.patch b/user/iputils/fix-init-of-cmsg.patch deleted file mode 100644 index 76ebc16c2..000000000 --- a/user/iputils/fix-init-of-cmsg.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fixes ping on s390x. - -diff --git a/ping.c b/ping.c -index a0857a1..329553d 100644 ---- a/ping.c -+++ b/ping.c -@@ -108,8 +108,11 @@ static int parsetos(char *str); - static struct { - struct cmsghdr cm; - struct in_pktinfo ipi; --} cmsg = { {sizeof(struct cmsghdr) + sizeof(struct in_pktinfo), SOL_IP, IP_PKTINFO}, -- {0, }}; -+} cmsg = { .cm = { -+ .cmsg_len = sizeof(struct cmsghdr) + sizeof(struct in_pktinfo), -+ .cmsg_level = SOL_IP, -+ .cmsg_type = IP_PKTINFO}, -+ .ipi = {0, }}; - int cmsg_len; - - struct sockaddr_in source; diff --git a/user/iputils/time.patch b/user/iputils/time.patch deleted file mode 100644 index 1d6033f7a..000000000 --- a/user/iputils/time.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./tracepath.c.orig -+++ ./tracepath.c -@@ -12,6 +12,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -+#include <time.h> - #include <sys/socket.h> - #include <linux/types.h> - #include <linux/errqueue.h> diff --git a/user/irssi/APKBUILD b/user/irssi/APKBUILD index 92effce1b..ffa7267ac 100644 --- a/user/irssi/APKBUILD +++ b/user/irssi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=irssi -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=0 pkgdesc="Text-based IRC client" url="https://irssi.org" @@ -9,9 +9,11 @@ arch="all" license="GPL-2.0+ AND ISC" makedepends="ncurses-dev glib-dev openssl-dev perl-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-perl" -source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz - fix-ridiculous-egregious-conformance-error.patch - " +source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz" + +# secfixes: irssi +# 1.2.1-r0: +# - CVE-2019-13045 build() { cd "$builddir" @@ -46,5 +48,4 @@ perl() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr mv "$pkgdir"/usr/share/irssi/scripts "$subpkgdir"/usr/share/irssi } -sha512sums="343530ca63355dd6683e84f31602c9162e1e3158e52ce81e37519d1e42abbdcb621fb710fcb605fcafd7e7ea3f2c30ed62607d4ea91d8c8dc29bf893e54aee40 irssi-1.2.0.tar.xz -88c9fe5593a81b92943d1ca419b39d074f9c52378350007c0896aa95ef056e098201b338d31da31b5ec1492e1577d2862b989e00427dc89edde0bcef46cd8e2a fix-ridiculous-egregious-conformance-error.patch" +sha512sums="67c4501b5a0055c1b24fa6753305658de809cd66e952e6f9233701a112989fd8721a065b1c681725b82346b40b53a29bd2b6b8b8315ac0ad196235a9e5156d5a irssi-1.2.1.tar.xz" diff --git a/user/isync/APKBUILD b/user/isync/APKBUILD index a1a5a09e3..19c801b6e 100644 --- a/user/isync/APKBUILD +++ b/user/isync/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=isync -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=0 pkgdesc="IMAP and MailDir mailbox synchronizer" url="http://isync.sourceforge.net/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b5186f2afe97cab58ce55d3ec19ae7371676ae614448614a9e3e02d09662c34b74e559f0926661fa0300ab22dab9e2e9089b78ee38b94141ff3f8b4d75578ffa isync-1.3.0.tar.gz" +sha512sums="59d702d41d4a4e72f03cb282b414d0bb859593171763e845bc24d116a74f807a79e5be61f1dd1f59a9ece492322bceac156b08958a246cbfbe7f230fab4cdda2 isync-1.3.1.tar.gz" diff --git a/user/java-common/APKBUILD b/user/java-common/APKBUILD index 12259b209..da94e271c 100644 --- a/user/java-common/APKBUILD +++ b/user/java-common/APKBUILD @@ -1,16 +1,16 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=java-common -pkgver=6 -pkgrel=0 +pkgver=7 +pkgrel=1 pkgdesc="Default Java runtime binary symlinks" url=" " arch="noarch" options="!check" # Symlinks only. license="Public-Domain" -depends="" +depends="nss" # for TLS, needed by all OpenJDKs. makedepends="" subpackages="" -source="" +source="java.profd" triggers="java-common.trigger=/usr/lib/jvm" package() { @@ -19,4 +19,7 @@ package() { ln -sf ../lib/jvm/default-jvm/jre/bin/rmiregistry "$pkgdir"/usr/bin ln -sf ../lib/jvm/default-jvm/jre/bin/keytool "$pkgdir"/usr/bin ln -sf ../lib/jvm/default-jvm/bin/appletviewer "$pkgdir"/usr/bin + + install -D -m755 "$srcdir"/java.profd "$pkgdir"/etc/profile.d/java.sh } +sha512sums="4c535555a89609988fbd379d4ef7c72d04eb8b88aed3c999a65e957196196c14733377b24f98b1ee0ae83f0cd43f55ab626ab073c1b30f478fb514bfc71cf641 java.profd" diff --git a/user/java-common/java.profd b/user/java-common/java.profd new file mode 100644 index 000000000..cf97cc5f9 --- /dev/null +++ b/user/java-common/java.profd @@ -0,0 +1,2 @@ +#!/bin/sh +export JAVA_HOME=/usr/lib/jvm/default-jvm diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD index 782be8aad..eda856860 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="KDE Jukebox" url="https://juk.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="03dfb936db72a27440d5c0800f33e0166ae230266138621c0a49a68b18b1766b9ed9f25f308b4b0ce75841b33a09dec2679578fcb353ed2e857227a829a0c103 juk-19.04.1.tar.xz" +sha512sums="3d5b693105dbbe32788995a05cf013ebe5d7243d99e5f8c75f3148f9fc1a6604c660473db07cf2a289ab120a495ffd3e19fbb4c741633f2eafed57b04e0b2b1b juk-19.04.2.tar.xz" diff --git a/user/kaffeine/APKBUILD b/user/kaffeine/APKBUILD index ee7dcffe2..737246458 100644 --- a/user/kaffeine/APKBUILD +++ b/user/kaffeine/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kaffeine -pkgver=2.0.17 +pkgver=2.0.18 pkgrel=0 pkgdesc="Media player with a focus on Digital TV (DVB)" url="https://www.kde.org/applications/multimedia/kaffeine/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="96b4f676452102802f0226037a21572f851b2ebe2338f758d4d14f15af63adc93fc1ff15d78753284793ca01ebe9fa5f7b367545cfa491e08f563c19d63130dc kaffeine-2.0.17.tar.xz" +sha512sums="60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4 kaffeine-2.0.18.tar.xz" diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD index f8bdda246..2f2a62ca6 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.04.1 +pkgver=19.04.2 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="ae7e7ea92bdac7400d7acc907eaec2603aaa93e671237ab38b826560082f7c204e54ce52d17aa140b9a100d0a2db727c8131e64910536aead6c13b7b795cb600 kalgebra-19.04.1.tar.xz" +sha512sums="fed4a751c526952cfa47caad9ba995c3ae4691cadb3a87be030f5fa16397c4e32199afc8495a8897b35cffda24766601fa31ca5ffd578fd44c0a152393eebde2 kalgebra-19.04.2.tar.xz" diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD index fb5750d13..6dc3f5862 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.04.1 +pkgver=19.04.2 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="b354542d34df53a1c4d48ac522b31bb131d44521e24d5aada6b953342a3ece71851baac726ceae779d019a6dc5373797f84ba13c6b5ec82fe422a3a2b4c0a2c4 kalzium-19.04.1.tar.xz" +sha512sums="e95e8bf03a28538b81582df8bd5873f576a20e0d3e9cdb7dfdc4aebd563701dfabf9cd5798226159709e73259534d6de84a74b4718f157f44dc4b0f2c486ec73 kalzium-19.04.2.tar.xz" diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD index 69d12b5ae..aba038abb 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.04.1 +pkgver=19.04.2 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="53d1352fb1436fc8cd341b39425b4ae7d64a2378197972e303877104b220447873d89a3ec4facd1b2199a741cb3cfab34fcf920f43ed40c3d4dd28de722c272e kanagram-19.04.1.tar.xz" +sha512sums="49d36ac9b7fafaa3e934f927b8b52a1d485180792fe78e2ce5e36b1efe75c177f78911225bdad9f716ab0d77a9b26ed26ef9247fbdeca2bffee2a0903a09c03c kanagram-19.04.2.tar.xz" diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD index 997bc3873..2a352ac3b 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Pac-Man clone" url="https://www.kde.org/applications/games/kapman/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7df13b6ec898e2f6f3c2be19b71531fb2efea406fbc58ac032a51b382e6e8b685d0b0af27f4d9ee4ae3d123be4f5bbef0e7b9e937ca6aeb3f2a365dec9bf47ce kapman-19.04.1.tar.xz" +sha512sums="274a955939e39c284c82c43db03c7bafc37e3497fca6c04e0087e794d6015b81026f0303caa32dd0a117507a0a277c1afcd42e76da5e5de15b0852362a8a425c kapman-19.04.2.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index 3ac9abcd6..ae31b0430 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.04.1 +pkgver=19.04.2 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="fa17365049496acdeccd70acfef1554af87b038a63c4e1dc38c6c3aaeb3ec127eed59a212fcf5488989a9e9f8cff3c71ccf00fd4081214cf51288ea2c2916077 kate-19.04.1.tar.xz" +sha512sums="568af7df0588d65f386f482f944b44c7bacffeecf374fce4b4e276be8ca556cbf983c2df2e99a3900c15bd7dfaa0d71b6540c37b4c2773a5293b3e5cba1d3939 kate-19.04.2.tar.xz" diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD index 15297a989..4e946eb33 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.04.1 +pkgver=19.04.2 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="75714f55202dcfe66717318bcbd4698b658cda12209ec1bb0bd397f755d7be742a0e276dc8c1e3b5eea0a42a38a44f193c45b059653ebe06fbad563e15136a7f katomic-19.04.1.tar.xz" +sha512sums="e8d01523a4c3714de07b5c9b7e0f3b811cc1638585b31614e4af81b18156e322073f429b64d5cdebe8659571924866bb4123f97478fc46403230056c7ce8ac67 katomic-19.04.2.tar.xz" diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD index dbfae7876..aaaaae987 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.04.1 +pkgver=19.04.2 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="a77cbbef0658b4b84f6d13326f9960f68e543872668f8e416add62516edf5a957f7a7dd4a39e7ab09ff4b6e4ade1ccab8935dc7132cbb5d486e8dd336ffbd945 kblackbox-19.04.1.tar.xz" +sha512sums="b38ca1b9b721dedf2a38e68b6239dbcf0841e38132df304f7bb2d37419bec3a380be260442aa174fb5ba7a27851fa51c69dcd2478a27b2b605a563457ec647ae kblackbox-19.04.2.tar.xz" diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD index 85bd23021..58d4462ba 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Falling blocks game" url="https://www.kde.org/applications/games/kblocks/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6913105aaeec4e797cf8a7102beb6aac0a16c4c0100f48cbf0d9cabb2eedf75597f54b1ce4956454b1810109e89cc5d439768110f8f865b89d6a37bf5f0df5b0 kblocks-19.04.1.tar.xz" +sha512sums="106411e7dfe5bc4e3808e6596b809d5a53c90164f603fa3617fd05610d917e49df6481ae6ea3aecaa2ac76000cfe0c3c55447582cc6ea029403f56551d43a29f kblocks-19.04.2.tar.xz" diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD index 7450c89c9..1ae026eeb 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.04.1 +pkgver=19.04.2 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="5277dce1ef25e68a3347cc7cf9ec83d645626002b1472ad4b6c3e1c68459c8b115351ec116a163525e192d32da01d599b906b38b940ff62811e7ab2832537ecc kbounce-19.04.1.tar.xz" +sha512sums="8d7876e7b79370f830dd4590e4201b9edb5d2629f6ca091cf5e2a83a5b27ebc30a93dc7af14defd0e1bcf7d015439a6b2bfc2b48a7f7acbd72329a591885ce11 kbounce-19.04.2.tar.xz" diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD index 9f0b91fba..54b63f94d 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.04.1 +pkgver=19.04.2 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="0b43b45408d2a4f41c0a00e2fc199c3f126e0a60392a7b48fe5b354ac6d531b9de1248b9b46698bb1bd746983d45f2b1c8196f0eeb72dd003ac4e8cfc28b5cc5 kbreakout-19.04.1.tar.xz" +sha512sums="3edba6319bf63bc25faab3842af65928781c98c9ef8251062da546758afb622cc67ea2389900468ba4d5af8a01cdad95b3342af17412d0868de595cb8a76d3a1 kbreakout-19.04.2.tar.xz" diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD index a1ab4ac03..a5d7ba0c7 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.04.1 +pkgver=19.04.2 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="12067ebc85acfcb4ebc14af7f0d5aefc3a37e751b65795c0c2bd50f45766858a0be218a356a6659a79f6050d34c9a702af529e09c79ecf92fb676245d65e5d60 kbruch-19.04.1.tar.xz" +sha512sums="df2e2c880a3d77daa52b12dcd7e97f3554d363f0314d4fb96ba851125bcb007ca91b28f2ceae76e9e38a16db5fc7ad9097ca520b47a282ee46a10385da7d31dc kbruch-19.04.2.tar.xz" diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD index 806d73ece..69fe7be38 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.04.1 +pkgver=19.04.2 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="eca2205de1d719e36ce150ba7ffd87142df060f24932488c843e7f62e1bb9674bb0ea181763910a82cb39b7268556a5dfa04ea42f2cbd344483fe5086f455885 kcachegrind-19.04.1.tar.xz" +sha512sums="08d680511c8793cc470a7a46c37d1fe911b35b638b096e698ab4dd45278776ec38ede10b6be37d1ddc28aa5986219ae1523564a063d73f4c4b462fdcde9b48d4 kcachegrind-19.04.2.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index 959db857e..02c7c8420 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.04.1 +pkgver=19.04.2 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="8c1868a571ea7fb77a5249d9154c32968974345ec1c8eadb233e5cf436110299baeda39d580ff12c958061188c96a49e899407c35008b476cd0395427566fe1c kcalc-19.04.1.tar.xz" +sha512sums="aa8db02c3b897ad30ef62fc01f715c2fd1fd9f1f745168dbff1daa5ee1eb4913e04ac6bec8e414fa029891abbbf01c38f55323a784abe42533701da2ec746a0d kcalc-19.04.2.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index fac8e4c48..3cc825c2b 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.04.1 +pkgver=19.04.2 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="9891af9994e1aa1778e1bcde117249c0a82d42b08a6135a1d55151473e20ee886856c0cd8b824eab59bfa9f233178d15d6ca2a850c144af518c9e2f8a23a9dd9 kcharselect-19.04.1.tar.xz" +sha512sums="652830d107f5d91dae6d158562b4350cf3f5239690cb3bf5e03b663e9dae490cdaa2f6fa28ad59c20e57b99d984ae2c909a9e81e83b5571533667261c230c1d7 kcharselect-19.04.2.tar.xz" diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD index 339fde904..700f80e9f 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.04.1 +pkgver=19.04.2 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="fe7d4408e1a40e71bd1c16646835f20be9ba21b96574a5b4e1dcbdf348f20ba9862db08fa2b08dd749956758057cc0b232b170d6a42c9db93a81a32d05bba2cb kcolorchooser-19.04.1.tar.xz" +sha512sums="14aa1edc8852544ce4415fde03ef00191127d1c2b55fda61ad20e1e9c41a43bb276ea720b8d6a77f513decbdbefc31c2eabbc8c66bea5e985cec948ff71cdd90 kcolorchooser-19.04.2.tar.xz" diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index 40793406e..ce0b84fb5 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.04.1 +pkgver=19.04.2 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 df6d7f2ac..068661510 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.04.1 +pkgver=19.04.2 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 c697be041..969359ea6 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.04.1 +pkgver=19.04.2 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 8b12cd235..3ff52ba34 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.04.1 +pkgver=19.04.2 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 974bb3456..32c49504e 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.04.1 +pkgver=19.04.2 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 20afd6ae9..dca659db1 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.04.1 +pkgver=19.04.2 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 f075a90f6..f81515fc2 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="KDE thumbnailing sofware" url="https://www.KDE.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="14471feb579f63a29e5241c56cbe6f10fbd880669544db0356ed2c2ce7d9342ddf79c584ee8cd03debafa03f5c3afe79c7b7d977df36f8fea9a9276a3b818cc0 kdegraphics-thumbnailers-19.04.1.tar.xz" +sha512sums="efca52616d371dd0c793da66bf46ddd691c3a903655d9a824f155283fa386fa5a5cec07864772bd978f1c0aeb428657c7fbe9fa95b54ee028861895a43ef1849 kdegraphics-thumbnailers-19.04.2.tar.xz" diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index 48f03b4c1..12b380ed2 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Libre video editor" url="https://kdenlive.org/" @@ -48,4 +48,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f2f488928c3f3279021fbe2762f48e8cf52e8f30fe47d5ef50cfceac28fe7b8535d27be18679cde37f6dac281ec2cd1a2cf0d371b79088413b2195d9b32ed70d kdenlive-19.04.1.tar.xz" +sha512sums="4e4bfc7da8a8a6dab53f8a537e6db38c7b7de282a49bcc62f7833f01e558343a72f33c5dc5e8bd8abbaaa709b75f1a036b1d4925055b40ce57a0212150fdb8e8 kdenlive-19.04.2.tar.xz" diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD index f9c4ae905..9dd135f71 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="View disk usage information" url="https://utils.kde.org/projects/kdf/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e95d0cff0b09630fc4e892613115157231b0355ecc0762cd9b7e97c491144f17a71008b229144321acae5cc9af4f5bd3eebd20f01cfe4bd088096262eadc8326 kdf-19.04.1.tar.xz" +sha512sums="75f166ec1377d70046955b85a7c6d11e054a1c98ed6904076ef0a349d056e8b8e5c41cc15a0229a0571768ca35955e95f1220e583c8acea5b855b2f393dd1438 kdf-19.04.2.tar.xz" diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD index cba44dcc0..d3c10c940 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Three-in-a-row game" url="https://games.kde.org/game.php?game=kdiamond" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9fa48d2c67218469870301607166cce0f4dcbef6193703de705e6b324626d09d43ddf037c6676eb682b66fdd12254f9d87d1bb39b90975f4375723e249862955 kdiamond-19.04.1.tar.xz" +sha512sums="b7699c4052ec4cd925ef5e58a1a5f4ff3e69e0b97973723d649e8359112210c00c11356cb72dbd53e113046d52edd40864b611e76271f504042661ba6c5dcee4 kdiamond-19.04.2.tar.xz" diff --git a/user/kdoctools/APKBUILD b/user/kdoctools/APKBUILD index f11c59983..126b3eda5 100644 --- a/user/kdoctools/APKBUILD +++ b/user/kdoctools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdoctools pkgver=5.54.0 -pkgrel=0 +pkgrel=1 pkgdesc="Tools to generate user-readable documentation from DocBook XML" url="https://www.kde.org/" arch="all" diff --git a/user/keychain/APKBUILD b/user/keychain/APKBUILD index 10c0ab99d..e3dc1306b 100644 --- a/user/keychain/APKBUILD +++ b/user/keychain/APKBUILD @@ -1,5 +1,5 @@ # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=keychain pkgver=2.8.5 pkgrel=0 diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD index 2dea1fd5f..c772977b2 100644 --- a/user/kfilemetadata/APKBUILD +++ b/user/kfilemetadata/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfilemetadata pkgver=5.54.0 -pkgrel=1 +pkgrel=2 pkgdesc="File metadata extraction framework" url="https://www.kde.org/" arch="all" diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index c1e0e971d..1e18c4700 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.04.1 +pkgver=19.04.2 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="2705fa4e64e547b5482399b5433ebc619036c3cd77dc86a78365580e89cc2a77334d81674d9790d92df3446724d680cedd03bf1e303525c4a3c51b46dc897496 kfind-19.04.1.tar.xz" +sha512sums="ce7064ad04f7137b7c85473d7302ad94ca73e049d2a3d416a63ad76e5631f4683c47bf9b1f769cdc7be81e7c51534685179a8285cf4aac6c0892c65e40576ddd kfind-19.04.2.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index 3ab0ce591..d126bc3b6 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.04.1 +pkgver=19.04.2 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="74dc83786c4e6190fa80b4d4f87568ed5bbcbcb5731bf13fe2cc91605fabcfaf24cf1061006b7d6efaa2a621332e69071426ad0486c6cc8bfa9543c0c84c2da5 kfloppy-19.04.1.tar.xz" +sha512sums="8a768e1c274af307778e057e781adfbda27902795dea11f1058bdfe3a1fe96aa4e450ca25bbe3412183458f49e288093d285767327904a0e5530b8b3bc51d989 kfloppy-19.04.2.tar.xz" diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD index 5edac7fff..6ce627714 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.04.1 +pkgver=19.04.2 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="83d8893cea2a8eeb9202e04b14dfb0c83c75738346c86c3d01381740b8c59ee4063ebc08b9250cb2c4c486ca9d2bb9a71c29f671dffbb91ac5db21b2fa429329 kfourinline-19.04.1.tar.xz" +sha512sums="ada6dc7ea981da7253f42ed2eb7e6d20351254983ed6d4ee2a0e565f59241709fd53f9f60e6a9eccb2d6579bee2189c231a76f98f129c8185c4b665a6d7ac8f0 kfourinline-19.04.2.tar.xz" diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD index b06b2bb3c..0363781cd 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.04.1 +pkgver=19.04.2 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="c20a195bfbc4b1942ae8ee1c4491601000b319dd3380d44f4dac09fb2e4e5e90f465b2cd2fc78fcaaea94f3997be5bfb7d7a8f1490b746a405d9e1db7cc290fe kgeography-19.04.1.tar.xz" +sha512sums="715565528f685960b36221988231102a11c39b2089390a0c7a801e12ff9857900815525947415b198159832af9dddcef224035dd67d01059ef26cf7fa8dbc2f0 kgeography-19.04.2.tar.xz" diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD index ac7b2690f..6dbf2b486 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Versatile download manager" url="https://www.kde.org/applications/internet/kget/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3d68276adc130ee2d67d23ebb99669824f2ed6f2bf415f056a057dadcd1a010c2d74b096fb25894ffdef07bca6051b5c17988c57e0f337d3460d952d96d86071 kget-19.04.1.tar.xz" +sha512sums="1c4eb6fd35bf8402c8cd2f5ded42fa049d0b535fe06ba2db5df2dadf90599639d773b294fd5cb47b447262fd392401437023274f7f155bad84ff5326838974db kget-19.04.2.tar.xz" diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD index 89746638f..63279fb43 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.04.1 +pkgver=19.04.2 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="fdfdec27c9325811ae459f6de9125a7830c9a4bea7aacda655908cb01dbdd444df84f8ef2f8f2e394b55b356950c3a8a343c51f0340fc112683d39ce6e1fe515 kgoldrunner-19.04.1.tar.xz" +sha512sums="0fb55812b69ca8f8cc83b40ef23e070827c19062608a12c9cf9caec05c5a5e7638390063874b250ee7e181eaa4c9bacdaff632798e022f003720d5bd077d9fc2 kgoldrunner-19.04.2.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index 92b4e6e37..427dbbcc7 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.04.1 +pkgver=19.04.2 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="ff0d3dcb32d6b81fedfa2ecaef6c9df738ba8b584552649f2b5fe1fe88ad3ab04be173b7dbaa388c5997a53e6665c9622f9c91aec298f71b207538a9f43cb3ff kgpg-19.04.1.tar.xz" +sha512sums="3c9cce222727758a04cdee9be09ad4e679aa9dc199a08d2cd867f75e6bb9dabd1137c60e2720e27d3affca73e8bc872aca088568a066d3f988d72843ee1d9e94 kgpg-19.04.2.tar.xz" diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD index 4c2563e5e..065c18fa2 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Hangman word game" url="https://www.kde.org/applications/education/khangman/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fd61cc6cd6249c1fb007ffd72d9305d5d4d5f5b4c4fa27b25550f67ee804289724e5edcb8fd6f40db347e1ac0f34c0f90ae9572c3e7d826dfa48228cd57de60e khangman-19.04.1.tar.xz" +sha512sums="df333255be6b4e279cd57f461aaa459bb780d631620211594a5364d16759f1a1b171f7538b5e3ec1f8ff9b261d7922fe22584e3270175298c4adabc72b14c313 khangman-19.04.2.tar.xz" diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD index 6815ae3fa..da91f5d10 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Graphical documentation viewer" url="https://www.kde.org/applications/system/khelpcenter/" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c42206554beff891c51c8dbe73baf722e1e571e1166916dad36c37573c09a5696c06b711748dd863782c43d507c2f6103d1aea122e5ef33fd59972c0d4e8503b khelpcenter-19.04.1.tar.xz +sha512sums="57b0267febb8ae8d6caa29be423a446267c32506bf4c8cfbe11069aad80c581cb66f8d647493edc723905b5db033992e56d85f425f27e388c97f4e8835688836 khelpcenter-19.04.2.tar.xz 4d7e286b7130547d7f26e11a0e5a40d20530e08cf657ff24d31cbc7b110628f564e513e5922a5cffc82d0830731ab03b07820884542292b3c03c7519617a20a3 es-doc-fix.patch" diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD index 47c614a49..f40509e4b 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.04.1 +pkgver=19.04.2 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="13961e15098f4ef285fc00e53b9e48475bb24c5c04ce44447aaba2fffde177d8ef113f76bf23d1bb0e0ecc7fc433891c864492c2449eddc8da4375f3d10719ed kig-19.04.1.tar.xz" +sha512sums="73a45c90aa02ca66e1593a365baf1b93baff73eae5048ee497e015ba14f548007809b4fd7d211cc4b26deb34da5e3cb357370ceb33bb5a1df154e6959d43329e kig-19.04.2.tar.xz" diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD index f15271b3c..86e0bcb30 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.04.1 +pkgver=19.04.2 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="a3f6eb361798f5d74ed939e4ca8426d89718bce93290b46d5c7d4d754829f1ff36a9771f610d9c4166613c35847599f8da1c32b30e0988ca4619659e75716d82 kigo-19.04.1.tar.xz" +sha512sums="650c09c85a9e1b5a69582d5171d36d60e472f9d93c39fdde50fc4dbb0d2ff213af83c6d910b5cc424af63faea5adffd3d479484e47829a2826378142c0ee4073 kigo-19.04.2.tar.xz" diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD index 8f94ec20c..2665a24c7 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.04.1 +pkgver=19.04.2 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="307c0da4026f6c689959e5e603794401d389a21882656b438197c58c44849a2ba91617e23edc4a8ad76fca0905b0df9bc54649aae22abff50b14b5936184bb21 killbots-19.04.1.tar.xz" +sha512sums="e0b34022cfc6afce9d72e6d516c9c5537de7e6d2dca7b162fa8d7e299d5ce35ca4122743226a4d5dc093cf9e8a6cd7afe2d2475dd19a9222ad2b86581b28699e killbots-19.04.2.tar.xz" diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index 766c3d8ed..89bf4c0f6 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a95247aa3174e6f9d153282c19519e13e9209793010d9b48109206a8d7a4db80086518ccbf0b442fc37715c1b4d10888e4a812082b5de998b4390d62aab472c3 kio-extras-19.04.1.tar.xz" +sha512sums="641048ec00585dde1ce8bb897647d4c4abe451f54d3024be5d7ffa5184243a97bacffe14d842b865aaf39a15fce13a9379a7e494c6f7e50911e4794fc7b52a16 kio-extras-19.04.2.tar.xz" diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD index fbd93527e..bc80f90f1 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.04.1 +pkgver=19.04.2 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="f561539cdc87a28cba80b99ec40734556dadb872fa5862311a41ad6749691bfa5806842dddd71af47ba9f5050c32359a173408c0225d55d6e0f10b96f26d8741 kiriki-19.04.1.tar.xz" +sha512sums="19200d05a7179dc521ae9bf4e80c65deee04287edc766543abbc3715fe3754dbe295ae4cfbcca61c1fa333591916565e5258987476492b80255d6b51d16f6c55 kiriki-19.04.2.tar.xz" diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD index 7a6973567..45dbc443e 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.04.1 +pkgver=19.04.2 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="3ce4f1d40ac7eaaa93364d8a809e7aa117c0d8be2507005e50f0fefdcbc5f57c10769a619508b1f3fbcee9710623fe7576307dff67c8d53ad67d0855e74e6e5e kiten-19.04.1.tar.xz" +sha512sums="a7c58cabae9749520a79a9d766393dd251f313c128029cfb388ac65180e9534f005a593ccf9c6b36592f624f915d7398a70ab68387c699b0cde13cfded9d7fdb kiten-19.04.2.tar.xz" diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD index 70c54ee87..f96289671 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.04.1 +pkgver=19.04.2 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="22168b89cfc2a099365df0ab791e5c39a4cfff09ef3a1a074a480d3e60f25139a76d99d3a684380f637fbe59401a8ff476204a72d221c283cd593d47719dc0f0 kjumpingcube-19.04.1.tar.xz" +sha512sums="14557360348ea7c4d5cec4bb4a7335e4b4e7e5755c5cdbaf1e5c38c15f5354f6327f83830a7e94190c7610f42218974cd268d5c5121c41e0757e4a6a59cbc395 kjumpingcube-19.04.2.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index 60ff7de3e..81b5cbb2f 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.04.1 +pkgver=19.04.2 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="8f8c289ede3e13397f4e5ee06d96d1e5a99737c5e30089297fb8294ee73c0934937bc78d24c89681f21ea6e7cf166cb8a8d314e0631d2f2d2188ce247abd28ea kleopatra-19.04.1.tar.xz -52cdace52d00932c8372f3abf03d24ba1d4d5650327aaf41871714d13cd92c9297a98e35901c80ca3495f3014450a7513948ccb83be032c1c8e81042e67431f2 qt5.9.patch" +sha512sums="44c23196da7cedb323d061125f14d2ecd144de9737a01474730982f9e6ba2b51382a4b0670dadf630348a52a4e19cf22e1a80f5ca0e6dd3903ea970acb3a9033 kleopatra-19.04.2.tar.xz +e7920b71ffa04e44644666e9ba2ffdb87a26b32b6430a824ccaff1bb80a84510453e5263a57637ed96a52056826a1dc9eeb92721b95eff90130997e806ff3282 qt5.9.patch" diff --git a/user/kleopatra/qt5.9.patch b/user/kleopatra/qt5.9.patch index 22d54f3b3..c909224e7 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.56.0") +set(KF5_MIN_VERSION "5.54.0") - set(KMIME_VERSION "5.11.1") - set(LIBKLEO_VERSION "5.11.1") + set(KMIME_VERSION "5.11.2") + set(LIBKLEO_VERSION "5.11.2") -set(QT_REQUIRED_VERSION "5.10.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 a8baf4512..f8c66dc6c 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.04.1 +pkgver=19.04.2 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="0a5f22b11586e171fddca45f6bcea5091882c9fdb0ba60dced530a0227682bbc149b852a04d7e6152b5cf27e00444fed73fb5ebf9f6b20f4e2c651924fcf0852 klettres-19.04.1.tar.xz" +sha512sums="ea2628f33ba05b3b3503db2defe2670b298da446c0784dcd50e1cf974ccda0e8b828e70f8d079d694a178c8959e188dedc86a6049a48556de6ca6cc98411482b klettres-19.04.2.tar.xz" diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD index 1c3ad8c2b..f8ecaf8e2 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Fun, simple colour matching game" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="90ed290bfd575260d0bcabe0767458bd93bb5d998244d5c388de4d0402e37e54d68d93b98e7bf987a883113b6e147cc8b42789d4b77a4e1929ddd82f9217ddcc klickety-19.04.1.tar.xz" +sha512sums="604e22acb578c1fcf95bc49eedd881c9ae29a5152c6c78f41099e6f3442fcdf2f4c7ea675503a49d00b2e4ec5979d22cada23b6473b3c7bef7430c8be4a8bac0 klickety-19.04.2.tar.xz" diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD index 7934486a9..c58e14be1 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.04.1 +pkgver=19.04.2 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="05be2e5349969e833204c8603b92ce97f963c20b241587fda2b897a887408fec0b67cefc7b3a18b4a49adcd6b960ae38b6ae2c6a74c2139da6bfecc8d8008a62 klines-19.04.1.tar.xz" +sha512sums="72ad5025c8bc3c7271c0cf997b3a7f57ab2edb472a93ed2ce4ab8d9033d3e449913c6783ea13c4074806671e3977aaa0178225cfd5171a8cd0268029d196d8bf klines-19.04.2.tar.xz" diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index 60b38f7c9..b393a8b7c 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="85963a1546764c76b10851c3f329475bc6246e04698193109cb99667ca51534c2990cd609432b5b333af87ee0f6812c25c930b526bf6f4b3788fa88f8c48d21e kmag-19.04.1.tar.xz" +sha512sums="9a548712ce32b853887bd15f6b7f6058ebb2b79aa1fe278bbfb95af35d2e91e172dddf62102ac5dd3f49498052f049ab87125ed9858ad177a9ccb9abcc501251 kmag-19.04.2.tar.xz" diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD index 82ee75dbd..ad210b84c 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.04.1 +pkgver=19.04.2 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="21efa9ab4ea1dd5480eade7bc9712e7c91abe065fc5ba5912f98e642a9e82f6581ce3ce95b0d6cf1dbc6d488adff2113f6188a65288ec5c13043b4616e1349a6 kmahjongg-19.04.1.tar.xz" +sha512sums="159b269a1f4dfeda9b36f6f6b6f1d2a1510676c221061a123be643343c2407829eea342f6f784e80aa94190d46b111d7fd591945314164e5b7564681c8432225 kmahjongg-19.04.2.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index 529ed5a7e..cab8ab8e7 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c70e8f176a879269e16095246a3dea52a2d437a6ab1a68e1785b96bd4c175095b41de8557900000839090a4881d8e51bf431c8aae35fb5008f7c76cec37254a3 kmime-19.04.1.tar.xz +sha512sums="043cddd297e31172a80167b872b6dcf675c659ec8613cbef8f41bc84bbf8f499f9b85600be0cd36fc6013ae1facadbf8fe022e107a37699b0f15aaac66b498ba kmime-19.04.2.tar.xz b5f04ab4f7ed60bde1eeb50141c5b51a4f285d7b125d834559419d56039c1d540a8d44f508801ae9ac2c6d91c3841d4e64c3856e2c5bfa33eb64175dc9b5c608 egregious-versions.patch" diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD index 99f512bd0..b646a846b 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.04.1 +pkgver=19.04.2 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="74d21df3f2ce2ac883b6e61a0f8c85c85b6cbd38ce3634581d0db2abf106f64693cc27013f0120946947c17d93790de2eaa319c361426e895168a29eaaf108fc kmines-19.04.1.tar.xz" +sha512sums="dd43246fc6ee85da08a4a7df7c53d84bb2b49c5e3d258f44798a7c1282e4d6b4ad693b659def1c9dd83d210ab7a254bc1051d3c55608d20d19e6321636700538 kmines-19.04.2.tar.xz" diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD index b8f161cb7..8d0532caf 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="KDE sound mixer" url="https://www.kde.org/applications/multimedia/kmix/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fc979608fbd4f95717b19ff09c2b7e2d55e6a29570934fbc6b56a9b9a9e70f3cb2719fdbd6230bed16de28085304ba3b6d035f62fc28c3b0275edd095e0199a1 kmix-19.04.1.tar.xz" +sha512sums="f5d012c7250d1d04447750c1cc64c3818067c75668fc0dc92cc34d8fb89672d900a35751a9fab65ce18b5ffd47c85eb3b4ef799ca6e6b67b01283b133a6ab55c kmix-19.04.2.tar.xz" diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index 28fbe17b0..575e9c73f 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.04.1 +pkgver=19.04.2 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="9c618755da01a2596a16bf62569f202c699a296a394a75adcfd246e2655809d8c56ee1302ddf92066fea77d962a2ffc76c0d5b3d28f5e59f1217d68cfa482f9d kmousetool-19.04.1.tar.xz" +sha512sums="8d43bc0981cd4376ae3704af2f4ef0ff96c8dd0097bf6446c17232b98459d93941576f1df0409117c6c1b94dddb64a0b520898db4b918d107316e8bf1574089b kmousetool-19.04.2.tar.xz" diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD index cbd2dd4aa..5ebe7b858 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Mathematical function plotter" url="https://www.kde.org/applications/education/kmplot/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="95a817918eb9386f8eec91c3bab0604ac38a394e905282f0f50a1254b889be2d559f4902ba3f56ea10246d31c2c99a37a4e8b7cb9a8707c363dfa16749c1af1c kmplot-19.04.1.tar.xz" +sha512sums="c541ecdd21546eca30472a74e624234360058ca7a9a74460110b67b10102a810ffc44ac5b70de1f9f57b95ac015d1a03a25db4aef20fbe1ecb9ef362928c7770 kmplot-19.04.2.tar.xz" diff --git a/user/knavalbattle/APKBUILD b/user/knavalbattle/APKBUILD index f182df0b2..f40f5e9e9 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.04.1 +pkgver=19.04.2 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="a7d7749bbfefd7b3a32e4cffb1d7040d2f9b023d36696a82a4cb1b3686a212ae3317894918e00afbf85d43de05c46c3ffdfa8e02c11fad6980933b7f578a63d0 knavalbattle-19.04.1.tar.xz" +sha512sums="a833d828b38f9d57f12079b32cf4ad6bc3132b4b253851b737cc57e5f15664b36d2b903373f8433bf721562f8caaf8b1a13074ad80114faf170357c7f83aa06e knavalbattle-19.04.2.tar.xz" diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD index b318a2c7e..c1f46bd46 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.04.1 +pkgver=19.04.2 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="006c76b9996ff74d9fdaace9e72426619198e74823f07f1433f1aaf1a91669b3ad9040709f97a51f2b65503fe6fc886ac705e60a3a9d4e9e9b8ae837025d6246 knetwalk-19.04.1.tar.xz" +sha512sums="95b43e03684f9a4926c4664877e2b3ea259beb8a9edbee8e1716d0beba7366e2c5c0fdac94f3611b2532354e0b7a09f3973d62bdf8d391bc87878c68638fd7ed knetwalk-19.04.2.tar.xz" diff --git a/user/kolf/APKBUILD b/user/kolf/APKBUILD index 28b73c18e..658071443 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.04.1 +pkgver=19.04.2 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="f8f1360ccc4d9623b8ac325333682125414150daf007376010b82e0dc35347fbb2a745fb45449a241f51b7426f386dd2deb9342f1663534685df134300a10ad5 kolf-19.04.1.tar.xz" +sha512sums="911d5bc4aa1d834fbb41dd3bd525d11ee95dbeaa03942df8f22eb5c7775498f74498f872e068f14b1cf4afe0973f0bf3ca21075dee1db7dca73782bc36423946 kolf-19.04.2.tar.xz" diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD index 7e3bddbd5..c0400d7c2 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.04.1 +pkgver=19.04.2 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="9af5989dec26aebfb0785ef81ab61e033fcee458c591bb2e73fd6d53acf387e79934422a6aab8e002ae6ffe452c228453fdb127509330986be6ae14e8a66d62c kollision-19.04.1.tar.xz" +sha512sums="f55df8c1bf0cb92f834ef6b0dcbdf8e7a8f537366de698fc23db60f7b94befdec1cc5c5bfabee2002db6f24bf0470eedfba376fd23a59a2c8229f52e8030ed8e kollision-19.04.2.tar.xz" diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD index 3beedfa4a..4da8e859d 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Simple painting program for KDE" url="http://kolourpaint.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2154a250683744cd566b3835b68d5f4d16c6b2b7ac747d1bd8fd1de41ebee64c5c972a799d06e1b88768d789393d7f7509428584b29d78923e2275a92de56b9f kolourpaint-19.04.1.tar.xz" +sha512sums="3a0b497003de467c19898682e1f0d76014ec9e68506271492fc8f30e9b9f08fa8639267c1fa84b18dde3d807d81e3db791764a6a43ac8cd7ca7d53b871410baa kolourpaint-19.04.2.tar.xz" diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD index 5027353ad..051147721 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.04.1 +pkgver=19.04.2 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="3656894ecad9ed015b2abe2eaa4c859e2af6c67dde5503a06043c66c0efcb0677564d82168e8692bfa523d6a92fb40eb72a02af94d82863d0673353d20d3d144 konquest-19.04.1.tar.xz" +sha512sums="2efb42c75868c4f395bd0b14de546a39769ed014a224b918160a7f872221ee9f4569204476bcb8dd76e9ec010e68a1fba64e4dc70647200d794b9024ba5fed65 konquest-19.04.2.tar.xz" diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD index 4262edda8..475bc19ac 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Terminal emulator for Qt/KDE" url="https://konsole.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="db1452dd7c9254a13d2585f70f8b9cb1d481ab01207437dc1597fe0187e20bea5692ae09f0b48e5958c1fe987f39b53791299e068539ad31536787b82673dba1 konsole-19.04.1.tar.xz" +sha512sums="528de38577a6cf9e77fce8f3e6a92c4d2461198eb6dc85ad9fb85c1a8ee5b652b244f2b1e5329e22ddf31bef7f6e0ab989a093364a1c2701d6d90595ff9b3418 konsole-19.04.2.tar.xz" diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD index 6b177b3b5..42cfd6dd7 100644 --- a/user/kpat/APKBUILD +++ b/user/kpat/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpat -pkgver=19.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Collection of card games for KDE" url="https://games.kde.org/game.php?game=kpat" arch="all" +options="!check" # Requires running X11 license="GPL-2.0-only" depends="libkdegames-carddecks" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev @@ -42,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2362920a4ddec7ddccb3de58bd1d3e4f424e844bc7c6aa4c16465b64d94967f0adfe903e2845cb61c5afbad5fd52c5f755f529c9934b4a201c3beab6516b6de6 kpat-19.04.1.tar.xz" +sha512sums="5433b523b467da6b9b0bcacd6c89f56b2bc5910fcf064a074fe12605f30b1f793d831c674dcfc1e27e707f8c8145a4bf47e607ccbe2dbd542d2d15e0e5b40c9d kpat-19.04.2.tar.xz" diff --git a/user/kphotoalbum/APKBUILD b/user/kphotoalbum/APKBUILD index c8c83d7f4..e47058f3d 100644 --- a/user/kphotoalbum/APKBUILD +++ b/user/kphotoalbum/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kphotoalbum pkgver=5.5 -pkgrel=0 +pkgrel=1 pkgdesc="Versatile photo album software by KDE" url="https://www.kphotoalbum.org/" arch="all" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index da85d2b76..386ca2afc 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.04.1 +pkgver=19.04.2 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="2eec73ef6a4fb546aa7ce6481c16f6a20d5b49d65ee9e3beab1d35169bab0e2b84bacdb7f00f38b691b86e906ad31bd1ed6a165075bb431c1f9fd9eb5023bc5e kpimtextedit-19.04.1.tar.xz +sha512sums="c928d3cc1690d04cd0c7b8d3fe963c479bd00cef4e0fdcdd28a98d22bb193195e8831ba71779a6017c3de8e10ab828335e1b5b20922b3d97bbf01b178ed61065 kpimtextedit-19.04.2.tar.xz 13f90299735e145142f969ffb6462b71c1cd85d5503c3902af924388042396526ff8b943229462e0ff7e5030393e5312dd67b8dfc66efec81f4f05ac15f86091 qt5.9.patch" diff --git a/user/kpmcore/APKBUILD b/user/kpmcore/APKBUILD index 102059e09..a6fef6476 100644 --- a/user/kpmcore/APKBUILD +++ b/user/kpmcore/APKBUILD @@ -4,7 +4,7 @@ pkgname=kpmcore pkgver=3.3.0 pkgrel=0 pkgdesc="Core routines for KDE Partition Manager" -url="https://www.kde.org/applications/system/kdepartitionmanager" +url="https://www.kde.org/applications/system/partitionmanager" arch="all" license="LGPL-2.1+" depends="" diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD index d770827cf..bf97f7336 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.04.1 +pkgver=19.04.2 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="60e9541a9e8377da5248471160733a86ae1c6f49c7649470ec313475ef483314fb59e8967b2d30dbde2012d437a98a9db11b172e2052a58b65075920daf75b13 krdc-19.04.1.tar.xz" +sha512sums="c63c2dfc3ba3f67bed02cc2c3b80300b90e54bd1e138374435faa73d47a5dd14b3faeb3371fe56ea6d26bb4c1da36af7aed9dfa25bf403707f900e40a0b8455d krdc-19.04.2.tar.xz" diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD index a34522600..0901e9f27 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Reversi game" url="https://games.kde.org/game.php?game=kreversi" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1b42a1e96e06de6571687b5e76c800adda3d68f6ce8792b2d09bca7ae962d924e500ac4b436ebdb261bb9b62f37039acf6cc0f9451bb704d15b21b1bd5859fb3 kreversi-19.04.1.tar.xz" +sha512sums="2a97f5c3fe47f1c33497ceceae5e7784c7e9ca1ae722b0cf1b9905515175f66bc5a0185572802185ca96feaf56f3b0d3fbdffaddbc24d0bd3ebbf65472550915 kreversi-19.04.2.tar.xz" diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD index 6723365c3..45f670912 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.04.1 +pkgver=19.04.2 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="8e070299753b785e9c4cf36e4ba1ba80502825aae7f605f531316ca5ddc05a5c36f4027d09e77ae0930efdbf61b720eb8ebe2d56e805486ebb7b06ce80b72c85 krfb-19.04.1.tar.xz" +sha512sums="aeb377cd79caa08d8ec3280e0c4ed3c19ffa04bf6e939f246d4b185fb9af5de2883e8c795d1931753ebd16f4c4acc5bb01fb21862250135b756a052fc91dce00 krfb-19.04.2.tar.xz" diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD index ac809584d..bbe0c9797 100644 --- a/user/krita/APKBUILD +++ b/user/krita/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krita -pkgver=4.1.8 -pkgrel=0 +pkgver=4.2.1 +pkgrel=1 pkgdesc="Digital painting program by KDE" url="https://krita.org/" arch="all" @@ -15,18 +15,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev qt5-qtsvg-dev qt5-qtmultimedia-dev kcrash-dev libice-dev libx11-dev libxcb-dev fftw-dev libpng-dev boost-dev tiff-dev libjpeg-turbo-dev kio-dev eigen-dev exiv2-dev lcms2-dev poppler-qt5-dev gsl-dev libxi-dev - libraw-dev" + libraw-dev quazip-dev" subpackages="$pkgname-lang" source="https://download.kde.org/stable/krita/$pkgver/krita-$pkgver.tar.gz" -prepare() { - cd "$builddir" - default_prepare - mkdir -p build -} - build() { - cd "$builddir"/build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -38,9 +31,10 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ + -DBUILD_TESTING=False \ ${CMAKE_CROSSOPTS} \ - .. - make + -Bbuild + make -C build } check() { @@ -49,8 +43,7 @@ check() { } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9 krita-4.1.8.tar.gz" +sha512sums="879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1 krita-4.2.1.tar.gz" diff --git a/user/kronometer/APKBUILD b/user/kronometer/APKBUILD index c1c33409c..71ef242f2 100644 --- a/user/kronometer/APKBUILD +++ b/user/kronometer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kronometer -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=0 pkgdesc="Easy-to-use stopwatch application" url="https://userbase.kde.org/Kronometer" @@ -15,7 +15,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kronometer/$pkgver/src/kronometer-$pkgver.tar.xz" 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="d635b55c0513427e7c98c7317813fd62886b7fb6aab7cb238ac6ba058ff37c7e9302c46c48e2248fa13e50d32d90a39ddd8d4bb88663a4019cd981f54e46a42c kronometer-2.2.1.tar.xz" +sha512sums="2c808d7b3fafdc2cf507b0bb64be1b36be166a43543b18569e430d86f75cc64505de9dafd9a06e5b8b9e7fde0c0e624f598da7539026885b12585e3628067f93 kronometer-2.2.2.tar.xz" diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD index 6ce44f38c..eeeab9216 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Screen ruler" url="https://www.kde.org/applications/graphics/kruler/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6ddbea90b6f75c6c5d3308b1e69d8ff3d28bba72cb4e35d0165c7b25926035febeffd671204abfdab6063bc810fa92d15bbddad82c46046a283819c44e43ed52 kruler-19.04.1.tar.xz" +sha512sums="cc79c4b1093d1b001dd739d5f487ba9199fb7a336c49e917db340d81d3d4f42a9e017e6a471695ee0de32abb2c076e299c8a1ff2842926788762db5b7593cbe5 kruler-19.04.2.tar.xz" diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD index 30988940e..1e5b20aed 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.04.1 +pkgver=19.04.2 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="7789cdcc61dd2c0690a80e5154efe3ff432321185e60d598e982acd9a92cc36926447ed295c1560c56bb207c0387a7b203f2fb3f75b62798a45ea898a5fd54fb kshisen-19.04.1.tar.xz" +sha512sums="2d99aa103f0d8a9ea9ecd689f3bfbc328453bb94ef52d490ba0866f0f3e967eac97b746ab511fa59016203fe40e1e7767f914c69d537bf1d8201526ac467a124 kshisen-19.04.2.tar.xz" diff --git a/user/ksirk/APKBUILD b/user/ksirk/APKBUILD index b88c01cb7..63b62224b 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.04.1 +pkgver=19.04.2 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="4407c942202deac31a46dd0dd4797630829f4e334db6d3fb5bf1baa3a1616e2f67a492550c3cd77a9632a9a9b687eb7bdbcd90f2002acd73258ebdacd288035b ksirk-19.04.1.tar.xz" +sha512sums="fabaea0ae4cbf8315b38244137e2c8ef76845c75efec281e09b3cdd5d29b2f8f596675286ef3607bbf3551582b967febe5e34765249b0b8e9be53cc36d7e4de1 ksirk-19.04.2.tar.xz" diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD index dd99fe9a3..ed27490b6 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Tron-like game" url="https://www.kde.org/applications/games/ksnakeduel/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b4439eef6b90d6d998a4790fddb79ea01604a69d63c5a54f71d7a5295a6d487c6515864881cdd9aa8223151ceee80372677831aa3373d8f662e49dfde8623373 ksnakeduel-19.04.1.tar.xz" +sha512sums="1f18e9673b5b943e4f65fb160dd192d48855ebd389b11a68b140f28a95b3be144012e2c0610c461a295532e1de5ce44cec6607aa95a8c41059586365ad69453c ksnakeduel-19.04.2.tar.xz" diff --git a/user/kspaceduel/APKBUILD b/user/kspaceduel/APKBUILD index 1ddf579fa..4fe79c60f 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.04.1 +pkgver=19.04.2 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="d5b5ccc168b6272d35ee8781a249a4aea5ca211e97f2b8cd2c71f2652caa9ebf41c9bd3c8bbbc716d0bb6b4d3f4c87cc2c609a2624ccc1cfc703f3e5315987d9 kspaceduel-19.04.1.tar.xz" +sha512sums="6e7e2416a9715b362c39037933b05e68e992849ef6ef6760fa337ebfd7755f4dc5835b0a1debccaa16da4c2873a8dc496e22c4b08e82a1f5a93532e60e0f8089 kspaceduel-19.04.2.tar.xz" diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD index e6b4feade..c1b5c9198 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.04.1 +pkgver=19.04.2 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="0a799744caf34bca1aa4174b8160e0703db59aba4b50fee3b9e5938e22e171e94d28f1fed798f83387e1b9c35241417560e25cca4514708a4f9fae0a02bfbdd1 ksquares-19.04.1.tar.xz" +sha512sums="091f8f27bf236675637ac6470c36a4367825679e5cfd4fd5da61bf391073ff2a0ebba9b3ca823272e1f3e3ece5eec1237414c9c30e11c768f006da5001ba9c94 ksquares-19.04.2.tar.xz" diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD index 7966eb088..8ba826bba 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.2.1 +pkgver=3.2.3 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="d62d2211db66941c402e19dee28ace235933fe33e077f7de3350c1a80eb02c18b23549c9cc8403fe9d34bc06332501b5ed931f992eb92c605fe7661572c3ed46 kstars-3.2.1.tar.xz" +sha512sums="29c534c860cb1ab2c52e497061b16c7870e63253a7184f79ed8565d56abbc2909160d7f8c649764e4eb7462630e30e4428a88753e7987e97e530b174076cbd37 kstars-3.2.3.tar.xz" diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD index 65074b490..db44ae22f 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.04.1 +pkgver=19.04.2 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="bf53460e9ff82c9e36be1c454588c6b0347365b2d62fbf3aa908883361c80e7da67ad23105ff3443f2bb0dec695aa787c7a15a20c4c9abec564f1f7a7be7f48b ksudoku-19.04.1.tar.xz" +sha512sums="d08dc4157a69b3614cefe5dd8fe9888b5c847bd53dbb2ff9c9132bf10f25e6e3843ccf46b3d156b81fe4b0e7269e48b9fe213f2562760b45fc3b3d29c3c97358 ksudoku-19.04.2.tar.xz" diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD index 11fe36915..bb5b69a98 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.04.1 +pkgver=19.04.2 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="6a30d655ca18f8249979e266fc6377ef69cf40b9c155e41cb4102e542ea1beabb5a647a23a37430bf010ff3b657887b58ed559f41f248fea76f47cea5146f295 ksystemlog-19.04.1.tar.xz" +sha512sums="214f2d5cc70f688857061342b5960aa3236d75610b0ca1248f28ab870a7a8ac79f1fc4485f639cb8868748307a0970665d89fc8b90e6141f8a4212036a46bab5 ksystemlog-19.04.2.tar.xz" diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD index 3f78cc184..9c67a56b8 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Steep responsibly" url="https://www.kde.org/applications/games/kteatime/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3afb59cf7fb5ba1273a49a69f4e587e0356055e992fec9115028769c9369cec77a9cf3648974c50e2d2c98ac587ec172f7fe03cfb423484ce0b28c226d4bda3b kteatime-19.04.1.tar.xz" +sha512sums="f909a7b9981c5e7ca3a93f73578e8ef17fae6b9603304c010e25b9234ff794894d25ba409e2666d2778080ad1bf60584d1b6ed914429aefa81aed6d403b3e3a7 kteatime-19.04.2.tar.xz" diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index 3282df44f..09266da33 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.04.1 +pkgver=19.04.2 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="a0d7fe8c12e827dfb7de201aa7dddfb594a18daed0f8a9fdf3eafa24db789a8a734df479e8fb22d160f089645e0bc34eb87d5d181d53863cae823f2de081d101 ktimer-19.04.1.tar.xz" +sha512sums="2e27db3401a0369ebaa3ff486bb63f150c38932945f157e286ef6dc8e00221556bb4557977c8e3aa62bec3b6a6fa620b8b3a3c9c2555b0591f357bd09dfbebdd ktimer-19.04.2.tar.xz" diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD index 9810a7570..78f570683 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Touch typing tutor" url="https://www.kde.org/applications/education/ktouch/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="82af8a4ff49643acc888bdaad5e1c8c3a7555dcb05e86f42216cc1350a28fa647714ad62f83ba244618ae2cc5b707847d9c36ca4e770fac8f5cb8cdcbf58c90b ktouch-19.04.1.tar.xz" +sha512sums="18b53d966d280f7425948f0cafeddc0be118be3babe86537a18bd86b9398282693eecae9a1860f97c36255921d617821ed23a7fcc4e0da76730d51d8a869fb1c ktouch-19.04.2.tar.xz" diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD index 0ff92497a..2f82e165f 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.04.1 +pkgver=19.04.2 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="c1f8183ccf7a8bf142e6989565b5bb59503078762f39e4879a7fbdc0fd21fa3913b42a2822d1bfcc5e450b3462f470203c21362193805bd88346f9cb43ed2925 ktuberling-19.04.1.tar.xz +sha512sums="77483995d02ed441812f258adcff6dbae176866d212a15ef539e520ceaf65cad475cdf150d457d918c9d2795ebd605bd96d44807a4feb3af1c7d21b06f23aef1 ktuberling-19.04.2.tar.xz a8c723302d141ff74a10cc38245524d59a51d476159c2ac46a1694747ddcb078abc42cea80cf5a5d3910c96c0c90fb7dbf82786496f03b4438a23a736a784e76 frameworks.patch" diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD index 3bba51e81..3ecf5f4dd 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Educational programming environment" url="https://www.kde.org/applications/education/kturtle/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d6abd252aad1f8ffa462a493881b5aec8c4463e38a2a372404e7237070b1c1a4598366600247e7d61ab31f8bd042b9ebcbd07059b6e1af6595ac86762db48eff kturtle-19.04.1.tar.xz" +sha512sums="429d4edb810aa436f1fd1a4af30742175c7dfee35d557fa17660cfe811e0a12ccfa9ec26ef00e2b4b3a688d167c8dc25029ca21bc53e63937df7b86b100aa24a kturtle-19.04.2.tar.xz" diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD index 08bf1c032..19057331b 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.04.1 +pkgver=19.04.2 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="b72ba8207ffa9e0362743bf9e4404fe9afa9d7e66531a66d79df5a805755a494bf028f5c86a00c0e8bb6e89a5f96f2a1f34cedf800b2c5318dacdfa9bf60a492 kubrick-19.04.1.tar.xz" +sha512sums="16dcd37e03fccb30f6b7d9094f9c08c09e6c7c93cc39ea3b027462b55080833f436e6803c235b2113b9f4fd139d63dd66e0676e73590a19abb255cd18ee7532b kubrick-19.04.2.tar.xz" diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index 52f041e98..a512e4072 100644 --- a/user/kwalletmanager/APKBUILD +++ b/user/kwalletmanager/APKBUILD @@ -1,10 +1,10 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwalletmanager -pkgver=19.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Manage KDE wallets" -url="https://www.kde.org/applications/system/kwalletmanager/" +url="https://www.kde.org/applications/system/kwalletmanager5" arch="all" license="GPL-2.0-only" depends="" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="95a1e01184f654c57002ad5d3bcdc3bd463377f3de7f0524282eab5ddf156ab8c4ae99afa0950df6cb2e280e34eac605810b491068f55076ced4d042cfab9cba kwalletmanager-19.04.1.tar.xz" +sha512sums="e8045a1ac135550bae1e1fecb16c11a92d10ffdae6a8f299006e8ce8659ead5a75c34ed06e10f9657609171a457f6c7fdc582d8379ba6f9ecf6450fe0f48136d kwalletmanager-19.04.2.tar.xz" diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD index ff17c9dfc..547146aab 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Sound editor built for KDE" url="http://kwave.sourceforge.net/" @@ -47,6 +47,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="42fef840ac66ee439d594727dd23e0a0cf4342d8f20990da3d1d83d758841821d7cac2bf99f23e135f7e7eea5d02d877cd19b307a1a47b23f258ea5e06c050fd kwave-19.04.1.tar.xz +sha512sums="d3be3aecf9b29747f91eae94a3bd6af7604997c21f76ef30e1e3eb77caa40e2a65588debf1568e5919448db114f4ff0bd69f46d58eeffbce76ba0287f309f2a3 kwave-19.04.2.tar.xz 63afd083727fd28436c2a8071429ba95fe4342c11669a4e27afc30b8a088b981f284fcff13861d5ef01a6f97152b25eec1fbeb303c9bdd76707e44ff5978dab8 es-doc-fix.patch 43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch" diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD index 521e42c96..bef71f5b9 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.04.1 +pkgver=19.04.2 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="f8858da7239562cb431cffe07ba003d0fdb469ce6fa4a4fc2cdafbc843e85baff40587c1140009121d94410b5895d5e15cc8a81178285934a4e17c487cd20496 kwordquiz-19.04.1.tar.xz" +sha512sums="263d885327750e2cbdfa3ccefca68da5bd79364a6aeeba00c38e57b8ad5c122fd0c05f85221567ea2b71c4857719378919475484b2f95a34438ae4c057aa661c kwordquiz-19.04.2.tar.xz" diff --git a/user/kxstitch/APKBUILD b/user/kxstitch/APKBUILD index a8634b0b9..d9ff8e851 100644 --- a/user/kxstitch/APKBUILD +++ b/user/kxstitch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kxstitch -pkgver=2.1.1 +pkgver=2.2.0 pkgrel=0 pkgdesc="Cross-stitch pattern editor by KDE" url="https://userbase.kde.org/KXStitch" @@ -15,7 +15,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kxstitch/$pkgver/kxstitch-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} \ + . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d5a6b6d06bfb894dd7404cb81350389f1ebf5c8a463eb792358abd67f362d1e1f578d06319461a006625864f1c4a69ebb4ccd0db422870c3eae0516c9132a3b3 kxstitch-2.1.1.tar.xz" +sha512sums="bf09130a35bc605db2bbd6e5e129ac494e8f02b920d4a8d6705b5030a9339306b3b302bd988839e1684da3e5e15e91d655dadf916eb4bf2dc9c1322fd435281d kxstitch-2.2.0.tar.xz" diff --git a/user/labplot/APKBUILD b/user/labplot/APKBUILD index caf9aa5df..d6ed5bf7e 100644 --- a/user/labplot/APKBUILD +++ b/user/labplot/APKBUILD @@ -4,7 +4,7 @@ pkgname=labplot pkgver=2.6 pkgrel=0 pkgdesc="Interactive tool for graphing and analysis of scientific data" -url="https://www.kde.org/applications/education/labplot/" +url="https://www.kde.org/applications/education/labplot2" arch="all" license="GPL-2.0-only" depends="shared-mime-info" @@ -13,7 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kdoctools-dev ki18n-dev kiconthemes-dev kdelibs4support-dev kxmlgui-dev knewstuff-dev ktextwidgets-dev kwidgetsaddons-dev gsl-dev fftw-dev qt5-qtserialport-dev syntax-highlighting-dev bison libexecinfo-dev - cantor-dev" + cantor-dev docbook-xsl" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/labplot/$pkgver.0/labplot-$pkgver.0.tar.xz" diff --git a/user/libblockdev/APKBUILD b/user/libblockdev/APKBUILD index 98eeda9dd..a3ab3dff7 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.21 +pkgver=2.22 pkgrel=0 pkgdesc="Library for manipulating block devices" url="http://storaged.org/libblockdev/" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev" source="https://github.com/storaged-project/libblockdev/releases/download/$pkgver-1/libblockdev-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,13 +27,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="7e6e12716e18c5e48f3b2207f132c242d99ce540f55de3b6932ac3427cb532d9074358c828d9702df71068a8454c642a4c0ff96e62a567ed1c1247c59ece432b libblockdev-2.21.tar.gz" +sha512sums="69bbd5afbd8abb0e22ef72d80375e32db653f21cf3063cf69fff71ad069ee0e6119adf6918a63e7ba9ec4ca02ffe3337be3edeeafdd3e73e4e53d85e90bf2f45 libblockdev-2.22.tar.gz" diff --git a/user/libbluray/APKBUILD b/user/libbluray/APKBUILD index 6d230fcb5..99d2d0002 100644 --- a/user/libbluray/APKBUILD +++ b/user/libbluray/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libbluray -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=0 pkgdesc="Library for Blu-Ray disc playback" url="https://www.videolan.org/developers/libbluray.html" @@ -13,8 +13,6 @@ subpackages="$pkgname-dev" source="https://download.videolan.org/pub/videolan/libbluray/$pkgver/libbluray-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,8 +26,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="0a3bcef06d2a58c51c3d46934c32941ec0606dc9b71fe36f72a6e34ab8113cf72cfb6e2fdd51f23e0a44ccd404323f5ac5c666aa1d839ae16cc775267cbce839 libbluray-1.1.1.tar.bz2" +sha512sums="5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7 libbluray-1.1.2.tar.bz2" diff --git a/user/libdc1394/0001-Fix-bad-variable-type-uint-int.patch b/user/libdc1394/0001-Fix-bad-variable-type-uint-int.patch deleted file mode 100644 index c2a572857..000000000 --- a/user/libdc1394/0001-Fix-bad-variable-type-uint-int.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9d0c3158bc73292ca755477f60cbf5b5fd622fde Mon Sep 17 00:00:00 2001 -From: Damien Douxchamps <ddsf@douxchamps.net> -Date: Thu, 12 Jan 2017 16:47:27 +0900 -Subject: [PATCH] Fix bad variable type uint -> int - -Type was change to uint in recent commit but it should have been INT. - -Signed-off-by: Damien Douxchamps <ddsf@douxchamps.net> ---- - libdc1394/AUTHORS | 1 + - libdc1394/dc1394/bayer.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/libdc1394/dc1394/bayer.c b/libdc1394/dc1394/bayer.c -index 10a4c1b..cbdc417 100644 ---- a/dc1394/bayer.c -+++ b/dc1394/bayer.c -@@ -24,6 +24,7 @@ - #include <limits.h> - #include <math.h> - #include <stdlib.h> -+#include <stdint.h> - #include <string.h> - #include "conversions.h" - -@@ -775,7 +776,7 @@ dc1394_bayer_Downsample(const uint8_t *restrict bayer, uint8_t *restrict rgb, in - { - uint8_t *outR, *outG, *outB; - register int i, j; -- uint tmp; -+ int tmp; - int st=sx*sy; - int p; - int sx2=sx<<1; --- -2.11.0 - diff --git a/user/libdc1394/APKBUILD b/user/libdc1394/APKBUILD index 8bed91739..d36d55a47 100644 --- a/user/libdc1394/APKBUILD +++ b/user/libdc1394/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=libdc1394 -pkgver=2.2.5 -pkgrel=4 +pkgver=2.2.6 +pkgrel=0 pkgdesc="Programming interface to control FireWire / IIDC cameras" url="https://damien.douxchamps.net/ieee1394/libdc1394/" arch="all" @@ -12,9 +12,7 @@ depends="" depends_dev="libusb-dev libraw1394-dev" makedepends="$depends_dev linux-headers" subpackages="$pkgname-dev $pkgname-doc" -source="https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/$pkgver/libdc1394-$pkgver.tar.gz - 0001-Fix-bad-variable-type-uint-int.patch - " +source="https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/$pkgver/libdc1394-$pkgver.tar.gz" build() { cd "$builddir" @@ -34,5 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4a02560b7b2db7199b91c35786cb9d5af51398795fc1b7f0cb577d3563b27c0d03d407fa472d9756a2f87b658350a55d29c16fef401a74f835ba86e25214d13c libdc1394-2.2.5.tar.gz -ab19b1aecec17b1caa6b225f626b6adcf80818cb59f693df69e9f0f2b4014846be22aa93473a62da8c7ae937ea8265f90499a9561d48e6bfe931e1e00cb16c60 0001-Fix-bad-variable-type-uint-int.patch" +sha512sums="2d60ed1054da67d8518e870193b60c1d79778858f48cc6487e252de00cc57a08548515d41914a37d0227d29e158d68892c290f83930ffd95f4a483dce5aa3d25 libdc1394-2.2.6.tar.gz" diff --git a/user/libebml/APKBUILD b/user/libebml/APKBUILD index 5ed4be827..03b2e73d7 100644 --- a/user/libebml/APKBUILD +++ b/user/libebml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libebml -pkgver=1.3.7 +pkgver=1.3.9 pkgrel=0 pkgdesc="Library to parse Extensible Binary Meta-Language files" url="https://www.matroska.org/" @@ -29,4 +29,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="ad574a73a1d2c5fbd4581991ff790ef22cfcaf5645295b06dce36235b43d552bbec3b400d3c80550c8020ed3720226fad05348c6034c444da1106439c7fd9fc1 libebml-1.3.7.tar.xz" +sha512sums="a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e libebml-1.3.9.tar.xz" diff --git a/user/libevdev/APKBUILD b/user/libevdev/APKBUILD index e83c3dd0d..aac737a91 100644 --- a/user/libevdev/APKBUILD +++ b/user/libevdev/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libevdev -pkgver=1.6.0 +pkgver=1.7.0 pkgrel=0 pkgdesc="Wrapper library for kernel event devices" url="https://www.freedesktop.org/wiki/Software/libevdev" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 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="73046da447773716c9f0c9f511f3a0a6ababcf92a146eba363014afcbdb465f4c3cd8be0917f2f01561a72f24f20fe8ecd333467437d9d85c03afcb433d05060 libevdev-1.6.0.tar.xz" +sha512sums="bc43723fd1ca251a77ee549022609f73c15a33ae470fc843ac687542fb1938fba4d046d3ee1dc814bc38a4292a7f2ad9e71fcce45525b518a4f4a5bef099aa6f libevdev-1.7.0.tar.xz" diff --git a/user/libevent/APKBUILD b/user/libevent/APKBUILD index e1d570d9d..a77cae8fd 100644 --- a/user/libevent/APKBUILD +++ b/user/libevent/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=libevent pkgver=2.1.8 -pkgrel=4 +pkgrel=5 pkgdesc="An event notification library" url="http://libevent.org/" arch="all" @@ -55,6 +55,7 @@ package() { dev() { replaces="libevent" default_dev + provides="$provides pc:libevent=$pkgver-r$pkgrel" mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } diff --git a/user/libexecinfo/APKBUILD b/user/libexecinfo/APKBUILD index 3f1040343..2c357a177 100644 --- a/user/libexecinfo/APKBUILD +++ b/user/libexecinfo/APKBUILD @@ -10,7 +10,7 @@ license="BSD-2-Clause" depends="" makedepends="" subpackages="$pkgname-dev" -source="http://distcache.freebsd.org/local-distfiles/itetcu/$pkgname-$pkgver.tar.bz2 +source="https://distcache.freebsd.org/local-distfiles/itetcu/$pkgname-$pkgver.tar.bz2 10-execinfo.patch 20-define-gnu-source.patch 30-linux-makefile.patch diff --git a/user/libfm-extra/APKBUILD b/user/libfm-extra/APKBUILD index 18a9ddb73..775b4d322 100644 --- a/user/libfm-extra/APKBUILD +++ b/user/libfm-extra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libfm-extra -pkgver=1.3.0.2 +pkgver=1.3.1 pkgrel=0 pkgdesc="Library for generating menu caches" url="https://wiki.lxde.org/en/PCManFM" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="179cc0350509cb1a8a60b89f8145169857926c7cc3dadb9f61078d4dba79709b248b3d05862e78c11747f1fc4e45825ad6f4916d423ae5e346e5274d34197445 libfm-1.3.0.2.tar.xz" +sha512sums="f385cf7bf2f4800c11dd6474cd20009cbe1208f1d08570b61954ea8bd84c56cc49880cbf84d4b2aa4b91eb6929d017ebc427649391059b786d7e6fc4535e4f14 libfm-1.3.1.tar.xz" diff --git a/user/libfm/APKBUILD b/user/libfm/APKBUILD index fc1021a8e..ad75ec5d9 100644 --- a/user/libfm/APKBUILD +++ b/user/libfm/APKBUILD @@ -2,19 +2,21 @@ # Maintainer: pkgname=libfm pkgver=1.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Library for file management" url="https://wiki.lxde.org/en/PCManFM" arch="all" license="GPL-2.0+" makedepends="dbus-glib-dev glib-dev gtk+2.0-dev intltool libexif-dev - menu-cache-dev udisks2-dev" + libfm-extra-dev menu-cache-dev udisks2-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -replaces="libfm-extra" -source="https://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.xz" +source="https://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.xz + without-extra.patch + " build() { cd "$builddir" + mv data/libfm.conf data/libfm.conf.sample ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -33,9 +35,5 @@ package() { make DESTDIR="$pkgdir" install } -dev() { - default_dev - replaces="libfm-extra-dev" -} - -sha512sums="f385cf7bf2f4800c11dd6474cd20009cbe1208f1d08570b61954ea8bd84c56cc49880cbf84d4b2aa4b91eb6929d017ebc427649391059b786d7e6fc4535e4f14 libfm-1.3.1.tar.xz" +sha512sums="f385cf7bf2f4800c11dd6474cd20009cbe1208f1d08570b61954ea8bd84c56cc49880cbf84d4b2aa4b91eb6929d017ebc427649391059b786d7e6fc4535e4f14 libfm-1.3.1.tar.xz +776559307e796309a0a68173292d4ce91c3a241a0e8310a04a96856949677f2f7f8527ae463e4438d635ebe93676dda923a2deed5b76aba007b00093e3a5a109 without-extra.patch" diff --git a/user/libfm/without-extra.patch b/user/libfm/without-extra.patch new file mode 100644 index 000000000..c6e86d5e7 --- /dev/null +++ b/user/libfm/without-extra.patch @@ -0,0 +1,75 @@ +--- libfm-1.3.1/Makefile.in.old 2018-12-17 19:18:43.000000000 +0000 ++++ libfm-1.3.1/Makefile.in 2019-06-04 01:33:11.797284687 +0000 +@@ -461,7 +461,7 @@ + docs/reference/libfm/version.xml.in + + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = libfm-extra.pc $(am__append_5) ++pkgconfig_DATA = $(am__append_5) + @EXTRALIB_ONLY_FALSE@SUBDIRS = $(DIST_SUBDIRS) $(am__append_3) + @EXTRALIB_ONLY_TRUE@SUBDIRS = src $(am__append_3) + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc +--- libfm-1.3.1/data/Makefile.in.old 2018-12-17 19:18:43.000000000 +0000 ++++ libfm-1.3.1/data/Makefile.in 2019-06-04 01:38:26.663631036 +0000 +@@ -406,7 +406,7 @@ + mime_DATA = libfm.xml + libfmconfdir = $(sysconfdir)/xdg/libfm + libfmconf_DATA = \ +- libfm.conf \ ++ libfm.conf.sample \ + $(NULL) + + desktop_in_files = \ +--- libfm-1.3.1/src/Makefile.in.old 2018-12-17 19:18:44.000000000 +0000 ++++ libfm-1.3.1/src/Makefile.in 2019-06-04 01:35:34.592026293 +0000 +@@ -909,14 +909,14 @@ + @EXTRALIB_ONLY_FALSE@ gtk/fm-thumbnail.h \ + @EXTRALIB_ONLY_FALSE@ $(NULL) + +-LIBFM_EXTRA_INCLUDES = \ +- fm-extra.h \ +- fm-version.h \ +- extra/fm-xml-file.h \ +- $(NULL) ++@EXTRALIB_ONLY_TRUE@LIBFM_EXTRA_INCLUDES = \ ++@EXTRALIB_ONLY_TRUE@ fm-extra.h \ ++@EXTRALIB_ONLY_TRUE@ fm-version.h \ ++@EXTRALIB_ONLY_TRUE@ extra/fm-xml-file.h \ ++@EXTRALIB_ONLY_TRUE@ $(NULL) + + EXTRA_LTLIBRARIES = libfm-gtk.la libfm-gtk3.la +-@EXTRALIB_ONLY_FALSE@lib_LTLIBRARIES = libfm-extra.la libfm.la @LIBFM_GTK_LTLIBRARIES@ ++@EXTRALIB_ONLY_FALSE@lib_LTLIBRARIES = libfm.la @LIBFM_GTK_LTLIBRARIES@ + @EXTRALIB_ONLY_TRUE@lib_LTLIBRARIES = libfm-extra.la + libfm_la_SOURCES = \ + $(libfm_SOURCES) \ +@@ -1059,7 +1059,7 @@ + @ENABLE_DEMO_TRUE@ $(GTK_LIBS) \ + @ENABLE_DEMO_TRUE@ $(INTLLIBS) \ + @ENABLE_DEMO_TRUE@ libfm.la \ +-@ENABLE_DEMO_TRUE@ libfm-extra.la \ ++@ENABLE_DEMO_TRUE@ -lfm-extra \ + @ENABLE_DEMO_TRUE@ @LIBFM_GTK_LTLIBRARIES@ \ + @ENABLE_DEMO_TRUE@ $(NULL) + +--- libfm-1.3.1/src/modules/Makefile.in.old 2018-12-17 19:18:44.000000000 +0000 ++++ libfm-1.3.1/src/modules/Makefile.in 2019-06-04 01:37:50.457501640 +0000 +@@ -180,8 +180,7 @@ + $(gtk_menu_trash_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ + @ENABLE_GTK_TRUE@am_gtk_menu_trash_la_rpath = -rpath $(pkglibdir) +-vfs_menu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(top_builddir)/src/libfm-extra.la ++vfs_menu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) + vfs_menu_la_SOURCES = vfs-menu.c + vfs_menu_la_OBJECTS = vfs_menu_la-vfs-menu.lo + vfs_menu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -459,7 +458,7 @@ + + # module-specific parameters + vfs_menu_la_CFLAGS = $(MENU_CACHE_CFLAGS) -I$(top_srcdir)/src/extra +-vfs_menu_la_LIBADD = $(MENU_CACHE_LIBS) $(top_builddir)/src/libfm-extra.la ++vfs_menu_la_LIBADD = $(MENU_CACHE_LIBS) -lfm-extra + gtk_fileprop_x_desktop_la_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src/gtk + gtk_fileprop_x_desktop_la_LIBADD = $(GTK_LIBS) + gtk_fileprop_x_shortcut_la_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src/gtk diff --git a/user/libgda/APKBUILD b/user/libgda/APKBUILD index 0e0c0731a..e4a2484ec 100644 --- a/user/libgda/APKBUILD +++ b/user/libgda/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgda -pkgver=5.2.8 +pkgver=5.2.9 pkgrel=0 pkgdesc="GNOME Database Access library" url="https://www.gnome-db.org/" @@ -19,7 +19,6 @@ source="https://ftp.gnome.org/pub/GNOME/sources/libgda/5.2/libgda-$pkgver.tar.xz " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,14 +32,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece libgda-5.2.8.tar.xz +sha512sums="a28324533298d42aacfce5d9f3d699314ddb5d5fe7e492433dbbe4232fb310b798d312ac08dffd4f4ebef5ceea3c6c49ef3c679ab97b5e9d1f64e3fed50b2231 libgda-5.2.9.tar.xz 911383ba387ecfd2c53bee777aa540f8490c52fdd82e20d23b7f61e5d8591643be9d2c50d4d45183d96b2a44d2e800ceb788bf7e871ade3a9166584c86af9be5 cs.patch" diff --git a/user/libgphoto2/APKBUILD b/user/libgphoto2/APKBUILD index 7bd75969d..59cd04e35 100644 --- a/user/libgphoto2/APKBUILD +++ b/user/libgphoto2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libgphoto2 -pkgver=2.5.22 +pkgver=2.5.23 pkgrel=0 pkgdesc="Digital camera library" url="http://www.gphoto.org" @@ -46,4 +46,4 @@ package() { "$pkgdir/lib/udev/rules.d/54-gphoto.rules" } -sha512sums="8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb libgphoto2-2.5.22.tar.bz2" +sha512sums="f5f8f33e934989e6f832952c6c7c2c9e37c436652a08191e8ccced293447a090cb596fff80b9b0ad52c99c0ffc08a1207ca7ef2b630dc52f4c6d7f86e4cbc95a libgphoto2-2.5.23.tar.bz2" diff --git a/user/libgsf/APKBUILD b/user/libgsf/APKBUILD index 086da1e6c..b0916d3da 100644 --- a/user/libgsf/APKBUILD +++ b/user/libgsf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libgsf -pkgver=1.14.45 +pkgver=1.14.46 pkgrel=0 pkgdesc="Library for manipulating structured files" url="https://www.gnome.org/" @@ -45,4 +45,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1 } -sha512sums="2e993150b6fec336a14fd85d5c631e4a3b43187039dab0cba3b8badf62873f39814392db92bb737b92aa9a6d8b4ba41f1fb248c1fe07b88cddd28ded5e4d9ebd libgsf-1.14.45.tar.xz" +sha512sums="130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0 libgsf-1.14.46.tar.xz" diff --git a/user/libical/APKBUILD b/user/libical/APKBUILD index 7a27c56d4..4d03d3c27 100644 --- a/user/libical/APKBUILD +++ b/user/libical/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libical -pkgver=3.0.4 -pkgrel=2 +pkgver=3.0.5 +pkgrel=0 pkgdesc="Reference implementation of the iCalendar format" url="https://libical.github.io/libical/" arch="all" @@ -18,7 +18,8 @@ build() { cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DSHARED_ONLY=true + -DSHARED_ONLY=true \ + -DENABLE_GTK_DOC=OFF make } @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9 libical-3.0.4.tar.gz" +sha512sums="9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656 libical-3.0.5.tar.gz" diff --git a/user/libice/APKBUILD b/user/libice/APKBUILD index 8d2fea498..1ea5a767f 100644 --- a/user/libice/APKBUILD +++ b/user/libice/APKBUILD @@ -1,19 +1,28 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libice pkgver=1.0.9 -pkgrel=3 +pkgrel=4 pkgdesc="X11 Inter-Client Exchange library" url="https://www.X.Org/" arch="all" license="MIT" depends= -makedepends="util-macros xmlto xorgproto-dev xtrans" +makedepends="libbsd-dev util-macros xmlto xorgproto-dev xtrans" checkdepends="check-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/lib/libICE-$pkgver.tar.bz2" - +source="https://www.X.Org/releases/individual/lib/libICE-$pkgver.tar.bz2 + CVE-2017-2626.patch" builddir="$srcdir/libICE-$pkgver" +# secfixes: +# 1.0.9-r4: +# - CVE-2017-2626 + +prepare() { + default_prepare + autoreconf -vif +} + build() { cd "$builddir" ./configure \ @@ -38,4 +47,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="daa8126ee5279c08f801274a2754132762dea2a40f4733c4b0bf8e8bdad61cba826939a2e067beb3524e256a98a2b83f23c8d4643f3e75a284ab02cc73da41b7 libICE-1.0.9.tar.bz2" +sha512sums="daa8126ee5279c08f801274a2754132762dea2a40f4733c4b0bf8e8bdad61cba826939a2e067beb3524e256a98a2b83f23c8d4643f3e75a284ab02cc73da41b7 libICE-1.0.9.tar.bz2 +83e53a4b48c429c7fad8f4feba1b9261e1ff26d995a729e7d38f1aac29cf5f69ffeb83a1733f3e624b09ae0ee97f09be8380ab0d59fb51436e1b537461a6943c CVE-2017-2626.patch" diff --git a/user/libice/CVE-2017-2626.patch b/user/libice/CVE-2017-2626.patch new file mode 100644 index 000000000..ea2d8835b --- /dev/null +++ b/user/libice/CVE-2017-2626.patch @@ -0,0 +1,142 @@ +From ff5e59f32255913bb1cdf51441b98c9107ae165b Mon Sep 17 00:00:00 2001 +From: Benjamin Tissoires <benjamin.tissoires@gmail.com> +Date: Tue, 4 Apr 2017 19:12:53 +0200 +Subject: Use getentropy() if arc4random_buf() is not available + +This allows to fix CVE-2017-2626 on Linux platforms without pulling in +libbsd. +The libc getentropy() is available since glibc 2.25 but also on OpenBSD. +For Linux, we need at least a v3.17 kernel. If the recommended +arc4random_buf() function is not available, emulate it by first trying +to use getentropy() on a supported glibc and kernel. If the call fails, +fall back to the current (partly vulnerable) code. + +Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> +Reviewed-by: Mark Kettenis <kettenis@openbsd.org> +Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- + configure.ac | 2 +- + src/iceauth.c | 65 ++++++++++++++++++++++++++++++++++++++++++----------------- + 2 files changed, 47 insertions(+), 20 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 458882a..c971ab6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,7 +38,7 @@ AC_DEFINE(ICE_t, 1, [Xtrans transport type]) + + # Checks for library functions. + AC_CHECK_LIB([bsd], [arc4random_buf]) +-AC_CHECK_FUNCS([asprintf arc4random_buf]) ++AC_CHECK_FUNCS([asprintf arc4random_buf getentropy]) + + # Allow checking code with lint, sparse, etc. + XORG_WITH_LINT +diff --git a/src/iceauth.c b/src/iceauth.c +index ed31683..de4785b 100644 +--- a/src/iceauth.c ++++ b/src/iceauth.c +@@ -44,31 +44,19 @@ Author: Ralph Mor, X Consortium + + static int was_called_state; + +-/* +- * MIT-MAGIC-COOKIE-1 is a sample authentication method implemented by +- * the SI. It is not part of standard ICElib. +- */ ++#ifndef HAVE_ARC4RANDOM_BUF + +- +-char * +-IceGenerateMagicCookie ( ++static void ++emulate_getrandom_buf ( ++ char *auth, + int len + ) + { +- char *auth; +-#ifndef HAVE_ARC4RANDOM_BUF + long ldata[2]; + int seed; + int value; + int i; +-#endif + +- if ((auth = malloc (len + 1)) == NULL) +- return (NULL); +- +-#ifdef HAVE_ARC4RANDOM_BUF +- arc4random_buf(auth, len); +-#else + #ifdef ITIMER_REAL + { + struct timeval now; +@@ -76,13 +64,13 @@ IceGenerateMagicCookie ( + ldata[0] = now.tv_sec; + ldata[1] = now.tv_usec; + } +-#else ++#else /* ITIMER_REAL */ + { + long time (); + ldata[0] = time ((long *) 0); + ldata[1] = getpid (); + } +-#endif ++#endif /* ITIMER_REAL */ + seed = (ldata[0]) + (ldata[1] << 16); + srand (seed); + for (i = 0; i < len; i++) +@@ -90,7 +78,46 @@ IceGenerateMagicCookie ( + value = rand (); + auth[i] = value & 0xff; + } +-#endif ++} ++ ++static void ++arc4random_buf ( ++ char *auth, ++ int len ++) ++{ ++ int ret; ++ ++#if HAVE_GETENTROPY ++ /* weak emulation of arc4random through the entropy libc */ ++ ret = getentropy (auth, len); ++ if (ret == 0) ++ return; ++#endif /* HAVE_GETENTROPY */ ++ ++ emulate_getrandom_buf (auth, len); ++} ++ ++#endif /* !defined(HAVE_ARC4RANDOM_BUF) */ ++ ++/* ++ * MIT-MAGIC-COOKIE-1 is a sample authentication method implemented by ++ * the SI. It is not part of standard ICElib. ++ */ ++ ++ ++char * ++IceGenerateMagicCookie ( ++ int len ++) ++{ ++ char *auth; ++ ++ if ((auth = malloc (len + 1)) == NULL) ++ return (NULL); ++ ++ arc4random_buf (auth, len); ++ + auth[len] = '\0'; + return (auth); + } +-- +cgit v1.1 + diff --git a/user/libidn2/APKBUILD b/user/libidn2/APKBUILD index b08fa94db..ee0936554 100644 --- a/user/libidn2/APKBUILD +++ b/user/libidn2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=libidn2 -pkgver=2.0.5 -pkgrel=1 +pkgver=2.2.0 +pkgrel=0 pkgdesc="Free implementation of IDNA2008, Punycode, and TR46" url="https://gitlab.com/libidn/libidn2" arch="all" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79 libidn2-2.0.5.tar.gz" +sha512sums="ccf56056a378d49a28ff67a2a23cd3d32ce51f86a78f84839b98dad709a1d0d03ac8d7c1496f0e4d3536bca00e3d09d34d76a37317b2ce87e3aa66bdf4e877b8 libidn2-2.2.0.tar.gz" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index d6b413fa9..14db25b0e 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.13.1 +pkgver=1.13.2 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" @@ -31,4 +31,4 @@ package() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="a19deec802e704038df0901c103a82a3370f56e0299f4cc1b6aa84c1832a66fb638e6f9d0fa708b51df6c3b939cdc1271e4ff547c645c566be03dce0bc9ff7e0 libinput-1.13.1.tar.xz" +sha512sums="26f11c5274c26acc38b9b5729195010c0799a9563f1eb0e0cd67e323f8ed73b0fc8db8584ec8fdf1b726417f64c2daeb54832167079832626c8c1190fccf459f libinput-1.13.2.tar.xz" diff --git a/user/libkdcraw/APKBUILD b/user/libkdcraw/APKBUILD index 647587860..0c85c067b 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.04.1 +pkgver=19.04.2 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="835419e536d4d226e57c850cda49762e2fa6033ca3ba759b8d6048eb8a5354c89d56e29721fd7e24866b307993243ea8eb14621c7945ce61f650bec0fc845a00 libkdcraw-19.04.1.tar.xz" +sha512sums="ffe6ea1459cba3ba2b2ce3092b825783b1eb89da8de2d5684b6d4816d01bc24afe4610de80779b13d798c0c525bf4847ae3ed67e3c314fc33ab1af5d74aaf7fa libkdcraw-19.04.2.tar.xz" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index 5ca21ecaf..aff1202d7 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Library for common routines shared between KDE games" url="https://www.kde.org/applications/games/" @@ -58,4 +58,4 @@ carddecks() { mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/ } -sha512sums="273eff7f23afd7a3937153a6e79ae5fb0fa0f02b650120b67bc958e840803b5014cc1e530a1874fd3816acd13c58d40311c90b8d4b94d7c464468d1e83fae1fa libkdegames-19.04.1.tar.xz" +sha512sums="c61448480bb1ff84934f63060abaebe136c7e3adfe0e8d17d8bb7fc47ae7c6de0578631fa85c788d4da5ae7736d071ce38f27cd37d487e7ccf2eed528058344f libkdegames-19.04.2.tar.xz" diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD index 888592a12..717639fe3 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Library for manipulating KVTML files" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e56d79694bbb1d6a20977232152b4416983b2899429ec3124161bbefa361d7e5551e0e341a361771fe6cc7c69da4084853ecde560762c53fcea574f31f512b3f libkeduvocdocument-19.04.1.tar.xz" +sha512sums="33f72aa55b931732a1821b52176f8d765c216939222f981cd9c5fe0d5ed5d556a88b1dedaae5de666f4d202a8bec018ead5760fd7f5c29bb24c3ae1e0688c015 libkeduvocdocument-19.04.2.tar.xz" diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD index 5f92ac3b9..d49285c0f 100644 --- a/user/libkexiv2/APKBUILD +++ b/user/libkexiv2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkexiv2 -pkgver=19.04.1 -pkgrel=0 +pkgver=19.04.2 +pkgrel=1 pkgdesc="KDE integration with Exiv2 EXIF data library" url="https://www.KDE.org/" arch="all" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c3738afe3d72bd499d92d1846245d65adcf7fd1074ac1ca5a64dda5bcaef20202c5a8e2372d69a0e493e2097a38bb9099ea6a1e1f5ae3adec03e3dc54fa732d0 libkexiv2-19.04.1.tar.xz" +sha512sums="971f9e9dad11b2196346304282cf672209326762298e276b1616329ccde000cfbb24c38a1b66e1b399c43a1cce2e47490e91c53bf8e0c519502ed5a1dd46249b libkexiv2-19.04.2.tar.xz" diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD index 641510f7e..9c5cc53ae 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="KDE Image Plugin Interface library" url="https://www.digikam.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="61fce9229bbc586529e328f70c99768584c2ae4f0a508c52370fd8741aecb582901c7eba7000eb2d0fd30119fb7fd58f7f7f3803c19f56d95d9da835b3aa7593 libkipi-19.04.1.tar.xz" +sha512sums="16ed6882dd5c3b0dc031252e98324406b4c90fb1d05fd197b3d2eab480fe60de6c726d31f20d4d5d839eaa3d12379a67c5759f5a278a122fd9c970861d013b1e libkipi-19.04.2.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index 155b4d458..db75c28a4 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="790d9723e0177491de36f102f1f77e01e955c9c13a2c8bef50365ab9cfaa810ac69c4291c8c27dae9e5b7f8e589cb7f83b031ad1f88c6039a4f51ff5104380a0 libkleo-19.04.1.tar.xz -d7b661a243c533123af0e97bcebdabb9f2d9fd67c7ae10ae91484de68ebca2b2aa7c745a9d2d33955631b22487c21491671b42cafb803f7d0cc4af731317319d egregious-versions.patch" +sha512sums="9dbe7a1671d819d8e69fd2701e45fec59c49c3ccbe5d92e3b4ad4f401c77c9c8b011c2de166f2ea503584aef8d784d0f269a2bd500fe327a8b1e1205d4a1f649 libkleo-19.04.2.tar.xz +130c4b609d546f18c969bb4fa3b83d437ac7d282639c89739899f9858f0345f4cea9a1b81bb4d69318534fa74439c7d29fb236ebd719409d937532f62d133a93 egregious-versions.patch" diff --git a/user/libkleo/egregious-versions.patch b/user/libkleo/egregious-versions.patch index d32f12d03..9c87ac11d 100644 --- a/user/libkleo/egregious-versions.patch +++ b/user/libkleo/egregious-versions.patch @@ -17,6 +17,6 @@ libKleo uses no new APIs. set(LIBKLEO_LIB_VERSION ${PIM_VERSION}) -set(QT_REQUIRED_VERSION "5.10.0") +set(QT_REQUIRED_VERSION "5.9.0") - set(KDEPIMTEXTEDIT_VERSION "5.11.1") + set(KDEPIMTEXTEDIT_VERSION "5.11.2") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets) diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD index dc618ce16..b24a5df94 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Library with Mah Jongg logic" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fd0b4525d7994594240a438b52ad94914a58d5406503024fa7a9b1ac69cb1eba13ac9e1730583ce94a55ed73ea2091e8d7198efc5f057255d958db15dc742b41 libkmahjongg-19.04.1.tar.xz" +sha512sums="434b404bb63ba9426eabaa69f7f305de0febb31f2219cd5e2f98f3f572ad26f35065a1de03f1cd31bc30f3a4664b6d7ca67378aa56f2905ce3cf8ae1d5da91ee libkmahjongg-19.04.2.tar.xz" diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD index 233c52a2c..38d2a520d 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="KDE scanning library" url="https://www.kde.org" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ee7b102a313b844a027461bb16cf7c283916b2df07a8bd76e29488f34cc6215f7dde6834a172a626dd3be941759cfffab4dd961338d0b78a5358109ae1234b7b libksane-19.04.1.tar.xz +sha512sums="8fcf07000356c40fb25a6b1f4bff6b86d93a3ff836dd5d5f09acfb4c18728a4a355ae895220941cd4ee62456187458c1d649342c79ff838f172acc4fb7edfddb libksane-19.04.2.tar.xz 60e0e8b073499e932d626a65c5cc23f58d2701921da547733d2736b58c6d412c8d6e782884916390ff16e02183a53ad283712f0bcf2cdcf5a0eb0d7029bb1ba8 frameworks.patch" diff --git a/user/libmatroska/APKBUILD b/user/libmatroska/APKBUILD index 85e521369..6a8ea1f9d 100644 --- a/user/libmatroska/APKBUILD +++ b/user/libmatroska/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libmatroska -pkgver=1.5.0 +pkgver=1.5.2 pkgrel=0 pkgdesc="Library to parse Matroska files" url="https://www.matroska.org/" @@ -29,4 +29,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="eb59b5afd9d510c2d6c7408b0053a261cee6669a9f5bbb1a939d98d96ac6c9b8f340691e95310268f59c954a1d9f72322fd0ec7b442a74c56cd2e2c22eb3a754 libmatroska-1.5.0.tar.xz" +sha512sums="122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2 libmatroska-1.5.2.tar.xz" diff --git a/user/libnice/APKBUILD b/user/libnice/APKBUILD index d7ab8cdb8..cd7579a03 100644 --- a/user/libnice/APKBUILD +++ b/user/libnice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libnice -pkgver=0.1.15 +pkgver=0.1.16 pkgrel=0 pkgdesc="GLib-based Interactive Connectivity Establishment (ICE) library" url="https://nice.freedesktop.org/wiki/" @@ -16,7 +16,6 @@ source="https://nice.freedesktop.org/releases/libnice-$pkgver.tar.gz " build() { - cd "$builddir" LDFLAGS="-Wl,-z,stack-size=1048576" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,15 +28,13 @@ build() { } check() { - cd "$builddir" # multi-make causes test-drop-invalid test to fail make -j1 check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c libnice-0.1.15.tar.gz +sha512sums="8fdf0f9fcf43c0fdffbdcb61988a7f9e14bd13bb1bc561d2b9faf493deb18151da14d484740571a302fa203ec7109d45c361ea791e81a2b29932a26220ce902c libnice-0.1.16.tar.gz c81aff0f8a674315997f2ecc1f0cbc501b54d49c142949aee68af42aaccf2a2f61d5eb46ce8c123b05fb98c2cd5ef5751b9228783e5e221b12be06b805da0ad3 dont-error-on-socket-close.patch" diff --git a/user/libpaper/APKBUILD b/user/libpaper/APKBUILD index 927b5e73a..99f2492c4 100644 --- a/user/libpaper/APKBUILD +++ b/user/libpaper/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libpaper -pkgver=1.1.26 +pkgver=1.1.28 pkgrel=0 pkgdesc="Library for handling paper characteristics" url="https://packages.debian.org/unstable/source/libpaper" @@ -13,12 +13,10 @@ makedepends="" source="http://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_$pkgver.tar.gz" prepare() { - cd "$builddir" autoreconf -vif } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,8 +26,7 @@ build() { } package() { - cd "$builddir" make prefix="$pkgdir"/usr install } -sha512sums="6c54d28004c2dc95cfcc58467026d87b1590d35c9acf09d85568be0c558a04c183e0657afe3278dc894825428372ae60ccf417ece955b7d358fd9ce7b3d78b76 libpaper_1.1.26.tar.gz" +sha512sums="3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc libpaper_1.1.28.tar.gz" diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD index 942d22442..172a0003d 100644 --- a/user/libpeas/APKBUILD +++ b/user/libpeas/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libpeas pkgver=1.22.0 -pkgrel=0 +pkgrel=1 pkgdesc="GObject-based plugin framework" url="https://gnome.org" arch="all" @@ -11,12 +11,10 @@ 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" -langdir="/usr/lib/locale" source="https://download.gnome.org/sources/libpeas/${pkgver%.*}/libpeas-$pkgver.tar.xz" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -27,12 +25,10 @@ build() { } check() { - cd "$builddir" - make check + DISPLAY= make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libpng/APKBUILD b/user/libpng/APKBUILD index e3504e859..ec109c15a 100644 --- a/user/libpng/APKBUILD +++ b/user/libpng/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=libpng -pkgver=1.6.36 +pkgver=1.6.37 pkgrel=0 pkgdesc="Portable Network Graphics library" url="http://www.libpng.org/" @@ -55,6 +55,6 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="8b9c54c5555d6a736eaf298cbbae1e08199001202bacabc6212d75fa619e2ecf06bcf36db0321bfdb90a3dc5cde361c8d951002701637a557c34eae80f5d0936 libpng-1.6.36.tar.gz -8fa213204768b058459ffd5eae6b3661c3f185d3baf1913da4337e7b7855e567f2525e7f67411c32fa8cb177a5f93d538c3d0ce17a94d4aa71bd9cffabe8b311 libpng-1.6.36-apng.patch.gz +sha512sums="2ce2b855af307ca92a6e053f521f5d262c36eb836b4810cb53c809aa3ea2dcc08f834aee0ffd66137768a54397e28e92804534a74abb6fc9f6f3127f14c9c338 libpng-1.6.37.tar.gz +226adcb3a8c60f2267fe2976ab531329ae43c2603dab4d0cf8f16217d64069936b879f3d6516b75d259c47d6f5c5b1f24f887602206c8e46abde0fb7f5c7946b libpng-1.6.37-apng.patch.gz e3fae918f14bc34e7c126892f69527c6e1b4d72593835ece839d9a28cff55a886b2030f877cf9e29b2c97abf2e47bbb5ba54584828edd2a841c2556f330b9c7e libpng-fix-arm-neon.patch" diff --git a/user/libqmatrixclient/APKBUILD b/user/libquotient/APKBUILD index 7dbe67024..b954f5c95 100644 --- a/user/libqmatrixclient/APKBUILD +++ b/user/libquotient/APKBUILD @@ -1,17 +1,19 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=libqmatrixclient -pkgver=0.5.1.2 +pkgname=libquotient +pkgver=0.5.2 pkgrel=0 pkgdesc="Library to interface with Matrix chat systems using Qt 5" -url="https://matrix.org/docs/projects/sdk/libqmatrixclient.html" +url="https://matrix.org/docs/projects/sdks/#lib-q-matrix-client" arch="all" license="LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake qt5-qtmultimedia-dev" subpackages="$pkgname-dev" -source="libqmatrixclient-$pkgver.tar.gz::https://github.com/QMatrixClient/libqmatrixclient/archive/$pkgver.tar.gz" +replaces="libqmatrixclient" +source="libquotient-$pkgver.tar.gz::https://github.com/quotient-im/libQuotient/archive/$pkgver.tar.gz" +builddir="$srcdir"/libQuotient-$pkgver build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -23,7 +25,6 @@ build() { -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" \ ${CMAKE_CROSSOPTS} make } @@ -36,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4e7cac3cc6a1ffc2a5a5ebf5c38dec72c3293f96b56d533838dea745a9b0de9a1ab14da666efcdad4f7d7a70279b922a0dbb3a3e26d1ad83f5b98d04fc9912a2 libqmatrixclient-0.5.1.2.tar.gz" +sha512sums="d1037139d62c41e35cd415e85ec8b7d3577af193e19a4307bcd65f83f43a54e015e4a888a0c26a266e41df613a329edd985e8935a9ea9d54f19662fdbfe55577 libquotient-0.5.2.tar.gz" diff --git a/user/librdkafka/APKBUILD b/user/librdkafka/APKBUILD new file mode 100644 index 000000000..c0f4a672e --- /dev/null +++ b/user/librdkafka/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=librdkafka +pkgver=1.0.1 +pkgrel=0 +pkgdesc="The Apache Kafka C/C++ library" +url="https://github.com/edenhill/librdkafka" +arch="all" +license="BSD-2-Clause" +depends="" +makedepends="zlib-dev zstd-dev openssl-dev lz4-dev bsd-compat-headers cyrus-sasl-dev" +subpackages="$pkgname-dev" +source="$pkgname-$pkgver.tar.gz::https://github.com/edenhill/$pkgname/archive/v$pkgver.tar.gz" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="094599e974236814c03e688eaa5e39d817cca110ff691501826268c45653fcd6b21b60e741140a1f7ffccd49902247f08fcec82475be2e9f85feaa4340b32d4c librdkafka-1.0.1.tar.gz" diff --git a/user/libsass/APKBUILD b/user/libsass/APKBUILD index 5d560aa6e..36e5f8e65 100644 --- a/user/libsass/APKBUILD +++ b/user/libsass/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libsass -pkgver=3.5.5 +pkgver=3.6.1 pkgrel=0 pkgdesc="Library for preprocessing CSS" url="https://sass-lang.com/libsass" @@ -16,14 +16,12 @@ subpackages="$pkgname-dev" source="libsass-$pkgver.tar.gz::https://github.com/sass/libsass/archive/$pkgver.tar.gz" build() { - cd "$builddir" make BUILD="shared" } package() { - cd "$builddir" mkdir -p "$pkgdir" make BUILD="shared" PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="dcb73a5080c00023b60a19ea037ba5af481253a7b47492bd7114bf45ab78ed931c7b207fa8f12ed200a39760553d72ae92dbe4eb80b826b59a6201fb34008fe5 libsass-3.5.5.tar.gz" +sha512sums="e9a3a30851e26145d049c4b20951c663a9d48c781a732acd3cc2cdb30df3449e445b57211f666b58afa137431fbdb149add48ff8a0dec92bd8abb514c90adebb libsass-3.6.1.tar.gz" diff --git a/user/libshout/APKBUILD b/user/libshout/APKBUILD index 5e0f491b5..1672399d8 100644 --- a/user/libshout/APKBUILD +++ b/user/libshout/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=libshout -pkgver=2.4.1 -pkgrel=2 +pkgver=2.4.3 +pkgrel=0 pkgdesc="Library for accessing a Icecast server" url="http://www.icecast.org/" arch="all" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-dev" source="https://downloads.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,8 +24,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219 libshout-2.4.1.tar.gz" +sha512sums="fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34 libshout-2.4.3.tar.gz" diff --git a/user/libsigc++/APKBUILD b/user/libsigc++/APKBUILD index 624c2d4bc..3e0bf669c 100644 --- a/user/libsigc++/APKBUILD +++ b/user/libsigc++/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libsigc++ -pkgver=2.10.1 +pkgver=2.10.2 pkgrel=0 pkgdesc="Library for type-safe callbacks in C++" url="https://libsigcplusplus.github.io/libsigcplusplus/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2 libsigc++-2.10.1.tar.xz" +sha512sums="33bc1ed20b3cec07aba3e090af24c3dcb0047b2ce4f693879fd7201a24abdeecb17f6b1307a2d0c0bc2b74f16cfa0c60f300b7cdf8ef13db1bfd990bdf8f9eb4 libsigc++-2.10.2.tar.xz" diff --git a/user/libsoup/APKBUILD b/user/libsoup/APKBUILD index ddcf75515..65c1d4edc 100644 --- a/user/libsoup/APKBUILD +++ b/user/libsoup/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libsoup -pkgver=2.66.1 +pkgver=2.66.2 pkgrel=0 pkgdesc="GObject-based HTTP library" url="https://wiki.gnome.org/Projects/libsoup" @@ -29,4 +29,4 @@ package() { DESTDIR="$pkgdir" ninja install } -sha512sums="bb9c15cae965606d5f7c009fab9223445235982269d23ff20e89249b10d3423797427e7cff39c31a3f5db99b0c2d7a01eb911edb61309603cdeb8f2467fe6039 libsoup-2.66.1.tar.xz" +sha512sums="1df443470239f23d22301e37e36f3d34963352ee0122f317cd15b19d90115831091bddcee27bc6f0d4994adcf4e5bd9c0395de2bd7f39ae305ba0edea7789092 libsoup-2.66.2.tar.xz" diff --git a/user/libssh2/APKBUILD b/user/libssh2/APKBUILD deleted file mode 100644 index cb6e11f97..000000000 --- a/user/libssh2/APKBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: -pkgname=libssh2 -pkgver=1.8.2 -pkgrel=0 -pkgdesc="Library for accessing SSH servers" -url="https://libssh2.org/" -arch="all" -options="!check" # Requires deprecated UsePrivilegeSeparation option. -license="BSD-3-Clause" -makedepends_host="openssl-dev zlib-dev" -subpackages="$pkgname-dev $pkgname-doc" -source="https://libssh2.org/download/libssh2-$pkgver.tar.gz" - -build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --with-libssl-prefix="${CBUILDROOT}"/usr \ - --disable-rpath - make -} - -check() { - cd "$builddir" - make check -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93 libssh2-1.8.2.tar.gz" diff --git a/user/libverto/001-libev-not-compliant-c89.patch b/user/libverto/001-libev-not-compliant-c89.patch deleted file mode 100644 index 502aefe98..000000000 --- a/user/libverto/001-libev-not-compliant-c89.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 09ee123..b7b5908 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7,8 +7,8 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], - [AC_USE_SYSTEM_EXTENSIONS], - [AC_GNU_SOURCE]) - --AC_PROG_CC_C89 --for flag in -std=c89 -Wall -Wextra; do -+AC_PROG_CC_C99 -+for flag in -Wall -Wextra; do - AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],) - done - diff --git a/user/libverto/APKBUILD b/user/libverto/APKBUILD index 4e208e48d..0e21014ab 100644 --- a/user/libverto/APKBUILD +++ b/user/libverto/APKBUILD @@ -1,26 +1,22 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=libverto -pkgver=0.3.0 -pkgrel=2 +pkgver=0.3.1 +pkgrel=0 pkgdesc="Main loop abstraction library" url="https://github.com/npmccallum/libverto" arch="all" license="MIT" makedepends="glib-dev libevent-dev libev-dev automake autoconf libtool" subpackages="$pkgname-dev $pkgname-libev $pkgname-libevent $pkgname-glib" -source="$pkgname-$pkgver.tar.gz::https://github.com/npmccallum/$pkgname/archive/$pkgver.tar.gz - 001-libev-not-compliant-c89.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/npmccallum/$pkgname/archive/$pkgver.tar.gz" prepare() { default_prepare - cd "$builddir" autoreconf -i } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -50,5 +44,4 @@ libev() { _mv_backend libev; } libevent() { _mv_backend libevent; } glib() { _mv_backend glib; } -sha512sums="1c5ff810c839a9dbd515f0782e4f742193e4e6d40a5a87e669ceb4765838d30569dc89f2b425c131247fb5f67e354abb472d08fc5e91f4e5a82c05a30d2daac8 libverto-0.3.0.tar.gz -db713bb388766a3bd4cf7fca579fdd1611f30d53054d246d42c2b106932a3c758347d84ff5138b1135c599437f520dc46d20048bb27e6d305e270fca7ac3a53b 001-libev-not-compliant-c89.patch" +sha512sums="8b46a5c410be210e52b92dccfe6e677026b26fd6cab1ee7a97d7eab4d4951913bde8768a77942189a0188ee336d5dcca2a985e9edc3a8c7529f164a7e5077bd8 libverto-0.3.1.tar.gz" diff --git a/user/libwacom/APKBUILD b/user/libwacom/APKBUILD index 52326df1f..56464b2a0 100644 --- a/user/libwacom/APKBUILD +++ b/user/libwacom/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libwacom pkgver=0.33 -pkgrel=0 +pkgrel=1 pkgdesc="Tablet description library" url="http://linuxwacom.sourceforge.net/" arch="all" @@ -11,7 +11,9 @@ depends="" makedepends="libgudev-dev" checkdepends="bash findutils" subpackages="$pkgname-dev $pkgname-doc" -source="https://github.com/linuxwacom/libwacom/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" +source="https://github.com/linuxwacom/libwacom/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2 + fix-database.patch + " build() { ./configure \ @@ -20,9 +22,6 @@ build() { --prefix=/usr \ --disable-static make - # conflicts with TS-6610 tablet - rm "$builddir"/data/huion-h420.tablet - rm "$builddir"/data/layouts/huion-h420.svg } check() { @@ -36,4 +35,5 @@ package() { > "$pkgdir"/usr/lib/udev/rules.d/65-libwacom.rules } -sha512sums="de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d libwacom-0.33.tar.bz2" +sha512sums="de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d libwacom-0.33.tar.bz2 +d1ac1176aa4a95991330e23fb84868d65a1b2e81d68173c990f885af1ce591de7aca16e21db8128e4f1975bca22b8014a6fa2ca8c0458dce464568239d75263c fix-database.patch" diff --git a/user/libwacom/fix-database.patch b/user/libwacom/fix-database.patch new file mode 100644 index 000000000..d367ca997 --- /dev/null +++ b/user/libwacom/fix-database.patch @@ -0,0 +1,15 @@ +https://github.com/linuxwacom/libwacom/issues/85 + +Awful, cheesy hack. + +--- libwacom-0.33/libwacom/libwacom-database.c.old 2019-04-12 03:10:21.000000000 +0000 ++++ libwacom-0.33/libwacom/libwacom-database.c 2019-06-01 06:24:56.290159726 +0000 +@@ -152,7 +152,7 @@ + + memset(namestr, 0, sizeof(namestr)); + +- rc = sscanf(str, "%63[^:]:%x:%x:%63c", busstr, vendor_id, product_id, namestr); ++ rc = sscanf(str, "%63[^:]:%x:%x:%63[^\b]", busstr, vendor_id, product_id, namestr); + if (rc == 4) { + *name = g_strdup(namestr); + } else if (rc == 3) { diff --git a/user/libx11/APKBUILD b/user/libx11/APKBUILD index 6a8b7b643..2c7087200 100644 --- a/user/libx11/APKBUILD +++ b/user/libx11/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libx11 -pkgver=1.6.7 +pkgver=1.6.8 pkgrel=0 pkgdesc="X11 client-side library" url="https://www.X.Org/" @@ -37,4 +37,4 @@ package() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="edd2273b9dadbbf90ad8d7b5715db29eb120a5a22ad2595f697e56532cc24b84e358580c00548fa6be8e9d26601a2b2cdab32272c59266709534317abbd05cd5 libX11-1.6.7.tar.bz2" +sha512sums="1de8e0ec466308bc48946d1ce7a7dc6bd3120b1b365cd01afd1bd51dd7369e3d1870dd379b0b7c5b07699095d59761bd23e2e02ab60929de32c39b6885016e76 libX11-1.6.8.tar.bz2" diff --git a/user/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD index 779e73a54..3e99f60f2 100644 --- a/user/libxfce4ui/APKBUILD +++ b/user/libxfce4ui/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libxfce4ui -pkgver=4.13.4 -pkgrel=0 +pkgver=4.13.5 +pkgrel=1 pkgdesc="UI library for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,13 +10,10 @@ license="LGPL-2.0+ AND GPL-2.0+" makedepends="intltool gtk+3.0-dev gobject-introspection-dev vala-dev libxfce4util-dev xfconf-dev startup-notification-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="http://archive.xfce.org/src/xfce/libxfce4ui/4.13/libxfce4ui-$pkgver.tar.bz2" -sha512sums="c82d6ff7ea0da4fc0f664bab92f1e9531162996a26bb092e6ba651cfc4551732cbcd8023908d428b47906c17c331c14bf4804256566ca564befa218dc1194206 libxfce4ui-4.13.4.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -28,12 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } +sha512sums="5ce49c7052392ac0df74b0d5069fa7880d7b322a15b10c5c20932f10ae06529be2b21d95f7e1c10a8ecb2e38cce9a2d880ac107c3ce1e7f51d570d5ece7b7d3c libxfce4ui-4.13.5.tar.bz2" diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD index 55a5a62f7..5ddc923d3 100644 --- a/user/libxfce4util/APKBUILD +++ b/user/libxfce4util/APKBUILD @@ -1,21 +1,18 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libxfce4util -pkgver=4.13.2 -pkgrel=0 +pkgver=4.13.3 +pkgrel=1 pkgdesc="Utility library for the XFCE desktop environment" url="https://xfce.org" arch="all" license="LGPL-2.0+ GPL-2.0+" makedepends="intltool glib-dev gobject-introspection-dev vala" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/libxfce4util/4.13/libxfce4util-$pkgver.tar.bz2" -sha512sums="3bbb718f3a6d2213c86695b3f99d1e67c859ce635e5d066b18745d2ee57c0b2eea468b61079d8e2514c2d8f5fa847539d236ec0ed3fd17fecd9d1b36dc3595c4 libxfce4util-4.13.2.tar.bz2" +source="https://archive.xfce.org/src/xfce/libxfce4util/4.13/libxfce4util-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +23,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } +sha512sums="e06bf58d46c5c3c6964a17ca8d998bd8e78bb61577ddcd855680878a890912a167212a2b4e3b347f41f84d2983e71fd1d76716db9c4a88a1d4f45a0f5aaf5e51 libxfce4util-4.13.3.tar.bz2" diff --git a/user/libxfixes/APKBUILD b/user/libxfixes/APKBUILD index e08077bf5..ec31f710b 100644 --- a/user/libxfixes/APKBUILD +++ b/user/libxfixes/APKBUILD @@ -7,14 +7,13 @@ url="https://www.X.Org/" arch="all" options="!check" # No test suite. license="MIT" -depends= +depends="" makedepends="libx11-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" source="http://www.x.org/releases/individual/lib/libXfixes-$pkgver.tar.bz2" builddir="$srcdir"/libXfixes-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,7 +25,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxfont/APKBUILD b/user/libxfont/APKBUILD index 918cbc02e..c98112974 100644 --- a/user/libxfont/APKBUILD +++ b/user/libxfont/APKBUILD @@ -14,7 +14,6 @@ source="https://www.x.org/releases/individual/lib/libXfont-$pkgver.tar.bz2" builddir="$srcdir/libXfont-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxfont2/APKBUILD b/user/libxfont2/APKBUILD index fc2836f2b..3ebe3e051 100644 --- a/user/libxfont2/APKBUILD +++ b/user/libxfont2/APKBUILD @@ -18,7 +18,6 @@ builddir="$srcdir/libXfont2-$pkgver" # - CVE-2017-16611 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +31,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxi/APKBUILD b/user/libxi/APKBUILD index ecc5c72a0..de7e400ba 100644 --- a/user/libxi/APKBUILD +++ b/user/libxi/APKBUILD @@ -1,20 +1,19 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxi -pkgver=1.7.9 -pkgrel=2 +pkgver=1.7.10 +pkgrel=0 pkgdesc="X11 input extension library" url="https://www.X.Org/" arch="all" license="MIT AND X11" subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" makedepends="libx11-dev libxext-dev libxfixes-dev util-macros xmlto xorgproto-dev" source="https://www.X.Org/releases/individual/lib/libXi-$pkgver.tar.bz2" builddir="$srcdir"/libXi-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,14 +27,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="9f1536944fcd232ba725addbc3afb1154c4e0df3c4380f4a54bada31371029ce3714fe0458529cd6b2787e3283f3bd35366420bca15fedfbd41f2f6b10eddce5 libXi-1.7.9.tar.bz2" +sha512sums="591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218 libXi-1.7.10.tar.bz2" diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD index 280955e7f..113d84c04 100644 --- a/user/lighttpd/APKBUILD +++ b/user/lighttpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lighttpd -pkgver=1.4.53 +pkgver=1.4.54 pkgrel=0 pkgdesc="A secure, fast, compliant and very flexible web-server" url="http://www.lighttpd.net/" @@ -101,7 +101,7 @@ mod_webdav() { _mv_mod mod_webdav } -sha512sums="bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76 lighttpd-1.4.53.tar.xz +sha512sums="aa180a2751711a77b9da91a6a285c967d2c183ccbabe3e9064aea74e44629c3b0227ac98c7d720c8d4d223ce4b31e8b221b05b928adc917b199ab1015fcdba37 lighttpd-1.4.54.tar.xz f2f3c5c7731550237fd75a8de66275f427eaf897cffff7ac7ef44178328ad8fad6c4ec6654759bfc665cbaf7991ddcdf0aaa916831c8b6aa440192d57b242038 lighttpd.initd 9d2ab5deb7353ebf290e90936b511941df440859c78589d0bcf130ef69a5e9c79e4d318548b6b118df002083c46f7476230a28954b7a10a9dbd05040e02b1291 lighttpd.confd 0536b4f21d2e8659f7831b45998c13d9f6051ae7ecde13be01f372f837d255bfc4e211de48a7686cc743d53aa9c08ab3f10ec19788896dcf8356b90053ca7a16 lighttpd.logrotate diff --git a/user/live-media/APKBUILD b/user/live-media/APKBUILD index 2c0272784..90d68eb2e 100644 --- a/user/live-media/APKBUILD +++ b/user/live-media/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=live-media -pkgver=2018.11.26 +pkgver=2019.05.29 pkgrel=0 pkgdesc="Libraries for multimedia streaming" url="http://live555.com/liveMedia" @@ -12,20 +12,18 @@ source="http://live555.com/liveMedia/public/live.$pkgver.tar.gz" builddir="$srcdir"/live prepare() { - cd "$builddir" + default_prepare sed -e "/^COMPILE_OPTS/s/$/ $CFLAGS -fPIC -DPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE/" \ -i config.linux-with-shared-libraries } build() { - cd "$builddir" ./genMakefiles linux-with-shared-libraries make C_COMPILER="${CC:-gcc}" CPLUSPLUS_COMPILER="${CXX:-g++}" } package() { local testprog f so - cd "$builddir" mkdir -p "$pkgdir"/usr/lib for f in BasicUsageEnvironment UsageEnvironment liveMedia groupsock; do mkdir -p "$pkgdir"/usr/include/$f @@ -53,4 +51,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="fa0fa88986d526314d53d54b3ee128a5305e5c81aacd40b22a79ee73bbd2476e406a8b485ef46e5d970902afea2417e2e8cccbce637b74725087e077c5528fd4 live.2018.11.26.tar.gz" +sha512sums="10f641d5748af49bf9a85b2b31f6a215ccef131f257cb5e44a0c41a9d56c68f3ce757ab59be7e127f2696f03f8a797de4177e9dd2b09b1b2b695d4fbc691fe4c live.2019.05.29.tar.gz" diff --git a/user/llvm8/APKBUILD b/user/llvm8/APKBUILD index de4969ac7..b86bfda2b 100644 --- a/user/llvm8/APKBUILD +++ b/user/llvm8/APKBUILD @@ -101,7 +101,7 @@ build() { -DLLVM_HOST_TRIPLE="$CHOST" \ -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_LINK_LLVM_DYLIB=ON \ - -DLLVM_TARGETS_TO_BUILD='AArch64;AMDGPU;ARM;BPF;Mips;PowerPC;Sparc;SystemZ;WebAssembly;X86' \ + -DLLVM_TARGETS_TO_BUILD='AArch64;AMDGPU;ARM;BPF;Hexagon;Lanai;Mips;MSP430;PowerPC;Sparc;SystemZ;WebAssembly;X86;XCore' \ "$builddir" make llvm-tblgen diff --git a/user/lolcat/APKBUILD b/user/lolcat/APKBUILD new file mode 100644 index 000000000..cd6bfc984 --- /dev/null +++ b/user/lolcat/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=lolcat +pkgver=1.0 +pkgrel=0 +pkgdesc="Taste the rainbow on your terminal" +url=" " +arch="all" +options="!check" # No test suite. +license="WTFPL" +depends="" +makedepends="" +subpackages="" +source="lolcat-$pkgver.tar.gz::https://github.com/jaseg/lolcat/archive/v$pkgver.tar.gz + https.patch + " + +build() { + make +} + +package() { + mkdir -p "$pkgdir"/usr/bin + make DESTDIR="$pkgdir/usr/bin" install +} + +sha512sums="5f668706c2415273140047040a9e6d02d80a1572a834503480688f46466e2750f3cf5372f364039921f6461f2dbec7fa2dbe8a5600abdf3390c2caf56d1595bf lolcat-1.0.tar.gz +e27aa207a990ce291c139d4b6d30468bd42a2f1ab17114f3b9354ebbf426542ab825de6cc6391dd356eb108ddd3554cddf84f4a8f2e34599fa6dfe2e10812c73 https.patch" diff --git a/user/lolcat/https.patch b/user/lolcat/https.patch new file mode 100644 index 000000000..630154df1 --- /dev/null +++ b/user/lolcat/https.patch @@ -0,0 +1,24 @@ +--- lolcat-1.0/lolcat.c.old 2018-12-02 04:37:59.000000000 +0000 ++++ lolcat-1.0/lolcat.c 2019-06-15 20:28:03.295298585 +0000 +@@ -45,9 +45,9 @@ + " lolcat Copy standard input to standard output.\n" + " fortune | lolcat Display a rainbow cookie.\n" + "\n" +- "Report lolcat bugs to <http://www.github.org/jaseg/lolcat/issues>\n" +- "lolcat home page: <http://www.github.org/jaseg/lolcat/>\n" +- "Original idea: <http://www.github.org/busyloop/lolcat/>\n"; ++ "Report lolcat bugs to <https://github.com/jaseg/lolcat/issues>\n" ++ "lolcat home page: <https://github.com/jaseg/lolcat/>\n" ++ "Original idea: <https://github.com/busyloop/lolcat/>\n"; + + #define ARRAY_SIZE(foo) (sizeof(foo) / sizeof(foo[0])) + const unsigned char codes[] = { 39, 38, 44, 43, 49, 48, 84, 83, 119, 118, 154, 148, 184, 178, 214, 208, 209, 203, 204, 198, 199, 163, 164, 128, 129, 93, 99, 63, 69, 33 }; +@@ -72,7 +72,7 @@ + + static void version(void) + { +- wprintf(L"lolcat version 0.1, (c) 2014 jaseg\n"); ++ wprintf(L"lolcat version 1.0, (c) 2014-2018 jaseg\n"); + exit(0); + } + diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD index 19d904a95..e9255fcbd 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.04.1 +pkgver=19.04.2 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="3b50fee9690d58f09c81a12982d6c9dc49130a00a3471236257111ac9ea62047ea5eae5d5331da36a2ed0a15dc6a78d21fd07c4ed5f9764cb3c3aacebf3c933f lskat-19.04.1.tar.xz" +sha512sums="8597e88211d8108b358aa8ad1053dfaff09b2d39e5b6c74db3ca467ad4dd9ac9dcce60f386239eddb8fc7960b59f07f5f368eddae0e0ef3dd436b87257f1017b lskat-19.04.2.tar.xz" diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD index e809a654f..3cf8fd603 100644 --- a/user/lua-filesystem/APKBUILD +++ b/user/lua-filesystem/APKBUILD @@ -5,7 +5,7 @@ _pkgname=luafilesystem pkgver=1.7.0.2 _pkgver=${pkgver//./_} _rockver=${pkgver%.*}-${pkgver##*.} -pkgrel=0 +pkgrel=1 pkgdesc="Filesystem functions for Lua" url="http://keplerproject.github.io/luafilesystem/" arch="all" @@ -26,9 +26,9 @@ check() { } package() { - local rockdir="$pkgdir"/usr/lib/luarocks/rocks-5.3/$_rockname/$_rockver + local rockdir="$pkgdir"/usr/lib/luarocks/rocks-5.3/$_pkgname/$_rockver cd "$builddir" - make LUA_LIBDIR="$pkgdir"/$(pkg-config --variable=INSTALL_CMOD lua5.3) install + make LUA_LIBDIR="$pkgdir"/$(pkg-config --variable=INSTALL_CMOD lua) install mkdir -p "$rockdir" echo 'rock_manifest = {}' > "$rockdir"/rock_manifest } diff --git a/user/lua-sec/APKBUILD b/user/lua-sec/APKBUILD index e6fe5e684..27ea13b48 100644 --- a/user/lua-sec/APKBUILD +++ b/user/lua-sec/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=lua-sec -pkgver=0.7 +pkgver=0.8 pkgrel=0 pkgdesc="TLS/SSL Support for Lua" url="https://github.com/brunoos/luasec/wiki" @@ -29,4 +29,4 @@ package() { cp -r samples "$pkgdir"/usr/share/doc/$pkgname/ } -sha512sums="6adf5241aa5a0d92c9dd7fc7f7e426969475548f47979ccc28187471b3bad4132c215de6da1f471d21b05c6558d36309264512c9c4ac70a53d6f6e204cac1358 luasec-0.7.tar.gz" +sha512sums="eebacc8bd3a3ba38a99ef885f61dcee662978d31332d367f8a810c25c30e009ed1fabe2b54c5f48fb584549be52a31e03f36ed59865350de38c5ae926025ca61 luasec-0.8.tar.gz" diff --git a/user/luarocks/APKBUILD b/user/luarocks/APKBUILD index f890e8403..f9ce9632f 100644 --- a/user/luarocks/APKBUILD +++ b/user/luarocks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=luarocks -pkgver=3.1.0 +pkgver=3.1.3 pkgrel=0 pkgdesc="Package manager for Lua software" url="https://luarocks.org/" @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fd8b63671641b0872d91af6e3f129a3b1264c23ba71b51d523ff4382ffb005799a341c4ffc6483818ed56a9d6945115018078eea7c9228ed8cb5df69207ee846 luarocks-3.1.0.tar.gz" +sha512sums="233e17cd89f99eb387b9e5256edb10c920fb0dd7a173561b24c09c45c341de62f85dba85787788546deef206022602d3f707291935da1a2aee5c05fcad6ddc1b luarocks-3.1.3.tar.gz" diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index fb4a1f02e..c427e2cb2 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.04.1 +pkgver=19.04.2 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="f1a0bbd99b17053e4a3d4555ff38ab74b9f6425e38383a55d529772cb9cf78981af0b560ded3e36731ded686165b6b8e09cf7d8e98c6e5f3c04a9a89294cee36 marble-19.04.1.tar.xz" +sha512sums="7673c8f361001bd3f1dc32ea6fce62a399ad5d2ae454e562758eb5fc154a3fc46c7743cff5bbc72f77fb13adcbd1766f1a61777a4514702324193cfda88d988e marble-19.04.2.tar.xz" diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD index 2f7daa034..0790a1cd9 100644 --- a/user/marco/APKBUILD +++ b/user/marco/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=marco -pkgver=1.22.1 +pkgver=1.22.2 pkgrel=0 pkgdesc="Window manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -36,5 +36,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="18093f4d419fbc90f957a04ec3e36a153b3c51a6bcdc1ac5884adcc0292f157bc5e4af51e171451a4b54b5bccffdee2e8a07ed13dafb6106773abfb06b6a8a4f marco-1.22.1.tar.xz +sha512sums="96665120dbc698c78795eeaa559ae2bfd2a3c7ed4846e40bcfb1d6dfc8d7e359b860e1e715085a17e11c66ce7f31561d372da8372209c21c7b1ce6029a3f5ea1 marco-1.22.2.tar.xz b377b2a7d2af094a8b4bd6d1827c85f9675656cd8bdc6892b334c8479d188459ec8585fed3c746fdaef5820f768ce93605586693a3308f0db2d6f58e08f4df49 correctly-posix.patch" diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD new file mode 100644 index 000000000..0b211f2ce --- /dev/null +++ b/user/mariadb/APKBUILD @@ -0,0 +1,271 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=mariadb +pkgver=10.4.6 +pkgrel=0 +pkgdesc="Open source database server" +url="https://mariadb.org/" +arch="all" +options="suid" # required for pam_auth plugin, which is needed for + # mysql_install_db to work +options="$options !dbg" # abuild can't handle splitting -dbg with the way + # this build's package() function works. +license="GPL-2.0-only" +pkgusers="mysql" +pkggroups="mysql" +depends="$pkgname-common" +depends_dev="openssl-dev zlib-dev" +makedepends="$depends_dev bison cmake curl-dev libaio-dev libarchive-dev + libedit-dev libevent-dev libexecinfo-dev libxml2-dev ncurses-dev + linux-pam-dev pcre-dev xz-dev" +_mytopdeps="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket + perl-term-readkey" +subpackages="$pkgname-client $pkgname-server $pkgname-libs $pkgname-embedded + $pkgname-common::noarch $pkgname-backup mytop::noarch $pkgname-openrc + $pkgname-doc $pkgname-dev" +source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz + crc32-power.patch + gcc_builtins_ppc.h + libedit.patch + ppchax.patch + mariadb.initd + mariadb-server.limits + " + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + + case "$CTARGET_ARCH" in + ppc) + cp "$srcdir"/gcc_builtins_ppc.h "$builddir"/include/atomic/gcc_builtins.h + ;; + esac + + local _release="\ + -DBUILD_CONFIG=mysql_release \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS=\"$CXXFLAGS -DNDEBUG\" \ + -DCMAKE_C_FLAGS=\"$CFLAGS -DNDEBUG\" \ + -DWITH_DEFAULT_COMPILER_OPTIONS=NO \ + -DWITH_DEFAULT_FEATURE_SET=NO " + + # NUMA is disabled because all arches do not support it + # SKIP_TESTS skips client unittests that require a server to be present + # JEMALLOC is reported to not work on musl, TODO: test this + # ASAN also doesn't work on musl iirc + local _deps="\ + -DWITH_MARIABACKUP=ON \ + -DWITH_NUMA=OFF \ + -DWITH_LIBNUMA=OFF \ + -DWITH_LIBWSREP=ON \ + -DWITH_UNIT_TESTS=ON \ + -DWITH_LIBEDIT=ON \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_UNITTEST=OFF \ + -DWITH_ASAN=OFF \ + -DWITH_JEMALLOC=OFF \ + -DWITH_LIBWRAP=OFF \ + -DWITH_SYSTEMD=no \ + -DWITH_VALGRIND=OFF \ + -DWITH_COMMENT=\"${DISTRO_NAME:-Adélie Linux}\" \ + -DENABLED_LOCAL_INFILE=ON \ + -DENABLED_PROFILING=OFF \ + -DSKIP_TESTS=ON " + + # AWS_KEY_MANAGEMENT makes this package non-redistributable, disable it + local _plugins="\ + -DPLUGIN_ARCHIVE=YES \ + -DPLUGIN_ARIA=YES \ + -DPLUGIN_BLACKHOLE=YES \ + -DPLUGIN_CSV=YES \ + -DPLUGIN_MYISAM=YES \ + -DAUTH_GSSAPI_PLUGIN_TYPE=NO \ + -DPLUGIN_AUTH_GSSAPI=NO \ + -DPLUGIN_AWS_KEY_MANAGEMENT=NO \ + -DPLUGIN_CASSANDRA=NO \ + -DPLUGIN_FEEDBACK=NO " + + # Investigate turning more of these on + local _innodb="\ + -DWITH_INNODB_LZMA=YES \ + -DWITH_INNODB_BZIP2=NO \ + -DWITH_INNODB_LZ4=NO \ + -DWITH_INNODB_LZO=NO \ + -DWITH_INNODB_SNAPPY=NO " + + # MongoDB is not libre software, disable it + local _connect="\ + -DCONNECT_WITH_MYSQL=YES \ + -DCONNECT_WITH_MONGO=NO \ + -DCONNECT_WITH_ODBC=NO \ + -DCONNECT_WITH_JDBC=NO \ + -DCONNECT_WITH_LIBXML2=system " + + # non-portable things, things that don't work on musl, BE, 32-bit etc + local _evil="\ + -DPLUGIN_MROONGA=NO \ + -DPLUGIN_ROCKSDB=NO \ + -DPLUGIN_TOKUDB=NO " + + local _system_libs="\ + -DWITH_LIBARCHIVE=system \ + -DWITH_PCRE=system \ + -DWITH_SSL=system \ + -DWITH_ZLIB=system \ + -DWITH_EXTERNAL_ZLIB=YES \ + -DCONC_WITH_EXTERNAL_ZLIB=YES " + + local _system_paths="\ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc/mysql \ + -DMYSQL_DATADIR=/var/lib/mariadb \ + -DMYSQL_UNIX_ADDR=/var/run/mariadb/mysqld.sock \ + -DINSTALL_UNIX_ADDRDIR=/var/run/mariadb/mysqld.sock \ + -DPKG_CONFIG_EXECUTABLE=/usr/bin/pkgconf \ + -DINSTALL_BINDIR=bin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_SBINDIR=sbin \ + -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_LIBDIR=lib \ + -DINSTALL_PLUGINDIR=lib/mariadb/plugin \ + -DINSTALL_DOCDIR=share/doc/$pkgname \ + -DINSTALL_DOCREADMEDIR=share/doc/$pkgname \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_MYSQLSHAREDIR=share/mariadb \ + -DINSTALL_SUPPORTFILESDIR=share/mariadb \ + -DSUFFIX_INSTALL_DIR=\"\" " + + _buildflags=$(echo "\ + ${_release}\ + ${_deps}\ + ${_plugins}\ + ${_innodb}\ + ${_connect}\ + ${_evil}\ + ${_system_libs}\ + ${_system_paths}\ + ${CMAKE_CROSSOPTS}" | tr -d '\t') + echo "Build Flags are: $_buildflags" + eval "cmake $_buildflags ." + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '^(test-connect)$' +} + +package() { + depends="$pkgname-client $pkgname-server" + install -m755 -D ${srcdir}/mariadb.initd ${pkgdir}/etc/init.d/mariadb +} + +openrc() { + default_openrc + depends="mariadb-server=$pkgver-r$pkgrel" +} + +_install_component() { + cd "$builddir" + component=$1 + prefix=$subpkgdir/usr + msg "Installing component \"$component\" into $prefix" + cmake -DCMAKE_INSTALL_PREFIX=${prefix} \ + -DCOMPONENT=${component} \ + -P cmake_install.cmake +} + +libs() { + pkgdesc="Libraries for the MariaDB database" + _install_component SharedLibraries +} + +client() { + pkgdesc="The MariaDB database client" + depends="mariadb-common=$pkgver-r$pkgrel" + for part in Client ClientPlugins; do + _install_component ${part} + done +} + +server() { + pkgdesc="The MariaDB database server" + depends="mariadb-common=$pkgver-r$pkgrel" + install="$pkgname-server.pre-install" + for part in Server Server_Scripts IniFiles connect-engine; do + _install_component ${part} + done + + install -m755 -D ${srcdir}/mariadb-server.limits \ + ${subpkgdir}/etc/security/limits.d/mariadb.conf +} + + +common() { + pkgdesc="MariaDB common files for both server and client" + replaces="mysql-common" + depends= + + SHARE_PATH=${pkgdir}-server/usr/share + mkdir -p ${subpkgdir}/usr + mv $SHARE_PATH ${subpkgdir}/usr + + _install_component Common +} + +embedded() { + pkgdesc="MariaDB embedded server and embeddable library" + + # move mysql-embedded from client subpackage to embedded + mkdir -p ${subpkgdir}/usr/bin + BIN_PATH=${pkgdir}-client/usr/bin + mv $BIN_PATH/mysql_embedded ${subpkgdir}/usr/bin/ + + # move embedded mysqld libraries from server package to embedded + mkdir -p ${subpkgdir}/usr/lib + LIB_PATH=${pkgdir}-server/usr/lib + MYSQLD_ELIB=$(readlink $LIB_PATH/libmysqld.so) + mv $LIB_PATH/$MYSQLD_ELIB ${subpkgdir}/usr/lib/ + mv $LIB_PATH/libmysqld.so ${subpkgdir}/usr/lib/ + mv $LIB_PATH/libmariadbd.so ${subpkgdir}/usr/lib/ +} + +backup() { + pkgdesc="The mariabackup tool for physical online backups" + _install_component backup +} + +mytop() { + pkgdesc="Command line tool used for monitoring MariaDB performance" + depends="$_mytopdeps" + _install_component Mytop +} + +dev() { + replaces="libmysqlclient mysql-dev" + provides="mysql-dev=$pkgver-r$pkgrel" + depends="$pkgname-libs" + _install_component Development + + # move symlinks for static libs from libs subpackage to dev + LIB_PATH=${pkgdir}-libs/usr/lib + mv $LIB_PATH/libmysqlclient.a ${subpkgdir}/usr/lib/ + mv $LIB_PATH/libmysqlclient_r.a ${subpkgdir}/usr/lib/ +} + +doc() { + for part in ManPagesClient ManPagesServer ManPagesDevelopment; do + _install_component ${part} + done + default_doc +} + +sha512sums="b04c47f72de2473d7b5edd04b4785a1d7179bb1f429f30ba53ae6cfbbb413200d9803eff1072949b2e81fd7d2164ea34c68620d621d4181b913daa2293ae140c mariadb-10.4.6.tar.gz +03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0 crc32-power.patch +15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3 gcc_builtins_ppc.h +41dc407cc16e7af5a8b9527489016a052a8bce85bd3d00f0d06b98b3fef16a693849d15a9a15136ee8148829fe4570d03df65dfb6fe9f0bccc447cab1bd666f4 libedit.patch +0725c1c04ce01d6035d4fef5018709c8814228bf250503455c2aa7c972278fcb78b47e681a721cb42dc61508075e1485116d8c7ac924c584b4bf5ca6b27b6594 ppchax.patch +1a2b058aad5fd6d6964db58b663591299a5bf82e7ad21a105d53a3e7ad1c3674c737caf3ee12799cce947cf8ead1f3e789dd8afcfc769891f08208b3006f9654 mariadb.initd +d47324b34a87410eddb554f65199d145dfba9ae40407a62fb77df4e1ebf13087d15eb28e61e5e7cc9139eb42f093a0955136edae4020822652a1f0b4e219849e mariadb-server.limits" diff --git a/user/mariadb/crc32-power.patch b/user/mariadb/crc32-power.patch new file mode 100644 index 000000000..aa269a599 --- /dev/null +++ b/user/mariadb/crc32-power.patch @@ -0,0 +1,8 @@ +--- mariadb-10.4.6/cmake/crc32.cmake.old 2019-06-17 22:00:31.000000000 +0000 ++++ mariadb-10.4.6/cmake/crc32.cmake 2019-07-06 22:02:39.704198796 +0000 +@@ -1,4 +1,4 @@ +-IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") ++IF(FALSE) + SET(HAVE_CRC32_VPMSUM 1) + SET(CRC32_LIBRARY crc32-vpmsum) + ADD_SUBDIRECTORY(extra/crc32-vpmsum) diff --git a/user/mariadb/gcc_builtins_ppc.h b/user/mariadb/gcc_builtins_ppc.h new file mode 100644 index 000000000..8e492c58a --- /dev/null +++ b/user/mariadb/gcc_builtins_ppc.h @@ -0,0 +1,78 @@ +#ifndef ATOMIC_GCC_BUILTINS_INCLUDED +#define ATOMIC_GCC_BUILTINS_INCLUDED + +/* Copyright (c) 2017 MariaDB Foundation + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ + + +#define MY_MEMORY_ORDER_RELAXED __ATOMIC_RELAXED +#define MY_MEMORY_ORDER_CONSUME __ATOMIC_CONSUME +#define MY_MEMORY_ORDER_ACQUIRE __ATOMIC_ACQUIRE +#define MY_MEMORY_ORDER_RELEASE __ATOMIC_RELEASE +#define MY_MEMORY_ORDER_ACQ_REL __ATOMIC_ACQ_REL +#define MY_MEMORY_ORDER_SEQ_CST __ATOMIC_SEQ_CST + +#define my_atomic_store32_explicit(P, D, O) __atomic_store_4((P), (D), (O)) +#define my_atomic_store64_explicit(P, D, O) __atomic_store_8((P), (D), (O)) +#define my_atomic_storeptr_explicit(P, D, O) __atomic_store_4((P), (unsigned int)(D), (O)) + +#define my_atomic_load32_explicit(P, O) __atomic_load_4((P), (O)) +#define my_atomic_load64_explicit(P, O) __atomic_load_8((P), (O)) +#define my_atomic_loadptr_explicit(P, O) __atomic_load_4((P), (O)) + +#define my_atomic_fas32_explicit(P, D, O) __atomic_exchange_4((P), (D), (O)) +#define my_atomic_fas64_explicit(P, D, O) __atomic_exchange_8((P), (D), (O)) +#define my_atomic_fasptr_explicit(P, D, O) __atomic_exchange_4((P), (D), (O)) + +#define my_atomic_add32_explicit(P, A, O) __atomic_fetch_add_4((P), (A), (O)) +#define my_atomic_add64_explicit(P, A, O) __atomic_fetch_add_8((P), (A), (O)) + +#define my_atomic_cas32_weak_explicit(P, E, D, S, F) \ + __atomic_compare_exchange_4((P), (E), (D), 1, (S), (F)) +#define my_atomic_cas64_weak_explicit(P, E, D, S, F) \ + __atomic_compare_exchange_8((P), (E), (D), 1, (S), (F)) +#define my_atomic_casptr_weak_explicit(P, E, D, S, F) \ + __atomic_compare_exchange_4((P), (E), (D), 1, (S), (F)) + +#define my_atomic_cas32_strong_explicit(P, E, D, S, F) \ + __atomic_compare_exchange_4((P), (E), (D), 0, (S), (F)) +#define my_atomic_cas64_strong_explicit(P, E, D, S, F) \ + __atomic_compare_exchange_8((P), (E), (D), 0, (S), (F)) +#define my_atomic_casptr_strong_explicit(P, E, D, S, F) \ + __atomic_compare_exchange_4((P), (E), (D), 0, (S), (F)) + +#define my_atomic_store32(P, D) __atomic_store_4((P), (D), __ATOMIC_SEQ_CST) +#define my_atomic_store64(P, D) __atomic_store_8((P), (D), __ATOMIC_SEQ_CST) +#define my_atomic_storeptr(P, D) __atomic_store_4((P), (D), __ATOMIC_SEQ_CST) + +#define my_atomic_load32(P) __atomic_load_4((P), __ATOMIC_SEQ_CST) +#define my_atomic_load64(P) __atomic_load_8((P), __ATOMIC_SEQ_CST) +#define my_atomic_loadptr(P) __atomic_load_4((P), __ATOMIC_SEQ_CST) + +#define my_atomic_fas32(P, D) __atomic_exchange_4((P), (D), __ATOMIC_SEQ_CST) +#define my_atomic_fas64(P, D) __atomic_exchange_8((P), (D), __ATOMIC_SEQ_CST) +#define my_atomic_fasptr(P, D) __atomic_exchange_4((P), (D), __ATOMIC_SEQ_CST) + +#define my_atomic_add32(P, A) __atomic_fetch_add_4((P), (A), __ATOMIC_SEQ_CST) +#define my_atomic_add64(P, A) __atomic_fetch_add_8((P), (A), __ATOMIC_SEQ_CST) + +#define my_atomic_cas32(P, E, D) \ + __atomic_compare_exchange_4((P), (E), (D), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) +#define my_atomic_cas64(P, E, D) \ + __atomic_compare_exchange_8((P), (E), (D), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) +#define my_atomic_casptr(P, E, D) \ + __atomic_compare_exchange_4((P), (E), (D), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) + +#endif /* ATOMIC_GCC_BUILTINS_INCLUDED */ diff --git a/user/mariadb/libedit.patch b/user/mariadb/libedit.patch new file mode 100644 index 000000000..14dc9db49 --- /dev/null +++ b/user/mariadb/libedit.patch @@ -0,0 +1,57 @@ +From d9342e88289fa588ea2f1a094dbfc32f0693e23d Mon Sep 17 00:00:00 2001 +From: Sebastian Kemper <sebastian_ml@gmx.net> +Date: Tue, 9 Apr 2019 22:28:10 +0200 +Subject: [PATCH] cmake: support new libedit interface + +libedit changed it's interface a while ago. MariaDB's cmake file doesn't +recognize the new interface, the compile test fails: + +/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx: In function 'int main(int, char**)': +/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx:6:47: error: invalid conversion from 'char*' to 'int' [-fpermissive] + int res= (*rl_completion_entry_function)(0,0); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ + +Fix this by adding a detection for the new interface as well. + +Run-tested on a MIPS machine. + +Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net> +--- + cmake/readline.cmake | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/cmake/readline.cmake b/cmake/readline.cmake +index 12a8980b6a90..a2b2cc4c241f 100644 +--- a/cmake/readline.cmake ++++ b/cmake/readline.cmake +@@ -160,8 +160,20 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT) + int res= (*rl_completion_entry_function)(0,0); + completion_matches(0,0); + }" +- LIBEDIT_INTERFACE) +- SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE}) ++ LIBEDIT_HAVE_COMPLETION_INT) ++ ++ CHECK_CXX_SOURCE_COMPILES(" ++ #include <stdio.h> ++ #include <readline.h> ++ int main(int argc, char **argv) ++ { ++ char res= *(*rl_completion_entry_function)(0,0); ++ completion_matches(0,0); ++ }" ++ LIBEDIT_HAVE_COMPLETION_CHAR) ++ IF(LIBEDIT_HAVE_COMPLETION_INT OR LIBEDIT_HAVE_COMPLETION_CHAR) ++ SET(USE_LIBEDIT_INTERFACE 1) ++ ENDIF() + ENDIF() + ENDMACRO() + +@@ -187,6 +199,7 @@ MACRO (MYSQL_CHECK_READLINE) + IF(USE_LIBEDIT_INTERFACE) + SET(MY_READLINE_INCLUDE_DIR ${LIBEDIT_INCLUDE_DIR}) + SET(MY_READLINE_LIBRARY ${LIBEDIT_LIBRARY} ${CURSES_LIBRARY}) ++ SET(USE_NEW_READLINE_INTERFACE ${LIBEDIT_HAVE_COMPLETION_CHAR}) + ELSE() + MYSQL_USE_BUNDLED_READLINE() + ENDIF() diff --git a/user/mariadb/mariadb-server.limits b/user/mariadb/mariadb-server.limits new file mode 100644 index 000000000..520783992 --- /dev/null +++ b/user/mariadb/mariadb-server.limits @@ -0,0 +1,3 @@ +#<domain> <type> <item> <value> +@mysql soft nofile 65535 +@mysql hard nofile 65535 diff --git a/user/mariadb/mariadb-server.pre-install b/user/mariadb/mariadb-server.pre-install new file mode 100644 index 000000000..de2bcd795 --- /dev/null +++ b/user/mariadb/mariadb-server.pre-install @@ -0,0 +1,7 @@ +#!/bin/sh + +groupadd -g 60 -r mysql +useradd -M -N -r -u 60 -g 60 -c "MariaDB Database User" -d /var/lib/mysql -s /sbin/nologin mysql + +mkdir /var/lib/mysql +chown mysql:mysql /var/lib/mysql diff --git a/user/mariadb/mariadb.initd b/user/mariadb/mariadb.initd new file mode 100644 index 000000000..4e1cf8d3e --- /dev/null +++ b/user/mariadb/mariadb.initd @@ -0,0 +1,47 @@ +#!/sbin/openrc-run + +getconf() { + v=$(my_print_defaults --mysqld | grep ^--$1) + [ -z $v ] && echo $2 || echo ${v#*=} +} + +retry="60" +extra_stopped_commands="setup" + +user=${MYSQLD_USER:-mysql} +group=${MYSQLD_GROUP:-mysql} +default_datadir=$(getconf datadir "/var/lib/mariadb") +datadir=${MYSQLD_DATADIR:-$default_datadir} + +command="/usr/bin/mysqld_safe" +command_args="--syslog --nowatch --user=$user" + +depend() { + use net + need localmount +} + +setup() { + checkpath -d -m 1775 -o $user:$group /run/mariadb + ebegin "Creating a new MySQL database in $datadir" + mysql_install_db --user=$user --datadir=$datadir + eend $? +} + +start_pre() { + pidfile=$(getconf pid-file "/run/mariadb/mysqld.pid") + command_args="$command_args --pid-file=$pidfile" + if [ ! -d $datadir/mysql ]; then + eerror "Data directory '$datadir' is empty or invalid." + eerror "Run '/etc/init.d/mariadb setup' to create new database." + fi +} + +start_post() { + ewaitfile 10 $(getconf socket "/run/mariadb/mysqld.sock") +} + +stop_pre() { + pidfile=$(getconf pid-file "/run/mariadb/mysqld.pid") +} + diff --git a/user/mariadb/ppchax.patch b/user/mariadb/ppchax.patch new file mode 100644 index 000000000..26ffb5189 --- /dev/null +++ b/user/mariadb/ppchax.patch @@ -0,0 +1,26 @@ +--- mariadb-10.4.6/configure.cmake.old 2019-06-17 22:00:31.000000000 +0000 ++++ mariadb-10.4.6/configure.cmake 2019-07-06 23:21:57.705655766 +0000 +@@ -922,6 +922,10 @@ + return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); + }" + HAVE_GCC_C11_ATOMICS) ++IF(NOT HAVE_GCC_C11_ATOMICS AND CMAKE_SYSTEM_PROCESSOR MATCHES "ppc") ++ SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} atomic) ++ SET(HAVE_GCC_C11_ATOMICS 1) ++ENDIF() + + IF(WITH_VALGRIND) + SET(HAVE_valgrind 1) +--- mariadb-10.4.6/mysys/CMakeLists.txt.old 2019-06-17 22:00:32.000000000 +0000 ++++ mariadb-10.4.6/mysys/CMakeLists.txt 2019-07-07 00:03:56.956394100 +0000 +@@ -91,6 +91,10 @@ + TARGET_LINK_LIBRARIES(mysys pthread) + ENDIF() + ++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc") ++ TARGET_LINK_LIBRARIES(mysys atomic) ++ENDIF() ++ + ADD_EXECUTABLE(thr_lock thr_lock.c) + TARGET_LINK_LIBRARIES(thr_lock mysys) + SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN") diff --git a/user/mate-calc/APKBUILD b/user/mate-calc/APKBUILD index f55f691fc..a8f505202 100644 --- a/user/mate-calc/APKBUILD +++ b/user/mate-calc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=mate-calc -pkgver=1.22.0 +pkgver=1.22.1 pkgrel=0 pkgdesc="Calculator utility for the MATE desktop environment" url="https://mate-desktop.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a0d72a17dc9e7e97ef36cb2f089db126b1f91790d6a34ae829ef9cea87e82b025ba106f08e8c677352e72423a6670a3bf8751eecc67444cd8cea8dc8f3cf6728 mate-calc-1.22.0.tar.xz" +sha512sums="8e8efa1c17f6b6330471d877bc4d9c8486c64fb22ac3e3caf13a47f8be030664f1ca635a2323a78c5345a838fda307c3b4913caa748a67cc45fe43b9c8070e9a mate-calc-1.22.1.tar.xz" diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD index ef7180b64..ef6b8c23f 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Music education software" url="https://minuet.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0db8274cc30d04c790a0261abdb32b9e759018a7725d25b0e50eab5b06117d3c2ab9a6e0f8ea1fbad22ccbe6fbeb366e557431b31e255919278591adcf48ace8 minuet-19.04.1.tar.xz" +sha512sums="126fbb29e4aba12627eaddef118ffa6807d772e3dbb7d5316fbf04de8a99a58f322c0ceac27aab4e7a7f9670f776515956edceb5578e510c3a02c5a326a333f1 minuet-19.04.2.tar.xz" diff --git a/user/modemmanager/APKBUILD b/user/modemmanager/APKBUILD index a6ad0524d..663eb5ab2 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.0 +pkgver=1.10.2 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="676b11892b284c2da587895e71903f80ec96978c66eafae5e2d90e5c0f1dae18e50efc68b704c7907f01f208d585f5a8140316cf83e093df3f782c80949c33bc ModemManager-1.10.0.tar.xz +sha512sums="766e2b84eeb3a2f3fa75eca43d1addf1ed4ad9dc8c3a8009927f93f7ec1ead86a80d566eaaf425219a23824e10d1ec19161a0493c3c7f057c0e695eb1533f42e ModemManager-1.10.2.tar.xz 78e1c2ef604fb8b204618b9ecdc741ed7087fcc46ee563dbaaf6c9c0185165be58abfc3bf8ba89129fce7570c172cd1ac1e191e6d1200e3029c14a585ff40b83 no-translit.patch 31ded548acc8ccfcca5cd54384819b73ad9ac83556b754fa03a1a9c08aed7f913c7f066000abef0e52310721ef8c00ca8f48f1f762faaa5792420f62b5201881 01-org.freedesktop.ModemManager.rules" diff --git a/user/mousepad/APKBUILD b/user/mousepad/APKBUILD index 7b848ad28..5ac314a65 100644 --- a/user/mousepad/APKBUILD +++ b/user/mousepad/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=mousepad pkgver=0.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="Simple text editor for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool glib-dev gtk+3.0-dev gtksourceview-3.0-dev dbus-glib-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/mousepad/0.4/mousepad-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/mousepad/0.4/mousepad-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/musl-locales/APKBUILD b/user/musl-locales/APKBUILD new file mode 100644 index 000000000..9bbf0c49b --- /dev/null +++ b/user/musl-locales/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Alyx <alyx@leuhta.com> +# Maintainer: Alyx <alyx@leuhta.com> +pkgname=musl-locales +pkgver=0.20190626 +pkgrel=0 +pkgdesc="Locale program for musl" +url="https://gitlab.com/rilian-la-te/musl-locales" +arch="all" +options="!check" # No test suite. +license="MIT" +depends="" +makedepends="cmake make gettext-tiny-dev" +subpackages="$pkgname-lang" +source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz" +builddir="$srcdir/$pkgname" + +build() { + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + . + make +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="f65381b6eec64e69e649dacd3a3f75e74d9236164a1277bd2493afb3cb469049bee026d590a7207413b4d92675f877d1d8d3b16c58840a6e15a81638a2f731f2 musl-locales-0.20190626.tar.gz" diff --git a/user/nano/APKBUILD b/user/nano/APKBUILD index 5c9e06bd5..079af13e3 100644 --- a/user/nano/APKBUILD +++ b/user/nano/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=nano -pkgver=4.2 +pkgver=4.3 pkgrel=0 pkgdesc="Enhanced clone of the Pico text editor" url="https://www.nano-editor.org" @@ -44,4 +44,4 @@ package() { rm -rf "$pkgdir"/usr/lib/charset.alias } -sha512sums="280c986ebbc83875270da659232910568bcade962b75ddf9ddc2af6e0fb9aab2b0d029a80d632b5c67fc385958ef4d724aafeeb10299c9e2bc281e737a11845c nano-4.2.tar.xz" +sha512sums="3b16b70bdd98ea92cef99dfe5ee859e198bdb1dfa44e25aa200362958f77f8127c7c66aaf204637b768f10b3ea6f45f41417359b2f2608fab28ee9041057bf4f nano-4.3.tar.xz" diff --git a/user/newt/APKBUILD b/user/newt/APKBUILD index c05167f63..0ba5de3ed 100644 --- a/user/newt/APKBUILD +++ b/user/newt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=newt -pkgver=0.52.20 +pkgver=0.52.21 pkgrel=0 pkgdesc="Terminal user interface library" url="https://pagure.io/newt/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d8d66cef16595d289e4d8cc75589c684e855158f0eda3530d8be9f980f663c4f175ac47925cf9ba6980e9e5fdb0a83f7bcacf38fef0db31a1a48a62bd07bdec6 newt-r0-52-20.tar.gz" +sha512sums="6a72e7f624edfcf4638cdced69ae3443dcd9abfe306e506b3220f48403dcb841ff7b05e07eabbabe73cfa689486c6ce64e240951abb1bc42c791d14493738247 newt-r0-52-21.tar.gz" diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD index 6ca30bbad..ca02a8688 100644 --- a/user/nfs-utils/APKBUILD +++ b/user/nfs-utils/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nfs-utils -pkgver=2.3.3 -pkgrel=1 +pkgver=2.4.1 +pkgrel=0 pkgdesc="NFS file sharing client and server" url="http://nfs.sourceforge.net/" arch="all" @@ -13,8 +13,8 @@ makedepends="keyutils-dev krb5-dev libevent-dev libtirpc-dev lvm2-dev rpcsvc-proto sqlite-dev util-linux-dev" subpackages="$pkgname-doc $pkgname-openrc" source="https://downloads.sourceforge.net/nfs/nfs-utils-$pkgver.tar.xz - freeaddrinfo-properly.patch nfs-utils-1.1.4-mtab-sym.patch + nfsdcld.patch posixish.patch undef-def.patch @@ -25,7 +25,6 @@ source="https://downloads.sourceforge.net/nfs/nfs-utils-$pkgver.tar.xz " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -43,13 +42,10 @@ build() { } check() { - cd "$builddir" make check } package() { - local _initd _confd - cd "$builddir" make DESTDIR="$pkgdir" install install -D -m644 "$srcdir"/exports "$pkgdir"/etc/exports @@ -63,11 +59,11 @@ package() { done } -sha512sums="5025ccd7699ac1a0fdbd8b18ed8b33ea89230158320d809ec51e73f831100db75dceaddde481d911eeca9059caa521d155c2d14d014d75f091f432aad92a9716 nfs-utils-2.3.3.tar.xz -7e1472989374cf8a8dbd4944bbd5deaa5520f12ea3627709be037fb78febec531b373c6e05004f27046d1e3842f5cc7ce024f4db65cf656864bda85db529b451 freeaddrinfo-properly.patch +sha512sums="9aec8465be4bba300c5cd2e0d22f9f6db489a989bfbf01b10f62a7e628347dda06aa3079d18abc6ff5b0d5df54fdd9f27297e3e80b5f7fe525ab78df8fd88d8e nfs-utils-2.4.1.tar.xz 1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998 nfs-utils-1.1.4-mtab-sym.patch -f0b87ff4229d96a46e3f0c17f87dcd3ce5c51651ee036d935c1481b421cd7e5b6a048a082b4f8115a969fe6e85cc871df7658bf5d80c480095b69f29fd6b085d posixish.patch -2e54efa2cac0522f549e8bed45147676d10b299b5060eda305da8767feb55d37627259196d89c295e8d5f4fbbb7c9e791a53dddd579187600f1717968049aa6a undef-def.patch +0275cacdaf399e9a9f132a79a6eab09aea176204181f2a1c1c7f062faeef5c4d979912aaf751bdfdfd3fc3d4dc166dca89ac1fabf2655d222379dd4e7ccab419 nfsdcld.patch +db5927d533ff8c1bfd5f4948bc1ea6a375a779f3ab10f7520367556cf195245fbeaf28ff9974daeec319b47f1f0344c7f93a354e8ab28de5c4203f0d2b273a6b posixish.patch +3436064c2aa8e8a645fdae11e87a1bc932cfe60883f1516a218fe3dc65d2abe962c9322dd1c59c2c117dd942e6b72d7311f51280d0d71fc69ed4ed543ac6d841 undef-def.patch fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220 exports bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535 nfs.confd f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018 nfs.initd diff --git a/user/nfs-utils/freeaddrinfo-properly.patch b/user/nfs-utils/freeaddrinfo-properly.patch deleted file mode 100644 index 7ddcde004..000000000 --- a/user/nfs-utils/freeaddrinfo-properly.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -Naur nfs-utils-2.3.3-orig/support/export/client.c nfs-utils-2.3.3/support/export/client.c ---- nfs-utils-2.3.3-orig/support/export/client.c 2018-09-06 13:09:08.000000000 -0500 -+++ nfs-utils-2.3.3/support/export/client.c 2019-04-21 02:48:45.676838188 -0500 -@@ -309,7 +309,8 @@ - init_addrlist(clp, ai); - - out: -- freeaddrinfo(ai); -+ if (ai != NULL) -+ freeaddrinfo(ai); - return clp; - } - -diff -Naur nfs-utils-2.3.3-orig/tests/nsm_client/nsm_client.c nfs-utils-2.3.3/tests/nsm_client/nsm_client.c ---- nfs-utils-2.3.3-orig/tests/nsm_client/nsm_client.c 2018-09-06 13:09:08.000000000 -0500 -+++ nfs-utils-2.3.3/tests/nsm_client/nsm_client.c 2019-04-21 02:35:53.139552780 -0500 -@@ -243,7 +243,8 @@ - printf("RPC client creation failed\n"); - } - out: -- freeaddrinfo(ai); -+ if (ai != NULL) -+ freeaddrinfo(ai); - return client; - } - -diff -Naur nfs-utils-2.3.3-orig/utils/exportfs/exportfs.c nfs-utils-2.3.3/utils/exportfs/exportfs.c ---- nfs-utils-2.3.3-orig/utils/exportfs/exportfs.c 2018-09-06 13:09:08.000000000 -0500 -+++ nfs-utils-2.3.3/utils/exportfs/exportfs.c 2019-04-21 02:40:07.432327005 -0500 -@@ -282,7 +282,8 @@ - validate_export(exp); - - out: -- freeaddrinfo(ai); -+ if (ai != NULL) -+ freeaddrinfo(ai); - } - - static int exportfs_generic(char *arg, char *options, int verbose) -@@ -395,7 +396,8 @@ - if (!success) - xlog(L_ERROR, "Could not find '%s:%s' to unexport.", hname, path); - -- freeaddrinfo(ai); -+ if (ai != NULL) -+ freeaddrinfo(ai); - } - - static int unexportfs_generic(char *arg, int verbose) -@@ -639,8 +641,10 @@ - } - - out: -- freeaddrinfo(results1); -- freeaddrinfo(results2); -+ if (results1 != NULL) -+ freeaddrinfo(results1); -+ if (results2 != NULL) -+ freeaddrinfo(results2); - return result; - } - -diff -Naur nfs-utils-2.3.3-orig/utils/mount/stropts.c nfs-utils-2.3.3/utils/mount/stropts.c ---- nfs-utils-2.3.3-orig/utils/mount/stropts.c 2018-09-06 13:09:08.000000000 -0500 -+++ nfs-utils-2.3.3/utils/mount/stropts.c 2019-04-21 02:43:18.451874403 -0500 -@@ -1263,7 +1263,8 @@ - } else - nfs_error(_("%s: internal option parsing error"), progname); - -- freeaddrinfo(mi.address); -+ if (mi.address != NULL) -+ freeaddrinfo(mi.address); - free(mi.hostname); - return retval; - } -diff -Naur nfs-utils-2.3.3-orig/utils/mountd/cache.c nfs-utils-2.3.3/utils/mountd/cache.c ---- nfs-utils-2.3.3-orig/utils/mountd/cache.c 2019-04-21 02:33:43.603417171 -0500 -+++ nfs-utils-2.3.3/utils/mountd/cache.c 2019-04-21 02:45:11.289792765 -0500 -@@ -834,7 +834,8 @@ - out: - if (found_path) - free(found_path); -- freeaddrinfo(ai); -+ if (ai != NULL) -+ freeaddrinfo(ai); - free(dom); - xlog(D_CALL, "nfsd_fh: found %p path %s", found, found ? found->e_path : NULL); - } -@@ -1355,7 +1356,7 @@ - xlog(D_CALL, "nfsd_export: found %p path %s", found, path ? path : NULL); - if (dom) free(dom); - if (path) free(path); -- freeaddrinfo(ai); -+ if (ai) freeaddrinfo(ai); - } - - -diff -Naur nfs-utils-2.3.3-orig/utils/mountd/mountd.c nfs-utils-2.3.3/utils/mountd/mountd.c ---- nfs-utils-2.3.3-orig/utils/mountd/mountd.c 2018-09-06 13:09:08.000000000 -0500 -+++ nfs-utils-2.3.3/utils/mountd/mountd.c 2019-04-21 02:45:41.796526387 -0500 -@@ -581,7 +581,8 @@ - freeaddrinfo(ai); - continue; - } -- freeaddrinfo(ai); -+ if (ai != NULL) -+ freeaddrinfo(ai); - } - cp = &(c->gr_next); - } -diff -Naur nfs-utils-2.3.3-orig/utils/statd/hostname.c nfs-utils-2.3.3/utils/statd/hostname.c ---- nfs-utils-2.3.3-orig/utils/statd/hostname.c 2018-09-06 13:09:08.000000000 -0500 -+++ nfs-utils-2.3.3/utils/statd/hostname.c 2019-04-21 02:41:39.712446505 -0500 -@@ -308,8 +308,10 @@ - } - - out: -- freeaddrinfo(results2); -- freeaddrinfo(results1); -+ if (results2 != NULL) -+ freeaddrinfo(results2); -+ if (results1 != NULL) -+ freeaddrinfo(results1); - - xlog(D_CALL, "%s: hostnames %s and %s %s", __func__, - hostname1, hostname2, diff --git a/user/nfs-utils/nfsdcld.patch b/user/nfs-utils/nfsdcld.patch new file mode 100644 index 000000000..e80956bb8 --- /dev/null +++ b/user/nfs-utils/nfsdcld.patch @@ -0,0 +1,21 @@ +--- nfs-utils-2.4.1/utils/nfsdcld/legacy.c.old 2019-06-10 14:34:37.000000000 +0000 ++++ nfs-utils-2.4.1/utils/nfsdcld/legacy.c 2019-06-20 00:29:10.493973462 +0000 +@@ -24,6 +24,7 @@ + #include <errno.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <limits.h> + #include "cld.h" + #include "sqlite.h" + #include "xlog.h" +--- nfs-utils-2.4.1/utils/nfsdcld/nfsdcld.c.old 2019-06-10 14:34:37.000000000 +0000 ++++ nfs-utils-2.4.1/utils/nfsdcld/nfsdcld.c 2019-06-20 00:28:42.926915402 +0000 +@@ -645,7 +645,7 @@ + int + main(int argc, char **argv) + { +- char arg; ++ int arg; + int rc = 0; + bool foreground = false; + char *progname; diff --git a/user/nfs-utils/posixish.patch b/user/nfs-utils/posixish.patch index 0f1a7cdee..9bc817ad0 100644 --- a/user/nfs-utils/posixish.patch +++ b/user/nfs-utils/posixish.patch @@ -1,24 +1,3 @@ ---- nfs-utils-2.3.1/configure.ac.orig 2018-05-21 11:05:01.939912918 -0700 -+++ nfs-utils-2.3.1/configure.ac 2018-05-21 11:05:10.531968707 -0700 -@@ -401,7 +401,7 @@ - fi - - dnl libdnsidmap specific checks --AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed)) -+AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed)) - - AC_ARG_ENABLE([ldap], - [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])]) ---- nfs-utils-2.3.1/support/misc/file.c.orig 2018-05-21 18:15:37.572007979 +0000 -+++ nfs-utils-2.3.1/support/misc/file.c 2018-05-21 18:15:43.668047008 +0000 -@@ -27,6 +27,7 @@ - #include <dirent.h> - #include <stdlib.h> - #include <stdbool.h> -+#include <limits.h> /* PATH_MAX */ - - #include "xlog.h" - #include "misc.h" --- nfs-utils-2.3.3/configure.old 2018-09-06 18:10:07.000000000 +0000 +++ nfs-utils-2.3.3/configure 2019-01-10 16:01:32.110000000 +0000 @@ -20302,9 +20302,9 @@ diff --git a/user/nfs-utils/undef-def.patch b/user/nfs-utils/undef-def.patch index 12bff6ddf..a8b03ac03 100644 --- a/user/nfs-utils/undef-def.patch +++ b/user/nfs-utils/undef-def.patch @@ -1,17 +1,6 @@ ---- nfs-utils-2.3.3/support/nfs/svc_socket.c.old 2018-09-06 18:09:08.000000000 +0000 -+++ nfs-utils-2.3.3/support/nfs/svc_socket.c 2019-01-10 16:17:02.270000000 +0000 -@@ -46,7 +46,7 @@ - struct rpcent *rpcp; - struct servent servbuf, *servp = NULL; - int ret = 0; --#if HAVE_GETRPCBYNUMBER_R -+#ifdef HAVE_GETRPCBYNUMBER_R - char rpcdata[1024]; - struct rpcent rpcbuf; - --- nfs-utils-2.3.3/utils/mountd/cache.c.old 2018-09-06 18:09:08.000000000 +0000 +++ nfs-utils-2.3.3/utils/mountd/cache.c 2019-01-10 16:26:22.750000000 +0000 -@@ -426,7 +426,7 @@ +@@ -446,7 +446,7 @@ if (count_slashes(p) != count_slashes(parent)) return 0; @@ -31,12 +20,3 @@ /* Cannot safely include linux/in6.h in old glibc, so hardcode the needed values */ # define IPV6_PREFER_SRC_PUBLIC 2 # define IPV6_ADDR_PREFERENCES 72 -@@ -1062,7 +1062,7 @@ - if (caddr) { - /* Get the address of our end of this connection */ - socklen_t len = sizeof(*caddr); -- if (getsockname(sock, caddr, &len) != 0) -+ if (getsockname(sock, (struct sockaddr *)caddr, &len) != 0) - caddr->sin_family = 0; - } - diff --git a/user/nmap/APKBUILD b/user/nmap/APKBUILD index 3cf0b1db3..d8bdea9a9 100644 --- a/user/nmap/APKBUILD +++ b/user/nmap/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=nmap pkgver=7.70 -pkgrel=0 +pkgrel=1 pkgdesc="A network exploration tool and security/port scanner" url="https://nmap.org/" arch="all" @@ -14,7 +14,9 @@ subpackages=" $pkgname-scripts::noarch $pkgname-nselibs::noarch $pkgname-nping - $pkgname-ncat" + $pkgname-ncat + $pkgname-ncat-doc:ncat_doc + netcat::noarch" source="https://nmap.org/dist/$pkgname-$pkgver.tar.bz2" prepare() { @@ -23,7 +25,6 @@ prepare() { } build() { - cd "$builddir" # zenmap and ndiff require python 2 ./configure \ --build=$CBUILD \ @@ -44,12 +45,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } @@ -78,10 +77,26 @@ ncat() { mv "$pkgdir"/usr/bin/ncat "$subpkgdir"/usr/bin } +ncat_doc() { + pkgdesc="ncat utility (docs)" + install_if="nmap-ncat=$pkgver-r$pkgrel docs" + mkdir -p "$subpkgdir"/usr/share/man/man1 + mv "${pkgdir}-doc"/usr/share/man/man1/ncat.1.gz \ + "$subpkgdir"/usr/share/man/man1 +} + nping() { pkgdesc="$pkgdesc (nping tool)" mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/nping "$subpkgdir"/usr/bin } +netcat() { + pkgdesc="Symlinks for netcat and nc to ncat" + depends="$pkgname-ncat" + mkdir -p "$subpkgdir"/usr/bin + ln -s ncat "$subpkgdir"/usr/bin/netcat + ln -s ncat "$subpkgdir"/usr/bin/nc +} + sha512sums="084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5 nmap-7.70.tar.bz2" diff --git a/user/notmuch/APKBUILD b/user/notmuch/APKBUILD index 4e8153630..b585d685f 100644 --- a/user/notmuch/APKBUILD +++ b/user/notmuch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=notmuch -pkgver=0.28.3 +pkgver=0.28.4 pkgrel=0 pkgdesc="Thread-based email index, search and tagging" url="https://notmuchmail.org/" @@ -36,8 +36,8 @@ build() { check() { cd "$builddir" # config, regexp-query: musl issues, TODO: Fixed in master - # count, insert: gdb-based tests which fail at some optimization levels, or w/o -g. - NOTMUCH_SKIP_TESTS="config regexp-query count insert" make check + # atomicity, count, new, insert: gdb-based tests which fail randomly on some arches, with some CFLAGS, or during some moon phases + NOTMUCH_SKIP_TESTS="config regexp-query atomicity count new insert" make check } package() { @@ -92,5 +92,5 @@ zshcomp() { mv "$pkgdir/usr/share/zsh" "$subpkgdir/usr/share" } -sha512sums="dd3931b78cc27540e962f1fca5f4ebb1c04b2637a5761cda023f307fd9be4b5ddc2af26010330868c55200fa96b60b2a11b3b22d4c20d2a4a2d3787421ed85cf notmuch-0.28.3.tar.gz +sha512sums="77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7 notmuch-0.28.4.tar.gz b2991ee5edf927f04d904d99888dbce17a98e9d4d7d809bc2248f45d214025f4a1632b19e4fbca2b08e99721ec8a7eea82384c5c718206884801c7bfa5a8c540 0.28.2-disable-rpath.patch" diff --git a/user/nsd/APKBUILD b/user/nsd/APKBUILD index f99b4514e..4c893b3d9 100644 --- a/user/nsd/APKBUILD +++ b/user/nsd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=nsd -pkgver=4.1.27 +pkgver=4.2.0 pkgrel=0 pkgdesc="An authoritative only name server" url="https://www.nlnetlabs.nl/projects/nsd/about/" @@ -50,6 +50,6 @@ openrc() { install -Dm644 "$srcdir/nsd.confd" "$subpkgdir/etc/conf.d/nsd" } -sha512sums="9c75041f5a6213cdba7238c2e51fc73031f6f073e06587659f93992fed49418ee789642b25b5522d48642507050ac15021f385927eed81ce5ea649f974e66402 nsd-4.1.27.tar.gz +sha512sums="caa14fcd599ddc631cb74c3a56e571044dae1deb2fa9bd6b062f143954f9207b64b42ab5eab917360161f96bae8711df932f3e18b58be98b3f7b640071e7e807 nsd-4.2.0.tar.gz f0ef1d3427e92650239d9d91402810c045fc9223e3f42ce86986422bf2039a0bcc02dffdfe1153d54de5c76c8f2bdc3e34fe341c65b41f2d333b02c00b5b0eae nsd.confd 139e52dec98792173f06d298574db0d0e6966a06af8a0a3069487beb01fd570c09d22322569b54bacdc43232dbfb99a8c497d4417d2bbfee88bcdd9d1b4d22f7 nsd.initd" diff --git a/user/numactl/APKBUILD b/user/numactl/APKBUILD new file mode 100644 index 000000000..a6122fcc5 --- /dev/null +++ b/user/numactl/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: Daniel Sabogal <dsabogalcc@gmail.com> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=numactl +pkgver=2.0.12 +pkgrel=0 +pkgdesc="Simple NUMA policy support" +url="https://github.com/numactl/numactl" +# ARM lacks the __NR_migrate_pages syscall +arch="all !armhf !armv7" +license="GPL-2.0+ AND LGPL-2.1" +makedepends="autoconf automake libtool linux-headers" +subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" +source="$pkgname-$pkgver.tar.gz::https://github.com/numactl/$pkgname/archive/v$pkgver.tar.gz + musl.patch" + +prepare() { + default_prepare + ./autogen.sh +} + +build() { + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man + make +} + +check() { + make check VERBOSE=1 TESTS='test/distance test/nodemap test/tbitmap' +} + +package() { + make DESTDIR="$pkgdir" install + + # provided by linux man-pages + rm -r "$pkgdir"/usr/share/man/man2 +} + +tools() { + pkgdesc="NUMA policy control tools" + + mkdir -p "$subpkgdir"/usr + mv "$pkgdir"/usr/bin "$subpkgdir"/usr +} + +sha512sums="3814efd924d1c9152a30f6ae5b665afc20648226cd475d72b933c0ec4f30249af4e25110de17f144734b787ed765644dca09a657219806ab5c9c550abd45bf8e numactl-2.0.12.tar.gz +c24affa5a8a8ea83d7f0ee384dc0629e17a5c4201357132f770f894ad4236772116d96d8389d54fb99095af40d1ccbffc3170b5fb9cc88cfca39179f50bee9c9 musl.patch" diff --git a/user/numactl/musl.patch b/user/numactl/musl.patch new file mode 100644 index 000000000..009233f63 --- /dev/null +++ b/user/numactl/musl.patch @@ -0,0 +1,21 @@ +--- numactl-2.0.11/syscall.c.orig ++++ numactl-2.0.11/syscall.c +@@ -115,14 +115,16 @@ + + #endif + +-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11) ++#if defined(__GLIBC__) ++# if __GLIBC_PREREQ(2,11) + + /* glibc 2.11 seems to have working 6 argument sycall. Use the + glibc supplied syscall in this case. + The version cut-off is rather arbitary and could be probably + earlier. */ + +-#define syscall6 syscall ++# define syscall6 syscall ++#endif + #elif defined(__x86_64__) + /* 6 argument calls on x86-64 are often buggy in both glibc and + asm/unistd.h. Add a working version here. */ diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD index a4d7cacc3..5f204c6b1 100644 --- a/user/okular/APKBUILD +++ b/user/okular/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okular -pkgver=19.04.1 -pkgrel=0 +pkgver=19.04.2 +pkgrel=1 pkgdesc="Universal document reader developed by KDE" url="https://okular.kde.org/" arch="all" @@ -47,5 +47,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="01be68692d106a4cc830361e9653f477e6ed204905950cf4db366b20c2665abc7914d6fca0504fc5ea2064f2f1e28dc8662deef3a73a52b32f3cdfafffed3007 okular-19.04.1.tar.xz +sha512sums="1bf79a5d72bdfbcf7caa4104b56cc1e5f5b72e0390521d2cac9a86ae8d66d495632a8af203bffb987fc6d40da41af0c54a8ebce3023b486dbc3eebbd35a866f7 okular-19.04.2.tar.xz d82dd9de666a28ef605d8a81e74851f265be4ccaeaa39a1cdee9eb1db830fcd0d581d01d6e89a1d36b8ea5c9c8113f1016090dc0e9f17070d388166d9e967458 es-doc-fix.patch" diff --git a/user/oniguruma/APKBUILD b/user/oniguruma/APKBUILD new file mode 100644 index 000000000..7df3e3af5 --- /dev/null +++ b/user/oniguruma/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Contributor: Francesco Colista <fcolista@alpinelinux.org> +# Maintainer: Samuel Holland <samuel@sholland.org> +pkgname=oniguruma +pkgver=6.9.2 +pkgrel=0 +pkgdesc="A regular expression library" +url="https://github.com/kkos/oniguruma" +arch="all" +license="BSD-2-Clause" +subpackages="$pkgname-dev" +source="https://github.com/kkos/$pkgname/releases/download/v$pkgver/onig-$pkgver.tar.gz" +builddir="$srcdir/onig-$pkgver" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="c10134e42a3c0b0eeae2027ffb7a3e1bcc9228dee286f6b6e997f8a73d717217fa74de0e19c40975d2e78044c8c4f029eb622f90c8eb4fdc4667eb4804e97001 onig-6.9.2.tar.gz" diff --git a/user/opal-utils/APKBUILD b/user/opal-utils/APKBUILD new file mode 100644 index 000000000..d6eddcd70 --- /dev/null +++ b/user/opal-utils/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=opal-utils +pkgver=6.3.1 +pkgrel=0 +pkgdesc="Tools for IBM FSP and OpenPOWER systems" +url="https://lists.ozlabs.org/listinfo/skiboot" +arch="ppc64" +license="Apache-2.0" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="skiboot-$pkgver.tar.gz::https://github.com/open-power/skiboot/archive/v$pkgver.tar.gz + musl.patch + opal-prd.patch + " +builddir="$srcdir/skiboot-$pkgver" + +_tools="opal-prd gard" + +build() { + for _tool in $_tools; do + cd "$builddir"/external/$_tool + make + done +} + +check() { + for _tool in $_tools; do + cd "$builddir"/external/$_tool + make test + done +} + +package() { + for _tool in $_tools; do + cd "$builddir"/external/$_tool + make DESTDIR="$pkgdir" prefix="/usr" install + done +} + +sha512sums="ad2156d864cedcf3d19e8ff094d12059703aaf9a5ea8403e230ecf33d331dae45e0f28a89c65ad05f94605e493bc8d42df92698847600810d5609bc56ade24b8 skiboot-6.3.1.tar.gz +e7480f16b6eb41fd65b40ea1f20031118030f24681b7b8afcfdebb8cde7625e45902683cfb5fe0af3259060fb1b92b9c2f5d62354de356e7706a7f08ad9f772e musl.patch +944dd564a2c846a675544c8ecdb2fa4714235f3fd974e135a71220379640f94883811399fe03d2d697fcb49e219504af264af0f201a6a7b37029687dea6a28cf opal-prd.patch" diff --git a/user/opal-utils/musl.patch b/user/opal-utils/musl.patch new file mode 100644 index 000000000..5835935e8 --- /dev/null +++ b/user/opal-utils/musl.patch @@ -0,0 +1,36 @@ +--- skiboot-6.3.1/ccan/endian/endian.h.old 2019-05-10 06:50:45.000000000 +0000 ++++ skiboot-6.3.1/ccan/endian/endian.h 2019-06-04 07:57:14.416435679 +0000 +@@ -112,9 +112,9 @@ + #error "Unknown endian" + #elif HAVE_LITTLE_ENDIAN && HAVE_BIG_ENDIAN + #error "Can't compile for both big and little endian." +-#elif HAVE_LITTLE_ENDIAN ++#elif HAVE_LITTLE_ENDIAN && !defined(__BYTE_ORDER) + #define __BYTE_ORDER __LITTLE_ENDIAN +-#elif HAVE_BIG_ENDIAN ++#elif HAVE_BIG_ENDIAN && !defined(__BYTE_ORDER) + #define __BYTE_ORDER __BIG_ENDIAN + #endif + +--- skiboot-6.3.1/include/inttypes.h.old 2019-05-10 06:50:45.000000000 +0000 ++++ skiboot-6.3.1/include/inttypes.h 2019-06-04 08:07:42.108161539 +0000 +@@ -25,15 +25,15 @@ + + #include <stdint.h> + +-#ifndef __WORDSIZE +-/* If we don't have __WORDSIZE it means we're *certainly* building skiboot ++#ifndef __LONG_WIDTH__ ++/* If we don't have __LONG_WIDTH__ it means we're *certainly* building skiboot + * which will *ALWAYS* have a word size of 32bits. + * (unless someone goes and ports skiboot to something that isn't powerpc) + */ +-#define __WORDSIZE 32 ++#define __LONG_WIDTH__ 32 + #endif + +-#if __WORDSIZE == 64 ++#if __LONG_WIDTH__ == 64 + #define PRIu64 "lu" + #define PRIx64 "lx" + #else diff --git a/user/opal-utils/opal-prd.patch b/user/opal-utils/opal-prd.patch new file mode 100644 index 000000000..29b38cd43 --- /dev/null +++ b/user/opal-utils/opal-prd.patch @@ -0,0 +1,8 @@ +--- 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 @@ +-#include <endian.h> ++#define __BYTE_ORDER __BIG_ENDIAN + #include <asm/unistd.h> + + #ifndef __NR_switch_endian diff --git a/user/openjdk7/APKBUILD b/user/openjdk7/APKBUILD index 597031b43..de476ea21 100644 --- a/user/openjdk7/APKBUILD +++ b/user/openjdk7/APKBUILD @@ -57,7 +57,7 @@ if [ "$BOOTSTRAP" != "no" ]; then makedepends="$makedepends java-gcj-compat" BOOTSTRAP_JAVA_HOME=/usr/lib/jvm/java-1.5-gcj/ else - makedepends="$makedepends $pkgname" + makedepends="$makedepends $pkgname fastjar" BOOTSTRAP_JAVA_HOME="$INSTALL_BASE" fi diff --git a/user/openjpeg/APKBUILD b/user/openjpeg/APKBUILD index 6e2993bd6..c549987d8 100644 --- a/user/openjpeg/APKBUILD +++ b/user/openjpeg/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openjpeg pkgver=2.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Open-source implementation of JPEG 2000 image codec" url="http://www.openjpeg.org/" arch="all" @@ -18,7 +18,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DOPENJPEG_INSTALL_LIB_DIR=lib \ - -DOPENJPEG_INSTALL_PACKAGE_DIR=/usr/lib/cmake/$pkgname-${pkgver%.*} + -DOPENJPEG_INSTALL_PACKAGE_DIR=lib/cmake/$pkgname-${pkgver%.*} make } diff --git a/user/orage/APKBUILD b/user/orage/APKBUILD index 4cb9121e2..c64f3c18b 100644 --- a/user/orage/APKBUILD +++ b/user/orage/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=orage pkgver=4.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="Calendaring software for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,14 +10,12 @@ license="GPL-2.0+ AND BSD-3-Clause AND (LGPL-2.1-only OR MPL-1.0) AND (GPL-2.0+ makedepends="intltool gtk+2.0-dev dbus-glib-dev libnotify-dev popt-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/orage/4.12/orage-$pkgver.tar.bz2 +source="https://archive.xfce.org/src/apps/orage/4.12/orage-$pkgver.tar.bz2 libical-3.patch " build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -28,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/otf-exo/APKBUILD b/user/otf-exo/APKBUILD index 588a20ec9..939ae229a 100644 --- a/user/otf-exo/APKBUILD +++ b/user/otf-exo/APKBUILD @@ -15,9 +15,9 @@ builddir="$srcdir" package() { cd "$builddir" - mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} for i in *.otf; do - install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} done } diff --git a/user/otf-office-code-pro/APKBUILD b/user/otf-office-code-pro/APKBUILD index 6628a1d77..0f34cac2a 100644 --- a/user/otf-office-code-pro/APKBUILD +++ b/user/otf-office-code-pro/APKBUILD @@ -14,15 +14,15 @@ source="https://github.com/nathco/Office-Code-Pro/archive/1.004.zip" builddir="$srcdir/Office-Code-Pro-$pkgver" package() { - mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} cd "$builddir/Fonts/Office Code Pro/OTF" for i in *.otf; do - install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} done - mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}-d + mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}-d cd "$builddir/Fonts/Office Code Pro D/OTF" for i in *.otf; do - install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}-d + install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}-d done } diff --git a/user/otf-proggy-vector/APKBUILD b/user/otf-proggy-vector/APKBUILD index 598f710e8..3af3cc125 100644 --- a/user/otf-proggy-vector/APKBUILD +++ b/user/otf-proggy-vector/APKBUILD @@ -15,9 +15,9 @@ builddir="$srcdir/proggyfonts-$pkgver" package() { cd "$builddir"/ProggyVector - mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} for i in *.otf; do - install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} done } diff --git a/user/otf-source-code-pro/APKBUILD b/user/otf-source-code-pro/APKBUILD index 442611e3f..78e144b82 100644 --- a/user/otf-source-code-pro/APKBUILD +++ b/user/otf-source-code-pro/APKBUILD @@ -16,9 +16,9 @@ builddir="$srcdir/source-code-pro-${pkgver}R-ro-${_pkgver}R-it" package() { cd "$builddir"/OTF - mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} for i in *.otf; do - install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} done } diff --git a/user/otf-source-sans-pro/APKBUILD b/user/otf-source-sans-pro/APKBUILD index 497de47fa..1e7c3b319 100644 --- a/user/otf-source-sans-pro/APKBUILD +++ b/user/otf-source-sans-pro/APKBUILD @@ -16,9 +16,9 @@ builddir="$srcdir/source-sans-pro-${pkgver}R-ro-${_pkgver}R-it" package() { cd "$builddir"/OTF - mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} for i in *.otf; do - install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} done } diff --git a/user/otf-source-serif-pro/APKBUILD b/user/otf-source-serif-pro/APKBUILD index 529c4fd71..478066c17 100644 --- a/user/otf-source-serif-pro/APKBUILD +++ b/user/otf-source-serif-pro/APKBUILD @@ -1,8 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=otf-source-serif-pro -pkgver=2.010 -_pkgver=1.010 +pkgver=3.000 pkgrel=0 pkgdesc="Serif font family for typesetting" url="https://adobe-fonts.github.io/source-serif-pro/" @@ -11,15 +10,14 @@ options="!check" # No tests license="OFL-1.1" depends="fontconfig" makedepends="" -source="https://github.com/adobe-fonts/source-serif-pro/releases/download/${pkgver}R-ro%2F${_pkgver}R-it/source-serif-pro-${pkgver}R-ro-${_pkgver}R-it.zip" -builddir="$srcdir/source-serif-pro-${pkgver}R-ro-${_pkgver}R-it" +source="https://github.com/adobe-fonts/source-serif-pro/releases/download/${pkgver}R/${pkgname#*-}-${pkgver}R.zip" package() { - cd "$builddir"/OTF - mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + cd "$srcdir"/OTF + mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} for i in *.otf; do - install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} done } -sha512sums="464fe11a928a8d574912a87d6df66c57a0fba554bb39ff8ae7faf607440f2805f8022f40870ed408284e3676cc164ce114a483ba4259e23b4d06efeee4c0fc3f source-serif-pro-2.010R-ro-1.010R-it.zip" +sha512sums="865ea8ab6d5b8107b85a494f3b54da83a479a613c198c657d16fc6abe10022d0bbb1e441a328371a33a0d393467da599eba6458be31835cdd7391cfde4a6eec8 source-serif-pro-3.000R.zip" diff --git a/user/p11-kit/APKBUILD b/user/p11-kit/APKBUILD index ee6c68cb9..fff4a60c6 100644 --- a/user/p11-kit/APKBUILD +++ b/user/p11-kit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: pkgname=p11-kit -pkgver=0.23.15 +pkgver=0.23.16.1 pkgrel=0 pkgdesc="Library for loading and sharing PKCS#11 modules" url="https://p11-glue.github.io/p11-glue/p11-kit.html" @@ -46,4 +46,4 @@ trust() { "$subpkgdir"/usr/lib/pkcs11/ } -sha512sums="d703eec12626b79551ce337521f7ea7b1a0b64c211d7a93d831dd28ec1de77c7b58358c1588bf82d70f047c01ad9433fa8a286d1a25ae3f6b0ee6016b8c42950 p11-kit-0.23.15.tar.gz" +sha512sums="7d0bbd793b43dba081054b4d022a8dbd1d477a3bd6aced72a641087023cf020f1d898899a08e737880e6c810f924814c62497c5ecb19f8322cde42667426a9a7 p11-kit-0.23.16.1.tar.gz" diff --git a/user/palapeli/APKBUILD b/user/palapeli/APKBUILD index 8038b6717..776d7955f 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.04.1 +pkgver=19.04.2 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="a560646ce1577b3ea24cefdd2ffc7053c407469ed1d76e0c4af9c74f45222daebf56d8e409cf8f832da73baaa6402dccacd06cf72c71cfc34e9b25c542b4a8a0 palapeli-19.04.1.tar.xz" +sha512sums="02bd0f8b686d2a73ed4871b80e9bedd468833ed403b293aa65db1d8d1baf607936d8d2ca89cd66518006a5fe920f476268f9835e73892fed3e980999605a5138 palapeli-19.04.2.tar.xz" diff --git a/user/papirus-icons/APKBUILD b/user/papirus-icons/APKBUILD index f506865a1..a7074ea0b 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=20180214 +pkgver=20190615 pkgrel=0 pkgdesc="Material, flat style icon theme" url="https://store.kde.org/p/1166289/" @@ -10,8 +10,7 @@ license="LGPL-3.0" options="!check" # Icon set. depends="" makedepends="" -install="" -subpackages="$pkgname-light $pkgname-dark $pkgname-adapta" +subpackages="$pkgname-light $pkgname-dark e$pkgname:epapirus" source="$pkgname-$pkgver.tar.gz::https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/$pkgver.tar.gz" builddir="$srcdir/papirus-icon-theme-$pkgver" @@ -34,12 +33,11 @@ dark() { mv "$pkgdir"/usr/share/icons/Papirus-Dark "$subpkgdir"/usr/share/icons/ } -adapta() { - pkgdesc="$pkgdesc (for Adapta theme)" +epapirus() { + pkgdesc="$pkgdesc" mkdir -p "$subpkgdir"/usr/share/icons - mv "$pkgdir"/usr/share/icons/Papirus-Adapta-* \ - "$subpkgdir"/usr/share/icons/ + mv "$pkgdir"/usr/share/icons/ePapirus "$subpkgdir"/usr/share/icons/ } -sha512sums="e3cff11cb4e0ad71ff5c44da9ef5135ce7fc2f4bea5e95f4c42963868ef7fce19daf45bc7f5649186bbedeb683d8a56a48f859cda17acacad7c3fbf35fdcd291 papirus-icons-20180214.tar.gz" +sha512sums="083f1afcc7e46a9688f96f584193cf07bcbe45f445feaee976b208a90e7758138fa0d77d355da73b241698ac2e0d1594613b57092d53294bd7e9cfa7b5ee1145 papirus-icons-20190615.tar.gz" diff --git a/user/parole/APKBUILD b/user/parole/APKBUILD index 496594ae1..bbd53dfad 100644 --- a/user/parole/APKBUILD +++ b/user/parole/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=parole pkgver=1.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="GStreamer-based media player for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+ AND LGPL-2.1+" makedepends="intltool gtk+3.0-dev dbus-glib-dev libxfce4ui-dev gstreamer-dev gst-plugins-base-dev libnotify-dev libice-dev" subpackages="$pkgname-dev $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/parole/1.0/parole-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/parole/1.0/parole-$pkgver.tar.bz2" build() { - cd "$builddir" - LIBS="-lX11" ./configure \ + LIBS="-lintl -lX11" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/partitionmanager/APKBUILD b/user/partitionmanager/APKBUILD index 33c6e3bdf..5e67e25af 100644 --- a/user/partitionmanager/APKBUILD +++ b/user/partitionmanager/APKBUILD @@ -4,7 +4,7 @@ pkgname=partitionmanager pkgver=3.3.1 pkgrel=0 pkgdesc="Qt-based partition manager" -url="https://www.kde.org/applications/system/kdepartitionmanager" +url="https://www.kde.org/applications/system/partitionmanager" arch="all" license="GPL-3.0+" depends="" diff --git a/user/perl-app-licensecheck/APKBUILD b/user/perl-app-licensecheck/APKBUILD index 58f4dd9e9..ed87308ff 100644 --- a/user/perl-app-licensecheck/APKBUILD +++ b/user/perl-app-licensecheck/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-app-licensecheck _pkgname=App-Licensecheck -pkgver=3.0.36 +pkgver=3.0.37 pkgrel=0 pkgdesc="Perl library and utility for checking source-file licensing" -url="https://metacpan.org/pod/distribution/App-Licensecheck" +url="https://metacpan.org/release/App-Licensecheck" arch="noarch" license="GPL-3.0+" depends="perl perl-getopt-long-descriptive perl-moo perl-namespace-clean @@ -20,20 +20,17 @@ source="https://cpan.metacpan.org/authors/id/J/JO/JONASS/$_pkgname-v$pkgver.tar. builddir="$srcdir"/$_pkgname-v$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="1afa30822028205742edadfdd9c393189a46d781a3b2988b4ff8c39e269762258b75e10b3002df4859607b6336f82aa13c740125f715e98bb0ce89318e78d5ca App-Licensecheck-v3.0.36.tar.gz" +sha512sums="6053ff06162ca651cd365e8a8049d48ed0deb2dd4ec7fae5fed8e6855f5cce7310099b47cfd1ddf79ef2cecb24eea28cc90247ed3d0220589c8185ef111d45ed App-Licensecheck-v3.0.37.tar.gz" diff --git a/user/perl-bareword-filehandles/APKBUILD b/user/perl-bareword-filehandles/APKBUILD index 1e75b8f9f..8ded0c7dc 100644 --- a/user/perl-bareword-filehandles/APKBUILD +++ b/user/perl-bareword-filehandles/APKBUILD @@ -1,34 +1,30 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-bareword-filehandles -pkgver=0.006 +pkgver=0.007 pkgrel=0 pkgdesc="Perl module for disabling support for bareword filehandles" url="https://metacpan.org/pod/bareword::filehandles" arch="all" license="Artistic-1.0-Perl" -depends="" -makedepends="perl-dev perl-b-hooks-op-check perl-extutils-depends" -install="" +depends="perl-b-hooks-op-check" +makedepends="perl-dev perl-extutils-depends" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/I/IL/ILMARI/bareword-filehandles-$pkgver.tar.gz" builddir="$srcdir/bareword-filehandles-$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="73cf85f35d10d13d4ad3be471e30cce0a19a899a7c4d033d2202d815dae8e30aa54b2ad7923dba6d798db1c49d2dcbc7c4f72b2d3f1f08e6e009700682d4e65e bareword-filehandles-0.006.tar.gz" +sha512sums="e7bd4e2ce32b819086050d1619806a5ffedb08732a25a8786dc70f6c8bea3cb3dab2bcced2d5f02f8248ca816dcccdaa2a20c6c943dc5667f334e9e319dbee6d bareword-filehandles-0.007.tar.gz" diff --git a/user/perl-bit-vector/APKBUILD b/user/perl-bit-vector/APKBUILD new file mode 100644 index 000000000..90dc9385a --- /dev/null +++ b/user/perl-bit-vector/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-bit-vector +pkgver=7.4 +pkgrel=0 +pkgdesc="Efficient bit vector, set of integers and 'big int' math library" +url="https://metacpan.org/release/Bit-Vector" +arch="all" +license="Artistic-1.0-Perl" +makedepends="perl-dev perl-carp-clan" +subpackages="$pkgname-doc" +#https://cpan.metacpan.org/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz +source="https://cpan.metacpan.org/authors/id/S/ST/STBEY/Bit-Vector-$pkgver.tar.gz" +builddir="$srcdir/Bit-Vector-$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="80aa49aea8c31c60c14161198eab9d620d738530c3c209104b8ad8f1144822f80c3effb3303c569fc556b2457328659ae5d1aaf511d714c835618b84c722abc5 Bit-Vector-7.4.tar.gz" diff --git a/user/perl-canary-stability/APKBUILD b/user/perl-canary-stability/APKBUILD index f68eadfc0..3aaa5ef2e 100644 --- a/user/perl-canary-stability/APKBUILD +++ b/user/perl-canary-stability/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-canary-stability -pkgver=2012 +pkgver=2013 pkgrel=0 pkgdesc="Canary to check Perl compatibility for schmorp's modules" url="https://metacpan.org/pod/Canary::Stability" @@ -9,26 +9,22 @@ arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" makedepends="perl-dev" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/Canary-Stability-$pkgver.tar.gz" builddir="$srcdir/Canary-Stability-$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="7780731e4142d536182e1820c041c43ae67c5b47c044f15d8dcc060646bbab10a974bddcb703fdb27f427db3cd4dbdff54e131dc708c0260d7275be869eb27b1 Canary-Stability-2012.tar.gz" +sha512sums="9dfb0e6d136048050aac7c29e1fc79dc2a7703c8800582aa837c5d9b9934c48bfcb0a9ef1c6b5bb7e71a10a709e7f7431b3c79ea12b8d9f374b33bfd4a3e468d Canary-Stability-2013.tar.gz" diff --git a/user/perl-carp-clan/APKBUILD b/user/perl-carp-clan/APKBUILD new file mode 100644 index 000000000..0a2586220 --- /dev/null +++ b/user/perl-carp-clan/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-carp-clan +pkgver=6.07 +pkgrel=0 +pkgdesc="Report modules as a 'clan' in Perl" +url="https://metacpan.org/pod/Carp::Clan" +arch="noarch" +license="Artistic-1.0-Perl" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Carp-Clan-$pkgver.tar.gz" +builddir="$srcdir/Carp-Clan-$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="0180c2bd2ffe9f2b6c23d7e76bf3dd8ceeacfc842b09c2dab2f81d002ff7235ce2d145e53c55e375cb889291577cfcd4cb9be34b5445ae532cb9768979c57e41 Carp-Clan-6.07.tar.gz" diff --git a/user/perl-class-accessor/APKBUILD b/user/perl-class-accessor/APKBUILD new file mode 100644 index 000000000..6ea77357d --- /dev/null +++ b/user/perl-class-accessor/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-class-accessor +pkgver=0.51 +pkgrel=0 +pkgdesc="Perl class accessor generator" +url="https://metacpan.org/release/Class-Accessor" +arch="noarch" +license="Artistic-1.0-Perl" +depends="perl-sub-name" +makedepends="perl-dev perl-module-install" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/K/KA/KASEI/Class-Accessor-$pkgver.tar.gz" +builddir="$srcdir/Class-Accessor-$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="be11acea4747c59e3e524c75d818e0391756cbc08eebff71dca280e737ce228209e76310649298e536e07db1c856d5a71dd64aefc55b49e33cfcb2b3439eab0b Class-Accessor-0.51.tar.gz" diff --git a/user/perl-crypt-rijndael/APKBUILD b/user/perl-crypt-rijndael/APKBUILD index 5b9e1283a..6ae7262f7 100644 --- a/user/perl-crypt-rijndael/APKBUILD +++ b/user/perl-crypt-rijndael/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-crypt-rijndael _pkgreal=Crypt-Rijndael -pkgver=1.13 +pkgver=1.14 pkgrel=0 pkgdesc="Crypt::CBC compliant Rijndael encryption module" url="https://metacpan.org/release/Crypt-Rijndael" @@ -39,5 +39,5 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="46eea4eb6568d9bb70685314c6a29214552787c8cf138adb77271d07b85c16d83ee3faa53e6c3b7d0abb5cb735827407e970f954ae93123dfeaebb5fb34f1329 Crypt-Rijndael-1.13.tar.gz +sha512sums="a3c419142954dc2b430422f532b5349d0fb902a704335ba0708504a6a4a5d617835409916b76bc1b8dc8669c0f03356dab3ef90e5f7ea530b5fcc70bd1bf4eff Crypt-Rijndael-1.14.tar.gz 4f96e3f326c48bdca94aa721468f6c927a6af39ab9683bc69058a9330d733c96e656883890cf9f2c4588173784d248238dec82a49e8261c0cd9e1d794764d97e use-stdint_h.patch" diff --git a/user/perl-datetime-timezone/APKBUILD b/user/perl-datetime-timezone/APKBUILD index cccb8ee11..1c862ef14 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.34 +pkgver=2.36 pkgrel=0 pkgdesc="Time zone object class and factory for Perl" url="https://metacpan.org/release/DateTime-TimeZone" @@ -17,20 +17,17 @@ source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-$pkg builddir="$srcdir/DateTime-TimeZone-$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="8525542dfee39f8b889889db310d455b03dd0f270d391a06c337c46d9d457969e365ebf9b8fa42eef71b1dbf2bbd3e25c1ef710f19701a300729bc1816bcaa0c DateTime-TimeZone-2.34.tar.gz" +sha512sums="6958d4ac21f1ed641e31d86dad83153bf4ad763e499cb062d918ac292d3ed7339486470d9812d7c5fc27040bc8d39fa73fd9f34bf2fd72404743cb1e9cf18a85 DateTime-TimeZone-2.36.tar.gz" diff --git a/user/perl-datetime/APKBUILD b/user/perl-datetime/APKBUILD index 9bdd7a945..e92505389 100644 --- a/user/perl-datetime/APKBUILD +++ b/user/perl-datetime/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-datetime _pkgname=DateTime -pkgver=1.50 +pkgver=1.51 pkgrel=0 pkgdesc="Date and time object for Perl" url="https://metacpan.org/release/DateTime" @@ -18,20 +18,17 @@ source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.g builddir="$srcdir/DateTime-$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="fa8f57aac2b736a5b8b70005b74a81ea4bc80143714a79f16896c4214776c591f3db6689841a6b5217070e02ccea6ccf30b565c3bb0acdce9d1ea44eb61fe85a DateTime-1.50.tar.gz" +sha512sums="d94d673ecefb7ed8bd485f7be9f3c2c0e9a07c402793f14f5af3bc026cc875d7d2a151f72f1c1d3518e08af133eab247796400215f4304f785d17d84e53caded DateTime-1.51.tar.gz" diff --git a/user/perl-devel-stacktrace/APKBUILD b/user/perl-devel-stacktrace/APKBUILD index 1420b82f3..3b14c894a 100644 --- a/user/perl-devel-stacktrace/APKBUILD +++ b/user/perl-devel-stacktrace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-devel-stacktrace -pkgver=2.03 +pkgver=2.04 pkgrel=0 pkgdesc="A Perl object representing a stack trace" url="https://metacpan.org/release/Devel-StackTrace" @@ -14,20 +14,17 @@ source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Devel-StackTrace-$pkgv builddir="$srcdir/Devel-StackTrace-$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="a5263ec76f5adb83b83cc4906c18d6c341f50472a254617882a889315597698968988be1bacbbb4c6c0709974ff4ba67a14835d3c2278d672219c52e4c823514 Devel-StackTrace-2.03.tar.gz" +sha512sums="2330c1d8619cdcb42b5919090e6eaabbe34ab26b50d5c09c4cfd7ed099829817a50ffe582bd1f2a19a7d5be050819796f22dee32b10e175259e6df177ce6d0a9 Devel-StackTrace-2.04.tar.gz" diff --git a/user/perl-dir-manifest/APKBUILD b/user/perl-dir-manifest/APKBUILD new file mode 100644 index 000000000..81ada3554 --- /dev/null +++ b/user/perl-dir-manifest/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-dir-manifest +_pkgname=Dir-Manifest +pkgver=0.0.5 +pkgrel=0 +pkgdesc="Perl module to turn a directory and files into a dictionary" +url="https://metacpan.org/release/Dir-Manifest" +arch="noarch" +license="X11" +depends="perl perl-moo perl-path-tiny" +makedepends="perl-dev perl-module-build" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + perl Build.PL installdirs=vendor + export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + ./Build +} + +check() { + ./Build test +} + +package() { + ./Build install destdir="$pkgdir" + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="531088dec5de10eb5de6d58e92e39e84e637f3913ddafc5f1d1510e7151bcd3f22a6a9a90934ad7c861352ef17f80e32248941a8bf40d66c5b8f9d4eab43daef Dir-Manifest-0.0.5.tar.gz" diff --git a/user/perl-games-solitaire-verify/APKBUILD b/user/perl-games-solitaire-verify/APKBUILD index 627484d38..185e64623 100644 --- a/user/perl-games-solitaire-verify/APKBUILD +++ b/user/perl-games-solitaire-verify/APKBUILD @@ -1,35 +1,34 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-games-solitaire-verify -pkgver=0.2000 +_pkgname=Games-Solitaire-Verify +pkgver=0.2201 pkgrel=0 pkgdesc="Verify solutions to solitaire games" url="https://metacpan.org/release/Games-Solitaire-Verify" arch="noarch" license="MIT" -depends="perl-class-xsaccessor perl-exception-class perl-list-moreutils" +depends="perl-class-xsaccessor perl-dir-manifest perl-exception-class + perl-list-moreutils" makedepends="perl-dev perl-module-build" checkdepends="perl-test-differences perl-path-tiny" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-$pkgver.tar.gz" -builddir="$srcdir/Games-Solitaire-Verify-$pkgver" +source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" perl Build.PL installdirs=vendor export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` ./Build } check() { - cd "$builddir" ./Build test } package() { - cd "$builddir" ./Build install destdir="$pkgdir" find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="4abc5cd68bc57f96115a2f273aa16076b2f2ff50a597a8e1f4bf5b6f6dcb26771346d7cff3cadfc10eb1f8584c79141b06ecd6b07b6b19610405dc80977d9382 Games-Solitaire-Verify-0.2000.tar.gz" +sha512sums="036c7eb81932ecf6cc6e9617f7e611e2a7dab032c60b3d7773554fe564fd93b54c4760e90f10c03408a4cf14bd23e54116f9b4f497113bdb2b2058d090ac2986 Games-Solitaire-Verify-0.2201.tar.gz" diff --git a/user/perl-getopt-long-descriptive/APKBUILD b/user/perl-getopt-long-descriptive/APKBUILD index 92fe31c60..c242ee5ce 100644 --- a/user/perl-getopt-long-descriptive/APKBUILD +++ b/user/perl-getopt-long-descriptive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-getopt-long-descriptive -pkgver=0.103 +pkgver=0.104 pkgrel=0 pkgdesc="Simpler Perl implementation of Getopt::Long" url="https://metacpan.org/release/Getopt-Long-Descriptive" @@ -15,20 +15,17 @@ source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-$ builddir="$srcdir/Getopt-Long-Descriptive-$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="9229575bde794fa1213871fbb33a12222737d7979cf4c290200fd85c7da9e3227539809b8380a88a85675429ceb61e505bac8cc4e1408ca63ba92b4e1b33149f Getopt-Long-Descriptive-0.103.tar.gz" +sha512sums="5579faa6f9012cd03ac4d51149b0854771f15d8e324f8df345fe6af1a8f3fdeaaef6c5becee55bf77515da85d92aa61a63dfc5ee8264d2d0368e02a4a4cbd7fa Getopt-Long-Descriptive-0.104.tar.gz" diff --git a/user/perl-inline-c/APKBUILD b/user/perl-inline-c/APKBUILD index f5065e0c5..480ebab83 100644 --- a/user/perl-inline-c/APKBUILD +++ b/user/perl-inline-c/APKBUILD @@ -1,35 +1,31 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-inline-c -pkgver=0.80 +pkgver=0.81 pkgrel=0 -pkgdesc="C Language Support for Inline" +pkgdesc="C language support for Inline" url="https://metacpan.org/pod/Inline::C" arch="noarch" license="GPL-1.0+ OR Artistic-1.0-Perl" depends="perl perl-inline perl-pegex perl-parse-recdescent" makedepends="perl-dev perl-file-sharedir-install" checkdepends="perl-test-warn perl-yaml-libyaml perl-file-copy-recursive" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/T/TI/TINITA/Inline-C-$pkgver.tar.gz" builddir="$srcdir/Inline-C-$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="f68eb9478374ef13a6eb0be6c5adc12ba9c052834ef45db6acc0c794ac295d5b47ffda57dd4d0b15345be96aa21ccaab8bf7e2be0ac0bc4cef73be782a346cf0 Inline-C-0.80.tar.gz" +sha512sums="c3d0d669c26017b4b63cc101377d067438c31fc5d1e6187d01194f70158049e386683b792716aad58772eae839512ecaefd4b3ac7a2377dd1404a651c24b2277 Inline-C-0.81.tar.gz" diff --git a/user/perl-inline/APKBUILD b/user/perl-inline/APKBUILD index c3343d150..43cb6de1f 100644 --- a/user/perl-inline/APKBUILD +++ b/user/perl-inline/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-inline -pkgver=0.82 +pkgver=0.83 pkgrel=0 pkgdesc="Write Perl Subroutines in Other Programming Languages" url="https://metacpan.org/pod/Inline" @@ -10,26 +10,22 @@ license="GPL-1.0+ OR Artistic-1.0-Perl" depends="perl" makedepends="perl-dev" checkdepends="perl-test-warn" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/T/TI/TINITA/Inline-$pkgver.tar.gz" builddir="$srcdir/Inline-$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="c53d8ae250e8463bd8973be96cf9bc70cc46fc937fb99990f4c1872c30411356f63ce785a10b55234e0d032a123a88c8192516ad9ad19ed50c0966b77669806a Inline-0.82.tar.gz" +sha512sums="83ebc1f6e836117a49e991117be2a650c077ecd368b50547b80176b8da1ab776c12ee9615b54d30f07cc4ec9b1456929e6a940e52e3a05d8d8df568ad32709cd Inline-0.83.tar.gz" diff --git a/user/perl-regexp-pattern-license/APKBUILD b/user/perl-regexp-pattern-license/APKBUILD index 7dd444b1f..7192765af 100644 --- a/user/perl-regexp-pattern-license/APKBUILD +++ b/user/perl-regexp-pattern-license/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-regexp-pattern-license -pkgver=3.1.92 +pkgver=3.1.94 pkgrel=0 pkgdesc="Perl module for regex-matching legal licenses" url="https://metacpan.org/pod/Regexp::Pattern::License" @@ -9,26 +9,22 @@ arch="noarch" license="GPL-3.0+" depends="perl perl-regexp-pattern perl-strictures perl-try-tiny" makedepends="" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/J/JO/JONASS/Regexp-Pattern-License-v$pkgver.tar.gz" builddir="$srcdir/Regexp-Pattern-License-v$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="f574479fb7c36de30fe9cf396920c239ced39ca208fb4ab64bafba5addb120043e66b30938b3d2ed1343f6e67bd5200025973a268af87138609ccb46c4ee4bc6 Regexp-Pattern-License-v3.1.92.tar.gz" +sha512sums="0111b27733a84b0d1aa64310a2b48072f4e9840f46a5d1937a6379e4c3b22396c09e947f451fea9202d4f912d95d2cc259d1f70fcfa00c263cf88bc344227bb8 Regexp-Pattern-License-v3.1.94.tar.gz" diff --git a/user/perl-regexp-pattern/APKBUILD b/user/perl-regexp-pattern/APKBUILD index 0990e8cba..b9c1265f6 100644 --- a/user/perl-regexp-pattern/APKBUILD +++ b/user/perl-regexp-pattern/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-regexp-pattern -pkgver=0.2.8 +pkgver=0.2.9 pkgrel=0 pkgdesc="Perl framework for regex collection standardization" url="https://metacpan.org/pod/Regexp::Pattern" @@ -9,26 +9,22 @@ arch="noarch" license="Artistic-1.0-Perl" depends="perl perl-test-exception" makedepends="" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/P/PE/PERLANCAR/Regexp-Pattern-$pkgver.tar.gz" builddir="$srcdir/Regexp-Pattern-$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="f2e1f1387b8ea563ad8066c8cdc1b94b2e5ba742b3833ab7764c9541974b8758998090840f74962250a8f5f3a7fd1cd03afbcf41ed942fc2cc1054ee15b4950e Regexp-Pattern-0.2.8.tar.gz" +sha512sums="5d08dad97ef9bf97a3a42132bee176b50da4cee9a399761f6189f39f70d6486a0c0915c5a00996be7d6d02092814cbd911c1d56775c72b103c511da95e9794c0 Regexp-Pattern-0.2.9.tar.gz" diff --git a/user/perl-template-toolkit/APKBUILD b/user/perl-template-toolkit/APKBUILD index 4d1cdec4c..bc3a7f733 100644 --- a/user/perl-template-toolkit/APKBUILD +++ b/user/perl-template-toolkit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-template-toolkit -pkgver=2.28 +pkgver=2.29 pkgrel=0 pkgdesc="Comprehensive template processing system" url="https://metacpan.org/release/Template-Toolkit" @@ -15,20 +15,17 @@ source="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/Template-Toolkit-$pkgv builddir="$srcdir/Template-Toolkit-$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="8f18a411e05108cddc4f2c5560c76b663d6b913f101c6b294b584390cd76d79805afa8208e1dfaf01011ff7d6364844a24587b33d8a3d330fb6b410e75e78a1d Template-Toolkit-2.28.tar.gz" +sha512sums="5b1bfeaf600a5628b6441e54de5c4af1cf4e01296792a79290d4bf2a698be47112e94a05fe3f47bf9ac64c4d8b9340aa6ef8738560fb1f96510d7d1c9f647a65 Template-Toolkit-2.29.tar.gz" diff --git a/user/perl-test-runvalgrind/APKBUILD b/user/perl-test-runvalgrind/APKBUILD index c6f31b336..4e6d9958c 100644 --- a/user/perl-test-runvalgrind/APKBUILD +++ b/user/perl-test-runvalgrind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-runvalgrind -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=0 pkgdesc="Tests an external program is 'valgrind clean' from Perl" url="https://metacpan.org/release/Test-RunValgrind" @@ -16,21 +16,18 @@ source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Test-RunValgrind-$pkgv builddir="$srcdir/Test-RunValgrind-$pkgver" build() { - cd "$builddir" perl Build.PL installdirs=vendor ./Build } check() { - cd "$builddir" ./Build test } package() { - cd "$builddir" ./Build install destdir="$pkgdir" find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="e85547d24fb7c8b0a8fd1a84826eec51d3c4c94d83cbb525517515ecc27b0ba530378a10f8a2ffee9fb1f48eb2e65a6a2654738ee069bd85adcec7f4c205f143 Test-RunValgrind-0.2.0.tar.gz +sha512sums="3ebe26bb06aa48e590d2714ef944b7f23b7a9db83410dafa252155524edd19ed9947e382cf532dbaae6e661bd1d8566d65b365fdf568452d164c1fd30ad230a0 Test-RunValgrind-0.2.1.tar.gz f2ebba2310df820666728e5f59c44f5b63cd03efdb42092f22700da13b4f099ae5c911292fb2a0f271f7629343727ea14c5953d2918c98419a580e5a998cb650 portable-memory-assumptions.patch" diff --git a/user/perl-test-taint/APKBUILD b/user/perl-test-taint/APKBUILD index 02488dfbf..35fc97e32 100644 --- a/user/perl-test-taint/APKBUILD +++ b/user/perl-test-taint/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-taint _pkgname=Test-Taint -pkgver=1.06 +pkgver=1.08 pkgrel=0 pkgdesc="Tools to test taintedness" url="https://metacpan.org/release/Test-Taint" @@ -15,20 +15,17 @@ source="https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/Test-Taint-$pkgver.ta builddir="$srcdir/Test-Taint-$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="58221b0145d9b908994c093168ca547a18cd56113f4923a4662bb9c113635378740363914d1fd43602f15c76a23cfe26d0682ed6ce22836d712692f439e782c2 Test-Taint-1.06.tar.gz" +sha512sums="2a7e3a60756c802dc33ac0b2a4102463de59fe92ba3cd83cb02e01e9f7aa13978c7a8ac7dcfdcf3c0d934af40e5189421874da819be9258e91080b777be71b20 Test-Taint-1.08.tar.gz" diff --git a/user/perl-test-time/APKBUILD b/user/perl-test-time/APKBUILD index f1b847587..4390a2d89 100644 --- a/user/perl-test-time/APKBUILD +++ b/user/perl-test-time/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-time _pkgname=Test-Time -pkgver=0.07 +pkgver=0.08 pkgrel=0 pkgdesc="Override Perl functions for testing" url="https://metacpan.org/release/Test-Time" @@ -15,20 +15,17 @@ source="https://cpan.metacpan.org/authors/id/S/SA/SATOH/Test-Time-$pkgver.tar.gz builddir="$srcdir/Test-Time-$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="b5ad87ea43eaae6b474be4aa7d153fe89bb9cc86254257e68073ff214b901846096037634a8d73b1e0852d5bf51fbee58e32c742c0726702ddb06d79679a65f9 Test-Time-0.07.tar.gz" +sha512sums="77f77f0f3aab033e1dd02c92ebae734a496e8c2e070f908ee73a70197971839009118f10c2e0ff2562172f4da62262eb2d67a05796c9dc77a46efaa9113f99df Test-Time-0.08.tar.gz" diff --git a/user/perl-test2-suite/APKBUILD b/user/perl-test2-suite/APKBUILD index 6382858fc..e0a2560a7 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.000120 +pkgver=0.000122 pkgrel=0 pkgdesc="Collection of Perl modules in the Test2 namespace" url="https://metacpan.org/pod/Test2::Suite" @@ -18,20 +18,17 @@ source="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test2-Suite-$pkgver.ta builddir="$srcdir/Test2-Suite-$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="bdaa2ee8eb6e4444b40598f42a87b29b7b049b8f8cd1629d3bd0c4a56de0579b610898312e0a6cb039f4107d4e8ca00510b31485e96a1e01db87a28102ea2c92 Test2-Suite-0.000120.tar.gz" +sha512sums="6332b4300ad37d16378a37a931f470b33c4c82603e4e0b3a0c42c707c75a735908001daecc47ed73361635aabd65c0909f37a74d731bc958f4345ea75207dab2 Test2-Suite-0.000122.tar.gz" diff --git a/user/perl-time-duration-parse/APKBUILD b/user/perl-time-duration-parse/APKBUILD index 22fbfbe7e..8cef9ca4c 100644 --- a/user/perl-time-duration-parse/APKBUILD +++ b/user/perl-time-duration-parse/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-time-duration-parse -pkgver=0.14 +pkgver=0.15 pkgrel=0 pkgdesc="Parse strings in Perl that represent time durations" url="https://metacpan.org/release/Time-Duration-Parse" @@ -14,20 +14,17 @@ source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Time-Duration-Parse-$pkg builddir="$srcdir/Time-Duration-Parse-$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="49dcb7d3979df7e84141ebf9262b2283dfe535502b71633d95424376146d81bbf5d6932035dde878a5b1bef265d84a029412ff0187927569cf48ad193ea2f8e3 Time-Duration-Parse-0.14.tar.gz" +sha512sums="1cd4b303cedc58d8513165297369b3705c2fe07db9b626c922829a8a86586bbdf631cd06052924dfaa030a5179e121bbb9c0d8b7159d54e137cb9e70f3086e20 Time-Duration-Parse-0.15.tar.gz" diff --git a/user/perl-time-duration/APKBUILD b/user/perl-time-duration/APKBUILD index daf931ee5..48b864ba0 100644 --- a/user/perl-time-duration/APKBUILD +++ b/user/perl-time-duration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-time-duration -pkgver=1.20 +pkgver=1.21 pkgrel=0 pkgdesc="Rounded or exact English expression of time durations in Perl" url="https://metacpan.org/release/Time-Duration" @@ -14,20 +14,17 @@ source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Time-Duration-$pkgver.ta builddir="$srcdir/Time-Duration-$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="74bdcbc2b65061ad30540a95467de24f552235cea2367a7770309d9ffefeb35717f438e4f7ebf6a1d63f338cd714ffe16b3f45808514995db9753d643892d5f9 Time-Duration-1.20.tar.gz" +sha512sums="2d03d73096967265f16f4ebde2d9fbb83fce591e15fa01f5f4f750123f27a4571bbd01d5d93f785f78ee8810aca9d945241e6a767b65f45abb4608d321108020 Time-Duration-1.21.tar.gz" diff --git a/user/perl-yaml-libyaml/APKBUILD b/user/perl-yaml-libyaml/APKBUILD index 87a8c5a80..c196a7506 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.77 +pkgver=0.79 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="20d35718ebd318c2e7cfd618274dafb9c4489596e6ee77ca957f58d4971b7c712cbbf71517c9b29f316d0059b1b9f375aab57facc895c61c200cc0e40589de33 YAML-LibYAML-0.77.tar.gz" +sha512sums="47b0f2d42ff972224af6fffa09631c7bcf221867cba3a0f9d56ce48f5a34bde56f3fdedbf15c47843ef24aba65676bfc7df5ce3d26b8f50011f2730071ca4877 YAML-LibYAML-0.79.tar.gz" diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD index c220704c6..3afe246c1 100644 --- a/user/php7/APKBUILD +++ b/user/php7/APKBUILD @@ -33,10 +33,15 @@ # - CVE-2019-9022 # - CVE-2019-9023 # - CVE-2019-9024 +# 7.2.19-r0: +# - CVE-2019-11036 +# - CVE-2019-11038 +# - CVE-2019-11039 +# - CVE-2019-11040 pkgname=php7 _pkgname=php -pkgver=7.2.17 +pkgver=7.2.19 pkgrel=0 _apiver=20170718 pkgdesc="The PHP7 language runtime engine" @@ -92,8 +97,7 @@ source="https://www.php.net/distributions/$_pkgname-$pkgver.tar.bz2 allow-build-recode-and-imap-together.patch fix-tests-devserver.patch pwbuflen.patch - enchant-2.patch - fix-32bit-int-min.patch" + enchant-2.patch" builddir="$srcdir/$_pkgname-$pkgver" _libdir="/usr/lib/$_pkgname" _extension_dir="$_libdir/modules" @@ -527,7 +531,7 @@ _mv() { mv $@ } -sha512sums="6d14311cb3699eec7a8eacfb82e0a00e8f5dcfb31474dd32071c1c3261ddf52157a43a1ead4762da01283b0f5ccbbae8dfbbad2fb59e0900a1769e9f318e5830 php-7.2.17.tar.bz2 +sha512sums="79077e73075f4aaba86699c536d8bad4929d351ad40f89c35b6f9ff0d1237b9e3d528be2918dae16519659bdaf93c5ab16fc81653fe13f667e6251871f05d722 php-7.2.19.tar.bz2 23df4e779c809db3e3b8e5b0353b1aafaad2f3dc56f2d1cd45f9b0e3ad71b32e40700d6ebfe914b3c87e8e0b670d0dc862ded1e5c898adf160e33dea372e044f php-fpm.initd 01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb php-fpm.logrotate a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48 php-module.conf @@ -537,5 +541,4 @@ a77dd3bdf9dc7a0f2c06ff3e7c425d062bbaa29902c17402ce98701dc99499be863ad543aa5e6a7d f8ecae241a90cbc3e98aa4deb3d5d35ef555f51380e29f4e182a8060dffeb84be74f030a14c6b452668471030d78964f52795ca74275db05543ccad20ef1f2cc allow-build-recode-and-imap-together.patch f8bb322e56df79dd9f391737fb8737945cc730b14c7dc2ae8688979c565a9b97f5f2a12c9fcd0d8124624a9d09bd10228147d9e999bb94909bbe249f0a50646c fix-tests-devserver.patch 8e538063d872f6770a57cdb844226a771ccda3d387dd1f199bb08c274b94fbe12ec0ef6df75c32071f308cb8f4ab51b91b520c7c2ed687adf96d0d322788e463 pwbuflen.patch -03de56676449ddc1ba1fc9c4fee2b2ed620cd1a8ce52d288c91b42e081182871ade55c8dbbe1c8286bc4eadcd92d497a62ac7b689ea8d6b1bcb5eb25225595c4 enchant-2.patch -90c29989b88fcec1b5700b525c7e9f39dee67ca32cf66109908ac750eb2930270de5e13bc2ba3f5720a57c5613e39bc04475fa2bc001ca47c9505bff7e14a9d9 fix-32bit-int-min.patch" +03de56676449ddc1ba1fc9c4fee2b2ed620cd1a8ce52d288c91b42e081182871ade55c8dbbe1c8286bc4eadcd92d497a62ac7b689ea8d6b1bcb5eb25225595c4 enchant-2.patch" diff --git a/user/php7/fix-32bit-int-min.patch b/user/php7/fix-32bit-int-min.patch deleted file mode 100644 index d121d26bc..000000000 --- a/user/php7/fix-32bit-int-min.patch +++ /dev/null @@ -1,1351 +0,0 @@ -From a467a89f167e9e03b4acc4bd9b1430e0d52133fa Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Wed, 20 Mar 2019 14:07:26 +0100 -Subject: [PATCH] Fix tests after fix for #76717 - ---- - .../general_functions/var_export-locale.phpt | 3 + - .../var_export-locale_32.phpt | 1148 +++++++++++++++++ - .../general_functions/var_export_basic1.phpt | 6 + - .../var_export_basic1_32.phpt | 147 +++ - 4 files changed, 1304 insertions(+) - create mode 100644 ext/standard/tests/general_functions/var_export-locale_32.phpt - create mode 100644 ext/standard/tests/general_functions/var_export_basic1_32.phpt - -diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt -index 7503e789b093..37625f4201ad 100644 ---- a/ext/standard/tests/general_functions/var_export-locale.phpt -+++ b/ext/standard/tests/general_functions/var_export-locale.phpt -@@ -7,6 +7,9 @@ serialize_precision=17 - if (!setlocale(LC_ALL, "german", "de","de_DE","de_DE.ISO8859-1","de_DE.ISO_8859-1","de_DE.UTF-8")) { - die("skip locale needed for this test is not supported on this platform"); - } -+if (PHP_INT_SIZE < 8) { -+ die("skip 64-bit only"); -+} - ?> - --FILE-- - <?php -diff --git a/ext/standard/tests/general_functions/var_export-locale_32.phpt b/ext/standard/tests/general_functions/var_export-locale_32.phpt -new file mode 100644 -index 000000000000..39efdec7dfcb ---- /dev/null -+++ b/ext/standard/tests/general_functions/var_export-locale_32.phpt -@@ -0,0 +1,1148 @@ -+--TEST-- -+Test var_export() function with locale -+--INI-- -+serialize_precision=17 -+--SKIPIF-- -+<?php -+if (!setlocale(LC_ALL, "german", "de","de_DE","de_DE.ISO8859-1","de_DE.ISO_8859-1","de_DE.UTF-8")) { -+ die("skip locale needed for this test is not supported on this platform"); -+} -+if (PHP_INT_SIZE > 4) { -+ die("skip 32-bit only"); -+} -+?> -+--FILE-- -+<?php -+setlocale(LC_ALL, "german", "de","de_DE","de_DE.ISO8859-1","de_DE.ISO_8859-1","de_DE.UTF-8"); -+/* Prototype: mixed var_export( mixed expression [, bool return]); -+ * Description: Returns the variable representation when the return parameter is used and evaluates to TRUE. Otherwise, this function will return NULL. -+ -+*/ -+ -+echo "*** Testing var_export() with integer values ***\n"; -+// different integer vlaues -+$valid_ints = array( -+ '0', -+ '1', -+ '-1', -+ '-2147483648', // max negative integer value -+ '-2147483647', -+ 2147483647, // max positive integer value -+ 2147483640, -+ 0x123B, // integer as hexadecimal -+ '0x12ab', -+ '0Xfff', -+ '0XFA', -+ -0x7fffffff - 1, // max negative integer as hexadecimal -+ '0x7fffffff', // max positive integer as hexadecimal -+ 0x7FFFFFFF, // max positive integer as hexadecimal -+ '0123', // integer as octal -+ 01, // should be quivalent to octal 1 -+ -017777777777 - 1, // max negative integer as octal -+ 017777777777, // max positive integer as octal -+ ); -+$counter = 1; -+/* Loop to check for above integer values with var_export() */ -+echo "\n*** Output for integer values ***\n"; -+foreach($valid_ints as $int_value) { -+echo "\nIteration ".$counter."\n"; -+var_export( $int_value ); -+echo "\n"; -+var_export( $int_value, FALSE); -+echo "\n"; -+var_dump( var_export( $int_value, TRUE) ); -+echo "\n"; -+$counter++; -+} -+ -+echo "*** Testing var_export() with valid boolean values ***\n"; -+// different valid boolean vlaues -+$valid_bool = array( -+ 1, -+ TRUE, -+ true, -+ 0, -+ FALSE, -+ false -+ ); -+$counter = 1; -+/* Loop to check for above boolean values with var_export() */ -+echo "\n*** Output for boolean values ***\n"; -+foreach($valid_bool as $bool_value) { -+echo "\nIteration ".$counter."\n"; -+var_export( $bool_value ); -+echo "\n"; -+var_export( $bool_value, FALSE); -+echo "\n"; -+var_dump( var_export( $bool_value, TRUE) ); -+echo "\n"; -+$counter++; -+} -+ -+echo "*** Testing var_export() with valid float values ***\n"; -+// different valid float vlaues -+$valid_floats = array( -+ (float)-2147483649, // float value -+ (float)2147483648, // float value -+ (float)-0x80000001, // float value, beyond max negative int -+ (float)0x800000001, // float value, beyond max positive int -+ (float)020000000001, // float value, beyond max positive int -+ (float)-020000000001, // float value, beyond max negative int -+ 0.0, -+ -0.1, -+ 10.0000000000000000005, -+ 10.5e+5, -+ 1e5, -+ 1e-5, -+ 1e+5, -+ 1E5, -+ 1E+5, -+ 1E-5, -+ .5e+7, -+ .6e-19, -+ .05E+44, -+ .0034E-30 -+); -+$counter = 1; -+/* Loop to check for above float values with var_export() */ -+echo "\n*** Output for float values ***\n"; -+foreach($valid_floats as $float_value) { -+echo "\nIteration ".$counter."\n"; -+var_export( $float_value ); -+echo "\n"; -+var_export( $float_value, FALSE); -+echo "\n"; -+var_dump( var_export( $float_value, TRUE) ); -+echo "\n"; -+$counter++; -+} -+ -+echo "*** Testing var_export() with valid strings ***\n"; -+// different valid string -+$valid_strings = array( -+ "", -+ " ", -+ '', -+ ' ', -+ "string", -+ 'string', -+ "NULL", -+ 'null', -+ "FALSE", -+ 'false', -+ "\x0b", -+ "\0", -+ '\0', -+ '\060', -+ "\070" -+ ); -+$counter = 1; -+/* Loop to check for above strings with var_export() */ -+echo "\n*** Output for strings ***\n"; -+foreach($valid_strings as $str) { -+echo "\nIteration ".$counter."\n"; -+var_export( $str ); -+echo "\n"; -+var_export( $str, FALSE); -+echo "\n"; -+var_dump( var_export( $str, TRUE) ); -+echo "\n"; -+$counter++; -+} -+ -+echo "*** Testing var_export() with valid arrays ***\n"; -+// different valid arrays -+$valid_arrays = array( -+ array(), -+ array(NULL), -+ array(null), -+ array(true), -+ array(""), -+ array(''), -+ array(array(), array()), -+ array(array(1, 2), array('a', 'b')), -+ array(1 => 'One'), -+ array("test" => "is_array"), -+ array(0), -+ array(-1), -+ array(10.5, 5.6), -+ array("string", "test"), -+ array('string', 'test') -+ ); -+$counter = 1; -+/* Loop to check for above arrays with var_export() */ -+echo "\n*** Output for arrays ***\n"; -+foreach($valid_arrays as $arr) { -+echo "\nIteration ".$counter."\n"; -+var_export( $arr ); -+echo "\n"; -+var_export( $arr, FALSE); -+echo "\n"; -+var_dump( var_export( $arr, TRUE) ); -+echo "\n"; -+$counter++; -+} -+ -+echo "*** Testing var_export() with valid objects ***\n"; -+ -+// class with no members -+class foo -+{ -+// no members -+} -+ -+// abstract class -+abstract class abstractClass -+{ -+ abstract protected function getClassName(); -+ public function printClassName () { -+ echo $this->getClassName() . "\n"; -+ } -+} -+// implement abstract class -+class concreteClass extends abstractClass -+{ -+ protected function getClassName() { -+ return "concreteClass"; -+ } -+} -+ -+// interface class -+interface iValue -+{ -+ public function setVal ($name, $val); -+ public function dumpVal (); -+} -+// implement the interface -+class Value implements iValue -+{ -+ private $vars = array (); -+ -+ public function setVal ( $name, $val ) { -+ $this->vars[$name] = $val; -+ } -+ -+ public function dumpVal () { -+ var_export ( $vars ); -+ } -+} -+ -+// a gereral class -+class myClass -+{ -+ var $foo_object; -+ public $public_var; -+ public $public_var1; -+ private $private_var; -+ protected $protected_var; -+ -+ function __construct ( ) { -+ $this->foo_object = new foo(); -+ $this->public_var = 10; -+ $this->public_var1 = new foo(); -+ $this->private_var = new foo(); -+ $this->proected_var = new foo(); -+ } -+} -+ -+// create a object of each class defined above -+$myClass_object = new myClass(); -+$foo_object = new foo(); -+$Value_object = new Value(); -+$concreteClass_object = new concreteClass(); -+ -+$valid_objects = array( -+ new stdclass, -+ new foo, -+ new concreteClass, -+ new Value, -+ new myClass, -+ $myClass_object, -+ $myClass_object->foo_object, -+ $myClass_object->public_var1, -+ $foo_object, -+ $Value_object, -+ $concreteClass_object -+ ); -+ $counter = 1; -+/* Loop to check for above objects with var_export() */ -+echo "\n*** Output for objects ***\n"; -+foreach($valid_objects as $obj) { -+echo "\nIteration ".$counter."\n"; -+var_export( $obj ); -+echo "\n"; -+var_export( $obj, FALSE); -+echo "\n"; -+var_dump( var_export( $obj, TRUE) ); -+echo "\n"; -+$counter++; -+} -+ -+echo "*** Testing var_export() with valid null values ***\n"; -+// different valid null vlaues -+$unset_var = array(); -+unset ($unset_var); // now a null -+$null_var = NULL; -+ -+$valid_nulls = array( -+ NULL, -+ null, -+ $null_var, -+ ); -+ $counter = 1; -+/* Loop to check for above null values with var_export() */ -+echo "\n*** Output for null values ***\n"; -+foreach($valid_nulls as $null_value) { -+echo "\nIteration ".$counter."\n"; -+var_export( $null_value ); -+echo "\n"; -+var_export( $null_value, FALSE); -+echo "\n"; -+var_dump( var_export( $null_value, true) ); -+echo "\n"; -+$counter++; -+} -+ -+echo "\n*** Testing error conditions ***\n"; -+//Zero argument -+var_export( var_export() ); -+ -+//arguments more than expected -+var_export( var_export(TRUE, FALSE, TRUE) ); -+ -+echo "\n\nDone"; -+ -+ -+?> -+--EXPECTF-- -+*** Testing var_export() with integer values *** -+ -+*** Output for integer values *** -+ -+Iteration 1 -+'0' -+'0' -+string(3) "'0'" -+ -+ -+Iteration 2 -+'1' -+'1' -+string(3) "'1'" -+ -+ -+Iteration 3 -+'-1' -+'-1' -+string(4) "'-1'" -+ -+ -+Iteration 4 -+'-2147483648' -+'-2147483648' -+string(13) "'-2147483648'" -+ -+ -+Iteration 5 -+'-2147483647' -+'-2147483647' -+string(13) "'-2147483647'" -+ -+ -+Iteration 6 -+2147483647 -+2147483647 -+string(10) "2147483647" -+ -+ -+Iteration 7 -+2147483640 -+2147483640 -+string(10) "2147483640" -+ -+ -+Iteration 8 -+4667 -+4667 -+string(4) "4667" -+ -+ -+Iteration 9 -+'0x12ab' -+'0x12ab' -+string(8) "'0x12ab'" -+ -+ -+Iteration 10 -+'0Xfff' -+'0Xfff' -+string(7) "'0Xfff'" -+ -+ -+Iteration 11 -+'0XFA' -+'0XFA' -+string(6) "'0XFA'" -+ -+ -+Iteration 12 -+-2147483647-1 -+-2147483647-1 -+string(13) "-2147483647-1" -+ -+ -+Iteration 13 -+'0x7fffffff' -+'0x7fffffff' -+string(12) "'0x7fffffff'" -+ -+ -+Iteration 14 -+2147483647 -+2147483647 -+string(10) "2147483647" -+ -+ -+Iteration 15 -+'0123' -+'0123' -+string(6) "'0123'" -+ -+ -+Iteration 16 -+1 -+1 -+string(1) "1" -+ -+ -+Iteration 17 -+-2147483647-1 -+-2147483647-1 -+string(13) "-2147483647-1" -+ -+ -+Iteration 18 -+2147483647 -+2147483647 -+string(10) "2147483647" -+ -+*** Testing var_export() with valid boolean values *** -+ -+*** Output for boolean values *** -+ -+Iteration 1 -+1 -+1 -+string(1) "1" -+ -+ -+Iteration 2 -+true -+true -+string(4) "true" -+ -+ -+Iteration 3 -+true -+true -+string(4) "true" -+ -+ -+Iteration 4 -+0 -+0 -+string(1) "0" -+ -+ -+Iteration 5 -+false -+false -+string(5) "false" -+ -+ -+Iteration 6 -+false -+false -+string(5) "false" -+ -+*** Testing var_export() with valid float values *** -+ -+*** Output for float values *** -+ -+Iteration 1 -+-2147483649.0 -+-2147483649.0 -+string(13) "-2147483649.0" -+ -+ -+Iteration 2 -+2147483648.0 -+2147483648.0 -+string(12) "2147483648.0" -+ -+ -+Iteration 3 -+-2147483649.0 -+-2147483649.0 -+string(13) "-2147483649.0" -+ -+ -+Iteration 4 -+34359738369.0 -+34359738369.0 -+string(13) "34359738369.0" -+ -+ -+Iteration 5 -+2147483649.0 -+2147483649.0 -+string(12) "2147483649.0" -+ -+ -+Iteration 6 -+-2147483649.0 -+-2147483649.0 -+string(13) "-2147483649.0" -+ -+ -+Iteration 7 -+0.0 -+0.0 -+string(3) "0.0" -+ -+ -+Iteration 8 -+-0.10000000000000001 -+-0.10000000000000001 -+string(20) "-0.10000000000000001" -+ -+ -+Iteration 9 -+10.0 -+10.0 -+string(4) "10.0" -+ -+ -+Iteration 10 -+1050000.0 -+1050000.0 -+string(9) "1050000.0" -+ -+ -+Iteration 11 -+100000.0 -+100000.0 -+string(8) "100000.0" -+ -+ -+Iteration 12 -+1.0000000000000001E-5 -+1.0000000000000001E-5 -+string(21) "1.0000000000000001E-5" -+ -+ -+Iteration 13 -+100000.0 -+100000.0 -+string(8) "100000.0" -+ -+ -+Iteration 14 -+100000.0 -+100000.0 -+string(8) "100000.0" -+ -+ -+Iteration 15 -+100000.0 -+100000.0 -+string(8) "100000.0" -+ -+ -+Iteration 16 -+1.0000000000000001E-5 -+1.0000000000000001E-5 -+string(21) "1.0000000000000001E-5" -+ -+ -+Iteration 17 -+5000000.0 -+5000000.0 -+string(9) "5000000.0" -+ -+ -+Iteration 18 -+6.0000000000000006E-20 -+6.0000000000000006E-20 -+string(22) "6.0000000000000006E-20" -+ -+ -+Iteration 19 -+5.0000000000000001E+42 -+5.0000000000000001E+42 -+string(22) "5.0000000000000001E+42" -+ -+ -+Iteration 20 -+3.4000000000000001E-33 -+3.4000000000000001E-33 -+string(22) "3.4000000000000001E-33" -+ -+*** Testing var_export() with valid strings *** -+ -+*** Output for strings *** -+ -+Iteration 1 -+'' -+'' -+string(2) "''" -+ -+ -+Iteration 2 -+' ' -+' ' -+string(3) "' '" -+ -+ -+Iteration 3 -+'' -+'' -+string(2) "''" -+ -+ -+Iteration 4 -+' ' -+' ' -+string(3) "' '" -+ -+ -+Iteration 5 -+'string' -+'string' -+string(8) "'string'" -+ -+ -+Iteration 6 -+'string' -+'string' -+string(8) "'string'" -+ -+ -+Iteration 7 -+'NULL' -+'NULL' -+string(6) "'NULL'" -+ -+ -+Iteration 8 -+'null' -+'null' -+string(6) "'null'" -+ -+ -+Iteration 9 -+'FALSE' -+'FALSE' -+string(7) "'FALSE'" -+ -+ -+Iteration 10 -+'false' -+'false' -+string(7) "'false'" -+ -+ -+Iteration 11 -+' ' -+' ' -+string(3) "' '" -+ -+ -+Iteration 12 -+'' . "\0" . '' -+'' . "\0" . '' -+string(14) "'' . "\0" . ''" -+ -+ -+Iteration 13 -+'\\0' -+'\\0' -+string(5) "'\\0'" -+ -+ -+Iteration 14 -+'\\060' -+'\\060' -+string(7) "'\\060'" -+ -+ -+Iteration 15 -+'8' -+'8' -+string(3) "'8'" -+ -+*** Testing var_export() with valid arrays *** -+ -+*** Output for arrays *** -+ -+Iteration 1 -+array ( -+) -+array ( -+) -+string(9) "array ( -+)" -+ -+ -+Iteration 2 -+array ( -+ 0 => NULL, -+) -+array ( -+ 0 => NULL, -+) -+string(22) "array ( -+ 0 => NULL, -+)" -+ -+ -+Iteration 3 -+array ( -+ 0 => NULL, -+) -+array ( -+ 0 => NULL, -+) -+string(22) "array ( -+ 0 => NULL, -+)" -+ -+ -+Iteration 4 -+array ( -+ 0 => true, -+) -+array ( -+ 0 => true, -+) -+string(22) "array ( -+ 0 => true, -+)" -+ -+ -+Iteration 5 -+array ( -+ 0 => '', -+) -+array ( -+ 0 => '', -+) -+string(20) "array ( -+ 0 => '', -+)" -+ -+ -+Iteration 6 -+array ( -+ 0 => '', -+) -+array ( -+ 0 => '', -+) -+string(20) "array ( -+ 0 => '', -+)" -+ -+ -+Iteration 7 -+array ( -+ 0 => -+ array ( -+ ), -+ 1 => -+ array ( -+ ), -+) -+array ( -+ 0 => -+ array ( -+ ), -+ 1 => -+ array ( -+ ), -+) -+string(55) "array ( -+ 0 => -+ array ( -+ ), -+ 1 => -+ array ( -+ ), -+)" -+ -+ -+Iteration 8 -+array ( -+ 0 => -+ array ( -+ 0 => 1, -+ 1 => 2, -+ ), -+ 1 => -+ array ( -+ 0 => 'a', -+ 1 => 'b', -+ ), -+) -+array ( -+ 0 => -+ array ( -+ 0 => 1, -+ 1 => 2, -+ ), -+ 1 => -+ array ( -+ 0 => 'a', -+ 1 => 'b', -+ ), -+) -+string(107) "array ( -+ 0 => -+ array ( -+ 0 => 1, -+ 1 => 2, -+ ), -+ 1 => -+ array ( -+ 0 => 'a', -+ 1 => 'b', -+ ), -+)" -+ -+ -+Iteration 9 -+array ( -+ 1 => 'One', -+) -+array ( -+ 1 => 'One', -+) -+string(23) "array ( -+ 1 => 'One', -+)" -+ -+ -+Iteration 10 -+array ( -+ 'test' => 'is_array', -+) -+array ( -+ 'test' => 'is_array', -+) -+string(33) "array ( -+ 'test' => 'is_array', -+)" -+ -+ -+Iteration 11 -+array ( -+ 0 => 0, -+) -+array ( -+ 0 => 0, -+) -+string(19) "array ( -+ 0 => 0, -+)" -+ -+ -+Iteration 12 -+array ( -+ 0 => -1, -+) -+array ( -+ 0 => -1, -+) -+string(20) "array ( -+ 0 => -1, -+)" -+ -+ -+Iteration 13 -+array ( -+ 0 => 10.5, -+ 1 => 5.5999999999999996, -+) -+array ( -+ 0 => 10.5, -+ 1 => 5.5999999999999996, -+) -+string(49) "array ( -+ 0 => 10.5, -+ 1 => 5.5999999999999996, -+)" -+ -+ -+Iteration 14 -+array ( -+ 0 => 'string', -+ 1 => 'test', -+) -+array ( -+ 0 => 'string', -+ 1 => 'test', -+) -+string(41) "array ( -+ 0 => 'string', -+ 1 => 'test', -+)" -+ -+ -+Iteration 15 -+array ( -+ 0 => 'string', -+ 1 => 'test', -+) -+array ( -+ 0 => 'string', -+ 1 => 'test', -+) -+string(41) "array ( -+ 0 => 'string', -+ 1 => 'test', -+)" -+ -+*** Testing var_export() with valid objects *** -+ -+*** Output for objects *** -+ -+Iteration 1 -+stdClass::__set_state(array( -+)) -+stdClass::__set_state(array( -+)) -+string(31) "stdClass::__set_state(array( -+))" -+ -+ -+Iteration 2 -+foo::__set_state(array( -+)) -+foo::__set_state(array( -+)) -+string(26) "foo::__set_state(array( -+))" -+ -+ -+Iteration 3 -+concreteClass::__set_state(array( -+)) -+concreteClass::__set_state(array( -+)) -+string(36) "concreteClass::__set_state(array( -+))" -+ -+ -+Iteration 4 -+Value::__set_state(array( -+ 'vars' => -+ array ( -+ ), -+)) -+Value::__set_state(array( -+ 'vars' => -+ array ( -+ ), -+)) -+string(57) "Value::__set_state(array( -+ 'vars' => -+ array ( -+ ), -+))" -+ -+ -+Iteration 5 -+myClass::__set_state(array( -+ 'foo_object' => -+ foo::__set_state(array( -+ )), -+ 'public_var' => 10, -+ 'public_var1' => -+ foo::__set_state(array( -+ )), -+ 'private_var' => -+ foo::__set_state(array( -+ )), -+ 'protected_var' => NULL, -+ 'proected_var' => -+ foo::__set_state(array( -+ )), -+)) -+myClass::__set_state(array( -+ 'foo_object' => -+ foo::__set_state(array( -+ )), -+ 'public_var' => 10, -+ 'public_var1' => -+ foo::__set_state(array( -+ )), -+ 'private_var' => -+ foo::__set_state(array( -+ )), -+ 'protected_var' => NULL, -+ 'proected_var' => -+ foo::__set_state(array( -+ )), -+)) -+string(293) "myClass::__set_state(array( -+ 'foo_object' => -+ foo::__set_state(array( -+ )), -+ 'public_var' => 10, -+ 'public_var1' => -+ foo::__set_state(array( -+ )), -+ 'private_var' => -+ foo::__set_state(array( -+ )), -+ 'protected_var' => NULL, -+ 'proected_var' => -+ foo::__set_state(array( -+ )), -+))" -+ -+ -+Iteration 6 -+myClass::__set_state(array( -+ 'foo_object' => -+ foo::__set_state(array( -+ )), -+ 'public_var' => 10, -+ 'public_var1' => -+ foo::__set_state(array( -+ )), -+ 'private_var' => -+ foo::__set_state(array( -+ )), -+ 'protected_var' => NULL, -+ 'proected_var' => -+ foo::__set_state(array( -+ )), -+)) -+myClass::__set_state(array( -+ 'foo_object' => -+ foo::__set_state(array( -+ )), -+ 'public_var' => 10, -+ 'public_var1' => -+ foo::__set_state(array( -+ )), -+ 'private_var' => -+ foo::__set_state(array( -+ )), -+ 'protected_var' => NULL, -+ 'proected_var' => -+ foo::__set_state(array( -+ )), -+)) -+string(293) "myClass::__set_state(array( -+ 'foo_object' => -+ foo::__set_state(array( -+ )), -+ 'public_var' => 10, -+ 'public_var1' => -+ foo::__set_state(array( -+ )), -+ 'private_var' => -+ foo::__set_state(array( -+ )), -+ 'protected_var' => NULL, -+ 'proected_var' => -+ foo::__set_state(array( -+ )), -+))" -+ -+ -+Iteration 7 -+foo::__set_state(array( -+)) -+foo::__set_state(array( -+)) -+string(26) "foo::__set_state(array( -+))" -+ -+ -+Iteration 8 -+foo::__set_state(array( -+)) -+foo::__set_state(array( -+)) -+string(26) "foo::__set_state(array( -+))" -+ -+ -+Iteration 9 -+foo::__set_state(array( -+)) -+foo::__set_state(array( -+)) -+string(26) "foo::__set_state(array( -+))" -+ -+ -+Iteration 10 -+Value::__set_state(array( -+ 'vars' => -+ array ( -+ ), -+)) -+Value::__set_state(array( -+ 'vars' => -+ array ( -+ ), -+)) -+string(57) "Value::__set_state(array( -+ 'vars' => -+ array ( -+ ), -+))" -+ -+ -+Iteration 11 -+concreteClass::__set_state(array( -+)) -+concreteClass::__set_state(array( -+)) -+string(36) "concreteClass::__set_state(array( -+))" -+ -+*** Testing var_export() with valid null values *** -+ -+*** Output for null values *** -+ -+Iteration 1 -+NULL -+NULL -+string(4) "NULL" -+ -+ -+Iteration 2 -+NULL -+NULL -+string(4) "NULL" -+ -+ -+Iteration 3 -+NULL -+NULL -+string(4) "NULL" -+ -+ -+*** Testing error conditions *** -+ -+Warning: var_export() expects at least 1 parameter, 0 given in %s on line %d -+NULL -+Warning: var_export() expects at most 2 parameters, 3 given in %s on line %d -+NULL -+ -+Done -diff --git a/ext/standard/tests/general_functions/var_export_basic1.phpt b/ext/standard/tests/general_functions/var_export_basic1.phpt -index 2dfd28785bc8..a7d3142ddc29 100644 ---- a/ext/standard/tests/general_functions/var_export_basic1.phpt -+++ b/ext/standard/tests/general_functions/var_export_basic1.phpt -@@ -1,5 +1,11 @@ - --TEST-- - Test var_export() function with integer values -+--SKIPIF-- -+<?php -+if (PHP_INT_SIZE < 8) { -+ die("skip 64-bit only"); -+} -+?> - --FILE-- - <?php - /* Prototype : mixed var_export(mixed var [, bool return]) -diff --git a/ext/standard/tests/general_functions/var_export_basic1_32.phpt b/ext/standard/tests/general_functions/var_export_basic1_32.phpt -new file mode 100644 -index 000000000000..95596800d690 ---- /dev/null -+++ b/ext/standard/tests/general_functions/var_export_basic1_32.phpt -@@ -0,0 +1,147 @@ -+--TEST-- -+Test var_export() function with integer values -+--SKIPIF-- -+<?php -+if (PHP_INT_SIZE > 4) { -+ die("skip 32-bit only"); -+} -+?> -+--FILE-- -+<?php -+/* Prototype : mixed var_export(mixed var [, bool return]) -+ * Description: Outputs or returns a string representation of a variable -+ * Source code: ext/standard/var.c -+ * Alias to functions: -+ */ -+ -+echo "*** Testing var_export() with integer values ***\n"; -+// different integer vlaues -+$valid_ints = array( -+ '0' => '0', -+ '1' => '1', -+ '-1' => '-1', -+ '-2147483648' => '-2147483648', // max negative integer value -+ '-2147483647' => '-2147483647', -+ '2147483647' => 2147483647, // max positive integer value -+ '2147483640' => 2147483640, -+ '0x123B' => 0x123B, // integer as hexadecimal -+ "'0x12ab'" => '0x12ab', -+ "'0Xfff'" => '0Xfff', -+ "'0XFA'" => '0XFA', -+ "-0x80000000" => -0x7FFFFFFF - 1, // max negative integer as hexadecimal -+ "'0x7fffffff'" => '0x7fffffff', // max positive integer as hexadecimal -+ "0x7FFFFFFF" => 0x7FFFFFFF, // max positive integer as hexadecimal -+ "'0123'" => '0123', // integer as octal -+ "01912" => 01, // should be quivalent to octal 1 -+ "-020000000000" => -017777777777 - 1, // max negative integer as octal -+ "017777777777" => 017777777777, // max positive integer as octal -+); -+ -+/* Loop to check for above integer values with var_export() */ -+echo "\n*** Output for integer values ***\n"; -+foreach($valid_ints as $key => $int_value) { -+ echo "\n-- Iteration: $key --\n"; -+ var_export( $int_value ); -+ echo "\n"; -+ var_export( $int_value, FALSE); -+ echo "\n"; -+ var_dump( var_export( $int_value, TRUE) ); -+} -+ -+?> -+===DONE=== -+--EXPECT-- -+*** Testing var_export() with integer values *** -+ -+*** Output for integer values *** -+ -+-- Iteration: 0 -- -+'0' -+'0' -+string(3) "'0'" -+ -+-- Iteration: 1 -- -+'1' -+'1' -+string(3) "'1'" -+ -+-- Iteration: -1 -- -+'-1' -+'-1' -+string(4) "'-1'" -+ -+-- Iteration: -2147483648 -- -+'-2147483648' -+'-2147483648' -+string(13) "'-2147483648'" -+ -+-- Iteration: -2147483647 -- -+'-2147483647' -+'-2147483647' -+string(13) "'-2147483647'" -+ -+-- Iteration: 2147483647 -- -+2147483647 -+2147483647 -+string(10) "2147483647" -+ -+-- Iteration: 2147483640 -- -+2147483640 -+2147483640 -+string(10) "2147483640" -+ -+-- Iteration: 0x123B -- -+4667 -+4667 -+string(4) "4667" -+ -+-- Iteration: '0x12ab' -- -+'0x12ab' -+'0x12ab' -+string(8) "'0x12ab'" -+ -+-- Iteration: '0Xfff' -- -+'0Xfff' -+'0Xfff' -+string(7) "'0Xfff'" -+ -+-- Iteration: '0XFA' -- -+'0XFA' -+'0XFA' -+string(6) "'0XFA'" -+ -+-- Iteration: -0x80000000 -- -+-2147483647-1 -+-2147483647-1 -+string(13) "-2147483647-1" -+ -+-- Iteration: '0x7fffffff' -- -+'0x7fffffff' -+'0x7fffffff' -+string(12) "'0x7fffffff'" -+ -+-- Iteration: 0x7FFFFFFF -- -+2147483647 -+2147483647 -+string(10) "2147483647" -+ -+-- Iteration: '0123' -- -+'0123' -+'0123' -+string(6) "'0123'" -+ -+-- Iteration: 01912 -- -+1 -+1 -+string(1) "1" -+ -+-- Iteration: -020000000000 -- -+-2147483647-1 -+-2147483647-1 -+string(13) "-2147483647-1" -+ -+-- Iteration: 017777777777 -- -+2147483647 -+2147483647 -+string(10) "2147483647" -+===DONE=== diff --git a/user/poppler-qt5/APKBUILD b/user/poppler-qt5/APKBUILD index 8e62189f4..5c0bbf4c8 100644 --- a/user/poppler-qt5/APKBUILD +++ b/user/poppler-qt5/APKBUILD @@ -1,40 +1,62 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=poppler-qt5 _realname=poppler -pkgver=0.74.0 +pkgver=0.77.0 pkgrel=0 +_testver=01c92874 pkgdesc="PDF rendering library based on xpdf 3.0 (Qt 5 bindings)" url="https://poppler.freedesktop.org/" arch="all" -options="!check" # Test data not included in tarball license="GPL-2.0+" makedepends="libjpeg-turbo-dev cairo-dev libxml2-dev fontconfig-dev qt5-qtbase-dev poppler-dev~$pkgver lcms2-dev openjpeg-dev" depends="" depends_dev="$makedepends" subpackages="$pkgname-dev" -source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz" -builddir="$srcdir"/$_realname-$pkgver +source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz + https://dev.sick.bike/dist/poppler-test-$_testver.tar.gz" +builddir="$srcdir"/$_realname-$pkgver/build + +# secfixes: poppler +# 0.77.0-r0: +# - CVE-2019-9200 +# - CVE-2019-9631 +# - CVE-2019-9903 +# - CVE-2019-10872 +# - CVE-2019-10873 +# - CVE-2019-11026 +# - CVE-2019-12293 prepare() { - mkdir -p build + default_prepare + mkdir "$builddir" } build() { - cd "$builddir"/build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DTESTDATADIR="$srcdir/poppler-test-$_testver" \ .. make } +check() { + # check_qt5_annotations: fails on ppc64 and x86_64 as of 0.77.0-r0 + # FAIL! : TestAnnotations::checkFontSizeAndColor() Compared values are not the same + # Actual (textAnnot->contents()): "\u00C3\u00BE\u00C3\u00BF\u0000f\u0000o\u0000o\u0000b\u0000a\u0000r" + # Expected (contents) : "foobar" + # Loc: [src/poppler-0.77.0/qt5/tests/check_annotations.cpp(100)] + ctest --output-on-failure \ + -E check_qt5_annotations +} + package() { - cd "$builddir"/build install -D -m644 poppler-qt5.pc "$pkgdir"/usr/lib/pkgconfig/poppler-qt5.pc cd qt5 make DESTDIR="$pkgdir" install } -sha512sums="4e48e2ffb559863ee693930db3b8594fd7e60e4b4ca3cdeb198faf90a6f4dbb5e102461492a12058221bc1218fe7e17c9085afb9e7956ae4bf26c11674315e66 poppler-0.74.0.tar.xz" +sha512sums="7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040 poppler-0.77.0.tar.xz +5275541ffa0fef9c55a0c02411947c610b2e7eb621f0a0fa9529810f8b09e2b0194c1da4b64eb9641b2c3af7b099e6bb7d1212b9087a21cf3af893090a10506b poppler-test-01c92874.tar.gz" diff --git a/user/poppler/APKBUILD b/user/poppler/APKBUILD index b1a6bf526..9c3385c8d 100644 --- a/user/poppler/APKBUILD +++ b/user/poppler/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: pkgname=poppler -pkgver=0.74.0 +pkgver=0.77.0 pkgrel=0 pkgdesc="PDF rendering library based on xpdf 3.0" url="https://poppler.freedesktop.org/" arch="all" -options="!check" # Test data is available in Git only. +options="!check" # Tests only cover Qt5 component. license="GPL-2.0+" depends="" depends_dev="cairo-dev glib-dev" @@ -16,6 +16,16 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-glib" source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz" builddir="$srcdir"/$pkgname-$pkgver/build +# secfixes: +# 0.77.0-r0: +# - CVE-2019-9200 +# - CVE-2019-9631 +# - CVE-2019-9903 +# - CVE-2019-10872 +# - CVE-2019-10873 +# - CVE-2019-11026 +# - CVE-2019-12293 + prepare() { default_prepare mkdir "$builddir" @@ -50,11 +60,4 @@ glib() { "$subpkgdir"/usr/lib/ } -_cpp() { - pkgdesc="Pure C++ wrapper for poppler" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libpoppler-cpp.so.* \ - "$subpkgdir"/usr/lib/ -} - -sha512sums="4e48e2ffb559863ee693930db3b8594fd7e60e4b4ca3cdeb198faf90a6f4dbb5e102461492a12058221bc1218fe7e17c9085afb9e7956ae4bf26c11674315e66 poppler-0.74.0.tar.xz" +sha512sums="7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040 poppler-0.77.0.tar.xz" diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD index 7fed2351e..91bdf258a 100644 --- a/user/postgresql/APKBUILD +++ b/user/postgresql/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=postgresql -pkgver=10.5 +pkgver=10.9 pkgrel=0 pkgdesc="Featureful object-relational database system (RDBMS)" url="https://www.postgresql.org/" @@ -35,23 +35,28 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2 # secfixes: # 9.6.4-r0: -# - CVE-2017-7546 -# - CVE-2017-7547 -# - CVE-2017-7548 +# - CVE-2017-7546 +# - CVE-2017-7547 +# - CVE-2017-7548 # 9.6.3-r0: -# - CVE-2017-7484 -# - CVE-2017-7485 -# - CVE-2017-7486 +# - CVE-2017-7484 +# - CVE-2017-7485 +# - CVE-2017-7486 # 10.1-r0: -# - CVE-2017-15098 -# - CVE-2017-15099 +# - CVE-2017-15098 +# - CVE-2017-15099 # 10.2-r0: -# - CVE-2018-1052 -# - CVE-2018-1053 +# - CVE-2018-1052 +# - CVE-2018-1053 # 10.3-r0: -# - CVE-2018-1058 +# - CVE-2018-1058 # 10.4-r0: -# - CVE-2018-1115 +# - CVE-2018-1115 +# 10.8-r0: +# - CVE-2018-16850 +# - CVE-2019-10130 +# 10.9-r0: +# - CVE-2019-10164 prepare() { default_prepare @@ -249,7 +254,7 @@ _submv() { done } -sha512sums="1bad30ae88beca66f7e8b99b82e7f02aac1e9230b328e6e5a762a704cdd9dc767d924f5a66c68c93586badfef91b7ff336120a567ce970eaa58bb44c662ad48c postgresql-10.5.tar.bz2 +sha512sums="4e2f30a0fd262f2e3ce5fc836425be635326600cd6cd4e117c57f59ea7ab2e9ea463a8d357fe7adb8c0dd0094e43d08efc2a137f8f9975715a5908e35920f98e postgresql-10.9.tar.bz2 1f8e7dc58f5b0a12427cf2fd904ffa898a34f23f3332c8382b94e0d991c007289e7913a69e04498f3d93fc5701855796c207b4b1cc4a0b366f586050124d7fcc initdb.patch 5f9d8bb4957194069d01af8ab3abc6d4d83a7e7f8bd7ebe1caae5361d621a3e58f91b14b952958138a794e0a80bc154fbb7e3e78d211e2a95b9b7901335de854 perl-rpath.patch 8439a6fdfdea0a4867daeb8bc23d6c825f30c00d91d4c39f48653f5ee77341f23282ce03a77aad94b5369700f11d2cb28d5aee360e59138352a9ab331a9f9d0f conf-unix_socket_directories.patch diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD index af46fd009..78a480016 100644 --- a/user/protobuf/APKBUILD +++ b/user/protobuf/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=protobuf _gemname=google-protobuf -pkgver=3.7.1 -_tstver=1.8.0 +pkgver=3.8.0 +_tstver=1.8.1 pkgrel=0 pkgdesc="Library for extensible, efficient structure packing" url="https://github.com/google/protobuf" @@ -116,5 +116,5 @@ vim() { "$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim } -sha512sums="7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f protobuf-3.7.1.tar.gz -1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d googletest-1.8.0.tar.gz" +sha512sums="ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2 protobuf-3.8.0.tar.gz +e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 googletest-1.8.1.tar.gz" diff --git a/user/py3-asn1crypto/APKBUILD b/user/py3-asn1crypto/APKBUILD index fc90861c4..bcb4a0e93 100644 --- a/user/py3-asn1crypto/APKBUILD +++ b/user/py3-asn1crypto/APKBUILD @@ -1,5 +1,6 @@ # Contributor: André Klitzing <aklitzing@gmail.com> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-asn1crypto _pkgname=${pkgname#py3-} pkgver=0.24.0 diff --git a/user/py3-certifi/APKBUILD b/user/py3-certifi/APKBUILD index 26f6b81f5..01b338ea7 100644 --- a/user/py3-certifi/APKBUILD +++ b/user/py3-certifi/APKBUILD @@ -1,4 +1,5 @@ -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-certifi _pkgname=${pkgname#py3-} pkgver=2019.3.9 diff --git a/user/py3-chardet/APKBUILD b/user/py3-chardet/APKBUILD index cf07aea4c..81f03379a 100644 --- a/user/py3-chardet/APKBUILD +++ b/user/py3-chardet/APKBUILD @@ -1,5 +1,6 @@ # Contributor: <xmingske@gmail.com> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-chardet _pkgname=${pkgname#py3-} pkgver=3.0.4 diff --git a/user/py3-commonmark/APKBUILD b/user/py3-commonmark/APKBUILD index 90bc7fe56..f8df6a75e 100644 --- a/user/py3-commonmark/APKBUILD +++ b/user/py3-commonmark/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-commonmark _pkgname=commonmark -pkgver=0.8.1 +pkgver=0.9.0 pkgrel=0 pkgdesc="Python parser for the CommonMark Markdown flavour" url="https://pypi.org/project/CommonMark/" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="dbab51d45c1973a8d0906148d785fb8ddc2b52177dfe0e69fe79bef2a5eb05a5a7ab8693852f4aaa8545af19d741569d04a24f06ea65171e6e80d9f66af47fdf commonmark-0.8.1.tar.gz" +sha512sums="f5cb6c9a32fdb441a229b70118652c0fd1b0f058728c594966f5fe04a58ec005feaade49fa72f3aa07b3376e4148e76203313e4f14d29fc86f2acc125533a4fa commonmark-0.9.0.tar.gz" diff --git a/user/py3-configargparse/APKBUILD b/user/py3-configargparse/APKBUILD index 4641df6e8..199dce3b7 100644 --- a/user/py3-configargparse/APKBUILD +++ b/user/py3-configargparse/APKBUILD @@ -1,7 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Stuart Cardall <developer@it-offshore.co.uk> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-configargparse _pkgname=ConfigArgParse pkgver=0.14.0 @@ -9,6 +10,7 @@ pkgrel=0 pkgdesc="A drop-in replacement for argparse" url="https://github.com/bw2/ConfigArgParse" arch="noarch" +options="!check" # https://github.com/bw2/ConfigArgParse/issues/146 license="MIT" depends="python3" makedepends="python3-dev python3-tests" diff --git a/user/py3-configobj/APKBUILD b/user/py3-configobj/APKBUILD index 6077aa8ec..7268eaa42 100644 --- a/user/py3-configobj/APKBUILD +++ b/user/py3-configobj/APKBUILD @@ -1,5 +1,6 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-configobj _pkgname=${pkgname#py3-} pkgver=5.0.6 diff --git a/user/py3-cryptography/APKBUILD b/user/py3-cryptography/APKBUILD index 7d006ac76..d0a9842d7 100644 --- a/user/py3-cryptography/APKBUILD +++ b/user/py3-cryptography/APKBUILD @@ -1,5 +1,6 @@ # Contributor: August Klein <amatcoder@gmail.com> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-cryptography _pkgname=${pkgname#py3-} pkgver=2.6.1 diff --git a/user/py3-future/APKBUILD b/user/py3-future/APKBUILD index 7f433a4fc..3fead3a17 100644 --- a/user/py3-future/APKBUILD +++ b/user/py3-future/APKBUILD @@ -1,5 +1,6 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-future _pkgname=${pkgname##py3-} pkgver=0.17.1 diff --git a/user/py3-idna/APKBUILD b/user/py3-idna/APKBUILD index 0fd7e1e8e..ea624e5fc 100644 --- a/user/py3-idna/APKBUILD +++ b/user/py3-idna/APKBUILD @@ -1,6 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-idna _pkgname=${pkgname#py3-} pkgver=2.8 diff --git a/user/py3-josepy/APKBUILD b/user/py3-josepy/APKBUILD index 511139b5b..84cfd7d1f 100644 --- a/user/py3-josepy/APKBUILD +++ b/user/py3-josepy/APKBUILD @@ -1,5 +1,6 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-josepy _pkgname=${pkgname#py3-} pkgver=1.1.0 diff --git a/user/py3-lxml/APKBUILD b/user/py3-lxml/APKBUILD index fd522ca47..cdb7b4362 100644 --- a/user/py3-lxml/APKBUILD +++ b/user/py3-lxml/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-lxml _pkgname=lxml -pkgver=4.3.3 +pkgver=4.3.4 pkgrel=0 pkgdesc="Python LXML Library" url="https://lxml.de/" @@ -23,4 +23,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="cbc1cd30bac4b9ac845d99949c8c231a7870398f942695df5a00586d70d0f6b6ebd457a1a9306806af7d0fd521a14c54d266902943263927a0d940abc3cdf5c0 lxml-4.3.3.tar.gz" +sha512sums="7349cb4805e538da5b11edcb79fcd09ddedf0d52e50273a4e587f209e6b147b50737c45dcfc8eb3ee8e7be8f99769046f704c5fc8c35cee74d5d22ef72d503ed lxml-4.3.4.tar.gz" diff --git a/user/py3-mako/APKBUILD b/user/py3-mako/APKBUILD index 0f952f32d..cf0db705a 100644 --- a/user/py3-mako/APKBUILD +++ b/user/py3-mako/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-mako _pkgname=Mako -pkgver=1.0.9 +pkgver=1.0.12 pkgrel=0 pkgdesc="Fast templating language for Python" url="http://www.makotemplates.org/" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="2b40b96edba9f1ac0c2090e5677742c1f7578d5a55ab1c09aa4198493144e30c25d6179a7bdee2d3fa12410da6c3b1105d2d70af77d4265d679f577a7e711c63 Mako-1.0.9.tar.gz" +sha512sums="aa295880c07938425e661b8865fed7cf398ac257d6b84bdbef5a2c542bbae79cd27df363e81c10450c9b6c8e038360166480b06e701d5a5affeb7bd03a7f5d83 Mako-1.0.12.tar.gz" diff --git a/user/py3-markdown/APKBUILD b/user/py3-markdown/APKBUILD index ef362e1f9..d31bd6040 100644 --- a/user/py3-markdown/APKBUILD +++ b/user/py3-markdown/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-markdown _pkgname=Markdown pkgver=3.0.1 diff --git a/user/py3-mock/APKBUILD b/user/py3-mock/APKBUILD index 26248b73f..1164ba07c 100644 --- a/user/py3-mock/APKBUILD +++ b/user/py3-mock/APKBUILD @@ -1,5 +1,6 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-mock _pkgname=${pkgname#py3-} pkgver=2.0.0 diff --git a/user/py3-openssl/APKBUILD b/user/py3-openssl/APKBUILD index b19a1d09d..f39f3da42 100644 --- a/user/py3-openssl/APKBUILD +++ b/user/py3-openssl/APKBUILD @@ -1,5 +1,6 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-openssl _pkgname=pyOpenSSL pkgver=19.0.0 diff --git a/user/py3-parsedatetime/APKBUILD b/user/py3-parsedatetime/APKBUILD index 777e90df7..dc2766b37 100644 --- a/user/py3-parsedatetime/APKBUILD +++ b/user/py3-parsedatetime/APKBUILD @@ -1,6 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Contributor: Roberto Oliveira <robertoguimaraes8@gmail.com> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-parsedatetime _pkgname=parsedatetime pkgver=2.4 diff --git a/user/py3-pbr/APKBUILD b/user/py3-pbr/APKBUILD index d92c97139..146a185ac 100644 --- a/user/py3-pbr/APKBUILD +++ b/user/py3-pbr/APKBUILD @@ -1,5 +1,6 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-pbr _pkgname=${pkgname#py3-} pkgver=5.1.3 diff --git a/user/py3-psutil/APKBUILD b/user/py3-psutil/APKBUILD new file mode 100644 index 000000000..465b3056f --- /dev/null +++ b/user/py3-psutil/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-psutil +_pkgname=${pkgname#py3-} +pkgver=5.6.3 +pkgrel=0 +pkgdesc="Process and system utilities" +url="https://pypi.org/project/psutil/" +arch="all" +options="!check" # Requires itself to be installed first +license="BSD-3-Clause" +depends="python3" +makedepends="python3-dev utmps-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz + utmpx.patch + " +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + LIBS="-lutmps -lskarnet" python3 setup.py build +} + +package() { + mkdir -p "$pkgdir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="62cf120c9391705bd393d6554afa32d672470b61ebb3c0e7458bad26134b784175ba64d3eff119ace6def2aebc97df73cd0c9d213776176ce39c3d47da3f3d9c psutil-5.6.3.tar.gz +5b0eea07856afeb0eff3268dc78bd3daf3491022e8a08c422db3eaad1b5e0da71429fe9e2e4b23f3eabf9669e7e4fb5a187c96aedbfe994692bb3e5a98fe2fc2 utmpx.patch" diff --git a/user/py3-psutil/utmpx.patch b/user/py3-psutil/utmpx.patch new file mode 100644 index 000000000..e7881e8f2 --- /dev/null +++ b/user/py3-psutil/utmpx.patch @@ -0,0 +1,87 @@ +--- psutil-5.6.2/psutil/_psutil_linux.c.old 2019-04-11 21:10:12.000000000 +0000 ++++ psutil-5.6.2/psutil/_psutil_linux.c 2019-06-14 20:19:26.804374285 +0000 +@@ -14,7 +14,7 @@ + #include <stdlib.h> + #include <mntent.h> + #include <features.h> +-#include <utmp.h> ++#include <utmpx.h> + #include <sched.h> + #include <linux/version.h> + #include <sys/syscall.h> +@@ -454,7 +454,7 @@ + */ + static PyObject * + psutil_users(PyObject *self, PyObject *args) { +- struct utmp *ut; ++ struct utmpx *utx; + PyObject *py_retlist = PyList_New(0); + PyObject *py_tuple = NULL; + PyObject *py_username = NULL; +@@ -465,20 +465,20 @@ + if (py_retlist == NULL) + return NULL; +- setutent(); ++ setutxent(); +- while (NULL != (ut = getutent())) { ++ while (NULL != (utx = getutxent())) { + py_tuple = NULL; + py_user_proc = NULL; +- if (ut->ut_type == USER_PROCESS) ++ if (utx->ut_type == USER_PROCESS) + py_user_proc = Py_True; + else + py_user_proc = Py_False; +- py_username = PyUnicode_DecodeFSDefault(ut->ut_user); ++ py_username = PyUnicode_DecodeFSDefault(utx->ut_user); + if (! py_username) + goto error; +- py_tty = PyUnicode_DecodeFSDefault(ut->ut_line); ++ py_tty = PyUnicode_DecodeFSDefault(utx->ut_line); + if (! py_tty) + goto error; +- py_hostname = PyUnicode_DecodeFSDefault(ut->ut_host); ++ py_hostname = PyUnicode_DecodeFSDefault(utx->ut_host); + if (! py_hostname) + goto error; + py_tuple = Py_BuildValue( +@@ -486,9 +486,9 @@ + py_username, // username + py_tty, // tty + py_hostname, // hostname +- (float)ut->ut_tv.tv_sec, // tstamp ++ (float)utx->ut_tv.tv_sec, // tstamp + py_user_proc, // (bool) user process +- ut->ut_pid // process id ++ utx->ut_pid // process id + ); + if (! py_tuple) + goto error; +@@ -499,7 +499,7 @@ + Py_DECREF(py_hostname); + Py_DECREF(py_tuple); + } +- endutent(); ++ endutxent(); + return py_retlist; + + error: +@@ -508,7 +508,7 @@ + Py_XDECREF(py_hostname); + Py_XDECREF(py_tuple); + Py_DECREF(py_retlist); +- endutent(); ++ endutxent(); + return NULL; + } + +--- psutil-5.6.2/setup.py.old 2019-04-11 21:10:12.000000000 +0000 ++++ psutil-5.6.2/setup.py 2019-06-14 20:25:29.994927919 +0000 +@@ -227,6 +227,7 @@ + ext = Extension( + 'psutil._psutil_linux', + sources=sources + ['psutil/_psutil_linux.c'], ++ libraries=['utmps', 'skarnet'], + define_macros=macros) + + elif SUNOS: diff --git a/user/py3-pygments/APKBUILD b/user/py3-pygments/APKBUILD index 699de3ca5..e68468221 100644 --- a/user/py3-pygments/APKBUILD +++ b/user/py3-pygments/APKBUILD @@ -1,6 +1,7 @@ # Contributor: Peter Bui <pnutzh4x0r@gmail.com> # Contributor: Matt Smith <mcs@darkregion.net> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-pygments _pkgname=Pygments pkgver=2.2.0 diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD index 24c486a07..d1dfe928d 100644 --- a/user/py3-pygobject/APKBUILD +++ b/user/py3-pygobject/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=py3-pygobject -pkgver=3.32.1 +pkgver=3.32.2 pkgrel=0 pkgdesc="Python bindings for GObject libraries" url="https://wiki.gnome.org/Projects/PyGObject" @@ -28,4 +28,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="5b325d0caf4f34f783fc2c664a795809f048eb1639d2f2e375fc147c852d6e29a8ab119438cac76786fb20220c72d5859cc06d6f70c29f976f6a5914e0169915 pygobject-3.32.1.tar.xz" +sha512sums="50081bfed45e8b5f0b87fe5c95d4cc12d1b31085e869c603bbc70e34bca69059cc44e8a42270f51e7f04e3ecf2c98da524327a982ed7bb594621fb434d4227f6 pygobject-3.32.2.tar.xz" diff --git a/user/py3-pysocks/APKBUILD b/user/py3-pysocks/APKBUILD index 131e9e353..39126c2b2 100644 --- a/user/py3-pysocks/APKBUILD +++ b/user/py3-pysocks/APKBUILD @@ -1,5 +1,6 @@ # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-pysocks _pkgname=PySocks pkgver=1.6.8 diff --git a/user/py3-pyyaml/APKBUILD b/user/py3-pyyaml/APKBUILD index 6dece19c3..5bdd8a36b 100644 --- a/user/py3-pyyaml/APKBUILD +++ b/user/py3-pyyaml/APKBUILD @@ -1,5 +1,5 @@ # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-pyyaml _pkgname=pyyaml pkgver=5.1 diff --git a/user/py3-requests-toolbelt/APKBUILD b/user/py3-requests-toolbelt/APKBUILD index eeef959c8..189ad887d 100644 --- a/user/py3-requests-toolbelt/APKBUILD +++ b/user/py3-requests-toolbelt/APKBUILD @@ -1,5 +1,6 @@ # Contributor: Roberto Oliveira <robertoguimaraes8@gmail.com> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-requests-toolbelt _pkgname=${pkgname##*-} pkgver=0.9.1 diff --git a/user/py3-requests/APKBUILD b/user/py3-requests/APKBUILD index 1746a8256..947eb68f6 100644 --- a/user/py3-requests/APKBUILD +++ b/user/py3-requests/APKBUILD @@ -1,12 +1,13 @@ # Contributor: Peter Bui <pnutzh4x0r@gmail.com> # Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-requests _pkgname=${pkgname#py3-} -pkgver=2.21.0 +pkgver=2.22.0 pkgrel=0 pkgdesc="A HTTP request library for Python" -url="http://www.python-requests.org/" +url="https://2.python-requests.org/" arch="noarch" license="Apache-2.0" options="!check" # tests connect to remote sites @@ -17,14 +18,12 @@ source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104 requests-2.21.0.tar.gz" +sha512sums="8b8e9da8a0c816fb4ff39be89ac7e1a9d5a99503ed93e44a0d78b28818f1c0eb253b151972a144151a616ba1b4bc5595245458a8268c5161391db54f740ac9a5 requests-2.22.0.tar.gz" diff --git a/user/py3-rfc3339/APKBUILD b/user/py3-rfc3339/APKBUILD index 928996f5e..b1ea564a9 100644 --- a/user/py3-rfc3339/APKBUILD +++ b/user/py3-rfc3339/APKBUILD @@ -1,6 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Contributor: Roberto Oliveira <robertoguimaraes8@gmail.com> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-rfc3339 _pkgname=pyRFC3339 pkgver=1.1 diff --git a/user/py3-twisted/APKBUILD b/user/py3-twisted/APKBUILD index 4a397f16d..a29880a9c 100644 --- a/user/py3-twisted/APKBUILD +++ b/user/py3-twisted/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-twisted _pkgname=Twisted -pkgver=19.2.0 +pkgver=19.2.1 pkgrel=0 pkgdesc="Asynchronous networking framework written in Python" url="https://twistedmatrix.com/" @@ -29,4 +29,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="46f2645e71bb8eca65c915078c7b0e71c6ed0c09deb9d947765326986b7cb7d535f2e15af23a48579d86be98d208a110c848b72803a68340b7b31a22784a62f2 Twisted-19.2.0.tar.bz2" +sha512sums="b358c3082a9005f7065da182cec3561d77aa34f21fc1bb20b1acdb1ad3ac7e8b0793c5f7189baec7cfa79dd19a97c3ded9381e4e376a770108f7f6b318bec5f3 Twisted-19.2.1.tar.bz2" diff --git a/user/py3-tz/APKBUILD b/user/py3-tz/APKBUILD index d8182670c..0ace396c5 100644 --- a/user/py3-tz/APKBUILD +++ b/user/py3-tz/APKBUILD @@ -1,6 +1,7 @@ # Contributor: Peter Bui <pnutzh4x0r@gmail.com> # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-tz _pkgname=pytz pkgver=2018.9 diff --git a/user/py3-urllib3/APKBUILD b/user/py3-urllib3/APKBUILD index 68ea652b2..7082e8f91 100644 --- a/user/py3-urllib3/APKBUILD +++ b/user/py3-urllib3/APKBUILD @@ -1,6 +1,7 @@ # Contributor: Yura Kushnir <kushnir.yura@gmail.com> # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-urllib3 _pkgname=${pkgname#py3-} pkgver=1.24.1 diff --git a/user/py3-zope-component/APKBUILD b/user/py3-zope-component/APKBUILD index 6c283d12c..32feb82ad 100644 --- a/user/py3-zope-component/APKBUILD +++ b/user/py3-zope-component/APKBUILD @@ -1,5 +1,6 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-zope-component _pkgname=zope.component pkgver=4.5 diff --git a/user/py3-zope-deferredimport/APKBUILD b/user/py3-zope-deferredimport/APKBUILD index f93a4d611..99c1b1838 100644 --- a/user/py3-zope-deferredimport/APKBUILD +++ b/user/py3-zope-deferredimport/APKBUILD @@ -1,5 +1,5 @@ # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-zope-deferredimport _pkgname=zope.deferredimport pkgver=4.3 diff --git a/user/py3-zope-deprecation/APKBUILD b/user/py3-zope-deprecation/APKBUILD index f21a1fdeb..22e629f26 100644 --- a/user/py3-zope-deprecation/APKBUILD +++ b/user/py3-zope-deprecation/APKBUILD @@ -1,5 +1,5 @@ # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-zope-deprecation _pkgname=zope.deprecation pkgver=4.4.0 diff --git a/user/py3-zope-event/APKBUILD b/user/py3-zope-event/APKBUILD index d03bc400e..391da22f7 100644 --- a/user/py3-zope-event/APKBUILD +++ b/user/py3-zope-event/APKBUILD @@ -1,5 +1,6 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-zope-event _pkgname=zope.event pkgver=4.4 diff --git a/user/py3-zope-hookable/APKBUILD b/user/py3-zope-hookable/APKBUILD index a2b4493be..454d1c46e 100644 --- a/user/py3-zope-hookable/APKBUILD +++ b/user/py3-zope-hookable/APKBUILD @@ -1,5 +1,5 @@ # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-zope-hookable _pkgname=zope.hookable pkgver=4.2.0 diff --git a/user/py3-zope-interface/APKBUILD b/user/py3-zope-interface/APKBUILD index b5e612068..d5262edb9 100644 --- a/user/py3-zope-interface/APKBUILD +++ b/user/py3-zope-interface/APKBUILD @@ -1,5 +1,6 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-zope-interface _pkgname=zope.interface pkgver=4.6.0 diff --git a/user/py3-zope-proxy/APKBUILD b/user/py3-zope-proxy/APKBUILD index 37a7b35b2..d35055b8b 100644 --- a/user/py3-zope-proxy/APKBUILD +++ b/user/py3-zope-proxy/APKBUILD @@ -1,5 +1,5 @@ # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=py3-zope-proxy _pkgname=zope.proxy pkgver=4.3.1 diff --git a/user/qpdf/APKBUILD b/user/qpdf/APKBUILD index 663813fcc..df20bbe25 100644 --- a/user/qpdf/APKBUILD +++ b/user/qpdf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=qpdf -pkgver=8.4.0 +pkgver=8.4.2 pkgrel=0 pkgdesc="Command-line tools and library for transforming PDF files" url="http://qpdf.sourceforge.net" @@ -57,4 +57,4 @@ fix_qdf() { mv "$pkgdir"/usr/bin/fix-qdf "$subpkgdir"/usr/bin/ } -sha512sums="13225c6285311e8fe89970971b082b9613e70d474ee71dd5572f1ae268234d366c2c9c7bf427c4758a746a1a27ecc0127d31044ab501dbc08885c8aa0a514028 qpdf-8.4.0.tar.gz" +sha512sums="9cde046fb5e42dc331933294155583fb20408704a0cab3075cc3e97bd4643e3178e4162b8de7434aa2304097e7734f985fdc8e7b05cc028c37193dce91797f7a qpdf-8.4.2.tar.gz" diff --git a/user/qpdfview/APKBUILD b/user/qpdfview/APKBUILD index 612cb251e..3f7876f4b 100644 --- a/user/qpdfview/APKBUILD +++ b/user/qpdfview/APKBUILD @@ -1,29 +1,29 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=qpdfview -pkgver=0.4.16 -pkgrel=1 +pkgver=0.4.18_beta1 +_pkgver=0.4.18beta1 +pkgrel=0 pkgdesc="A tabbed document viewer" url="https://launchpad.net/qpdfview" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cups-dev gnutls-dev poppler-qt5-dev qt5-qttools-dev qt5-qtbase-dev - qt5-qtsvg-dev" +makedepends="cups-dev djvulibre-dev gnutls-dev libspectre-dev + poppler-qt5-dev qt5-qttools-dev qt5-qtbase-dev qt5-qtsvg-dev" subpackages="$pkgname-doc" -source="$url/trunk/$pkgver/+download/qpdfview-$pkgver.tar.gz" +source="$url/trunk/$_pkgver/+download/qpdfview-$_pkgver.tar.gz" +builddir="$srcdir/$pkgname-$_pkgver" build() { - cd "$builddir" lrelease qpdfview.pro - qmake CONFIG+="without_ps without_djvu" qpdfview.pro + qmake qpdfview.pro make } package() { - cd "$builddir" make INSTALL_ROOT="$pkgdir" install } -sha512sums="d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584 qpdfview-0.4.16.tar.gz" +sha512sums="88c8f1a4a9f8d62ef4c073c50a7dfe57397a3c64621d3916578194c0aa6db3fc47c537652213c7851e70c2a655165fa4343f15ac615ba977c921648d7cfd834c qpdfview-0.4.18beta1.tar.gz" diff --git a/user/qt-creator/APKBUILD b/user/qt-creator/APKBUILD index 1c6203faf..866b43437 100644 --- a/user/qt-creator/APKBUILD +++ b/user/qt-creator/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt-creator -pkgver=4.8.2 -pkgrel=1 +pkgver=4.9.1 +pkgrel=0 pkgdesc="Cross-platform multi-language programming IDE" url="https://doc.qt.io/qtcreator/index.html" arch="all" @@ -18,7 +18,6 @@ ldpath="/usr/lib/qtcreator" builddir="$srcdir/$pkgname-opensource-src-$pkgver" build() { - cd "$builddir" export LLVM_INSTALL_DIR=/usr qmake -r "QMAKE_CFLAGS += $CFLAGS" "QMAKE_CXXFLAGS += $CXXFLAGS" "QMAKE_LFLAGS += $LDFLAGS" "QMAKE_LIBS += -lexecinfo" ln -s /usr/bin/python3 "$srcdir"/python @@ -27,8 +26,7 @@ build() { } package() { - cd "$builddir" make install INSTALL_ROOT="$pkgdir"/usr } -sha512sums="dfaa620caa0f92adc095c661b9e1688d4e42b8fab2520d14a2b524f14af376d61683519e5dc50165dd7e47d98c55cf47890ca712c71b83a5a13aa3c9a6f9505e qt-creator-opensource-src-4.8.2.tar.gz" +sha512sums="f0b4b83e8103f493aceb41e8919bd3cbfac1aae3dd8862a2d844271bcf15f73d5dc67e87097a81800b1ac3efee057f35de4d58408f1baa4a4d1d46450319cf93 qt-creator-opensource-src-4.9.1.tar.gz" diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD index e32542954..98328624a 100644 --- a/user/qt5ct/APKBUILD +++ b/user/qt5ct/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=qt5ct -pkgver=0.38 +pkgver=0.39 pkgrel=0 pkgdesc="GUI utility for configuring Qt5" url="https://sourceforge.net/projects/qt5ct/" @@ -23,4 +23,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="0c33beca5103f6c01fceabffea50df5798f055b1e530fc084b294917d8bfa6ea78db72385e8941fe92164c682a069b166c69595e2e06bc62be0595a3718a7323 qt5ct-0.38.tar.bz2" +sha512sums="ea7a4f34bae5aac622bcf9171982a16a982c8318d8c218c97e452e9fa7f4ea39018d269b2c62467830642961f873d9464c5a93a88529562340f13582436bdf65 qt5ct-0.39.tar.bz2" diff --git a/user/quassel/APKBUILD b/user/quassel/APKBUILD index 695fd4e4b..f9f583de7 100644 --- a/user/quassel/APKBUILD +++ b/user/quassel/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=quassel pkgver=0.13.1 -pkgrel=0 +pkgrel=1 pkgdesc="Modern, cross-platform IRC client" url="https://quassel-irc.org/" arch="all" @@ -14,7 +14,9 @@ makedepends="qt5-qtbase-dev qt5-qtmultimedia-dev libdbusmenu-qt-dev sonnet-dev kwidgetsaddons-dev qca-dev qt5-qttools-dev zlib-dev libexecinfo-dev" langdir="/usr/share/quassel/translations" subpackages="$pkgname-core $pkgname-client $pkgname-lang" -source="https://quassel-irc.org/pub/quassel-$pkgver.tar.bz2" +source="https://quassel-irc.org/pub/quassel-$pkgver.tar.bz2 + unterminated-mIRC-codes.patch + " # secfixes: # 0.12.5-r0: @@ -74,4 +76,5 @@ core() { mv "$pkgdir"/usr/bin/quasselcore "$subpkgdir"/usr/bin/ } -sha512sums="4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c quassel-0.13.1.tar.bz2" +sha512sums="4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c quassel-0.13.1.tar.bz2 +7f5ffa64d0620061ac2b6eab2e163d5862d43b16e3d7572415b5819f9ee19a5482791c3cee20c3b99722f05ffed3f1f3ba6c82e7f78b6bea9170037675dd3b4a unterminated-mIRC-codes.patch" diff --git a/user/quassel/unterminated-mIRC-codes.patch b/user/quassel/unterminated-mIRC-codes.patch new file mode 100644 index 000000000..8cedeb461 --- /dev/null +++ b/user/quassel/unterminated-mIRC-codes.patch @@ -0,0 +1,40 @@ +From 391cdf6c2595060ff3b2adb54f5b2fc8ebd7cc04 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Mon, 3 Jun 2019 00:16:30 -0500 +Subject: [PATCH] multilineedit: handle unterminated mIRC codes + +Currently, if an unterminated mIRC code is pasted into Quassel, trying to +go through input line history will cause a deadlock. This breaks the loop +at the cost of possibly mangling the formatting of the line somewhat. +This is seen as more acceptable than locking up, and the line is invalid +anyway. + +Reproducer: + +```sh +printf '\00303,08HONK' | xclip -selection clipboard +``` + +Paste into Quassel, send, press Up arrow key. +--- + src/uisupport/multilineedit.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp +index 133a2433..b13834c5 100644 +--- a/src/uisupport/multilineedit.cpp ++++ b/src/uisupport/multilineedit.cpp +@@ -645,6 +645,10 @@ QString MultiLineEdit::convertMircCodesToHtml(const QString &text) + } + + posRight = text.indexOf(mircCode.cap(), posRight + 1); ++ if (posRight == -1) { ++ words << text.mid(posLeft); ++ break; // unclosed color code; can't process ++ } + words << text.mid(posLeft, posRight + 1 - posLeft); + posLeft = posRight + 1; + } +-- +2.21.0 + diff --git a/user/quaternion/APKBUILD b/user/quaternion/APKBUILD index 4b19bab1e..76f7284af 100644 --- a/user/quaternion/APKBUILD +++ b/user/quaternion/APKBUILD @@ -1,14 +1,14 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=quaternion -pkgver=0.0.9.4a +pkgver=0.0.9.4c pkgrel=0 pkgdesc="Qt5-based Matrix chat client" url="https://matrix.org/docs/projects/client/quaternion.html" arch="all" license="GPL-3.0+" depends="qt5-qtquickcontrols" -makedepends="cmake libqmatrixclient-dev qt5-qtbase-dev qt5-qtdeclarative-dev +makedepends="cmake libquotient-dev qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtmultimedia-dev qt5-qttools-dev" subpackages="" source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/${pkgver/_/-}.tar.gz" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cb1cd10f34670e53c6e1bf749b647cae73f7f3c72615a71d865b0599da7d2b3cb233ce8ff7d32d92a605de4e087744b438abf19c16e0e320a5ec5463b29aa84b quaternion-0.0.9.4a.tar.gz" +sha512sums="405b8e6fae4bd4b2d6a08e582ae7451d080f0de2d993103d90cb2c613a7a9ab4e53c3bbcc298f0a6aedc6ff3da84ced763580c4806e1d5d59f08af131dc8b102 quaternion-0.0.9.4c.tar.gz" diff --git a/user/quazip/APKBUILD b/user/quazip/APKBUILD new file mode 100644 index 000000000..bae54fd46 --- /dev/null +++ b/user/quazip/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=quazip +pkgver=0.8.1 +pkgrel=0 +pkgdesc="Qt ZIP archive library" +url="https://stachenov.github.io/quazip/" +arch="all" +license="LGPL-2.1-only WITH Static-linking-exception" +depends="" +makedepends="qt5-qtbase-dev zlib-dev" +subpackages="$pkgname-dev" +source="quazip-$pkgver.tar.gz::https://github.com/stachenov/quazip/archive/v$pkgver.tar.gz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb quazip-0.8.1.tar.gz" diff --git a/user/rdesktop/APKBUILD b/user/rdesktop/APKBUILD index 2bdffb3c5..51e79ab84 100644 --- a/user/rdesktop/APKBUILD +++ b/user/rdesktop/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rdesktop -pkgver=1.8.4 -pkgrel=1 +pkgver=1.8.6 +pkgrel=0 pkgdesc="Remote Desktop Protocol client" url="https://www.rdesktop.org/" arch="all" @@ -18,14 +18,12 @@ source="https://github.com/rdesktop/rdesktop/releases/download/v$pkgver/rdesktop " prepare() { - cd "$builddir" default_prepare update_config_sub ./bootstrap } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -38,15 +36,13 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae rdesktop-1.8.4.tar.gz -ae91f4e0eb1e2c3141aedef660eb89628b334155c8c0559805cc4ac75274fff94101daf665052b27fe5074ce7468ff854fab865e7efd377d08d525319c7aa150 gssapi.patch +sha512sums="18b918883746c490852b97086e7727d546a0b1902a87515d6ff7b9568f30404a24934ea3ac55c9213d4db7bf5be3b47985490fa0533b15d9d6749d31c77260a6 rdesktop-1.8.6.tar.gz +d55709968b21b64fe33bc1fe90156515e88fe715cbaad6f9c7a15ce4b26e09397821708139748c744ba8bb12f1e751602189317c583ff2017941f39360b4b8cd gssapi.patch e8b4af70a54944d83b7c899aa680042f559e75af3e9a3deb2c7395f8b4a56e50d1c2f26bd10b2377ff577115d635c2aa0fdbddf995588f1d492badfc3e72456e signed-int.patch" diff --git a/user/rdesktop/gssapi.patch b/user/rdesktop/gssapi.patch index 5befcf02e..a24d2b718 100644 --- a/user/rdesktop/gssapi.patch +++ b/user/rdesktop/gssapi.patch @@ -1,38 +1,3 @@ -From 71f1cfb909c0a955632001cf9fad80a321a43372 Mon Sep 17 00:00:00 2001 -From: Pierre Ossman <ossman@cendio.se> -Date: Mon, 10 Jul 2017 15:12:26 +0200 -Subject: [PATCH 1/2] Fix pointer types for gss_wrap()/gss_unrap() - -We were using the incorrect type for the context for these two calls. -No practical effects, but some noise from the compiler about the wrong -pointer type. ---- - cssp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cssp.c b/cssp.c -index 9f4c0829..6ac37746 100644 ---- a/cssp.c -+++ b/cssp.c -@@ -173,7 +173,7 @@ cssp_gss_get_service_name(char *server, gss_name_t * name) - } - - static RD_BOOL --cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in, STREAM out) -+cssp_gss_wrap(gss_ctx_id_t ctx, STREAM in, STREAM out) - { - int conf_state; - OM_uint32 major_status; -@@ -212,7 +212,7 @@ cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in, STREAM out) - } - - static RD_BOOL --cssp_gss_unwrap(gss_ctx_id_t * ctx, STREAM in, STREAM out) -+cssp_gss_unwrap(gss_ctx_id_t ctx, STREAM in, STREAM out) - { - OM_uint32 major_status; - OM_uint32 minor_status; - From b556651fe109c8802a0c798b8a680e5ff883bf4e Mon Sep 17 00:00:00 2001 From: Pierre Ossman <ossman@cendio.se> Date: Mon, 10 Jul 2017 15:14:01 +0200 diff --git a/user/ripgrep/APKBUILD b/user/ripgrep/APKBUILD new file mode 100644 index 000000000..ff5555085 --- /dev/null +++ b/user/ripgrep/APKBUILD @@ -0,0 +1,237 @@ +# Contributor: Gentoo Rust Maintainers <rust@gentoo.org> +# Contributor: Molly Miller <adelie@m-squa.red> +# Maintainer: Samuel Holland <samuel@sholland.org> +pkgname=ripgrep +pkgver=11.0.1 +pkgrel=0 +pkgdesc="Recursively searches directories for a regex pattern" +url="https://github.com/BurntSushi/ripgrep" +arch="all" +license="Unlicense" +makedepends="cargo pcre2-dev" +subpackages="$pkgname-zsh-completion:_zshcomp:noarch" +source="pcre2-static.patch" + +# dependencies taken from Cargo.lock +cargo_deps=" +$pkgname-$pkgver +aho-corasick-0.7.3 +atty-0.2.11 +autocfg-0.1.2 +base64-0.10.1 +bitflags-1.0.4 +bstr-0.1.2 +bytecount-0.5.1 +byteorder-1.3.1 +cc-1.0.35 +cfg-if-0.1.7 +clap-2.33.0 +cloudabi-0.0.3 +crossbeam-channel-0.3.8 +crossbeam-utils-0.6.5 +encoding_rs-0.8.17 +encoding_rs_io-0.1.6 +fnv-1.0.6 +fuchsia-cprng-0.1.1 +glob-0.3.0 +globset-0.4.3 +grep-0.2.4 +grep-cli-0.1.2 +grep-matcher-0.1.2 +grep-pcre2-0.1.3 +grep-printer-0.1.2 +grep-regex-0.1.3 +grep-searcher-0.1.4 +ignore-0.4.7 +itoa-0.4.3 +lazy_static-1.3.0 +libc-0.2.51 +log-0.4.6 +memchr-2.2.0 +memmap-0.7.0 +num_cpus-1.10.0 +packed_simd-0.3.3 +pcre2-0.2.0 +pcre2-sys-0.2.0 +pkg-config-0.3.14 +proc-macro2-0.4.27 +quote-0.6.12 +rand-0.6.5 +rand_chacha-0.1.1 +rand_core-0.3.1 +rand_core-0.4.0 +rand_hc-0.1.0 +rand_isaac-0.1.1 +rand_jitter-0.1.3 +rand_os-0.1.3 +rand_pcg-0.1.2 +rand_xorshift-0.1.1 +rdrand-0.4.0 +redox_syscall-0.1.54 +redox_termios-0.1.1 +regex-1.1.6 +regex-automata-0.1.6 +regex-syntax-0.6.6 +remove_dir_all-0.5.1 +ryu-0.2.7 +same-file-1.0.4 +serde-1.0.90 +serde_derive-1.0.90 +serde_json-1.0.39 +smallvec-0.6.9 +strsim-0.8.0 +syn-0.15.31 +tempfile-3.0.7 +termcolor-1.0.4 +termion-1.5.1 +textwrap-0.11.0 +thread_local-0.3.6 +ucd-util-0.1.3 +unicode-width-0.1.5 +unicode-xid-0.1.0 +utf8-ranges-1.0.2 +walkdir-2.2.7 +winapi-0.3.7 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-util-0.1.2 +winapi-x86_64-pc-windows-gnu-0.4.0 +wincolor-1.0.1 +" + +source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+)-([0-9.]+(-(alpha|beta|rc)[0-9.]+)?)#&.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" + +prepare() { + export CARGO_HOME="$srcdir/cargo-home" + export CARGO_VENDOR="$CARGO_HOME/adelie" + + (builddir=$srcdir; default_prepare) + + mkdir -p "$CARGO_VENDOR" + cat <<- EOF > "$CARGO_HOME/config" + [source.adelie] + directory = "${CARGO_VENDOR}" + + [source.crates-io] + replace-with = "adelie" + local-registry = "/nonexistant" + EOF + + for _dep in $cargo_deps; do + ln -s "$srcdir/$_dep" "$CARGO_VENDOR/$_dep" + _sum=$(sha256sum "$srcdir/$_dep.tar.gz" | cut -d' ' -f1) + cat <<- EOF > "$CARGO_VENDOR/$_dep/.cargo-checksum.json" + { + "package":"$_sum", + "files":{} + } + EOF + done +} + +build() { + export CARGO_HOME="$srcdir/cargo-home" + cargo build -j $JOBS --features pcre2 --release +} + +check() { + export CARGO_HOME="$srcdir/cargo-home" + cargo test -j $JOBS --features pcre2 --release +} + +package() { + export CARGO_HOME="$srcdir/cargo-home" + cargo install --features pcre2 --path . --root="$pkgdir"/usr + rm "$pkgdir"/usr/.crates.toml +} + +_zshcomp() { + pkgdesc="ZSH completion for ripgrep" + license="BSD-3-Clause" + install_if="$pkgname=$pkgver-r$pkgrel zsh" + + install -Dm0755 $builddir/complete/_rg "$subpkgdir"/usr/share/zsh/site-functions/_rg +} + +sha512sums="1c5d7cc31478f850b748356a24a8a2e6a702651dff37a8fb64131096f72ff71e8f01084b70e9af9af1a212d7a095b1c8cab3d9b20d722c284abbbf68fea15412 pcre2-static.patch +91a06a11e94cfd595ac1cc5ed6db481cff8b319de4fb09d1d29e800b60f75a4e696df75f97e0e29d53d7d68fc3fd7cebc5ae16b1329214fb1383d454fb2b0864 ripgrep-11.0.1.tar.gz +4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9 aho-corasick-0.7.3.tar.gz +9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79 atty-0.2.11.tar.gz +0f692f4062d22be01c32af2ceb6ed3887a7d65843e1a6ec696fbaa46517d02e62d573055efe5da3a63847f05bc37b254bf2dd750738b528774f63352eacdabe4 autocfg-0.1.2.tar.gz +674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535 base64-0.10.1.tar.gz +81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de bitflags-1.0.4.tar.gz +93e57b17e06c9f67179e31338a7fd8f69ad7e807955d8483ac781208edf59339e89b8e11223d79b2b640a1679d61e2d4c7ca15ca6fab602b97b8558757f2899b bstr-0.1.2.tar.gz +9017ed0545266c1f55cc9cd65fb63906bc50ea28c8de30770cb618029a605744a5234487766d52c77ded01a8b08c91d08264175eb4f4352e6777ad5d152670a9 bytecount-0.5.1.tar.gz +b8d8273293f776cf567dbb9357e73a65cfd352461963b2ba202959bb48338f5e14eaebb221f940c09dc0b3214924e40194f6952c32631f20a18030ad22258c25 byteorder-1.3.1.tar.gz +6d2c2708d696598e403027b3ee3e4cda4d7119185bdc2ab8c825e36bb2b9f48f40b84392b708100b812ed4a74626b7fef5b3698a9f5513de8f00ff6d922a3f04 cc-1.0.35.tar.gz +30a1510f0a217e588e9a2c1ef51e6188d7437c63641284782262fa9a2ec78f04d0bbdac7ce32c0e8282e2e518d4b6c9d6ed0c2658baac412133ad1cc1f8d43a4 cfg-if-0.1.7.tar.gz +f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz +691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c cloudabi-0.0.3.tar.gz +9b4c4b9345276b0227041a64f7ea4971dcd37ac5a2d404408d7e1875cd9a1318cbbee0cd91d4ba4b73201927ae61cf35382d2c8ef9461f21d71e802d01063583 crossbeam-channel-0.3.8.tar.gz +5bcf3eed8f28d608b675aa4588b133393ced515e2f7fa37b413b34aa5ee550100899d957906dd04fcaee68cea57d2c8f230e06d6903f5ef117c9313d6cdbc2a8 crossbeam-utils-0.6.5.tar.gz +db7a7d469d34feaa899195c336fb9211ee358c226597d0900850fbafac2ee39a89bff253663744ec737a055bf7582e96b9825e96e679da4bb9fb3b0cc59d1453 encoding_rs-0.8.17.tar.gz +ef8e9d93ff5395c0a5dc0f777907632cd2d38cdef4d0b9d4ee0697701a1e4320221605ff699d6c66c0d80c582378ad7ca10a56c3914e8466192189a47c3cd9f9 encoding_rs_io-0.1.6.tar.gz +f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844 fnv-1.0.6.tar.gz +ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 fuchsia-cprng-0.1.1.tar.gz +87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46 glob-0.3.0.tar.gz +255ffa4234c7014fc1de961fabb2a8b8f3285d72f84ac03d89f613467594767ef424b84bccaa4c68ae289ae603de189ddd4c44b0d156680aed1252ef961f748c globset-0.4.3.tar.gz +c6983df9dcc268bc9835173189afc28ffec9dd234a0949389a40629e5644707b7c1b90025882c2580cc5f963fc4902070b191ecc6cacd602fa4c140ee8bdfbd1 grep-0.2.4.tar.gz +1dcfd004cdddd02f4e77e96ca1d75009fb088b3b163c08a484b89d234e5262e655139f5f02c4471f9585e9655423eb7650f68c8ec7f6c316bf63b2e243bd3213 grep-cli-0.1.2.tar.gz +d948460d67f90a6cf289f2d704a3dab05f8005bcc24eb89266b03fc2b2c35f6aa81d73412302de8f48afc2562c8bbf3d0e5b94070bad2ebcc933b4eee8a91e3b grep-matcher-0.1.2.tar.gz +49777885abbf028ac7845d76faf4d1f566d7551e71cdd9788bcc237f110d1f77fb438c42e965ec0b3b2943022acf0fd1b28f7b6e5ed3bf20525476eb9e9aa749 grep-pcre2-0.1.3.tar.gz +a430f24e97e44c56c3faac2e49acb9ad96263614042f007252af944580726c38931f7fa272d0bc26d6d8b99bf47f9d55c3c3014210360f10290c16a6ee151a59 grep-printer-0.1.2.tar.gz +9d84fbbd703653a671340d1ba812331841d1c446f00170bfbe7df7775b9eb398693dea19c55db4a7d0f69de226d7ab73866519a81dfaebb65867a6597891f4d4 grep-regex-0.1.3.tar.gz +de61c95e66ec221005168bf0e855b800bccdef92c1c11153586d4577b286851534050b6976b14d45e3bcb12121085a5a1c4f71a057a3ed22a96b1de343609712 grep-searcher-0.1.4.tar.gz +8db0fcaa966e81b4407700131f3b609165aa3db4fa046410a56f7e4f5a571f5f0bde399b022610f3967f0a640a1da5e268580b6d0e59b6f1be60687f0d3e9685 ignore-0.4.7.tar.gz +da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1 itoa-0.4.3.tar.gz +08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822 lazy_static-1.3.0.tar.gz +d05693e7106e1887d94b23ddff5692111c2164e7ce59d9c60995af2a49fcf03ea8723e837370867c1177315aecdf25be82bf723c5e798ada66f5cc7886c22857 libc-0.2.51.tar.gz +3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb log-0.4.6.tar.gz +19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088 memchr-2.2.0.tar.gz +3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa memmap-0.7.0.tar.gz +a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02 num_cpus-1.10.0.tar.gz +f0198f5c589be082053ae156372ea826c66e31aad993f64af097faf36045f1d1b6cc4b4b46d9cc8a1c7a28e11f707026df6c419a42e2011b1c4a34f579018826 packed_simd-0.3.3.tar.gz +c8d6aa4e357c9b5cc7e8d527a0d0a605378f975f41fe0a5f4996175be1f620e8446bc7e6135927b50bf3687618671ca85bb2a67314b78989818efe30d25d3521 pcre2-0.2.0.tar.gz +23255712188fd517ca9cd0760c6da649006916b6e3b3295bc6078942706d622504da1b2b9c1199cd30208cc48aca08667b23941a357e4ac0f5fd20a1be3daeac pcre2-sys-0.2.0.tar.gz +bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d pkg-config-0.3.14.tar.gz +b1ec1f59355c122022ac93f7ac03ddcc092b8712321f4ad74bf346a0dbea06c31cc695b1edfb735010620ab5eac5c62d3bde423c8458691edd0336127462359c proc-macro2-0.4.27.tar.gz +5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798 quote-0.6.12.tar.gz +2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 rand-0.6.5.tar.gz +200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b rand_chacha-0.1.1.tar.gz +5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz +f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845 rand_core-0.4.0.tar.gz +808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f rand_hc-0.1.0.tar.gz +9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e rand_isaac-0.1.1.tar.gz +a70bb59677bc82b4f0b6549d8907b1cde2e1529435866b9161cbbef28ae79f7edaa4067fc6498800267f944d853940670bdd093d437ca8cc84eb2b0ea6dcd551 rand_jitter-0.1.3.tar.gz +01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 rand_os-0.1.3.tar.gz +6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c rand_pcg-0.1.2.tar.gz +3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 rand_xorshift-0.1.1.tar.gz +6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz +38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e redox_syscall-0.1.54.tar.gz +201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981 redox_termios-0.1.1.tar.gz +f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e regex-1.1.6.tar.gz +2e438167ef10459cb1f7ab7afe0297e3a93e34b8195d631206c804b4fc5498e03df243531df282928fb2b3bc4ab8dd0a15a101f9aa368c104fc24df190e85f14 regex-automata-0.1.6.tar.gz +5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76 regex-syntax-0.6.6.tar.gz +9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928 remove_dir_all-0.5.1.tar.gz +94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4 ryu-0.2.7.tar.gz +bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea same-file-1.0.4.tar.gz +6ad37dc002a7b8db9e38590f70a9dc26a93a82a1f6d9414fc2a45dd2f57b974a947c1a4c350c970f69199de08d5a94cb6ba5b53c0cc7efa817e3442957638a5d serde-1.0.90.tar.gz +50ecd5c54dda7708959a2163e365cff09489489893d421e5dda09bca8a6f824b42722af1eff76fcc93f8b9f507db33019f7eb743301025b3504e19ab3d64d015 serde_derive-1.0.90.tar.gz +7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036 serde_json-1.0.39.tar.gz +2bfd96b6c07a740b77c9d3221604e108bb730770970e7428a2a38d29711dff16eea08251e826d2d511d13a887c3256ec3a689e3c481ddb9029f47452fb2877e2 smallvec-0.6.9.tar.gz +1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 strsim-0.8.0.tar.gz +3c9ded90ae93d4634ddd10d51eaf08d89c5c0b1df67a8425299d9ff61ab09f40f7b0a9f222aedb276b231efd6f3c55776390c0d230fdcaa492167dc056c04ca7 syn-0.15.31.tar.gz +b6fb6a1f4f0f5483255f9672114fa6adf13edd4bfe8f7fbe6c4225a36ccab5b58fc5f5510c50e70746e2697f2cf503b20682e5b44cef0b65b7ffac4ee39529e8 tempfile-3.0.7.tar.gz +cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b termcolor-1.0.4.tar.gz +1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76 termion-1.5.1.tar.gz +f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz +cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253 thread_local-0.3.6.tar.gz +50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e ucd-util-0.1.3.tar.gz +bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2 unicode-width-0.1.5.tar.gz +cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d unicode-xid-0.1.0.tar.gz +ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb utf8-ranges-1.0.2.tar.gz +bf7c06f982383f4ac7c513bfaf18350924d57dfacb1e9469c1600cf578a759714fd51d261b7fa8c49d29293f24ce4075dc84ee267f5559459622fc97939d338c walkdir-2.2.7.tar.gz +6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134 winapi-0.3.7.tar.gz +a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz +54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a winapi-util-0.1.2.tar.gz +4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz +f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1 wincolor-1.0.1.tar.gz" diff --git a/user/ripgrep/pcre2-static.patch b/user/ripgrep/pcre2-static.patch new file mode 100644 index 000000000..180e91b68 --- /dev/null +++ b/user/ripgrep/pcre2-static.patch @@ -0,0 +1,12 @@ +--- src/pcre2-sys-0.2.0/build.rs 2019-06-22 01:43:31.024909528 +0000 ++++ src/pcre2-sys-0.2.0/build.rs 2019-06-22 01:43:43.697401790 +0000 +@@ -64,8 +64,7 @@ + + // Don't link to a system library if we want a static build. + let want_static = +- env::var("PCRE2_SYS_STATIC").unwrap_or(String::new()) == "1" +- || target.contains("musl"); ++ false; + if !want_static && pkg_config::probe_library("libpcre2-8").is_ok() { + return; + } diff --git a/user/ristretto/APKBUILD b/user/ristretto/APKBUILD index 1970f15af..965fde75b 100644 --- a/user/ristretto/APKBUILD +++ b/user/ristretto/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=ristretto pkgver=0.8.4 -pkgrel=0 +pkgrel=1 pkgdesc="Image viewer for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+ AND LGPL-2.0+" makedepends="intltool libexif-dev gtk+2.0-dev libxfce4util-dev libxfce4ui-dev libmagic" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/ristretto/0.8/ristretto-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/ristretto/0.8/ristretto-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index 6370cb46c..bf2b79aaa 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Graph theory IDE" url="https://www.kde.org/applications/education/rocs/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ec4ca3fe066113099a7cd241fc421ce773e17c5f732717d327a1ff08f892a3b438fefc34b18fb87d065342193bff229c51bd5543e86e59f5ac4a257c5b47f909 rocs-19.04.1.tar.xz" +sha512sums="d763877e05686fdd15b6481d079808ecb20c0b27b5e90bb8e9a5bf93e878914f3091f51ce3b99895c633124d03cc0110db7231c0e1e5f54f8b792c532dfdde0d rocs-19.04.2.tar.xz" diff --git a/user/rrdtool/APKBUILD b/user/rrdtool/APKBUILD index f61223adc..bec89b8ca 100644 --- a/user/rrdtool/APKBUILD +++ b/user/rrdtool/APKBUILD @@ -1,19 +1,20 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: pkgname=rrdtool -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=0 pkgdesc="Data logging and graphing application" url="https://oss.oetiker.ch/rrdtool/" arch="all" -options="!check" # Tests fail because of CET time zone begin date changing. license="GPL-2.0+" depends="font-sony-misc" +checkdepends="bc" makedepends="cairo-dev freetype-dev groff libart-lgpl-dev libpng-dev libxml2-dev pango-dev perl-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang perl-rrd:perl_rrd $pkgname-cached $pkgname-cgi $pkgname-utils librrd:libs" source="https://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz + disable-rpn2.patch rrdcached.initd " @@ -33,7 +34,7 @@ build() { check() { cd "$builddir" - make check + LANG=C.UTF-8 LC_ALL=C.UTF-8 TZ=UTC make check } package() { @@ -86,5 +87,6 @@ utils() { "$subpkgdir"/usr/bin } -sha512sums="ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14 rrdtool-1.7.1.tar.gz +sha512sums="453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29 rrdtool-1.7.2.tar.gz +47fbfa1ee974d607c15d7a49b1007ccfb6dcd2764f82236f8741b96fe1c3cdec8535f570116a2b24767e09c018177bd5ace4f2ceb39342b2baf3baec01a35dc1 disable-rpn2.patch c0c27b2c2dfa8e7ec1cb1160d2bda8d7996bbea67f4ce7779da029f583c35e5e415cf46e2a1e5cb8ed2e63d2c58a68fd7471ee6bd820db4c0f4eeeb5c252f8a3 rrdcached.initd" diff --git a/user/rrdtool/disable-rpn2.patch b/user/rrdtool/disable-rpn2.patch new file mode 100644 index 000000000..1baed862c --- /dev/null +++ b/user/rrdtool/disable-rpn2.patch @@ -0,0 +1,35 @@ +https://github.com/oetiker/rrdtool-1.x/issues/1012 +--- rrdtool-1.7.2/tests/Makefile.in.old 2019-05-27 18:46:42.000000000 +0000 ++++ rrdtool-1.7.2/tests/Makefile.in 2019-06-04 06:27:36.143871636 +0000 +@@ -537,7 +537,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + TESTS = modify1 modify2 modify3 modify4 modify5 \ +- tune1 tune2 graph1 rpn1 rpn2 \ ++ tune1 tune2 graph1 rpn1 \ + rrdcreate \ + dump-restore \ + create-with-source-1 create-with-source-2 create-with-source-3 \ +@@ -555,7 +555,7 @@ + rrdcreate \ + tune1-testa-mod1.dump tune1-testa-mod2.dump tune1-testorg.dump \ + tune2-testa-mod1.dump tune2-testorg.dump \ +- valgrind-supressions dcounter1 dcounter1.output graph1.output vformatter1 rpn1.output rpn2.output \ ++ valgrind-supressions dcounter1 dcounter1.output graph1.output vformatter1 rpn1.output \ + xport1.json.output xport1.xml.output \ + pdp-calc1 pdp-calc1-1-avg-60.output pdp-calc1-1-avg-300.output pdp-calc1-1-max-300.output + +@@ -820,13 +820,6 @@ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ +- "$$tst" $(AM_TESTS_FD_REDIRECT) +-rpn2.log: rpn2 +- @p='rpn2'; \ +- b='rpn2'; \ +- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ +- --log-file $$b.log --trs-file $$b.trs \ +- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) + rrdcreate.log: rrdcreate + @p='rrdcreate'; \ diff --git a/user/rrdtool/no-posix-fallocate.patch b/user/rrdtool/no-posix-fallocate.patch deleted file mode 100644 index c34c5a187..000000000 --- a/user/rrdtool/no-posix-fallocate.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- rrdtool-1.4.8.orig/configure.ac -+++ rrdtool-1.4.8/configure.ac -@@ -280,9 +280,6 @@ - #include <fcntl.h>]) - AC_CHECK_FUNCS(posix_fadvise) - --dnl can we use posix_fallocate --AC_CHECK_FUNCS(posix_fallocate) -- - CONFIGURE_PART(Libintl Processing) - - AM_GNU_GETTEXT_VERSION(0.17) diff --git a/user/rsibreak/APKBUILD b/user/rsibreak/APKBUILD index 1096db075..0757ad517 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.9 +pkgver=0.12.10 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/" @@ -17,7 +17,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/rsibreak/0.12/rsibreak-$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="37b193b0fffffcef6ffdb04950f5eb6f2503db3830e0c5142ad820243b4826567d2e4139e14ae2a6bdd08e6c7a0fb5a7b29b627d2dfb10fc7135e9bf86cb6e57 rsibreak-0.12.9.tar.xz" +sha512sums="0e5c5dabe0efa05f53b5a0b5823ef856ca6806ac1a3a1a45f57f236789190718b2ab73af35ee6617a42eb672e06554687dd41f3ab02e9c37d25ef926fee2240c rsibreak-0.12.10.tar.xz" diff --git a/user/ruby-bundler/APKBUILD b/user/ruby-bundler/APKBUILD new file mode 100644 index 000000000..d3c470b51 --- /dev/null +++ b/user/ruby-bundler/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +_gemname=bundler +pkgname=ruby-$_gemname +pkgver=2.0.2 +pkgrel=0 +pkgdesc="Manage an application's gem dependencies" +url="https://bundler.io/" +arch="noarch" +license="MIT" +depends="ruby ruby-dev" +subpackages="$pkgname-doc" +options="!check" +source="https://rubygems.org/downloads/$_gemname-$pkgver.gem" +builddir="$srcdir/$_gemname-$pkgver" + +package() { + local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')" + + gem install --local \ + --install-dir "$gemdir" \ + --bindir "$pkgdir/usr/bin" \ + --ignore-dependencies \ + --no-document \ + --verbose \ + "$srcdir"/$_gemname-$pkgver.gem + + local n; for n in 1 5; do + mkdir -p "$pkgdir"/usr/share/man/man$n + mv "$gemdir"/gems/$_gemname-$pkgver/man/*.$n "$pkgdir"/usr/share/man/man$n/ + done + + rm -rf "$gemdir"/cache \ + "$gemdir"/build_info \ + "$gemdir"/doc \ + "$gemdir"/gems/$_gemname-$pkgver/man \ + "$gemdir"/gems/$_gemname-$pkgver/*.md +} + + +sha512sums="f41fe9e385fbf42859f3514b71abdaa1fd787f4ff4b1169b8ee40ea7778c114657c60ca3d6d6d72fbe972af0558f0cccd9c9f28cad7fc712ada27f037dce8a6a bundler-2.0.2.gem" diff --git a/user/ruby-rspec-core/APKBUILD b/user/ruby-rspec-core/APKBUILD index 34deeb73d..e6f3cc048 100644 --- a/user/ruby-rspec-core/APKBUILD +++ b/user/ruby-rspec-core/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-core _gemname=${pkgname#ruby-} -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=0 pkgdesc="RSpec runner and formatters" -url="https://relishapp.com/rspec/rspec-core/" +url="https://relishapp.com/rspec/rspec-core" arch="noarch" options="!check" # rspec's tests are written in rspec license="MIT" @@ -37,5 +37,5 @@ package() { "$gemdir"/doc } -sha512sums="6d3f431a1f9485009f5029bea967f36cb789be8cf33722b36c40df44e12a2284674c6c8af333bfe8ba8825e032576569fd42c92f798988faad732ac3a720c5e6 ruby-rspec-core-3.8.0.tar.gz +sha512sums="fb9d6098e9c43b0fb0b7344521861c6095bee09d3fcaec526bed7b67f21cdff067a4a913f7cf17af9436587a20caab172670058785f138f50103708475057941 ruby-rspec-core-3.8.1.tar.gz e0cbcfddcc4c73d9b9673907e3b1a785b399c0b3b213761e9dbca9fadc55d50a88389eaf561f5603bd674eb94ce9f2ecf829d884eaa77df8ef1b565c0c7f25f2 gemspec.patch" diff --git a/user/ruby-rspec-expectations/APKBUILD b/user/ruby-rspec-expectations/APKBUILD index 1cf7cf5cc..ab3808053 100644 --- a/user/ruby-rspec-expectations/APKBUILD +++ b/user/ruby-rspec-expectations/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-expectations _gemname=${pkgname#ruby-} -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=0 pkgdesc="Provides a readable API to express expected outcomes of a code example in RSpec" url="https://relishapp.com/rspec/rspec-expectations/" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="328b3403e7ac2864ed6ad1a196ca24df6693797e35525559f2082c7e1c161d60da7776ca1a68a82364a7ea55115ac2c12ebf6af8486ef88757a4818a9683ae80 ruby-rspec-expectations-3.8.3.tar.gz +sha512sums="0ecb16f11ccf19c02c40ce587f33846fb2241f1663dd87f012b9b782338c213362dac624c434dee6e00ad2cc7ec4a1cd0af7f2edf1a8e9ebb0a0dfb31cd244d8 ruby-rspec-expectations-3.8.4.tar.gz 1d477004521852e23d01b197187dbb434a2c7fd179e506c82a12e17f5d52470fe2a113112e7052b9479077eafa6759beb07c03301de1f8ea7f5c4643c92d8346 gemspec.patch" diff --git a/user/ruby-rspec-mocks/APKBUILD b/user/ruby-rspec-mocks/APKBUILD index 70a6b801c..314915d92 100644 --- a/user/ruby-rspec-mocks/APKBUILD +++ b/user/ruby-rspec-mocks/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-mocks _gemname=${pkgname#ruby-} -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=0 pkgdesc="RSpec's 'test double' framework, with support for stubbing and mocking" url="https://relishapp.com/rspec/rspec-mocks/" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="0649c3722479013aa1a20f750b3a83a9b426e5f79cb0edff995b09d1e2fa674fb8e91c0c94e7f9513f338c3c2e9c5b824a9473e91955cf928542324b8b1463ba ruby-rspec-mocks-3.8.0.tar.gz +sha512sums="ec71c4b815beef315f8db329bd2b0e60cdbb1fa37939c624799c1589d94dd28f74b3d1a4c0b9025bc98a809f80d625315458351fe7dec8291bad20e79beecca8 ruby-rspec-mocks-3.8.1.tar.gz 6fd7ab08b20a93f806a8d3c42da5da0a99162793079ecb1695341a04dff2a7cefdb12592d1798fb844dfbdf8ead6ad0b8729e461d3cd5af46d853b182d15228d gemspec.patch" diff --git a/user/ruby-rspec-support/APKBUILD b/user/ruby-rspec-support/APKBUILD index ba2389e72..12c754fc0 100644 --- a/user/ruby-rspec-support/APKBUILD +++ b/user/ruby-rspec-support/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-support _gemname=${pkgname#ruby-} -pkgver=3.8.0 +pkgver=3.8.2 pkgrel=0 pkgdesc="Support utilities for RSpec gems" -url="https://relishapp.com/rspec/rspec-support/" +url="https://rubygems.org/gems/rspec-support" arch="noarch" options="!check" # rspec's tests are written in rspec license="MIT" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="e16cc7bcc3de797e78c4f6ed475b0e60d492d0442dc048b4b2769a4819b80d1fb4a12aefaee3cc6a35f08d35f5fea82e00cc0fcf04363e57e74a6f5ed73d0693 ruby-rspec-support-3.8.0.tar.gz +sha512sums="9fb9f8f2507edee5e7c414d32c1641803eed7a5e17fd300308449277ec6efb786f07207d8f28bcea0a669b8d76a2da53057488d149990ae973c0f7a0343180dc ruby-rspec-support-3.8.2.tar.gz e9d611ea1789e835f742aa92f1e668840139e2621898edf158dc53e111db4119a324da65d2d28f5c6e737c82f261f4adb3beb8c244ee01d2f618778ed62d3731 gemspec.patch" diff --git a/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch b/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch index bb20cb7b6..f6a0ddb6b 100644 --- a/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch +++ b/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch @@ -1,33 +1,23 @@ -From 6861c8305fc6449fdc019405d501e5740d44b818 Mon Sep 17 00:00:00 2001 +From 600b7bb76d82d2ec180051318d811ad50fd68900 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Wed, 10 Jan 2018 13:36:41 -0600 -Subject: [PATCH 01/14] Don't pass CFLAGS to the C++ compiler +Subject: [PATCH 01/13] Don't pass CFLAGS to the C++ compiler --- - src/bootstrap/builder.rs | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) + src/bootstrap/builder.rs | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index 9c58f5b179..bbb275c572 100644 +index 522466314d..86f059a202 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs -@@ -1037,7 +1037,7 @@ impl<'a> Builder<'a> { - let cflags = self.cflags(target, GitRepo::Rustc).join(" "); - cargo - .env(format!("CFLAGS_{}", target), cflags.clone()) -- .env("CFLAGS", cflags.clone()); -+ .env("CFLAGS", cflags); - - if let Some(ar) = self.ar(target) { - let ranlib = format!("{} s", ar.display()); -@@ -1052,9 +1052,7 @@ impl<'a> Builder<'a> { +@@ -1098,8 +1098,7 @@ impl<'a> Builder<'a> { + if let Ok(cxx) = self.cxx(target) { let cxx = ccacheify(&cxx); cargo - .env(format!("CXX_{}", target), &cxx) -- .env("CXX", &cxx) -- .env(format!("CXXFLAGS_{}", target), cflags.clone()) -- .env("CXXFLAGS", cflags); -+ .env("CXX", &cxx); +- .env(format!("CXX_{}", target), &cxx) +- .env(format!("CXXFLAGS_{}", target), cflags); ++ .env(format!("CXX_{}", target), &cxx); } } diff --git a/user/rust/0002-Fix-LLVM-build.patch b/user/rust/0002-Fix-LLVM-build.patch index 7d12e84d3..8b035a02d 100644 --- a/user/rust/0002-Fix-LLVM-build.patch +++ b/user/rust/0002-Fix-LLVM-build.patch @@ -1,17 +1,17 @@ -From d44d2ca85013e85b2b72940609131d1229647461 Mon Sep 17 00:00:00 2001 +From 1359f28a3d69943ff8bcd28d0dcca4c68200ff6a Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Fri, 8 Sep 2017 00:04:29 -0500 -Subject: [PATCH 02/14] Fix LLVM build +Subject: [PATCH 02/13] Fix LLVM build --- src/bootstrap/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index 7491385af7..74c04bac6b 100644 +index fb60b470a3..71ca61d97e 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs -@@ -772,7 +772,8 @@ impl Build { +@@ -783,7 +783,8 @@ impl Build { // cc-rs because the build scripts will determine that for themselves. let mut base = self.cc[&target].args().iter() .map(|s| s.to_string_lossy().into_owned()) diff --git a/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch b/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch index c1cb5e930..1d51af2d9 100644 --- a/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch +++ b/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch @@ -1,18 +1,18 @@ -From 520ceedb4a6384da5c207aa434a29d68fc8e238a Mon Sep 17 00:00:00 2001 +From d4b81fe2c052ddd6776da36b035dbe2c2564689b Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Sat, 2 Dec 2017 17:25:44 -0600 -Subject: [PATCH 03/14] Allow rustdoc to work when cross-compiling on musl +Subject: [PATCH 03/13] Allow rustdoc to work when cross-compiling on musl musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH. --- - src/bootstrap/bin/rustdoc.rs | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) + src/bootstrap/bin/rustdoc.rs | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs -index dec74e60c7..af76331db0 100644 +index 1c9f6e1ab2..7e90be8d8c 100644 --- a/src/bootstrap/bin/rustdoc.rs +++ b/src/bootstrap/bin/rustdoc.rs -@@ -24,9 +24,6 @@ fn main() { +@@ -23,9 +23,6 @@ fn main() { Err(_) => 0, }; @@ -22,15 +22,24 @@ index dec74e60c7..af76331db0 100644 //FIXME(misdreavus): once stdsimd uses cfg(rustdoc) instead of cfg(dox), remove the `--cfg dox` //arguments here let mut cmd = Command::new(rustdoc); -@@ -38,7 +35,7 @@ fn main() { +@@ -37,7 +34,7 @@ fn main() { .arg("--sysroot") - .arg(sysroot) + .arg(&sysroot) .env(bootstrap::util::dylib_path_var(), - env::join_paths(&dylib_path).unwrap()); + PathBuf::from(libdir.clone())); // Force all crates compiled by this compiler to (a) be unstable and (b) // allow the `rustc_private` feature to link to other unstable crates +@@ -86,7 +83,7 @@ fn main() { + eprintln!( + "rustdoc command: {:?}={:?} {:?}", + bootstrap::util::dylib_path_var(), +- env::join_paths(&dylib_path).unwrap(), ++ PathBuf::from(libdir.clone()), + cmd, + ); + eprintln!("sysroot: {:?}", sysroot); -- 2.21.0 diff --git a/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch b/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch index 6ec5eb76f..a1ee6c661 100644 --- a/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch +++ b/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch @@ -1,42 +1,48 @@ -From 46e6ead56b2899d9041fe73c1530b7f02df2ca40 Mon Sep 17 00:00:00 2001 +From 7f7ea1cba86a15510de2410529c8460fc5b7018b Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Fri, 8 Sep 2017 00:05:18 -0500 -Subject: [PATCH 04/14] Require static native libraries when linking static +Subject: [PATCH 04/13] Require static native libraries when linking static executables -gcc/ld will create a dynamically-linked executable without warning, even -when passed `-static`, when asked to link to a `.so`. Avoid this -confusing and unintended behavior by always using the static version of -libraries when trying to link static executables. +On ELF targets like Linux, gcc/ld will create a dynamically-linked +executable without warning, even when passed `-static`, when asked to +link to a `.so`. Avoid this confusing and unintended behavior by always +using the static version of libraries when trying to link static +executables. Fixes #54243 --- - src/librustc_codegen_llvm/back/link.rs | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) + src/librustc_codegen_llvm/back/link.rs | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/librustc_codegen_llvm/back/link.rs b/src/librustc_codegen_llvm/back/link.rs -index fc744201a3..bae8b6ed75 100644 +index 19419a72b9..9d26dd0b35 100644 --- a/src/librustc_codegen_llvm/back/link.rs +++ b/src/librustc_codegen_llvm/back/link.rs -@@ -1413,8 +1413,8 @@ fn add_upstream_rust_crates(cmd: &mut dyn Linker, +@@ -1408,9 +1408,7 @@ fn add_upstream_rust_crates(cmd: &mut dyn Linker, } } -// Link in all of our upstream crates' native dependencies. Remember that -// all of these upstream native dependencies are all non-static -+// Link in all of our upstream crates' native dependencies. Remember that when -+// linking libraries, these upstream native dependencies are all non-static - // dependencies. We've got two cases then: +-// dependencies. We've got two cases then: ++// Link in all of our upstream crates' native dependencies. We have two cases: // // 1. The upstream crate is an rlib. In this case we *must* link in the -@@ -1458,7 +1458,14 @@ fn add_upstream_native_libraries(cmd: &mut dyn Linker, + // native dependency because the rlib is just an archive. +@@ -1453,7 +1451,19 @@ fn add_upstream_native_libraries(cmd: &mut dyn Linker, continue } match lib.kind { - NativeLibraryKind::NativeUnknown => cmd.link_dylib(&name.as_str()), + NativeLibraryKind::NativeUnknown => { -+ // When creating executables, match library linkage to that of the executable. -+ if crate_type == config::CrateType::Executable && sess.crt_static() { ++ // On some targets, like Linux, linking a static executable inhibits using ++ // dylibs at all. Force native libraries to be static, even if for example ++ // an upstream rlib was originally linked against a native shared library. ++ if crate_type == config::CrateType::Executable ++ && sess.crt_static() ++ && !sess.target.target.options.crt_static_allows_dylibs ++ { + cmd.link_staticlib(&name.as_str()) + } else { + cmd.link_dylib(&name.as_str()) diff --git a/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch index 6053de26b..4d70e7084 100644 --- a/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch +++ b/user/rust/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch @@ -1,13 +1,13 @@ -From 5d98731bae319172c5fbfd8235f62bb00acb3a7d Mon Sep 17 00:00:00 2001 +From 121e89f649b1cfe3c18dc622279dc5a79873fcdb Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Fri, 8 Sep 2017 22:11:14 -0500 -Subject: [PATCH 05/14] Remove -nostdlib and musl_root from musl targets +Subject: [PATCH 05/13] Remove -nostdlib and musl_root from musl targets --- config.toml.example | 6 ---- - src/bootstrap/bin/rustc.rs | 12 -------- + src/bootstrap/bin/rustc.rs | 10 ------- src/bootstrap/cc_detect.rs | 27 ++---------------- - src/bootstrap/compile.rs | 21 -------------- + src/bootstrap/compile.rs | 21 +------------- src/bootstrap/config.rs | 7 ----- src/bootstrap/configure.py | 22 --------------- src/bootstrap/lib.rs | 8 ------ @@ -15,14 +15,15 @@ Subject: [PATCH 05/14] Remove -nostdlib and musl_root from musl targets .../dist-i586-gnu-i586-i686-musl/Dockerfile | 2 -- src/ci/docker/dist-various-1/Dockerfile | 7 ----- src/ci/docker/dist-x86_64-musl/Dockerfile | 1 - + src/ci/docker/test-various/Dockerfile | 1 - src/librustc_target/spec/linux_musl_base.rs | 16 ----------- - 12 files changed, 3 insertions(+), 154 deletions(-) + 13 files changed, 4 insertions(+), 152 deletions(-) diff --git a/config.toml.example b/config.toml.example -index 23943d34b7..5eace54c6b 100644 +index 8b2153cd2e..b8145ce8d5 100644 --- a/config.toml.example +++ b/config.toml.example -@@ -461,12 +461,6 @@ +@@ -474,12 +474,6 @@ # only use static libraries. If unset, the target's default linkage is used. #crt-static = false @@ -32,27 +33,19 @@ index 23943d34b7..5eace54c6b 100644 -# linked binaries -#musl-root = "..." - - # Used in testing for configuring where the QEMU images are located, you - # probably don't want to use this. - #qemu-rootfs = "..." + # The root location of the `wasm32-unknown-wasi` sysroot. + #wasi-root = "..." + diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs -index a0c75cd9e9..f8daab9bd1 100644 +index a76584093f..8a534ab8e2 100644 --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs -@@ -20,7 +20,6 @@ - extern crate bootstrap; - - use std::env; --use std::ffi::OsString; - use std::io; - use std::path::PathBuf; - use std::process::Command; -@@ -116,17 +115,6 @@ fn main() { +@@ -122,16 +122,6 @@ fn main() { cmd.arg("-Cprefer-dynamic"); } -- // Help the libc crate compile by assisting it in finding the MUSL -- // native libraries. +- // Help the libc crate compile by assisting it in finding various +- // sysroot native libraries. - if let Some(s) = env::var_os("MUSL_ROOT") { - if target.contains("musl") { - let mut root = OsString::from("native="); @@ -61,15 +54,14 @@ index a0c75cd9e9..f8daab9bd1 100644 - cmd.arg("-L").arg(&root); - } - } -- - // Override linker if necessary. - if let Ok(target_linker) = env::var("RUSTC_TARGET_LINKER") { - cmd.arg(format!("-Clinker={}", target_linker)); + if let Some(s) = env::var_os("WASI_ROOT") { + let mut root = OsString::from("native="); + root.push(&s); diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs -index 37844759c7..fa553c0b06 100644 +index dfc243b705..848d1d4b2b 100644 --- a/src/bootstrap/cc_detect.rs +++ b/src/bootstrap/cc_detect.rs -@@ -85,7 +85,7 @@ pub fn find(build: &mut Build) { +@@ -84,7 +84,7 @@ pub fn find(build: &mut Build) { if let Some(cc) = config.and_then(|c| c.cc.as_ref()) { cfg.compiler(cc); } else { @@ -78,7 +70,7 @@ index 37844759c7..fa553c0b06 100644 } let compiler = cfg.get_compiler(); -@@ -114,7 +114,7 @@ pub fn find(build: &mut Build) { +@@ -113,7 +113,7 @@ pub fn find(build: &mut Build) { if let Some(cxx) = config.and_then(|c| c.cxx.as_ref()) { cfg.compiler(cxx); } else { @@ -87,7 +79,7 @@ index 37844759c7..fa553c0b06 100644 } let compiler = cfg.get_compiler(); build.verbose(&format!("CXX_{} = {:?}", host, compiler.path())); -@@ -125,8 +125,7 @@ pub fn find(build: &mut Build) { +@@ -124,8 +124,7 @@ pub fn find(build: &mut Build) { fn set_compiler(cfg: &mut cc::Build, compiler: Language, target: Interned<String>, @@ -97,7 +89,7 @@ index 37844759c7..fa553c0b06 100644 match &*target { // When compiling for android we may have the NDK configured in the // config.toml in which case we look there. Otherwise the default -@@ -166,26 +165,6 @@ fn set_compiler(cfg: &mut cc::Build, +@@ -165,26 +164,6 @@ fn set_compiler(cfg: &mut cc::Build, } } @@ -125,11 +117,11 @@ index 37844759c7..fa553c0b06 100644 } } diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index b581271663..21421b2e38 100644 +index 66443d472d..bbaa32a91c 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs -@@ -114,21 +114,6 @@ impl Step for Std { - fn copy_third_party_objects(builder: &Builder, compiler: &Compiler, target: Interned<String>) { +@@ -114,20 +114,7 @@ impl Step for Std { + fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target: Interned<String>) { let libdir = builder.sysroot_libdir(*compiler, target); - // Copies the crt(1,i,n).o startup objects @@ -145,29 +137,29 @@ index b581271663..21421b2e38 100644 - &libdir.join(obj), - ); - } -- } -- - // Copies libunwind.a compiled to be linked wit x86_64-fortanix-unknown-sgx. - // - // This target needs to be linked to Fortanix's port of llvm's libunwind. -@@ -182,12 +167,6 @@ pub fn std_cargo(builder: &Builder, - cargo.arg("--features").arg(features) +- } else if target.ends_with("-wasi") { ++ if target.ends_with("-wasi") { + for &obj in &["crt1.o"] { + builder.copy( + &builder.wasi_root(target).unwrap().join("lib/wasm32-wasi").join(obj), +@@ -190,12 +177,6 @@ pub fn std_cargo(builder: &Builder<'_>, .arg("--manifest-path") .arg(builder.src.join("src/libstd/Cargo.toml")); -- + - if target.contains("musl") { - if let Some(p) = builder.musl_root(target) { - cargo.env("MUSL_ROOT", p); - } - } - } - } - +- + if target.ends_with("-wasi") { + if let Some(p) = builder.wasi_root(target) { + cargo.env("WASI_ROOT", p); diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs -index 9421817ae6..cd70c1a1e4 100644 +index 0c31c41ced..b8c690fc41 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs -@@ -128,8 +128,6 @@ pub struct Config { +@@ -133,8 +133,6 @@ pub struct Config { pub print_step_timings: bool, pub missing_tools: bool, @@ -176,15 +168,15 @@ index 9421817ae6..cd70c1a1e4 100644 pub prefix: Option<PathBuf>, pub sysconfdir: Option<PathBuf>, pub datadir: Option<PathBuf>, -@@ -164,7 +162,6 @@ pub struct Target { +@@ -169,7 +167,6 @@ pub struct Target { pub linker: Option<PathBuf>, pub ndk: Option<PathBuf>, pub crt_static: Option<bool>, - pub musl_root: Option<PathBuf>, + pub wasi_root: Option<PathBuf>, pub qemu_rootfs: Option<PathBuf>, pub no_std: bool, - } -@@ -296,7 +293,6 @@ struct Rust { +@@ -306,7 +303,6 @@ struct Rust { backtrace: Option<bool>, default_linker: Option<String>, channel: Option<String>, @@ -192,35 +184,35 @@ index 9421817ae6..cd70c1a1e4 100644 rpath: Option<bool>, optimize_tests: Option<bool>, debuginfo_tests: Option<bool>, -@@ -335,7 +331,6 @@ struct TomlTarget { +@@ -346,7 +342,6 @@ struct TomlTarget { linker: Option<String>, android_ndk: Option<String>, crt_static: Option<bool>, - musl_root: Option<String>, + wasi_root: Option<String>, qemu_rootfs: Option<String>, } - -@@ -549,7 +544,6 @@ impl Config { +@@ -566,7 +561,6 @@ impl Config { set(&mut config.llvm_tools_enabled, rust.llvm_tools); - config.rustc_parallel_queries = rust.experimental_parallel_queries.unwrap_or(false); + config.rustc_parallel = rust.parallel_compiler.unwrap_or(false); config.rustc_default_linker = rust.default_linker.clone(); - config.musl_root = rust.musl_root.clone().map(PathBuf::from); config.save_toolstates = rust.save_toolstates.clone().map(PathBuf::from); set(&mut config.deny_warnings, rust.deny_warnings.or(flags.warnings)); set(&mut config.backtrace_on_ice, rust.backtrace_on_ice); -@@ -592,7 +586,6 @@ impl Config { +@@ -609,7 +603,6 @@ impl Config { target.ranlib = cfg.ranlib.clone().map(PathBuf::from); target.linker = cfg.linker.clone().map(PathBuf::from); target.crt_static = cfg.crt_static.clone(); - target.musl_root = cfg.musl_root.clone().map(PathBuf::from); + target.wasi_root = cfg.wasi_root.clone().map(PathBuf::from); target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from); - config.target_config.insert(INTERNER.intern_string(triple.clone()), target); diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py -index b0c3c97024..5128897bf7 100755 +index ade8afee7c..f9ccf7aed5 100755 --- a/src/bootstrap/configure.py +++ b/src/bootstrap/configure.py -@@ -105,28 +105,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk", +@@ -111,28 +111,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk", "aarch64-linux-android NDK standalone path") v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk", "x86_64-linux-android NDK standalone path") @@ -250,10 +242,10 @@ index b0c3c97024..5128897bf7 100755 "rootfs in qemu testing, you probably don't want to use this") v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs", diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index 74c04bac6b..aa91600ea7 100644 +index 71ca61d97e..3b53029a79 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs -@@ -849,14 +849,6 @@ impl Build { +@@ -861,14 +861,6 @@ impl Build { } } @@ -265,14 +257,14 @@ index 74c04bac6b..aa91600ea7 100644 - .map(|p| &**p) - } - - /// Returns true if this is a no-std `target`, if defined - fn no_std(&self, target: Interned<String>) -> Option<bool> { + /// Returns the sysroot for the wasi target, if defined + fn wasi_root(&self, target: Interned<String>) -> Option<&Path> { self.config.target_config.get(&target) diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs -index fe547a6b15..a452c874c4 100644 +index b9f456e910..792c975333 100644 --- a/src/bootstrap/sanity.rs +++ b/src/bootstrap/sanity.rs -@@ -169,34 +169,6 @@ pub fn check(build: &mut Build) { +@@ -171,34 +171,6 @@ pub fn check(build: &mut Build) { } } @@ -321,10 +313,10 @@ index ba2d32a929..412c37fdd1 100644 --disable-docs diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile -index ab2dd5a399..a9569fe6d4 100644 +index a722a41839..44e6728de7 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile -@@ -128,13 +128,6 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \ +@@ -132,13 +132,6 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \ CXX_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ ENV RUST_CONFIGURE_ARGS \ @@ -339,22 +331,34 @@ index ab2dd5a399..a9569fe6d4 100644 --disable-docs diff --git a/src/ci/docker/dist-x86_64-musl/Dockerfile b/src/ci/docker/dist-x86_64-musl/Dockerfile -index 06f8a2fbba..f5dd379528 100644 +index 21a9023a45..db7c9729d0 100644 --- a/src/ci/docker/dist-x86_64-musl/Dockerfile +++ b/src/ci/docker/dist-x86_64-musl/Dockerfile -@@ -30,7 +30,6 @@ COPY scripts/sccache.sh /scripts/ +@@ -29,7 +29,6 @@ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh ENV RUST_CONFIGURE_ARGS \ -- --musl-root-x86_64=/musl-x86_64 \ +- --musl-root-x86_64=/usr/local/x86_64-linux-musl \ --enable-extended \ --disable-docs +diff --git a/src/ci/docker/test-various/Dockerfile b/src/ci/docker/test-various/Dockerfile +index 611a24a69b..99c2b866b1 100644 +--- a/src/ci/docker/test-various/Dockerfile ++++ b/src/ci/docker/test-various/Dockerfile +@@ -31,7 +31,6 @@ COPY scripts/sccache.sh /scripts/ + RUN sh /scripts/sccache.sh + + ENV RUST_CONFIGURE_ARGS \ +- --musl-root-x86_64=/usr/local/x86_64-linux-musl \ + --set build.nodejs=/node-v9.2.0-linux-x64/bin/node \ + --set rust.lld + diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs -index 1bc90d1a73..e26a5240a6 100644 +index e294e63982..58ae91a96a 100644 --- a/src/librustc_target/spec/linux_musl_base.rs +++ b/src/librustc_target/spec/linux_musl_base.rs -@@ -3,28 +3,12 @@ use spec::{LinkerFlavor, TargetOptions}; +@@ -3,28 +3,12 @@ use crate::spec::{LinkerFlavor, TargetOptions}; pub fn opts() -> TargetOptions { let mut base = super::linux_base::opts(); diff --git a/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch index f7f7ccd3e..38065f96c 100644 --- a/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch +++ b/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch @@ -1,14 +1,14 @@ -From eb2340bd8c8d9e79eb4bb231ccb31cd4e4bba907 Mon Sep 17 00:00:00 2001 +From e74e7ab193b0d59302eac1edbab423f2e83e986d Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Sat, 9 Sep 2017 00:14:16 -0500 -Subject: [PATCH 06/14] Prefer libgcc_eh over libunwind for musl +Subject: [PATCH 06/13] Prefer libgcc_eh over libunwind for musl --- src/libunwind/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs -index 7ed7837268..2f38a43845 100644 +index 0ccffea317..935175dd8d 100644 --- a/src/libunwind/lib.rs +++ b/src/libunwind/lib.rs @@ -26,6 +26,6 @@ cfg_if! { diff --git a/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch b/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch index 6435eeef0..b8fa40308 100644 --- a/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch +++ b/user/rust/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch @@ -1,25 +1,25 @@ -From e60db771c8ffe7b82a97ca516737cbf40b372e54 Mon Sep 17 00:00:00 2001 +From cd7484e89d44ad980a526eb993c5cbc2b7f0878a Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Sun, 16 Sep 2018 16:40:04 +0000 -Subject: [PATCH 07/14] runtest: Fix proc-macro tests on musl hosts +Subject: [PATCH 07/13] runtest: Fix proc-macro tests on musl hosts --- src/tools/compiletest/src/runtest.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs -index 400c205d44..be5c50b070 100644 +index 2021dd513a..765353620b 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs -@@ -1566,7 +1566,6 @@ impl<'test> TestCx<'test> { +@@ -1605,7 +1605,6 @@ impl<'test> TestCx<'test> { None } else if self.config.target.contains("cloudabi") || self.config.target.contains("emscripten") - || (self.config.target.contains("musl") && !aux_props.force_host) || self.config.target.contains("wasm32") + || self.config.target.contains("nvptx") { - // We primarily compile all auxiliary libraries as dynamic libraries -@@ -1574,10 +1573,8 @@ impl<'test> TestCx<'test> { +@@ -1614,10 +1613,8 @@ impl<'test> TestCx<'test> { // for the test suite (otherwise including libstd statically in all // executables takes up quite a bit of space). // diff --git a/user/rust/0008-test-enum-debug-Correct-minimum-LLVM-version.patch b/user/rust/0008-test-enum-debug-Correct-minimum-LLVM-version.patch deleted file mode 100644 index dddaf75bf..000000000 --- a/user/rust/0008-test-enum-debug-Correct-minimum-LLVM-version.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 8dbda1b85a15b04300f73eb30c1e2da196750cfb Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Fri, 22 Mar 2019 17:08:06 -0500 -Subject: [PATCH 08/14] test/enum-debug*: Correct minimum LLVM version - ---- - src/test/codegen/enum-debug-clike.rs | 2 +- - src/test/codegen/enum-debug-niche-2.rs | 2 +- - src/test/codegen/enum-debug-niche.rs | 2 +- - src/test/codegen/enum-debug-tagged.rs | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/test/codegen/enum-debug-clike.rs b/src/test/codegen/enum-debug-clike.rs -index 98f07505f7..11e2fae596 100644 ---- a/src/test/codegen/enum-debug-clike.rs -+++ b/src/test/codegen/enum-debug-clike.rs -@@ -4,7 +4,7 @@ - - // ignore-tidy-linelength - // ignore-windows --// min-system-llvm-version 7.0 -+// min-system-llvm-version 8.0 - - // compile-flags: -g -C no-prepopulate-passes - -diff --git a/src/test/codegen/enum-debug-niche-2.rs b/src/test/codegen/enum-debug-niche-2.rs -index 369fa1fcfd..aa6cbf66b4 100644 ---- a/src/test/codegen/enum-debug-niche-2.rs -+++ b/src/test/codegen/enum-debug-niche-2.rs -@@ -4,7 +4,7 @@ - - // ignore-tidy-linelength - // ignore-windows --// min-system-llvm-version 7.0 -+// min-system-llvm-version 8.0 - - // compile-flags: -g -C no-prepopulate-passes - -diff --git a/src/test/codegen/enum-debug-niche.rs b/src/test/codegen/enum-debug-niche.rs -index 1273a785ba..93eebde7b8 100644 ---- a/src/test/codegen/enum-debug-niche.rs -+++ b/src/test/codegen/enum-debug-niche.rs -@@ -4,7 +4,7 @@ - - // ignore-tidy-linelength - // ignore-windows --// min-system-llvm-version 7.0 -+// min-system-llvm-version 8.0 - - // compile-flags: -g -C no-prepopulate-passes - -diff --git a/src/test/codegen/enum-debug-tagged.rs b/src/test/codegen/enum-debug-tagged.rs -index 5c37e40c27..84976ce97a 100644 ---- a/src/test/codegen/enum-debug-tagged.rs -+++ b/src/test/codegen/enum-debug-tagged.rs -@@ -4,7 +4,7 @@ - - // ignore-tidy-linelength - // ignore-windows --// min-system-llvm-version 7.0 -+// min-system-llvm-version 8.0 - - // compile-flags: -g -C no-prepopulate-passes - --- -2.21.0 - diff --git a/user/rust/0009-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/user/rust/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch index da9d25537..0fefe38cc 100644 --- a/user/rust/0009-test-use-extern-for-plugins-Don-t-assume-multilib.patch +++ b/user/rust/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch @@ -1,19 +1,19 @@ -From b7fdd2b4b192e1ac7e59fe009e7b7bba8943c8dc Mon Sep 17 00:00:00 2001 +From 6ad7add8f7dee0f6dac64add5d64098667a5168d Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Sat, 6 Oct 2018 04:01:48 +0000 -Subject: [PATCH 09/14] test/use-extern-for-plugins: Don't assume multilib +Subject: [PATCH 08/13] test/use-extern-for-plugins: Don't assume multilib --- src/test/run-make-fulldeps/use-extern-for-plugins/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile -index cc7bc176f4..36553f1e44 100644 +index 3976da3113..567a8d3157 100644 --- a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile +++ b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile -@@ -4,12 +4,7 @@ SKIP_OS := 'FreeBSD OpenBSD Bitrig SunOS' - - ifneq ($(UNAME),$(findstring $(UNAME),$(SKIP_OS))) +@@ -5,12 +5,7 @@ + # ignore-bitrig + # ignore-sunos -HOST := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //') -ifeq ($(findstring i686,$(HOST)),i686) diff --git a/user/rust/0010-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/user/rust/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch index ff49416e0..3c0bc7c5e 100644 --- a/user/rust/0010-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch +++ b/user/rust/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch @@ -1,7 +1,7 @@ -From 4ca0a1760317d3029bfcb0e6253252b926ef92ce Mon Sep 17 00:00:00 2001 +From fb4844f8b8a546873b909490b66bde24772e4cc7 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Mon, 17 Sep 2018 01:32:20 +0000 -Subject: [PATCH 10/14] test/sysroot-crates-are-unstable: Fix test when rpath +Subject: [PATCH 09/13] test/sysroot-crates-are-unstable: Fix test when rpath is disabled Without this environment var, the test can't run rustc to find diff --git a/user/rust/0010-Ignore-broken-and-non-applicable-tests.patch b/user/rust/0010-Ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 000000000..f1349b906 --- /dev/null +++ b/user/rust/0010-Ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,104 @@ +From 44e9b61563be6a169575358107774109f910cb9d Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 10/13] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +simd-intrinsic-generic-select.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + src/test/codegen/sparc-struct-abi.rs | 1 + + src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile | 2 ++ + src/test/run-make-fulldeps/long-linker-command-lines/Makefile | 2 ++ + src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 ++ + src/test/run-pass/env-funky-keys.rs | 1 + + src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs | 2 ++ + src/test/run-pass/simd/simd-intrinsic-generic-select.rs | 2 ++ + 7 files changed, 12 insertions(+) + +diff --git a/src/test/codegen/sparc-struct-abi.rs b/src/test/codegen/sparc-struct-abi.rs +index 78e5b14a21..6f93e93286 100644 +--- a/src/test/codegen/sparc-struct-abi.rs ++++ b/src/test/codegen/sparc-struct-abi.rs +@@ -4,6 +4,7 @@ + + // only-sparc64 + // compile-flags: -O --target=sparc64-unknown-linux-gnu --crate-type=rlib ++// ignore-test + #![feature(no_core, lang_items)] + #![no_core] + +diff --git a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile +index f124ca2ab6..363b18f098 100644 +--- a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile ++++ b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile +@@ -1,3 +1,5 @@ ++# ignore-aarch64 ++ + -include ../tools.mk + + all: +diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile +index 5876fbc94b..5f167ece1a 100644 +--- a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile ++++ b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile +@@ -1,3 +1,5 @@ ++# ignore-test ++ + -include ../tools.mk + + all: +diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +index 9e77070685..6d92ec5cec 100644 +--- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile ++++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +@@ -1,3 +1,5 @@ ++# ignore-test ++ + -include ../tools.mk + + all: +diff --git a/src/test/run-pass/env-funky-keys.rs b/src/test/run-pass/env-funky-keys.rs +index 79f32bd6c2..fc171687c9 100644 +--- a/src/test/run-pass/env-funky-keys.rs ++++ b/src/test/run-pass/env-funky-keys.rs +@@ -1,5 +1,6 @@ + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs b/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs +index b28f742a92..3ee4ccce73 100644 +--- a/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs ++++ b/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs +@@ -2,6 +2,8 @@ + #![allow(non_camel_case_types)] + + // ignore-emscripten ++// ignore-powerpc ++// ignore-powerpc64 + + // Test that the simd_bitmask intrinsic produces correct results. + +diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-select.rs b/src/test/run-pass/simd/simd-intrinsic-generic-select.rs +index f79b140494..39080c8c90 100644 +--- a/src/test/run-pass/simd/simd-intrinsic-generic-select.rs ++++ b/src/test/run-pass/simd/simd-intrinsic-generic-select.rs +@@ -2,6 +2,8 @@ + #![allow(non_camel_case_types)] + + // ignore-emscripten ++// ignore-powerpc ++// ignore-powerpc64 + + // Test that the simd_select intrinsics produces correct results. + +-- +2.21.0 + diff --git a/user/rust/0011-Ignore-broken-and-non-applicable-tests.patch b/user/rust/0011-Ignore-broken-and-non-applicable-tests.patch deleted file mode 100644 index ebf711f77..000000000 --- a/user/rust/0011-Ignore-broken-and-non-applicable-tests.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 63a413a24f98461476aac7ac7ead69c948874e7d Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Sun, 16 Sep 2018 16:38:48 +0000 -Subject: [PATCH 11/14] Ignore broken and non-applicable tests - -long-linker-command-lines: takes >10 minutes to run (but still passes) -sparc-struct-abi: no sparc target -sysroot-crates-are-unstable: can't run rustc without rpath ---- - src/test/codegen/sparc-struct-abi.rs | 1 + - src/test/run-make-fulldeps/long-linker-command-lines/Makefile | 1 - - src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 +- - src/test/run-pass/simd/simd-intrinsic-generic-select.rs | 2 ++ - 4 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/test/codegen/sparc-struct-abi.rs b/src/test/codegen/sparc-struct-abi.rs -index 78e5b14a21..6f93e93286 100644 ---- a/src/test/codegen/sparc-struct-abi.rs -+++ b/src/test/codegen/sparc-struct-abi.rs -@@ -4,6 +4,7 @@ - - // only-sparc64 - // compile-flags: -O --target=sparc64-unknown-linux-gnu --crate-type=rlib -+// ignore-test - #![feature(no_core, lang_items)] - #![no_core] - -diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile -index 5876fbc94b..e9f5c33b77 100644 ---- a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile -+++ b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile -@@ -2,4 +2,3 @@ - - all: - $(RUSTC) foo.rs -g -O -- RUSTC="$(RUSTC_ORIGINAL)" $(call RUN,foo) -diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -index 9e77070685..7784230b46 100644 ---- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -+++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -@@ -1,4 +1,4 @@ - -include ../tools.mk - - all: -- env '$(HOST_RPATH_ENV)' python2.7 test.py -+ true -diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-select.rs b/src/test/run-pass/simd/simd-intrinsic-generic-select.rs -index f79b140494..39080c8c90 100644 ---- a/src/test/run-pass/simd/simd-intrinsic-generic-select.rs -+++ b/src/test/run-pass/simd/simd-intrinsic-generic-select.rs -@@ -2,6 +2,8 @@ - #![allow(non_camel_case_types)] - - // ignore-emscripten -+// ignore-powerpc -+// ignore-powerpc64 - - // Test that the simd_select intrinsics produces correct results. - --- -2.21.0 - diff --git a/user/rust/0012-Link-stage-2-tools-dynamically-to-libstd.patch b/user/rust/0011-Link-stage-2-tools-dynamically-to-libstd.patch index 8d37b335c..e46aeac77 100644 --- a/user/rust/0012-Link-stage-2-tools-dynamically-to-libstd.patch +++ b/user/rust/0011-Link-stage-2-tools-dynamically-to-libstd.patch @@ -1,14 +1,14 @@ -From 51b5ec642911295036d4ff19d4d6799037da3efc Mon Sep 17 00:00:00 2001 +From 91549d8c4f37fd0756d2b95fffcb7055acb663d1 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Mon, 24 Sep 2018 23:42:23 +0000 -Subject: [PATCH 12/14] Link stage 2 tools dynamically to libstd +Subject: [PATCH 11/13] Link stage 2 tools dynamically to libstd --- src/bootstrap/tool.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs -index 9f6db73e6f..69cc2219c1 100644 +index 23775a91e4..d79fede548 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -208,7 +208,9 @@ pub fn prepare_tool_cargo( diff --git a/user/rust/0013-Move-debugger-scripts-to-usr-share-rust.patch b/user/rust/0012-Move-debugger-scripts-to-usr-share-rust.patch index a401dc5ab..449abc0cf 100644 --- a/user/rust/0013-Move-debugger-scripts-to-usr-share-rust.patch +++ b/user/rust/0012-Move-debugger-scripts-to-usr-share-rust.patch @@ -1,7 +1,7 @@ -From 17bb016bf9eefb42e1205b5f8d7b944147337f24 Mon Sep 17 00:00:00 2001 +From 6ebe128c3440ee224fed5e0a2b8897df21ed55f2 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Mon, 17 Sep 2018 02:09:10 +0000 -Subject: [PATCH 13/14] Move debugger scripts to /usr/share/rust +Subject: [PATCH 12/13] Move debugger scripts to /usr/share/rust --- src/bootstrap/dist.rs | 2 +- @@ -10,11 +10,11 @@ Subject: [PATCH 13/14] Move debugger scripts to /usr/share/rust 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index 0c6e213110..1858fade71 100644 +index 61a7705bd6..920e0ad1f1 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs -@@ -583,7 +583,7 @@ impl Step for DebuggerScripts { - fn run(self, builder: &Builder) { +@@ -597,7 +597,7 @@ impl Step for DebuggerScripts { + fn run(self, builder: &Builder<'_>) { let host = self.host; let sysroot = self.sysroot; - let dst = sysroot.join("lib/rustlib/etc"); diff --git a/user/rust/0014-Add-foxkit-target-specs.patch b/user/rust/0013-Add-foxkit-target-specs.patch index ecbfe26b5..c0e8cd4a2 100644 --- a/user/rust/0014-Add-foxkit-target-specs.patch +++ b/user/rust/0013-Add-foxkit-target-specs.patch @@ -1,17 +1,17 @@ -From 2ca1aeb3cb3e0d52917cec2a96101aba5c6e40ce Mon Sep 17 00:00:00 2001 +From fcf56fefa4b75f24430f69477d8cca8ee758fa41 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Mon, 17 Sep 2018 02:29:06 +0000 -Subject: [PATCH 14/14] Add foxkit target specs +Subject: [PATCH 13/13] Add foxkit target specs --- - .../spec/aarch64_foxkit_linux_musl.rs | 21 +++++++++++++++++ - .../spec/armv7_foxkit_linux_musleabihf.rs | 21 +++++++++++++++++ - .../spec/i586_foxkit_linux_musl.rs | 23 +++++++++++++++++++ - src/librustc_target/spec/mod.rs | 7 ++++++ - .../spec/powerpc64_foxkit_linux_musl.rs | 21 +++++++++++++++++ - .../spec/powerpc_foxkit_linux_musl.rs | 23 +++++++++++++++++++ - .../spec/x86_64_foxkit_linux_musl.rs | 21 +++++++++++++++++ - 7 files changed, 137 insertions(+) + .../spec/aarch64_foxkit_linux_musl.rs | 11 +++++++++++ + .../spec/armv7_foxkit_linux_musleabihf.rs | 11 +++++++++++ + src/librustc_target/spec/i586_foxkit_linux_musl.rs | 13 +++++++++++++ + src/librustc_target/spec/mod.rs | 7 +++++++ + .../spec/powerpc64_foxkit_linux_musl.rs | 11 +++++++++++ + .../spec/powerpc_foxkit_linux_musl.rs | 13 +++++++++++++ + .../spec/x86_64_foxkit_linux_musl.rs | 11 +++++++++++ + 7 files changed, 77 insertions(+) create mode 100644 src/librustc_target/spec/aarch64_foxkit_linux_musl.rs create mode 100644 src/librustc_target/spec/armv7_foxkit_linux_musleabihf.rs create mode 100644 src/librustc_target/spec/i586_foxkit_linux_musl.rs @@ -21,21 +21,11 @@ Subject: [PATCH 14/14] Add foxkit target specs diff --git a/src/librustc_target/spec/aarch64_foxkit_linux_musl.rs b/src/librustc_target/spec/aarch64_foxkit_linux_musl.rs new file mode 100644 -index 0000000000..18ad2c2f31 +index 0000000000..9ba8bc1deb --- /dev/null +++ b/src/librustc_target/spec/aarch64_foxkit_linux_musl.rs -@@ -0,0 +1,21 @@ -+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT -+// file at the top-level directory of this distribution and at -+// http://rust-lang.org/COPYRIGHT. -+// -+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -+// option. This file may not be copied, modified, or distributed -+// except according to those terms. -+ -+use spec::TargetResult; +@@ -0,0 +1,11 @@ ++use crate::spec::TargetResult; + +pub fn target() -> TargetResult { + let mut base = super::aarch64_unknown_linux_musl::target()?; @@ -48,21 +38,11 @@ index 0000000000..18ad2c2f31 +} diff --git a/src/librustc_target/spec/armv7_foxkit_linux_musleabihf.rs b/src/librustc_target/spec/armv7_foxkit_linux_musleabihf.rs new file mode 100644 -index 0000000000..facfd5d363 +index 0000000000..5a88f77896 --- /dev/null +++ b/src/librustc_target/spec/armv7_foxkit_linux_musleabihf.rs -@@ -0,0 +1,21 @@ -+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT -+// file at the top-level directory of this distribution and at -+// http://rust-lang.org/COPYRIGHT. -+// -+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -+// option. This file may not be copied, modified, or distributed -+// except according to those terms. -+ -+use spec::TargetResult; +@@ -0,0 +1,11 @@ ++use crate::spec::TargetResult; + +pub fn target() -> TargetResult { + let mut base = super::armv7_unknown_linux_musleabihf::target()?; @@ -75,21 +55,11 @@ index 0000000000..facfd5d363 +} diff --git a/src/librustc_target/spec/i586_foxkit_linux_musl.rs b/src/librustc_target/spec/i586_foxkit_linux_musl.rs new file mode 100644 -index 0000000000..e0284d96e6 +index 0000000000..f0c4ffbf58 --- /dev/null +++ b/src/librustc_target/spec/i586_foxkit_linux_musl.rs -@@ -0,0 +1,23 @@ -+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT -+// file at the top-level directory of this distribution and at -+// http://rust-lang.org/COPYRIGHT. -+// -+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -+// option. This file may not be copied, modified, or distributed -+// except according to those terms. -+ -+use spec::{LinkerFlavor, TargetResult}; +@@ -0,0 +1,13 @@ ++use crate::spec::{LinkerFlavor, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::i586_unknown_linux_musl::target()?; @@ -103,10 +73,10 @@ index 0000000000..e0284d96e6 + Ok(base) +} diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs -index f42b0a1c3c..f83be3e4e3 100644 +index 46fefd78f4..7cdcb319c6 100644 --- a/src/librustc_target/spec/mod.rs +++ b/src/librustc_target/spec/mod.rs -@@ -278,6 +278,13 @@ macro_rules! supported_targets { +@@ -329,6 +329,13 @@ macro_rules! supported_targets { } supported_targets! { @@ -122,21 +92,11 @@ index f42b0a1c3c..f83be3e4e3 100644 ("i686-unknown-linux-gnu", i686_unknown_linux_gnu), diff --git a/src/librustc_target/spec/powerpc64_foxkit_linux_musl.rs b/src/librustc_target/spec/powerpc64_foxkit_linux_musl.rs new file mode 100644 -index 0000000000..b7202ee0fc +index 0000000000..b105aa247e --- /dev/null +++ b/src/librustc_target/spec/powerpc64_foxkit_linux_musl.rs -@@ -0,0 +1,21 @@ -+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT -+// file at the top-level directory of this distribution and at -+// http://rust-lang.org/COPYRIGHT. -+// -+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -+// option. This file may not be copied, modified, or distributed -+// except according to those terms. -+ -+use spec::TargetResult; +@@ -0,0 +1,11 @@ ++use crate::spec::TargetResult; + +pub fn target() -> TargetResult { + let mut base = super::powerpc64_unknown_linux_musl::target()?; @@ -149,21 +109,11 @@ index 0000000000..b7202ee0fc +} diff --git a/src/librustc_target/spec/powerpc_foxkit_linux_musl.rs b/src/librustc_target/spec/powerpc_foxkit_linux_musl.rs new file mode 100644 -index 0000000000..34246a7e28 +index 0000000000..a425f472aa --- /dev/null +++ b/src/librustc_target/spec/powerpc_foxkit_linux_musl.rs -@@ -0,0 +1,23 @@ -+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT -+// file at the top-level directory of this distribution and at -+// http://rust-lang.org/COPYRIGHT. -+// -+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -+// option. This file may not be copied, modified, or distributed -+// except according to those terms. -+ -+use spec::{LinkerFlavor, TargetResult}; +@@ -0,0 +1,13 @@ ++use crate::spec::{LinkerFlavor, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::powerpc_unknown_linux_musl::target()?; @@ -178,21 +128,11 @@ index 0000000000..34246a7e28 +} diff --git a/src/librustc_target/spec/x86_64_foxkit_linux_musl.rs b/src/librustc_target/spec/x86_64_foxkit_linux_musl.rs new file mode 100644 -index 0000000000..801dd8d6f4 +index 0000000000..40adbd77b3 --- /dev/null +++ b/src/librustc_target/spec/x86_64_foxkit_linux_musl.rs -@@ -0,0 +1,21 @@ -+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT -+// file at the top-level directory of this distribution and at -+// http://rust-lang.org/COPYRIGHT. -+// -+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -+// option. This file may not be copied, modified, or distributed -+// except according to those terms. -+ -+use spec::TargetResult; +@@ -0,0 +1,11 @@ ++use crate::spec::TargetResult; + +pub fn target() -> TargetResult { + let mut base = super::x86_64_unknown_linux_musl::target()?; diff --git a/user/rust/0030-libc-linkage.patch b/user/rust/0030-libc-linkage.patch index 754074355..2454acdb3 100644 --- a/user/rust/0030-libc-linkage.patch +++ b/user/rust/0030-libc-linkage.patch @@ -1,23 +1,33 @@ ---- a/vendor/libc/src/unix/mod.rs -+++ b/vendor/libc/src/unix/mod.rs -@@ -287,11 +287,7 @@ cfg_if! { +--- rustc-1.35.0-src/vendor/libc/src/lib.rs ++++ rustc-1.35.0-src/vendor/libc/src/lib.rs +@@ -26,6 +26,7 @@ + #![deny(missing_copy_implementations, safe_packed_borrows)] + #![no_std] + #![cfg_attr(feature = "rustc-dep-of-std", no_core)] ++#![cfg_attr(feature = "rustc-dep-of-std", feature(static_nobundle))] + + #[macro_use] + mod macros; +--- rustc-1.35.0-src/vendor/libc/src/unix/mod.rs ++++ rustc-1.35.0-src/vendor/libc/src/unix/mod.rs +@@ -307,11 +307,11 @@ cfg_if! { // cargo build, don't pull in anything extra as the libstd dep // already pulls in all libs. } else if #[cfg(target_env = "musl")] { -- #[cfg_attr(feature = "rustc-dep-of-std", ++ #[link(name = "c")] ++ extern {} + #[cfg_attr(feature = "rustc-dep-of-std", - link(name = "c", kind = "static", -- cfg(target_feature = "crt-static")))] ++ link(name = "gcc", kind = "static-nobundle", + cfg(target_feature = "crt-static")))] - #[cfg_attr(feature = "rustc-dep-of-std", - link(name = "c", cfg(not(target_feature = "crt-static"))))] -+ #[link(name = "c")] extern {} } else if #[cfg(target_os = "emscripten")] { #[link(name = "c")] -diff --git rustc-1.33.0-src/vendor/libc/.cargo-checksum.json.orig rustc-1.33.0-src/vendor/libc/.cargo-checksum.json -index b580eeb..4f3a87d 100644 ---- rustc-1.33.0-src/vendor/libc/.cargo-checksum.json.orig -+++ rustc-1.33.0-src/vendor/libc/.cargo-checksum.json +--- rustc-1.35.0-src/vendor/libc/.cargo-checksum.json ++++ rustc-1.35.0-src/vendor/libc/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"Cargo.toml":"e1bbf88a55a1ba674f5192fe1585b57a51751ee6c5aa7edeb87df8027c3bb912","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"40ddea9181e5374cf535aae33ad4ace80bd9b1beea8f881ff8d2b777da9489b2","build.rs":"2d1cbe87e0478de12a15a230d7ef0997020ba845b5b7d221d74cd2ce3fe0e720","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"640375751825b8d4adf4fb089a53c4d883f265f96b07daf06f2dcf3acf6639c9","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75fe9e88c4bcf4d836ca9f765c05c9c5be3","src/dox.rs":"b4b96dcba47797a6160c07f29982dd15d48fd2813d7d1000484bd9adc4a89de1","src/fuchsia/aarch64.rs":"40dce617877e606e92353491e1913711b1ecfa510bb983156f4a8460f490419e","src/fuchsia/mod.rs":"784dee21605f00a41d7cae1fc3d782646a84515a687a4952700eae51cc3840f0","src/fuchsia/x86_64.rs":"b4a3eff94dcf1ffe41e6500468ca2cff0e97ddbcc75fe079b6ac7adb1e493f56","src/lib.rs":"d456d34fc58c8d194f8f24201b4021860f61c5f125904bb8dcc954d1f813f6b7","src/macros.rs":"29d61c13523328c4742a7290dbb7d718ce198740824592e029199e9df5429b20","src/redox/mod.rs":"87cb35a988be84d45e79206f7cb5d098e8e7c5a1825cfcd0bd663453dedc3103","src/redox/net.rs":"f2e1922883f208cb46c00744da4a68feccfbec576c6981978ad404e46f818c8b","src/sgx.rs":"18d33a470d06c15b00be5a3bf45b6e51da6104ae7437f50c0eccbd3b79994389","src/switch.rs":"00365ed196519b260fc99a32f02d60b3fb1aaf0484654b19fec8c25bc1687420","src/unix/bsd/apple/b32.rs":"da60c99ee3d773f9c0767b93ccf18b67ad67576e2c58e2e86d05b23c23fd989a","src/unix/bsd/apple/b64.rs":"0cc15406c3a91abde65b28c7783ccab7801474ecc51c78dbd1d7332d4b834390","src/unix/bsd/apple/mod.rs":"b0e2d1f7fdb71d7a02bc5994c66a5ae660955227a0c0f808172a30b38fd40299","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"6c69319675328d4d16939c9c2aba3fb8ca9381a8b390d18d766949307090304b","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"97132e2097411034271b8c927ecc94a208a361564680972a6c82998bd30a9826","src/unix/bsd/freebsdlike/freebsd/mod.rs":"6bbb3c3cf0753f32a2e61ac0f011a6c5e870a0814a6ed4eb9bb9dcdc58a9dca3","src/unix/bsd/freebsdlike/freebsd/x86.rs":"54311d3ebf2bb091ab22361e377e6ef9224aec2ecfe459fbfcedde4932db9c58","src/unix/bsd/freebsdlike/freebsd/x86_64.rs":"97132e2097411034271b8c927ecc94a208a361564680972a6c82998bd30a9826","src/unix/bsd/freebsdlike/mod.rs":"596def64669e2f27cffebca8e5c682ee7d576f84f8f99771c27e86ce8e818221","src/unix/bsd/mod.rs":"0c846b3a2c9390dfe090603f1ad643b107cc7e7605866c5399aa81dfea4e74bd","src/unix/bsd/netbsdlike/mod.rs":"9f55f35f8e4e26c7c63eaf67ddda0e40cc2abbabc2a68750809162e6f80144f1","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"f455848cd03cb80897776f2355dbd14bbb3aa88b1aa6aec22122ec47cdbd0f20","src/unix/bsd/netbsdlike/netbsd/arm.rs":"4c9eac982c385165f475ef3a80770fd634c6dde8fb400b3cb7e08c9bb7498af6","src/unix/bsd/netbsdlike/netbsd/mod.rs":"88617ada3bc740c5262926b9c45d7f51120d358522f051f0afdf7465edd13c29","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"183818c62dff72db6ee1d329d90ad8727628775ed5cd823c8485c6769003c91e","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"4db043327fb2615af2fb0f999d162310bea2294e7d050806e19a46b083561f16","src/unix/bsd/netbsdlike/netbsd/x86.rs":"979c4cbacbde37b9053f2c9df4b8f87d37b255436ef4a383e1e5f40ee21180d6","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"741353a1c6451efb0c7c7c486fd2cb54e3d36fd1c3dd280f6432d8858b0a5356","src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs":"4d2ad2e885d83ad3134add61580f49a8e58cb03284ae328273a9e2e104a4d084","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86_64.rs":"6e6f15e81597d85d83ca0eeb154e4f8b8e7f9cbb6a9cfa176601f78642ef94f9","src/unix/bsd/netbsdlike/openbsdlike/mod.rs":"6320b7bc7283dbc2a07cfb8b5a793c0153535601d050f33c1ff5e4a5cc57c2be","src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs":"820092e397c7ec259cd2de8f2444083a8e57071c02d73d678701dfa7807726e9","src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs":"6adc0dcb1b358ef91bbeb5512e19ba6f40adc77b7d259cb11641a69426fc5ea2","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs":"44b7ea81cf363777b29935da175e702cbf45ed78f7498ae57faf44aa32335085","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs":"97956c3a53aa07a2edf8865252f980dade0d34e930adca0e870e7344d7e2b0bb","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"b00fa310b6d835cb613a02101c7b1a72c636faec316586587cb63aebdcb9de8f","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"248c0b0abaa7d56a7dc3293e67a0ce70a4ef8c83638bda8aa222ad8bb0ef6801","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/mod.rs":"c5f3c6d74ac8e8ef83374b6115bab7c6e57297336a7635aa4c47462649b00dfb","src/unix/newlib/aarch64/mod.rs":"c408a990f22fb4292a824f38367e9b517e6e6f8623328397ee631cc88b3d1f7d","src/unix/newlib/arm/mod.rs":"2b6dba2e697ab9b4f4bc4dd5f28057249e9b596d1cb395a9322ec87605c4a5c4","src/unix/newlib/mod.rs":"eea5f1eb720184d9a00be966e4161fddb3733362fc349182e85b1599ba4e825f","src/unix/notbsd/android/b32/arm.rs":"3625a32c7e58cfe683a53486fbe3d42d4e28f00bea31e19cb46ed2bb0b6a140b","src/unix/notbsd/android/b32/mod.rs":"2fbe398c1fb5251dda6213741a193e50aae4622807cb255d1dd2e82b536f0c65","src/unix/notbsd/android/b32/x86.rs":"ae2b7f1d6278caddc007749bb1d09ca33f7593478a0fd7fe98b457dae86c7814","src/unix/notbsd/android/b64/aarch64.rs":"63d65629d79371814910f691672ef593d20244ee09be26f1ebe07ee6212d0163","src/unix/notbsd/android/b64/mod.rs":"90d4f6b063fd4de42fd302cbc9d9902fd99ac1d71dc48cb8bc6ad7b4c902e481","src/unix/notbsd/android/b64/x86_64.rs":"5547aef8dcbaa5a932559f34606fd8d89f6c9c15173d2b1412c12d39b3c1045f","src/unix/notbsd/android/mod.rs":"19013f41ac8ccac034eb48777a4041d69342edb9ca25d4e0bb9c5938f62eef3e","src/unix/notbsd/emscripten.rs":"9ed47a0a5020c8f72d9496f87ef0da669c1ed2b85980013100c466f18cd8a4c5","src/unix/notbsd/linux/mips/mips32.rs":"a483ddfd10765b7d5090dc21686eee8842649cd21236828a42d634114885f5f9","src/unix/notbsd/linux/mips/mips64.rs":"9fff696e3943cf206b549d1ae13fa361828e9a8454e2d5730eeaa1c172ff370d","src/unix/notbsd/linux/mips/mod.rs":"d18a40011e9090a4a2a1f27e5bd96eb2503ac352f4809648e15841083d7f3a68","src/unix/notbsd/linux/mod.rs":"d84e95d36f9477fa1aa694bf18a919ba20e65aa71539c3f3dc06e8f92acee521","src/unix/notbsd/linux/musl/b32/arm.rs":"fdf170e03812072785ec531f1ae810d0c4feb9b29d0c316681b9f7affe1262c0","src/unix/notbsd/linux/musl/b32/mips.rs":"afa4981d93f29b3fb0083a73ce1323f7dce1392f90d5cf1966b1fae10d510033","src/unix/notbsd/linux/musl/b32/mod.rs":"540928f168f145c136f9dd729ffa12b9d1838d9fe664fc642365d17d7fae648f","src/unix/notbsd/linux/musl/b32/powerpc.rs":"16c615770a96f155540511f58b5a8070c9c7a43e12bdfed83996690e7558bcb5","src/unix/notbsd/linux/musl/b32/x86.rs":"3abf1610c68c37f407cdd0f93563c3542c024219e0e8c9888266a6ee014e0c87","src/unix/notbsd/linux/musl/b64/aarch64.rs":"d98643408c2837387988f78adc95c90ad21196a6f8f879e3d33d7e8ccf612640","src/unix/notbsd/linux/musl/b64/mod.rs":"d9285cd705e2e92552a08c9aa69b810e7e1bd0e9da6edf069c678af285579661","src/unix/notbsd/linux/musl/b64/powerpc64.rs":"544d8a7f6d6d84143df8a4c3537c9a3a36bf3d338d7a1c15689b94492498d8d7","src/unix/notbsd/linux/musl/b64/x86_64.rs":"25340999290a63d564ec149532c905f59c312ec369f8806d6b15df66fa1b8857","src/unix/notbsd/linux/musl/mod.rs":"4e582af62a11e8a5235ccbeabe5b1003fc17705e606c1ed9b21b931a470681fc","src/unix/notbsd/linux/other/b32/arm.rs":"d9892f7350b2978335f734f1cd2d7fed60f0f2e66aa05bee3f69549c031f8b14","src/unix/notbsd/linux/other/b32/mod.rs":"26211878c6481861e11393625620edaa0700cac41f55f0118c0f0bd42c1b7520","src/unix/notbsd/linux/other/b32/powerpc.rs":"253fcd2f9978525285be1903cc08f3fec2dc3b12d1660a33e2995b4f6b810d1c","src/unix/notbsd/linux/other/b32/x86.rs":"49376e3ed0f3ff95c230ac20751911fe3c608dfe15c7c118b069fd7a954d8db9","src/unix/notbsd/linux/other/b64/aarch64.rs":"1124ab5e974718b94fa40ae0f1772fb1c537910ef3e018b7c6c94a38b83dd742","src/unix/notbsd/linux/other/b64/mod.rs":"63e1a3fdf5f4d1b9820934ab344c91aed5e458e7e05908535d2e942d51a08bf8","src/unix/notbsd/linux/other/b64/not_x32.rs":"fa8636fb93eab230ed53bdec0a06f5b81d6d982cc0800103563c8c1eefcdb2d9","src/unix/notbsd/linux/other/b64/powerpc64.rs":"a771d982ed8a9458e1f2f039f959b5075b22443159875ba5612eebba96661c24","src/unix/notbsd/linux/other/b64/sparc64.rs":"0caffe5924886f3aed187531dfe78189b3df40adb96782ec4b471647ff83e9b1","src/unix/notbsd/linux/other/b64/x32.rs":"06a26c5120ced30fc015c220799b67c4401be2f13fc6c7361bebd3d37ff4982d","src/unix/notbsd/linux/other/b64/x86_64.rs":"70d0cec088630502128c1c28ffef9dcc0fd9c0644f6a71b1325961d075625226","src/unix/notbsd/linux/other/mod.rs":"fe76beac87fc549b076078a0fa3e2ecd4c13b0e6e4fcb34a89e16c6584f5259b","src/unix/notbsd/linux/s390x.rs":"9e990574dfc22b6eb91bcc7c6f8297f9ad42f9183efb366a818be88180a3fac3","src/unix/notbsd/mod.rs":"a0fdecac118b70fb670f0fcccaa7f826440873448a96dd557fb1fe52cf391e89","src/unix/solaris/mod.rs":"7950a26f3eb0b7bc8e71f524cc2e05832b759fe2ce12a58e0c1957e0ec1286dc","src/unix/uclibc/mips/mips32.rs":"9739c5fb47f389a0394ef08ee30da97a3de0a1300020731a8cc0a033616011b2","src/unix/uclibc/mips/mips64.rs":"230583280bbc7b3c7fcdb61244f51fa1af5944ca127c7cf83c598fe2313713d0","src/unix/uclibc/mips/mod.rs":"2d76e6cfeb2b7f7c59231a6e099f1aed811a45659e62153aaf00c220b9488a9d","src/unix/uclibc/mod.rs":"521818507cef958376edfd8401c35db7ee1c51ee3cf106ad962002104a184cf5","src/unix/uclibc/x86_64/l4re.rs":"68fd3a833fd1f7caf784a084224f384bdbdfb8b5a14ef94c4f5155409afb3439","src/unix/uclibc/x86_64/mod.rs":"419182836aedd426a5c9e6b8667058adf86ac8f43af73ce8d00c503f8ff8f414","src/unix/uclibc/x86_64/other.rs":"f03b47842896f2f3ae6f8ebdcbcf0276454f880349d9cf00e3d304f8136893c5","src/windows/gnu.rs":"4d9033162cc6f7d245256c7b165c1ec18a741771fd9b99a55b421e8d14978599","src/windows/mod.rs":"7d74b12f71de86ee517a9cd93b1b38d0551646db0eaf526048abcbdd4bbeb250","src/windows/msvc.rs":"8f46cf66883c794175609a3b2bafaa094d0ba63eb6720ef1b84b175603f1074f"},"package":"023a4cd09b2ff695f9734c1934145a315594b7986398496841c7031a5a1bbdbd"} +-{"files":{"CONTRIBUTING.md":"abc79e7f6c3eee37e21baca32847b6709c973f4995b32892e80deb56b73c9ac5","Cargo.toml":"c150fb3c5d9159cce669ff588684190f7b177d3aec39c543625a714d6630b9e5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"35582cfa483e7676b25ae4a07064a19443f4942f5e60e43b91632fcd6ae95156","build.rs":"e9b7364366a5b4caa9daa436ab8a3469532fe63d5fae4d3b2e5ff59d32ff3f3a","rustfmt.toml":"8a654d5787585ca8f2c20580737336fc327f411a07b0dbd4870adf6e9bdf624f","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"037c1a3160ae3bc336f6f7135476704e7f5e834e4039fa02b37f03b507118945","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75fe9e88c4bcf4d836ca9f765c05c9c5be3","src/fuchsia/aarch64.rs":"40dce617877e606e92353491e1913711b1ecfa510bb983156f4a8460f490419e","src/fuchsia/align.rs":"9ca6271f2cbb0e6ca3b48ff6898ecee31c89b3c8388ae20be63e457aabad13a5","src/fuchsia/mod.rs":"fcadc9203451d5c04c36044f8b4cda7f64815c180446e87dbd02fbf7e6fda0f2","src/fuchsia/no_align.rs":"56868534e4ed3f94a27ed39c42f01210c8ecfdbafd4e27679860fbc65a2ae8de","src/fuchsia/x86_64.rs":"911d1249370cf1b0b7b38960cae28af1276f0f614cfcbf5174dbaa38be3dff1d","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"9d764e53df81416a5182b71a26402d2071fc0c15160103b6670b6b268fc356da","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"b0d525e3da42b1fde74356f3856e9054254eaefb260c2da8a253b025754c8770","src/macros.rs":"8232e284068d34336713535595fad3c910093346be32e72bde3d3d03327ec6b8","src/redox/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/redox/mod.rs":"34f132e794dc25bbb0e3c08b7f87e4508ce62e0aac00acf39dcdb0f246d7dfc0","src/redox/net.rs":"351960c3a3ad9b296fe43533cac429434e0872c8cca5ad5047dce79d82e009ee","src/redox/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/sgx.rs":"7ff2fbf3e5ad1c880014d68e012f4381a9b9140d13089193b9fba07a7f27c352","src/switch.rs":"fe1414ca053b73cf8a5f54448e807abe81c776c6ac0dfe47ea7772c8140f50b6","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32.rs":"0095a17e49fa423cab8644c722a375b88f5c0cf56fa456b549738d98131bb2f9","src/unix/bsd/apple/b64.rs":"99fbd3e6d2c969080631e23f58deffa51cb3f42b7a08395b49556f19bb40d4e1","src/unix/bsd/apple/mod.rs":"e1959b482dc3c1703eb032b5d6e269c434326dc3eae9f99bb88d51c732cd3df0","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"2cb0a5d10a3c5721d10209ad7ddc59f6756b2c1d4bc89450988053efad788eb6","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"4dcd712c0dd5470171746071a176391f937de7865dd0792173284992d9e3f2c7","src/unix/bsd/freebsdlike/freebsd/arm.rs":"84cf36223f0229cb383036563a4902731543e89b37e4dfe2f450cced566d8545","src/unix/bsd/freebsdlike/freebsd/mod.rs":"0752dc1097fd5e94aabfe7b6d4ead2b94e5c0540e2cd3c8efee883bba13e1a0c","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"9873f41843cbf066f6ffab8eeb63115095f81ce9fa8f337b95ec871e40c6565d","src/unix/bsd/freebsdlike/freebsd/x86.rs":"716cb67cd0aea66d4a8e40470d32b55cbfafddf75edd34a90f70d518c8c75457","src/unix/bsd/freebsdlike/freebsd/x86_64.rs":"dd3d8a546730f09b1ef0dfeeb20244eef01d1b4028799b28b3a0c33ae05d5002","src/unix/bsd/freebsdlike/mod.rs":"2938bb8b0a0f1d66912bdb4bac3e59863bd90787fe49e1d3a522098acfdb2b7a","src/unix/bsd/mod.rs":"0e92970853a9efbb51a17b9cb8009eb4e9a04cbf12d0e315659d240812c1e760","src/unix/bsd/netbsdlike/mod.rs":"77b85ecd2187df55466663f6af624416d9c99922065c6fbd0438d5b7063db89c","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"b38fc046f9a40fea28bd26328b96629f4d5d63d7524936bd6af1865d401a8716","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"75adb8d6ee202d50487913c245e1a880447582f45e1ef6339743305a13fb5719","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"135509edeaf3fb3f102d89d51ff1a8f82323497336a8dc7e1f0f23b5c2434b73","src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs":"51dd68ca3c3eab0f1fe496b0dc12ad8b85f8cf964af0c2c95ab9834ad03938a8","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86_64.rs":"6e6f15e81597d85d83ca0eeb154e4f8b8e7f9cbb6a9cfa176601f78642ef94f9","src/unix/bsd/netbsdlike/openbsdlike/mod.rs":"c8d18b725c62c2f1a3c5e42d875e1a3b167c13a1bd6ae3d35f35a6ec29402f81","src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs":"ee0057fb97a5e16e46e0f8e4a215f6141b68ea75dd6cb5d53166bee2431082e2","src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs":"a3fb2cfc0e100c860dff1674a90693d57e66b7f12861155ceb42c2de372454bd","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs":"1201371a662cb3515ebb42676cdca9199da7bf4d7c8f90b56f00db03a9fc61f7","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs":"26ef6f50740fad5bb722e0f30025c369c287b2204489682319f7b24fce6de98d","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"b451e320e5c98d6b2e7fcb804e2be6669783510011ebd8dea27d64acbf955774","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"d97797fe66dd43c61f6f895596f6a57145b4c9ef61edd93c8ff9b497a2d28411","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/mod.rs":"f9a63de7c9566cdaa970daeb3828887f7b2d8bf090da86be1a15c32288ae3da3","src/unix/newlib/aarch64/mod.rs":"c408a990f22fb4292a824f38367e9b517e6e6f8623328397ee631cc88b3d1f7d","src/unix/newlib/align.rs":"04e9b1ac6ca4af24fe5170385249fd64039ebf7f4817c5ceed3a303f3bc8a4aa","src/unix/newlib/arm/mod.rs":"2b6dba2e697ab9b4f4bc4dd5f28057249e9b596d1cb395a9322ec87605c4a5c4","src/unix/newlib/mod.rs":"e73d1b49662581382c91b3d4615d21812df58bf5477a3eba5c1df8a4c00a1c43","src/unix/newlib/no_align.rs":"7123dcec13604a11b7765c380ff3a4d0da19c39f4b03919de7857723c0cf1502","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/notbsd/android/b32/arm.rs":"3625a32c7e58cfe683a53486fbe3d42d4e28f00bea31e19cb46ed2bb0b6a140b","src/unix/notbsd/android/b32/mod.rs":"05a714a785fa94a5131af3d59612ce1e9a5823b3327eb2a23de8ad0ce125c377","src/unix/notbsd/android/b32/x86.rs":"ae2b7f1d6278caddc007749bb1d09ca33f7593478a0fd7fe98b457dae86c7814","src/unix/notbsd/android/b64/aarch64.rs":"63d65629d79371814910f691672ef593d20244ee09be26f1ebe07ee6212d0163","src/unix/notbsd/android/b64/mod.rs":"d3bcb20e70d29a450577c09706bb520fab09d0cb3102755736867bf8a957319c","src/unix/notbsd/android/b64/x86_64.rs":"5547aef8dcbaa5a932559f34606fd8d89f6c9c15173d2b1412c12d39b3c1045f","src/unix/notbsd/android/mod.rs":"87dcb5bb8edf9ca2a7e7715f28c44c1330f15419d6d4f9422a81a61b6cf27a8c","src/unix/notbsd/emscripten/align.rs":"dee06bccb5f1a58bd498468f204b8f1d8f2c2a536c595d31e730330a79af7ea5","src/unix/notbsd/emscripten/mod.rs":"42947782f571b56cc1b1c1f4364bb35519bcc44ab8aca53bb13bfd46904de1e0","src/unix/notbsd/emscripten/no_align.rs":"f3960b1d6ede1f8f9d51407a3de5337d44dd5d954e1a4c2bf0ea11e76f2629da","src/unix/notbsd/linux/align.rs":"f2520d03b411519161eaaf043f1948b3279509a3f272b2958bca1d1aeda0434d","src/unix/notbsd/linux/mips/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/notbsd/linux/mips/mips32.rs":"96153abc38b10309e64cb49b1a1e4107be70dbc40bc54ba0372a4573b098b514","src/unix/notbsd/linux/mips/mips64.rs":"9bd96aa81cb0f536c3607d0a2906f4be7a44c3f89e40d5955a898835f04f0e15","src/unix/notbsd/linux/mips/mod.rs":"9a67a2f4043907a50a43569c06ffb4890aefa8db1c26a8737c6bb4bd3e39d90e","src/unix/notbsd/linux/mips/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/notbsd/linux/mod.rs":"895c6d0c1ee5436592e35b4dd87ea361ab81b750d45250b0ff850ac1cef4750d","src/unix/notbsd/linux/musl/b32/arm.rs":"fdf170e03812072785ec531f1ae810d0c4feb9b29d0c316681b9f7affe1262c0","src/unix/notbsd/linux/musl/b32/mips.rs":"afa4981d93f29b3fb0083a73ce1323f7dce1392f90d5cf1966b1fae10d510033","src/unix/notbsd/linux/musl/b32/mod.rs":"540928f168f145c136f9dd729ffa12b9d1838d9fe664fc642365d17d7fae648f","src/unix/notbsd/linux/musl/b32/powerpc.rs":"16c615770a96f155540511f58b5a8070c9c7a43e12bdfed83996690e7558bcb5","src/unix/notbsd/linux/musl/b32/x86.rs":"adf8bb67b47995760aab14f04ae671ebd8ecca5579e90314612f46cb79b30cc2","src/unix/notbsd/linux/musl/b64/aarch64.rs":"d98643408c2837387988f78adc95c90ad21196a6f8f879e3d33d7e8ccf612640","src/unix/notbsd/linux/musl/b64/mod.rs":"d9285cd705e2e92552a08c9aa69b810e7e1bd0e9da6edf069c678af285579661","src/unix/notbsd/linux/musl/b64/powerpc64.rs":"544d8a7f6d6d84143df8a4c3537c9a3a36bf3d338d7a1c15689b94492498d8d7","src/unix/notbsd/linux/musl/b64/x86_64.rs":"19197260a6d06ee521a5aa40a1860b7be33176d0f52bc92d56165fc42729cbd5","src/unix/notbsd/linux/musl/mod.rs":"13d766411fa206b987567e7c802dfe7585e6b7f002fe13ec0fbc810e522b7e2d","src/unix/notbsd/linux/no_align.rs":"7a1cc536b26c22019d7dab6b6db3a8c9edbb753d3f37a7985c30d8894c2c6b06","src/unix/notbsd/linux/other/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/notbsd/linux/other/b32/arm.rs":"d9892f7350b2978335f734f1cd2d7fed60f0f2e66aa05bee3f69549c031f8b14","src/unix/notbsd/linux/other/b32/mod.rs":"26211878c6481861e11393625620edaa0700cac41f55f0118c0f0bd42c1b7520","src/unix/notbsd/linux/other/b32/powerpc.rs":"253fcd2f9978525285be1903cc08f3fec2dc3b12d1660a33e2995b4f6b810d1c","src/unix/notbsd/linux/other/b32/x86.rs":"fea38039a1908ddeb90672b8ef246c743eec6758663a79aea401e21ef40a736d","src/unix/notbsd/linux/other/b64/aarch64.rs":"1124ab5e974718b94fa40ae0f1772fb1c537910ef3e018b7c6c94a38b83dd742","src/unix/notbsd/linux/other/b64/mod.rs":"63e1a3fdf5f4d1b9820934ab344c91aed5e458e7e05908535d2e942d51a08bf8","src/unix/notbsd/linux/other/b64/not_x32.rs":"fa8636fb93eab230ed53bdec0a06f5b81d6d982cc0800103563c8c1eefcdb2d9","src/unix/notbsd/linux/other/b64/powerpc64.rs":"a771d982ed8a9458e1f2f039f959b5075b22443159875ba5612eebba96661c24","src/unix/notbsd/linux/other/b64/sparc64.rs":"0caffe5924886f3aed187531dfe78189b3df40adb96782ec4b471647ff83e9b1","src/unix/notbsd/linux/other/b64/x32.rs":"06a26c5120ced30fc015c220799b67c4401be2f13fc6c7361bebd3d37ff4982d","src/unix/notbsd/linux/other/b64/x86_64.rs":"017cb7cf2810bc633e21879a8951a2c10031c500648e5eb4accc6c88b58ecaa3","src/unix/notbsd/linux/other/mod.rs":"a980e9e3853f8e24498d6cd185c38097710757654480ca460f6378ffeeddf5ef","src/unix/notbsd/linux/other/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/notbsd/linux/s390x/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/notbsd/linux/s390x/mod.rs":"b01d158eefce4c31f377b63964d253f9934f7468af35a24474a163ad3725796a","src/unix/notbsd/linux/s390x/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/notbsd/mod.rs":"5cfdcf78b70b4e4ef4a3733cac364a0bc2512dee798f897a8db7d78d4dd194a6","src/unix/solarish/compat.rs":"8db2a43eafbd3504e9eb9e8f18416c57d947798871bd45be3e2fb9946e292610","src/unix/solarish/mod.rs":"c6a740dac9af99321f48d5c9e86c6a4f5dcc611c413263881764f7121c1f7e9d","src/unix/uclibc/align.rs":"5607180357a9e3d87163e478116b45c7ece391d8366d65ff856cdf3e849452d7","src/unix/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/arm/mod.rs":"66d54a7028a422fe331028441d1b1f18cf34bb2deff2a9e5220384b6e10dcc40","src/unix/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/mips/mips32/mod.rs":"d1a1af63b583b170d5c94b46a04589a11b9d4f8dc658ab8c74302bae656d0e85","src/unix/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/uclibc/mips/mips64/mod.rs":"03f3bad1c681e6fde4a8ed999ce1d38313166c17d35eded66bd6b4f8387efeb7","src/unix/uclibc/mips/mips64/no_align.rs":"bf11b59caa173a6d94d86f42a8de9c5682f798647fba3a17169214b59ab467fe","src/unix/uclibc/mips/mod.rs":"2d76e6cfeb2b7f7c59231a6e099f1aed811a45659e62153aaf00c220b9488a9d","src/unix/uclibc/mod.rs":"924f95073f77047b1f72de3d933852d1df13b19906a63c5974a64032f1bb772c","src/unix/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/uclibc/x86_64/align.rs":"26e48fc79dbdeee4408ae8e071aa90e1be34ccdf0c135689b805aa4abd568e5e","src/unix/uclibc/x86_64/l4re.rs":"bb31053d6403091e11f95ac2203982f279f8b984a19adf30796878c45fdd8c25","src/unix/uclibc/x86_64/mod.rs":"df78de7e0234192c0559b9820c0034a24d72a0820d361f9aad05a9eac36e80ff","src/unix/uclibc/x86_64/no_align.rs":"b308f7b110caf7405b57186882cfc4804caae49a8287f8ab612ec8548467f2f4","src/unix/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/wasi.rs":"84e88b124249816db0976cda78515af3ee3eedacbcd69ae388dc2a6bc757dcd4","src/windows/gnu.rs":"4d9033162cc6f7d245256c7b165c1ec18a741771fd9b99a55b421e8d14978599","src/windows/mod.rs":"2761f3f80c8af5c04e685af8ac3a2bc8c7d6de91cbad9b96a3a6dae67457a891","src/windows/msvc.rs":"8f46cf66883c794175609a3b2bafaa094d0ba63eb6720ef1b84b175603f1074f"},"package":"bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"} \ No newline at end of file -+{"files":{"Cargo.toml":"e1bbf88a55a1ba674f5192fe1585b57a51751ee6c5aa7edeb87df8027c3bb912","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"40ddea9181e5374cf535aae33ad4ace80bd9b1beea8f881ff8d2b777da9489b2","build.rs":"2d1cbe87e0478de12a15a230d7ef0997020ba845b5b7d221d74cd2ce3fe0e720","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"640375751825b8d4adf4fb089a53c4d883f265f96b07daf06f2dcf3acf6639c9","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75fe9e88c4bcf4d836ca9f765c05c9c5be3","src/dox.rs":"b4b96dcba47797a6160c07f29982dd15d48fd2813d7d1000484bd9adc4a89de1","src/fuchsia/aarch64.rs":"40dce617877e606e92353491e1913711b1ecfa510bb983156f4a8460f490419e","src/fuchsia/mod.rs":"784dee21605f00a41d7cae1fc3d782646a84515a687a4952700eae51cc3840f0","src/fuchsia/x86_64.rs":"b4a3eff94dcf1ffe41e6500468ca2cff0e97ddbcc75fe079b6ac7adb1e493f56","src/lib.rs":"d456d34fc58c8d194f8f24201b4021860f61c5f125904bb8dcc954d1f813f6b7","src/macros.rs":"29d61c13523328c4742a7290dbb7d718ce198740824592e029199e9df5429b20","src/redox/mod.rs":"87cb35a988be84d45e79206f7cb5d098e8e7c5a1825cfcd0bd663453dedc3103","src/redox/net.rs":"f2e1922883f208cb46c00744da4a68feccfbec576c6981978ad404e46f818c8b","src/sgx.rs":"18d33a470d06c15b00be5a3bf45b6e51da6104ae7437f50c0eccbd3b79994389","src/switch.rs":"00365ed196519b260fc99a32f02d60b3fb1aaf0484654b19fec8c25bc1687420","src/unix/bsd/apple/b32.rs":"da60c99ee3d773f9c0767b93ccf18b67ad67576e2c58e2e86d05b23c23fd989a","src/unix/bsd/apple/b64.rs":"0cc15406c3a91abde65b28c7783ccab7801474ecc51c78dbd1d7332d4b834390","src/unix/bsd/apple/mod.rs":"b0e2d1f7fdb71d7a02bc5994c66a5ae660955227a0c0f808172a30b38fd40299","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"6c69319675328d4d16939c9c2aba3fb8ca9381a8b390d18d766949307090304b","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"97132e2097411034271b8c927ecc94a208a361564680972a6c82998bd30a9826","src/unix/bsd/freebsdlike/freebsd/mod.rs":"6bbb3c3cf0753f32a2e61ac0f011a6c5e870a0814a6ed4eb9bb9dcdc58a9dca3","src/unix/bsd/freebsdlike/freebsd/x86.rs":"54311d3ebf2bb091ab22361e377e6ef9224aec2ecfe459fbfcedde4932db9c58","src/unix/bsd/freebsdlike/freebsd/x86_64.rs":"97132e2097411034271b8c927ecc94a208a361564680972a6c82998bd30a9826","src/unix/bsd/freebsdlike/mod.rs":"596def64669e2f27cffebca8e5c682ee7d576f84f8f99771c27e86ce8e818221","src/unix/bsd/mod.rs":"0c846b3a2c9390dfe090603f1ad643b107cc7e7605866c5399aa81dfea4e74bd","src/unix/bsd/netbsdlike/mod.rs":"9f55f35f8e4e26c7c63eaf67ddda0e40cc2abbabc2a68750809162e6f80144f1","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"f455848cd03cb80897776f2355dbd14bbb3aa88b1aa6aec22122ec47cdbd0f20","src/unix/bsd/netbsdlike/netbsd/arm.rs":"4c9eac982c385165f475ef3a80770fd634c6dde8fb400b3cb7e08c9bb7498af6","src/unix/bsd/netbsdlike/netbsd/mod.rs":"88617ada3bc740c5262926b9c45d7f51120d358522f051f0afdf7465edd13c29","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"183818c62dff72db6ee1d329d90ad8727628775ed5cd823c8485c6769003c91e","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"4db043327fb2615af2fb0f999d162310bea2294e7d050806e19a46b083561f16","src/unix/bsd/netbsdlike/netbsd/x86.rs":"979c4cbacbde37b9053f2c9df4b8f87d37b255436ef4a383e1e5f40ee21180d6","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"741353a1c6451efb0c7c7c486fd2cb54e3d36fd1c3dd280f6432d8858b0a5356","src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs":"4d2ad2e885d83ad3134add61580f49a8e58cb03284ae328273a9e2e104a4d084","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86_64.rs":"6e6f15e81597d85d83ca0eeb154e4f8b8e7f9cbb6a9cfa176601f78642ef94f9","src/unix/bsd/netbsdlike/openbsdlike/mod.rs":"6320b7bc7283dbc2a07cfb8b5a793c0153535601d050f33c1ff5e4a5cc57c2be","src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs":"820092e397c7ec259cd2de8f2444083a8e57071c02d73d678701dfa7807726e9","src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs":"6adc0dcb1b358ef91bbeb5512e19ba6f40adc77b7d259cb11641a69426fc5ea2","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs":"44b7ea81cf363777b29935da175e702cbf45ed78f7498ae57faf44aa32335085","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs":"97956c3a53aa07a2edf8865252f980dade0d34e930adca0e870e7344d7e2b0bb","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"b00fa310b6d835cb613a02101c7b1a72c636faec316586587cb63aebdcb9de8f","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"248c0b0abaa7d56a7dc3293e67a0ce70a4ef8c83638bda8aa222ad8bb0ef6801","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/mod.rs":"3231196aa748186ad21063bb43c69b95c0d90ba32c5547c72f7c6ed343a100b7","src/unix/newlib/aarch64/mod.rs":"c408a990f22fb4292a824f38367e9b517e6e6f8623328397ee631cc88b3d1f7d","src/unix/newlib/arm/mod.rs":"2b6dba2e697ab9b4f4bc4dd5f28057249e9b596d1cb395a9322ec87605c4a5c4","src/unix/newlib/mod.rs":"eea5f1eb720184d9a00be966e4161fddb3733362fc349182e85b1599ba4e825f","src/unix/notbsd/android/b32/arm.rs":"3625a32c7e58cfe683a53486fbe3d42d4e28f00bea31e19cb46ed2bb0b6a140b","src/unix/notbsd/android/b32/mod.rs":"2fbe398c1fb5251dda6213741a193e50aae4622807cb255d1dd2e82b536f0c65","src/unix/notbsd/android/b32/x86.rs":"ae2b7f1d6278caddc007749bb1d09ca33f7593478a0fd7fe98b457dae86c7814","src/unix/notbsd/android/b64/aarch64.rs":"63d65629d79371814910f691672ef593d20244ee09be26f1ebe07ee6212d0163","src/unix/notbsd/android/b64/mod.rs":"90d4f6b063fd4de42fd302cbc9d9902fd99ac1d71dc48cb8bc6ad7b4c902e481","src/unix/notbsd/android/b64/x86_64.rs":"5547aef8dcbaa5a932559f34606fd8d89f6c9c15173d2b1412c12d39b3c1045f","src/unix/notbsd/android/mod.rs":"19013f41ac8ccac034eb48777a4041d69342edb9ca25d4e0bb9c5938f62eef3e","src/unix/notbsd/emscripten.rs":"9ed47a0a5020c8f72d9496f87ef0da669c1ed2b85980013100c466f18cd8a4c5","src/unix/notbsd/linux/mips/mips32.rs":"a483ddfd10765b7d5090dc21686eee8842649cd21236828a42d634114885f5f9","src/unix/notbsd/linux/mips/mips64.rs":"9fff696e3943cf206b549d1ae13fa361828e9a8454e2d5730eeaa1c172ff370d","src/unix/notbsd/linux/mips/mod.rs":"d18a40011e9090a4a2a1f27e5bd96eb2503ac352f4809648e15841083d7f3a68","src/unix/notbsd/linux/mod.rs":"d84e95d36f9477fa1aa694bf18a919ba20e65aa71539c3f3dc06e8f92acee521","src/unix/notbsd/linux/musl/b32/arm.rs":"fdf170e03812072785ec531f1ae810d0c4feb9b29d0c316681b9f7affe1262c0","src/unix/notbsd/linux/musl/b32/mips.rs":"afa4981d93f29b3fb0083a73ce1323f7dce1392f90d5cf1966b1fae10d510033","src/unix/notbsd/linux/musl/b32/mod.rs":"540928f168f145c136f9dd729ffa12b9d1838d9fe664fc642365d17d7fae648f","src/unix/notbsd/linux/musl/b32/powerpc.rs":"16c615770a96f155540511f58b5a8070c9c7a43e12bdfed83996690e7558bcb5","src/unix/notbsd/linux/musl/b32/x86.rs":"3abf1610c68c37f407cdd0f93563c3542c024219e0e8c9888266a6ee014e0c87","src/unix/notbsd/linux/musl/b64/aarch64.rs":"d98643408c2837387988f78adc95c90ad21196a6f8f879e3d33d7e8ccf612640","src/unix/notbsd/linux/musl/b64/mod.rs":"d9285cd705e2e92552a08c9aa69b810e7e1bd0e9da6edf069c678af285579661","src/unix/notbsd/linux/musl/b64/powerpc64.rs":"544d8a7f6d6d84143df8a4c3537c9a3a36bf3d338d7a1c15689b94492498d8d7","src/unix/notbsd/linux/musl/b64/x86_64.rs":"25340999290a63d564ec149532c905f59c312ec369f8806d6b15df66fa1b8857","src/unix/notbsd/linux/musl/mod.rs":"4e582af62a11e8a5235ccbeabe5b1003fc17705e606c1ed9b21b931a470681fc","src/unix/notbsd/linux/other/b32/arm.rs":"d9892f7350b2978335f734f1cd2d7fed60f0f2e66aa05bee3f69549c031f8b14","src/unix/notbsd/linux/other/b32/mod.rs":"26211878c6481861e11393625620edaa0700cac41f55f0118c0f0bd42c1b7520","src/unix/notbsd/linux/other/b32/powerpc.rs":"253fcd2f9978525285be1903cc08f3fec2dc3b12d1660a33e2995b4f6b810d1c","src/unix/notbsd/linux/other/b32/x86.rs":"49376e3ed0f3ff95c230ac20751911fe3c608dfe15c7c118b069fd7a954d8db9","src/unix/notbsd/linux/other/b64/aarch64.rs":"1124ab5e974718b94fa40ae0f1772fb1c537910ef3e018b7c6c94a38b83dd742","src/unix/notbsd/linux/other/b64/mod.rs":"63e1a3fdf5f4d1b9820934ab344c91aed5e458e7e05908535d2e942d51a08bf8","src/unix/notbsd/linux/other/b64/not_x32.rs":"fa8636fb93eab230ed53bdec0a06f5b81d6d982cc0800103563c8c1eefcdb2d9","src/unix/notbsd/linux/other/b64/powerpc64.rs":"a771d982ed8a9458e1f2f039f959b5075b22443159875ba5612eebba96661c24","src/unix/notbsd/linux/other/b64/sparc64.rs":"0caffe5924886f3aed187531dfe78189b3df40adb96782ec4b471647ff83e9b1","src/unix/notbsd/linux/other/b64/x32.rs":"06a26c5120ced30fc015c220799b67c4401be2f13fc6c7361bebd3d37ff4982d","src/unix/notbsd/linux/other/b64/x86_64.rs":"70d0cec088630502128c1c28ffef9dcc0fd9c0644f6a71b1325961d075625226","src/unix/notbsd/linux/other/mod.rs":"fe76beac87fc549b076078a0fa3e2ecd4c13b0e6e4fcb34a89e16c6584f5259b","src/unix/notbsd/linux/s390x.rs":"9e990574dfc22b6eb91bcc7c6f8297f9ad42f9183efb366a818be88180a3fac3","src/unix/notbsd/mod.rs":"a0fdecac118b70fb670f0fcccaa7f826440873448a96dd557fb1fe52cf391e89","src/unix/solaris/mod.rs":"7950a26f3eb0b7bc8e71f524cc2e05832b759fe2ce12a58e0c1957e0ec1286dc","src/unix/uclibc/mips/mips32.rs":"9739c5fb47f389a0394ef08ee30da97a3de0a1300020731a8cc0a033616011b2","src/unix/uclibc/mips/mips64.rs":"230583280bbc7b3c7fcdb61244f51fa1af5944ca127c7cf83c598fe2313713d0","src/unix/uclibc/mips/mod.rs":"2d76e6cfeb2b7f7c59231a6e099f1aed811a45659e62153aaf00c220b9488a9d","src/unix/uclibc/mod.rs":"521818507cef958376edfd8401c35db7ee1c51ee3cf106ad962002104a184cf5","src/unix/uclibc/x86_64/l4re.rs":"68fd3a833fd1f7caf784a084224f384bdbdfb8b5a14ef94c4f5155409afb3439","src/unix/uclibc/x86_64/mod.rs":"419182836aedd426a5c9e6b8667058adf86ac8f43af73ce8d00c503f8ff8f414","src/unix/uclibc/x86_64/other.rs":"f03b47842896f2f3ae6f8ebdcbcf0276454f880349d9cf00e3d304f8136893c5","src/windows/gnu.rs":"4d9033162cc6f7d245256c7b165c1ec18a741771fd9b99a55b421e8d14978599","src/windows/mod.rs":"7d74b12f71de86ee517a9cd93b1b38d0551646db0eaf526048abcbdd4bbeb250","src/windows/msvc.rs":"8f46cf66883c794175609a3b2bafaa094d0ba63eb6720ef1b84b175603f1074f"},"package":"023a4cd09b2ff695f9734c1934145a315594b7986398496841c7031a5a1bbdbd"} ++{"files":{"CONTRIBUTING.md":"abc79e7f6c3eee37e21baca32847b6709c973f4995b32892e80deb56b73c9ac5","Cargo.toml":"c150fb3c5d9159cce669ff588684190f7b177d3aec39c543625a714d6630b9e5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"35582cfa483e7676b25ae4a07064a19443f4942f5e60e43b91632fcd6ae95156","build.rs":"e9b7364366a5b4caa9daa436ab8a3469532fe63d5fae4d3b2e5ff59d32ff3f3a","rustfmt.toml":"8a654d5787585ca8f2c20580737336fc327f411a07b0dbd4870adf6e9bdf624f","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"037c1a3160ae3bc336f6f7135476704e7f5e834e4039fa02b37f03b507118945","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75fe9e88c4bcf4d836ca9f765c05c9c5be3","src/fuchsia/aarch64.rs":"40dce617877e606e92353491e1913711b1ecfa510bb983156f4a8460f490419e","src/fuchsia/align.rs":"9ca6271f2cbb0e6ca3b48ff6898ecee31c89b3c8388ae20be63e457aabad13a5","src/fuchsia/mod.rs":"fcadc9203451d5c04c36044f8b4cda7f64815c180446e87dbd02fbf7e6fda0f2","src/fuchsia/no_align.rs":"56868534e4ed3f94a27ed39c42f01210c8ecfdbafd4e27679860fbc65a2ae8de","src/fuchsia/x86_64.rs":"911d1249370cf1b0b7b38960cae28af1276f0f614cfcbf5174dbaa38be3dff1d","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"9d764e53df81416a5182b71a26402d2071fc0c15160103b6670b6b268fc356da","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"7e80726ac2e4fe5d1354950e93055120b5e3babc339f0315bf34bc7eb8f4c937","src/macros.rs":"8232e284068d34336713535595fad3c910093346be32e72bde3d3d03327ec6b8","src/redox/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/redox/mod.rs":"34f132e794dc25bbb0e3c08b7f87e4508ce62e0aac00acf39dcdb0f246d7dfc0","src/redox/net.rs":"351960c3a3ad9b296fe43533cac429434e0872c8cca5ad5047dce79d82e009ee","src/redox/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/sgx.rs":"7ff2fbf3e5ad1c880014d68e012f4381a9b9140d13089193b9fba07a7f27c352","src/switch.rs":"fe1414ca053b73cf8a5f54448e807abe81c776c6ac0dfe47ea7772c8140f50b6","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32.rs":"0095a17e49fa423cab8644c722a375b88f5c0cf56fa456b549738d98131bb2f9","src/unix/bsd/apple/b64.rs":"99fbd3e6d2c969080631e23f58deffa51cb3f42b7a08395b49556f19bb40d4e1","src/unix/bsd/apple/mod.rs":"e1959b482dc3c1703eb032b5d6e269c434326dc3eae9f99bb88d51c732cd3df0","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"2cb0a5d10a3c5721d10209ad7ddc59f6756b2c1d4bc89450988053efad788eb6","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"4dcd712c0dd5470171746071a176391f937de7865dd0792173284992d9e3f2c7","src/unix/bsd/freebsdlike/freebsd/arm.rs":"84cf36223f0229cb383036563a4902731543e89b37e4dfe2f450cced566d8545","src/unix/bsd/freebsdlike/freebsd/mod.rs":"0752dc1097fd5e94aabfe7b6d4ead2b94e5c0540e2cd3c8efee883bba13e1a0c","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"9873f41843cbf066f6ffab8eeb63115095f81ce9fa8f337b95ec871e40c6565d","src/unix/bsd/freebsdlike/freebsd/x86.rs":"716cb67cd0aea66d4a8e40470d32b55cbfafddf75edd34a90f70d518c8c75457","src/unix/bsd/freebsdlike/freebsd/x86_64.rs":"dd3d8a546730f09b1ef0dfeeb20244eef01d1b4028799b28b3a0c33ae05d5002","src/unix/bsd/freebsdlike/mod.rs":"2938bb8b0a0f1d66912bdb4bac3e59863bd90787fe49e1d3a522098acfdb2b7a","src/unix/bsd/mod.rs":"0e92970853a9efbb51a17b9cb8009eb4e9a04cbf12d0e315659d240812c1e760","src/unix/bsd/netbsdlike/mod.rs":"77b85ecd2187df55466663f6af624416d9c99922065c6fbd0438d5b7063db89c","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"b38fc046f9a40fea28bd26328b96629f4d5d63d7524936bd6af1865d401a8716","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"75adb8d6ee202d50487913c245e1a880447582f45e1ef6339743305a13fb5719","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"135509edeaf3fb3f102d89d51ff1a8f82323497336a8dc7e1f0f23b5c2434b73","src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs":"51dd68ca3c3eab0f1fe496b0dc12ad8b85f8cf964af0c2c95ab9834ad03938a8","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86_64.rs":"6e6f15e81597d85d83ca0eeb154e4f8b8e7f9cbb6a9cfa176601f78642ef94f9","src/unix/bsd/netbsdlike/openbsdlike/mod.rs":"c8d18b725c62c2f1a3c5e42d875e1a3b167c13a1bd6ae3d35f35a6ec29402f81","src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs":"ee0057fb97a5e16e46e0f8e4a215f6141b68ea75dd6cb5d53166bee2431082e2","src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs":"a3fb2cfc0e100c860dff1674a90693d57e66b7f12861155ceb42c2de372454bd","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs":"1201371a662cb3515ebb42676cdca9199da7bf4d7c8f90b56f00db03a9fc61f7","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs":"26ef6f50740fad5bb722e0f30025c369c287b2204489682319f7b24fce6de98d","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"b451e320e5c98d6b2e7fcb804e2be6669783510011ebd8dea27d64acbf955774","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"d97797fe66dd43c61f6f895596f6a57145b4c9ef61edd93c8ff9b497a2d28411","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/mod.rs":"ca64d5483b17632ac0b1366edaa715f64b1aed696a7e038a7e49b726a22f871f","src/unix/newlib/aarch64/mod.rs":"c408a990f22fb4292a824f38367e9b517e6e6f8623328397ee631cc88b3d1f7d","src/unix/newlib/align.rs":"04e9b1ac6ca4af24fe5170385249fd64039ebf7f4817c5ceed3a303f3bc8a4aa","src/unix/newlib/arm/mod.rs":"2b6dba2e697ab9b4f4bc4dd5f28057249e9b596d1cb395a9322ec87605c4a5c4","src/unix/newlib/mod.rs":"e73d1b49662581382c91b3d4615d21812df58bf5477a3eba5c1df8a4c00a1c43","src/unix/newlib/no_align.rs":"7123dcec13604a11b7765c380ff3a4d0da19c39f4b03919de7857723c0cf1502","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/notbsd/android/b32/arm.rs":"3625a32c7e58cfe683a53486fbe3d42d4e28f00bea31e19cb46ed2bb0b6a140b","src/unix/notbsd/android/b32/mod.rs":"05a714a785fa94a5131af3d59612ce1e9a5823b3327eb2a23de8ad0ce125c377","src/unix/notbsd/android/b32/x86.rs":"ae2b7f1d6278caddc007749bb1d09ca33f7593478a0fd7fe98b457dae86c7814","src/unix/notbsd/android/b64/aarch64.rs":"63d65629d79371814910f691672ef593d20244ee09be26f1ebe07ee6212d0163","src/unix/notbsd/android/b64/mod.rs":"d3bcb20e70d29a450577c09706bb520fab09d0cb3102755736867bf8a957319c","src/unix/notbsd/android/b64/x86_64.rs":"5547aef8dcbaa5a932559f34606fd8d89f6c9c15173d2b1412c12d39b3c1045f","src/unix/notbsd/android/mod.rs":"87dcb5bb8edf9ca2a7e7715f28c44c1330f15419d6d4f9422a81a61b6cf27a8c","src/unix/notbsd/emscripten/align.rs":"dee06bccb5f1a58bd498468f204b8f1d8f2c2a536c595d31e730330a79af7ea5","src/unix/notbsd/emscripten/mod.rs":"42947782f571b56cc1b1c1f4364bb35519bcc44ab8aca53bb13bfd46904de1e0","src/unix/notbsd/emscripten/no_align.rs":"f3960b1d6ede1f8f9d51407a3de5337d44dd5d954e1a4c2bf0ea11e76f2629da","src/unix/notbsd/linux/align.rs":"f2520d03b411519161eaaf043f1948b3279509a3f272b2958bca1d1aeda0434d","src/unix/notbsd/linux/mips/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/notbsd/linux/mips/mips32.rs":"96153abc38b10309e64cb49b1a1e4107be70dbc40bc54ba0372a4573b098b514","src/unix/notbsd/linux/mips/mips64.rs":"9bd96aa81cb0f536c3607d0a2906f4be7a44c3f89e40d5955a898835f04f0e15","src/unix/notbsd/linux/mips/mod.rs":"9a67a2f4043907a50a43569c06ffb4890aefa8db1c26a8737c6bb4bd3e39d90e","src/unix/notbsd/linux/mips/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/notbsd/linux/mod.rs":"895c6d0c1ee5436592e35b4dd87ea361ab81b750d45250b0ff850ac1cef4750d","src/unix/notbsd/linux/musl/b32/arm.rs":"fdf170e03812072785ec531f1ae810d0c4feb9b29d0c316681b9f7affe1262c0","src/unix/notbsd/linux/musl/b32/mips.rs":"afa4981d93f29b3fb0083a73ce1323f7dce1392f90d5cf1966b1fae10d510033","src/unix/notbsd/linux/musl/b32/mod.rs":"540928f168f145c136f9dd729ffa12b9d1838d9fe664fc642365d17d7fae648f","src/unix/notbsd/linux/musl/b32/powerpc.rs":"16c615770a96f155540511f58b5a8070c9c7a43e12bdfed83996690e7558bcb5","src/unix/notbsd/linux/musl/b32/x86.rs":"adf8bb67b47995760aab14f04ae671ebd8ecca5579e90314612f46cb79b30cc2","src/unix/notbsd/linux/musl/b64/aarch64.rs":"d98643408c2837387988f78adc95c90ad21196a6f8f879e3d33d7e8ccf612640","src/unix/notbsd/linux/musl/b64/mod.rs":"d9285cd705e2e92552a08c9aa69b810e7e1bd0e9da6edf069c678af285579661","src/unix/notbsd/linux/musl/b64/powerpc64.rs":"544d8a7f6d6d84143df8a4c3537c9a3a36bf3d338d7a1c15689b94492498d8d7","src/unix/notbsd/linux/musl/b64/x86_64.rs":"19197260a6d06ee521a5aa40a1860b7be33176d0f52bc92d56165fc42729cbd5","src/unix/notbsd/linux/musl/mod.rs":"13d766411fa206b987567e7c802dfe7585e6b7f002fe13ec0fbc810e522b7e2d","src/unix/notbsd/linux/no_align.rs":"7a1cc536b26c22019d7dab6b6db3a8c9edbb753d3f37a7985c30d8894c2c6b06","src/unix/notbsd/linux/other/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/notbsd/linux/other/b32/arm.rs":"d9892f7350b2978335f734f1cd2d7fed60f0f2e66aa05bee3f69549c031f8b14","src/unix/notbsd/linux/other/b32/mod.rs":"26211878c6481861e11393625620edaa0700cac41f55f0118c0f0bd42c1b7520","src/unix/notbsd/linux/other/b32/powerpc.rs":"253fcd2f9978525285be1903cc08f3fec2dc3b12d1660a33e2995b4f6b810d1c","src/unix/notbsd/linux/other/b32/x86.rs":"fea38039a1908ddeb90672b8ef246c743eec6758663a79aea401e21ef40a736d","src/unix/notbsd/linux/other/b64/aarch64.rs":"1124ab5e974718b94fa40ae0f1772fb1c537910ef3e018b7c6c94a38b83dd742","src/unix/notbsd/linux/other/b64/mod.rs":"63e1a3fdf5f4d1b9820934ab344c91aed5e458e7e05908535d2e942d51a08bf8","src/unix/notbsd/linux/other/b64/not_x32.rs":"fa8636fb93eab230ed53bdec0a06f5b81d6d982cc0800103563c8c1eefcdb2d9","src/unix/notbsd/linux/other/b64/powerpc64.rs":"a771d982ed8a9458e1f2f039f959b5075b22443159875ba5612eebba96661c24","src/unix/notbsd/linux/other/b64/sparc64.rs":"0caffe5924886f3aed187531dfe78189b3df40adb96782ec4b471647ff83e9b1","src/unix/notbsd/linux/other/b64/x32.rs":"06a26c5120ced30fc015c220799b67c4401be2f13fc6c7361bebd3d37ff4982d","src/unix/notbsd/linux/other/b64/x86_64.rs":"017cb7cf2810bc633e21879a8951a2c10031c500648e5eb4accc6c88b58ecaa3","src/unix/notbsd/linux/other/mod.rs":"a980e9e3853f8e24498d6cd185c38097710757654480ca460f6378ffeeddf5ef","src/unix/notbsd/linux/other/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/notbsd/linux/s390x/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/notbsd/linux/s390x/mod.rs":"b01d158eefce4c31f377b63964d253f9934f7468af35a24474a163ad3725796a","src/unix/notbsd/linux/s390x/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/notbsd/mod.rs":"5cfdcf78b70b4e4ef4a3733cac364a0bc2512dee798f897a8db7d78d4dd194a6","src/unix/solarish/compat.rs":"8db2a43eafbd3504e9eb9e8f18416c57d947798871bd45be3e2fb9946e292610","src/unix/solarish/mod.rs":"c6a740dac9af99321f48d5c9e86c6a4f5dcc611c413263881764f7121c1f7e9d","src/unix/uclibc/align.rs":"5607180357a9e3d87163e478116b45c7ece391d8366d65ff856cdf3e849452d7","src/unix/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/arm/mod.rs":"66d54a7028a422fe331028441d1b1f18cf34bb2deff2a9e5220384b6e10dcc40","src/unix/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/mips/mips32/mod.rs":"d1a1af63b583b170d5c94b46a04589a11b9d4f8dc658ab8c74302bae656d0e85","src/unix/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/uclibc/mips/mips64/mod.rs":"03f3bad1c681e6fde4a8ed999ce1d38313166c17d35eded66bd6b4f8387efeb7","src/unix/uclibc/mips/mips64/no_align.rs":"bf11b59caa173a6d94d86f42a8de9c5682f798647fba3a17169214b59ab467fe","src/unix/uclibc/mips/mod.rs":"2d76e6cfeb2b7f7c59231a6e099f1aed811a45659e62153aaf00c220b9488a9d","src/unix/uclibc/mod.rs":"924f95073f77047b1f72de3d933852d1df13b19906a63c5974a64032f1bb772c","src/unix/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/uclibc/x86_64/align.rs":"26e48fc79dbdeee4408ae8e071aa90e1be34ccdf0c135689b805aa4abd568e5e","src/unix/uclibc/x86_64/l4re.rs":"bb31053d6403091e11f95ac2203982f279f8b984a19adf30796878c45fdd8c25","src/unix/uclibc/x86_64/mod.rs":"df78de7e0234192c0559b9820c0034a24d72a0820d361f9aad05a9eac36e80ff","src/unix/uclibc/x86_64/no_align.rs":"b308f7b110caf7405b57186882cfc4804caae49a8287f8ab612ec8548467f2f4","src/unix/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/wasi.rs":"84e88b124249816db0976cda78515af3ee3eedacbcd69ae388dc2a6bc757dcd4","src/windows/gnu.rs":"4d9033162cc6f7d245256c7b165c1ec18a741771fd9b99a55b421e8d14978599","src/windows/mod.rs":"2761f3f80c8af5c04e685af8ac3a2bc8c7d6de91cbad9b96a3a6dae67457a891","src/windows/msvc.rs":"8f46cf66883c794175609a3b2bafaa094d0ba63eb6720ef1b84b175603f1074f"},"package":"bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"} diff --git a/user/rust/0031-typenum-pmmx.patch b/user/rust/0031-typenum-pmmx.patch new file mode 100644 index 000000000..6b3c5df57 --- /dev/null +++ b/user/rust/0031-typenum-pmmx.patch @@ -0,0 +1,33 @@ +From 0d5196feadafa77c727f517d747ffcf3fd0e8ba9 Mon Sep 17 00:00:00 2001 +From: Michael Hudson-Doyle <michael.hudson@canonical.com> +Date: Wed, 13 Mar 2019 15:55:30 +1300 +Subject: [PATCH] round result of (highest as f64).log(2.0) + +Even though (1024f64).log(2.0) has an exact, representable, value, with +rustc 1.32 on i386 it comes out as +9.999999999999999985 with +optimization enabled. And the rustc doesn't like having two defintions +for U1024 etc. + +--- + build/main.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git rustc-1.35.0-src/vendor/typenum/build/main.rs rustc-1.35.0-src/vendor/typenum/build/main.rs +index 16b0ffe2f..b7939f993 100644 +--- rustc-1.35.0-src/vendor/typenum/build/main.rs ++++ rustc-1.35.0-src/vendor/typenum/build/main.rs +@@ -81,7 +81,7 @@ pub fn no_std() {} + fn main() { + let highest: u64 = 1024; + +- let first2: u32 = (highest as f64).log(2.0) as u32 + 1; ++ let first2: u32 = (highest as f64).log(2.0).round() as u32 + 1; + let first10: u32 = (highest as f64).log(10.0) as u32 + 1; + let uints = (0..(highest + 1)) + .chain((first2..64).map(|i| 2u64.pow(i))) +--- rustc-1.35.0-src/vendor/typenum/.cargo-checksum.json ++++ rustc-1.35.0-src/vendor/typenum/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"CHANGELOG.md":"caf37574d41c38570e892c4fed38cbc2fd22794ec512949c1f0faad1d866fced","Cargo.toml":"58822547c70a09449e6a069e6c197423a9e471d993ebf4ea20101e042781edf7","LICENSE":"a825bd853ab71619a4923d7b4311221427848070ff44d990da39b0b274c1683f","README.md":"7a19a1fb2f219fbc270535e0fee2caa96968b976cd74d33d12e2f2ef436d0895","build/main.rs":"44d33ee79a76a90a769096547ba4c7a5d3822afffeed025dfbcc5bb755227d52","build/op.rs":"a393b6818384a50688db8cb923891f86ccce39a9dccbf7c684efb9bef83b4acf","build/tests.rs":"a04fd3185ea8b19c36cb939178e5fedf16b4b36c2df0a2e79593339d998bd1ce","src/array.rs":"7243dbe44f3818c852c67bd0c3af14d57473fb9c3efda2c0d98251b3fe8b4d57","src/bit.rs":"023f9f6768331ac17de72b6248c6a9d6a7b856842f56067c9c1e04b729ed9e04","src/int.rs":"de4c49717a7a40572e579fad2380f29698c5571844ff1462e368531072dba55e","src/lib.rs":"2a58ff8553851eb6b9d7fa70315d688431dd0573f8491e53cfe799a092347b96","src/marker_traits.rs":"abf73f3930b5129d01aaa64c51275c4ca4ce0ef8961f7a9e744ee731d6308200","src/operator_aliases.rs":"43eb6a29dc0387ec329df5d9af0b4479a1301b3a9b2304c3b7b7d8c03e01ff5d","src/private.rs":"48c572aa27bd444062eadb4bd3f5ca38c1e6efb66bc074f38555499b33f0dcaf","src/type_operators.rs":"df9ef3ae2a69d56258db41f8166342a65f6e4085581709140719d1b7e3916bb9","src/uint.rs":"df4fdad3110a7e08fdc21e49f7e82fd525d6a78fcf904a766729aa47c0200727","tests/test.rs":"1e559fadf0af1a38d7049caef26e3a162c58ea5e024aa637299376d776986549"},"package":"612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"} +\ No newline at end of file ++{"files":{"CHANGELOG.md":"caf37574d41c38570e892c4fed38cbc2fd22794ec512949c1f0faad1d866fced","Cargo.toml":"58822547c70a09449e6a069e6c197423a9e471d993ebf4ea20101e042781edf7","LICENSE":"a825bd853ab71619a4923d7b4311221427848070ff44d990da39b0b274c1683f","README.md":"7a19a1fb2f219fbc270535e0fee2caa96968b976cd74d33d12e2f2ef436d0895","build/main.rs":"38a90c85068bb6bba1d21e9d5976e693b9b868ed0c16b26986332d2ca1c01047","build/op.rs":"a393b6818384a50688db8cb923891f86ccce39a9dccbf7c684efb9bef83b4acf","build/tests.rs":"a04fd3185ea8b19c36cb939178e5fedf16b4b36c2df0a2e79593339d998bd1ce","src/array.rs":"7243dbe44f3818c852c67bd0c3af14d57473fb9c3efda2c0d98251b3fe8b4d57","src/bit.rs":"023f9f6768331ac17de72b6248c6a9d6a7b856842f56067c9c1e04b729ed9e04","src/int.rs":"de4c49717a7a40572e579fad2380f29698c5571844ff1462e368531072dba55e","src/lib.rs":"2a58ff8553851eb6b9d7fa70315d688431dd0573f8491e53cfe799a092347b96","src/marker_traits.rs":"abf73f3930b5129d01aaa64c51275c4ca4ce0ef8961f7a9e744ee731d6308200","src/operator_aliases.rs":"43eb6a29dc0387ec329df5d9af0b4479a1301b3a9b2304c3b7b7d8c03e01ff5d","src/private.rs":"48c572aa27bd444062eadb4bd3f5ca38c1e6efb66bc074f38555499b33f0dcaf","src/type_operators.rs":"df9ef3ae2a69d56258db41f8166342a65f6e4085581709140719d1b7e3916bb9","src/uint.rs":"df4fdad3110a7e08fdc21e49f7e82fd525d6a78fcf904a766729aa47c0200727","tests/test.rs":"1e559fadf0af1a38d7049caef26e3a162c58ea5e024aa637299376d776986549"},"package":"612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"} diff --git a/user/rust/0040-rls-atomics.patch b/user/rust/0040-rls-atomics.patch index 4dd813faa..d9aedb9af 100644 --- a/user/rust/0040-rls-atomics.patch +++ b/user/rust/0040-rls-atomics.patch @@ -1,17 +1,15 @@ -diff --git a/src/tools/rls/src/cmd.rs b/src/tools/rls/src/cmd.rs -index 64035aa..d9129d8 100644 ---- a/src/tools/rls/src/cmd.rs -+++ b/src/tools/rls/src/cmd.rs -@@ -17,7 +17,7 @@ use crate::config::Config; +--- rustc-1.35.0-src/src/tools/rls/rls/src/cmd.rs ++++ rustc-1.35.0-src/src/tools/rls/rls/src/cmd.rs +@@ -7,7 +7,7 @@ use crate::config::Config; use crate::server::{self, LsService, Notification, Request, RequestId}; use rls_analysis::{AnalysisHost, Target}; use rls_vfs::Vfs; -use std::sync::atomic::{AtomicU64, Ordering}; +use std::sync::atomic::{AtomicU32, Ordering}; - use languageserver_types::{ + use lsp_types::{ ClientCapabilities, CodeActionContext, CodeActionParams, CompletionItem, -@@ -424,8 +424,8 @@ fn url(file_name: &str) -> Url { +@@ -313,8 +313,8 @@ fn url(file_name: &str) -> Url { } fn next_id() -> RequestId { @@ -22,11 +20,9 @@ index 64035aa..d9129d8 100644 } // Custom reader and output for the RLS server. -diff --git a/src/tools/rls/src/server/io.rs b/src/tools/rls/src/server/io.rs -index 7b93d4a..f3c5361 100644 ---- a/src/tools/rls/src/server/io.rs -+++ b/src/tools/rls/src/server/io.rs -@@ -17,7 +17,7 @@ use crate::lsp_data::{LSPNotification, LSPRequest}; +--- rustc-1.35.0-src/src/tools/rls/rls/src/server/io.rs ++++ rustc-1.35.0-src/src/tools/rls/rls/src/server/io.rs +@@ -7,7 +7,7 @@ use crate::lsp_data::{LSPNotification, LSPRequest}; use std::fmt; use std::io::{self, BufRead, Write}; @@ -35,7 +31,7 @@ index 7b93d4a..f3c5361 100644 use std::sync::Arc; use jsonrpc_core::{self as jsonrpc, response, version, Id}; -@@ -190,14 +190,14 @@ pub trait Output: Sync + Send + Clone + 'static { +@@ -171,13 +171,13 @@ pub trait Output: Sync + Send + Clone + 'static { /// An output that sends notifications and responses on `stdout`. #[derive(Clone)] pub(super) struct StdioOutput { @@ -44,15 +40,14 @@ index 7b93d4a..f3c5361 100644 } impl StdioOutput { - /// Construct a new `stdout` output. - crate fn new() -> StdioOutput { - StdioOutput { -- next_id: Arc::new(AtomicU64::new(1)), -+ next_id: Arc::new(AtomicU32::new(1).into()), - } + /// Constructs a new `stdout` output. + pub(crate) fn new() -> StdioOutput { +- StdioOutput { next_id: Arc::new(AtomicU64::new(1)) } ++ StdioOutput { next_id: Arc::new(AtomicU32::new(1).into()) } } } -@@ -215,7 +215,7 @@ impl Output for StdioOutput { + +@@ -194,7 +194,7 @@ impl Output for StdioOutput { } fn provide_id(&self) -> RequestId { diff --git a/user/rust/0050-LLVM-8.0-compatibility.patch b/user/rust/0050-LLVM-8.0-compatibility.patch deleted file mode 100644 index a8bffb2b9..000000000 --- a/user/rust/0050-LLVM-8.0-compatibility.patch +++ /dev/null @@ -1,310 +0,0 @@ -From 78ff5598497c95a696ca669f88a93d127aa24c8d Mon Sep 17 00:00:00 2001 -From: Josh Stone <jistone@redhat.com> -Date: Wed, 16 Jan 2019 09:59:03 -0800 -Subject: [PATCH 08/15] LLVM 8.0 compatibility - -Backported from commit df0466d upstream. ---- - src/librustc_codegen_llvm/debuginfo/mod.rs | 15 ++-- - src/librustc_codegen_llvm/llvm/ffi.rs | 22 +++-- - src/rustllvm/PassWrapper.cpp | 7 +- - src/rustllvm/RustWrapper.cpp | 93 ++++++++++++++++++++-- - src/test/codegen/enum-debug-clike.rs | 5 +- - 5 files changed, 123 insertions(+), 19 deletions(-) - -diff --git a/src/librustc_codegen_llvm/debuginfo/mod.rs b/src/librustc_codegen_llvm/debuginfo/mod.rs -index 2eab626ae8..7aca63caa4 100644 ---- a/src/librustc_codegen_llvm/debuginfo/mod.rs -+++ b/src/librustc_codegen_llvm/debuginfo/mod.rs -@@ -12,7 +12,7 @@ use self::source_loc::InternalDebugLocation::{self, UnknownLocation}; - - use llvm; - use llvm::debuginfo::{DIFile, DIType, DIScope, DIBuilder, DISubprogram, DIArray, DIFlags, -- DILexicalBlock}; -+ DISPFlags, DILexicalBlock}; - use rustc::hir::CodegenFnAttrFlags; - use rustc::hir::def_id::{DefId, CrateNum}; - use rustc::ty::subst::{Substs, UnpackedKind}; -@@ -283,7 +283,6 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> { - let linkage_name = mangled_name_of_instance(self, instance); - - let scope_line = span_start(self, span).line; -- let is_local_to_unit = is_node_local_to_unit(self, def_id); - - let function_name = CString::new(name).unwrap(); - let linkage_name = SmallCStr::new(&linkage_name.as_str()); -@@ -301,6 +300,14 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> { - flags |= DIFlags::FlagNoReturn; - } - -+ let mut spflags = DISPFlags::SPFlagDefinition; -+ if is_node_local_to_unit(self, def_id) { -+ spflags |= DISPFlags::SPFlagLocalToUnit; -+ } -+ if self.sess().opts.optimize != config::OptLevel::No { -+ spflags |= DISPFlags::SPFlagOptimized; -+ } -+ - let fn_metadata = unsafe { - llvm::LLVMRustDIBuilderCreateFunction( - DIB(self), -@@ -310,11 +317,9 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> { - file_metadata, - loc.line as c_uint, - function_type_metadata, -- is_local_to_unit, -- true, - scope_line as c_uint, - flags, -- self.sess().opts.optimize != config::OptLevel::No, -+ spflags, - llfn, - template_parameters, - None) -diff --git a/src/librustc_codegen_llvm/llvm/ffi.rs b/src/librustc_codegen_llvm/llvm/ffi.rs -index 11e34f600c..853c1ff004 100644 ---- a/src/librustc_codegen_llvm/llvm/ffi.rs -+++ b/src/librustc_codegen_llvm/llvm/ffi.rs -@@ -2,7 +2,7 @@ use super::debuginfo::{ - DIBuilder, DIDescriptor, DIFile, DILexicalBlock, DISubprogram, DIType, - DIBasicType, DIDerivedType, DICompositeType, DIScope, DIVariable, - DIGlobalVariableExpression, DIArray, DISubrange, DITemplateTypeParameter, DIEnumerator, -- DINameSpace, DIFlags, -+ DINameSpace, DIFlags, DISPFlags, - }; - - use libc::{c_uint, c_int, size_t, c_char}; -@@ -591,6 +591,20 @@ pub mod debuginfo { - const FlagMainSubprogram = (1 << 21); - } - } -+ -+ // These values **must** match with LLVMRustDISPFlags!! -+ bitflags! { -+ #[repr(C)] -+ #[derive(Default)] -+ pub struct DISPFlags: ::libc::uint32_t { -+ const SPFlagZero = 0; -+ const SPFlagVirtual = 1; -+ const SPFlagPureVirtual = 2; -+ const SPFlagLocalToUnit = (1 << 2); -+ const SPFlagDefinition = (1 << 3); -+ const SPFlagOptimized = (1 << 4); -+ } -+ } - } - - extern { pub type ModuleBuffer; } -@@ -1387,11 +1401,9 @@ extern "C" { - File: &'a DIFile, - LineNo: c_uint, - Ty: &'a DIType, -- isLocalToUnit: bool, -- isDefinition: bool, - ScopeLine: c_uint, - Flags: DIFlags, -- isOptimized: bool, -+ SPFlags: DISPFlags, - Fn: &'a Value, - TParam: &'a DIArray, - Decl: Option<&'a DIDescriptor>) -@@ -1529,7 +1541,7 @@ extern "C" { - AlignInBits: u32, - Elements: &'a DIArray, - ClassType: &'a DIType, -- IsFixed: bool) -+ IsScoped: bool) - -> &'a DIType; - - pub fn LLVMRustDIBuilderCreateUnionType(Builder: &DIBuilder<'a>, -diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp -index df7a81643b..18d277be21 100644 ---- a/src/rustllvm/PassWrapper.cpp -+++ b/src/rustllvm/PassWrapper.cpp -@@ -789,7 +789,7 @@ struct LLVMRustThinLTOData { - StringMap<GVSummaryMapTy> ModuleToDefinedGVSummaries; - - #if LLVM_VERSION_GE(7, 0) -- LLVMRustThinLTOData() : Index(/* isPerformingAnalysis = */ false) {} -+ LLVMRustThinLTOData() : Index(/* HaveGVs = */ false) {} - #endif - }; - -@@ -865,7 +865,12 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules, - auto deadIsPrevailing = [&](GlobalValue::GUID G) { - return PrevailingType::Unknown; - }; -+#if LLVM_VERSION_GE(8, 0) -+ computeDeadSymbolsWithConstProp(Ret->Index, Ret->GUIDPreservedSymbols, -+ deadIsPrevailing, /* ImportEnabled = */ true); -+#else - computeDeadSymbols(Ret->Index, Ret->GUIDPreservedSymbols, deadIsPrevailing); -+#endif - #else - computeDeadSymbols(Ret->Index, Ret->GUIDPreservedSymbols); - #endif -diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp -index 9d3e6f93b0..7905e9f0f2 100644 ---- a/src/rustllvm/RustWrapper.cpp -+++ b/src/rustllvm/RustWrapper.cpp -@@ -294,7 +294,7 @@ extern "C" void LLVMRustSetHasUnsafeAlgebra(LLVMValueRef V) { - extern "C" LLVMValueRef - LLVMRustBuildAtomicLoad(LLVMBuilderRef B, LLVMValueRef Source, const char *Name, - LLVMAtomicOrdering Order) { -- LoadInst *LI = new LoadInst(unwrap(Source), 0); -+ LoadInst *LI = new LoadInst(unwrap(Source)); - LI->setAtomic(fromRust(Order)); - return wrap(unwrap(B)->Insert(LI, Name)); - } -@@ -511,6 +511,71 @@ static DINode::DIFlags fromRust(LLVMRustDIFlags Flags) { - return Result; - } - -+// These values **must** match debuginfo::DISPFlags! They also *happen* -+// to match LLVM, but that isn't required as we do giant sets of -+// matching below. The value shouldn't be directly passed to LLVM. -+enum class LLVMRustDISPFlags : uint32_t { -+ SPFlagZero = 0, -+ SPFlagVirtual = 1, -+ SPFlagPureVirtual = 2, -+ SPFlagLocalToUnit = (1 << 2), -+ SPFlagDefinition = (1 << 3), -+ SPFlagOptimized = (1 << 4), -+ // Do not add values that are not supported by the minimum LLVM -+ // version we support! see llvm/include/llvm/IR/DebugInfoFlags.def -+ // (In LLVM < 8, createFunction supported these as separate bool arguments.) -+}; -+ -+inline LLVMRustDISPFlags operator&(LLVMRustDISPFlags A, LLVMRustDISPFlags B) { -+ return static_cast<LLVMRustDISPFlags>(static_cast<uint32_t>(A) & -+ static_cast<uint32_t>(B)); -+} -+ -+inline LLVMRustDISPFlags operator|(LLVMRustDISPFlags A, LLVMRustDISPFlags B) { -+ return static_cast<LLVMRustDISPFlags>(static_cast<uint32_t>(A) | -+ static_cast<uint32_t>(B)); -+} -+ -+inline LLVMRustDISPFlags &operator|=(LLVMRustDISPFlags &A, LLVMRustDISPFlags B) { -+ return A = A | B; -+} -+ -+inline bool isSet(LLVMRustDISPFlags F) { return F != LLVMRustDISPFlags::SPFlagZero; } -+ -+inline LLVMRustDISPFlags virtuality(LLVMRustDISPFlags F) { -+ return static_cast<LLVMRustDISPFlags>(static_cast<uint32_t>(F) & 0x3); -+} -+ -+#if LLVM_VERSION_GE(8, 0) -+static DISubprogram::DISPFlags fromRust(LLVMRustDISPFlags SPFlags) { -+ DISubprogram::DISPFlags Result = DISubprogram::DISPFlags::SPFlagZero; -+ -+ switch (virtuality(SPFlags)) { -+ case LLVMRustDISPFlags::SPFlagVirtual: -+ Result |= DISubprogram::DISPFlags::SPFlagVirtual; -+ break; -+ case LLVMRustDISPFlags::SPFlagPureVirtual: -+ Result |= DISubprogram::DISPFlags::SPFlagPureVirtual; -+ break; -+ default: -+ // The rest are handled below -+ break; -+ } -+ -+ if (isSet(SPFlags & LLVMRustDISPFlags::SPFlagLocalToUnit)) { -+ Result |= DISubprogram::DISPFlags::SPFlagLocalToUnit; -+ } -+ if (isSet(SPFlags & LLVMRustDISPFlags::SPFlagDefinition)) { -+ Result |= DISubprogram::DISPFlags::SPFlagDefinition; -+ } -+ if (isSet(SPFlags & LLVMRustDISPFlags::SPFlagOptimized)) { -+ Result |= DISubprogram::DISPFlags::SPFlagOptimized; -+ } -+ -+ return Result; -+} -+#endif -+ - extern "C" uint32_t LLVMRustDebugMetadataVersion() { - return DEBUG_METADATA_VERSION; - } -@@ -575,16 +640,26 @@ LLVMRustDIBuilderCreateSubroutineType(LLVMRustDIBuilderRef Builder, - extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateFunction( - LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, - const char *LinkageName, LLVMMetadataRef File, unsigned LineNo, -- LLVMMetadataRef Ty, bool IsLocalToUnit, bool IsDefinition, -- unsigned ScopeLine, LLVMRustDIFlags Flags, bool IsOptimized, -- LLVMValueRef Fn, LLVMMetadataRef TParam, LLVMMetadataRef Decl) { -+ LLVMMetadataRef Ty, unsigned ScopeLine, LLVMRustDIFlags Flags, -+ LLVMRustDISPFlags SPFlags, LLVMValueRef Fn, LLVMMetadataRef TParam, -+ LLVMMetadataRef Decl) { - DITemplateParameterArray TParams = - DITemplateParameterArray(unwrap<MDTuple>(TParam)); -+#if LLVM_VERSION_GE(8, 0) -+ DISubprogram *Sub = Builder->createFunction( -+ unwrapDI<DIScope>(Scope), Name, LinkageName, unwrapDI<DIFile>(File), -+ LineNo, unwrapDI<DISubroutineType>(Ty), ScopeLine, fromRust(Flags), -+ fromRust(SPFlags), TParams, unwrapDIPtr<DISubprogram>(Decl)); -+#else -+ bool IsLocalToUnit = isSet(SPFlags & LLVMRustDISPFlags::SPFlagLocalToUnit); -+ bool IsDefinition = isSet(SPFlags & LLVMRustDISPFlags::SPFlagDefinition); -+ bool IsOptimized = isSet(SPFlags & LLVMRustDISPFlags::SPFlagOptimized); - DISubprogram *Sub = Builder->createFunction( - unwrapDI<DIScope>(Scope), Name, LinkageName, unwrapDI<DIFile>(File), - LineNo, unwrapDI<DISubroutineType>(Ty), IsLocalToUnit, IsDefinition, - ScopeLine, fromRust(Flags), IsOptimized, TParams, - unwrapDIPtr<DISubprogram>(Decl)); -+#endif - unwrap<Function>(Fn)->setSubprogram(Sub); - return wrap(Sub); - } -@@ -773,14 +848,14 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateEnumerationType( - LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, - LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits, - uint32_t AlignInBits, LLVMMetadataRef Elements, -- LLVMMetadataRef ClassTy, bool IsFixed) { -+ LLVMMetadataRef ClassTy, bool IsScoped) { - #if LLVM_VERSION_GE(7, 0) - return wrap(Builder->createEnumerationType( - unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIFile>(File), LineNumber, - SizeInBits, AlignInBits, DINodeArray(unwrapDI<MDTuple>(Elements)), -- unwrapDI<DIType>(ClassTy), "", IsFixed)); -+ unwrapDI<DIType>(ClassTy), "", IsScoped)); - #else -- // Ignore IsFixed on older LLVM. -+ // Ignore IsScoped on older LLVM. - return wrap(Builder->createEnumerationType( - unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIFile>(File), LineNumber, - SizeInBits, AlignInBits, DINodeArray(unwrapDI<MDTuple>(Elements)), -@@ -920,7 +995,11 @@ extern "C" void LLVMRustUnpackOptimizationDiagnostic( - if (loc.isValid()) { - *Line = loc.getLine(); - *Column = loc.getColumn(); -+#if LLVM_VERSION_GE(8, 0) -+ FilenameOS << loc.getAbsolutePath(); -+#else - FilenameOS << loc.getFilename(); -+#endif - } - - RawRustStringOstream MessageOS(MessageOut); -diff --git a/src/test/codegen/enum-debug-clike.rs b/src/test/codegen/enum-debug-clike.rs -index 98f07505f7..62cfef5a84 100644 ---- a/src/test/codegen/enum-debug-clike.rs -+++ b/src/test/codegen/enum-debug-clike.rs -@@ -8,8 +8,11 @@ - - // compile-flags: -g -C no-prepopulate-passes - -+// DIFlagFixedEnum was deprecated in 8.0, renamed to DIFlagEnumClass. -+// We match either for compatibility. -+ - // CHECK-LABEL: @main --// CHECK: {{.*}}DICompositeType{{.*}}tag: DW_TAG_enumeration_type,{{.*}}name: "E",{{.*}}flags: DIFlagFixedEnum,{{.*}} -+// CHECK: {{.*}}DICompositeType{{.*}}tag: DW_TAG_enumeration_type,{{.*}}name: "E",{{.*}}flags: {{(DIFlagEnumClass|DIFlagFixedEnum)}},{{.*}} - // CHECK: {{.*}}DIEnumerator{{.*}}name: "A",{{.*}}value: {{[0-9].*}} - // CHECK: {{.*}}DIEnumerator{{.*}}name: "B",{{.*}}value: {{[0-9].*}} - // CHECK: {{.*}}DIEnumerator{{.*}}name: "C",{{.*}}value: {{[0-9].*}} --- -2.19.2 - diff --git a/user/rust/APKBUILD b/user/rust/APKBUILD index e855f770f..393f2ce98 100644 --- a/user/rust/APKBUILD +++ b/user/rust/APKBUILD @@ -3,9 +3,9 @@ # Contributor: Jeizsm <jeizsm@gmail.com> # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=rust -pkgver=1.33.0 -_bootcargover=0.33.0 -_bootver=1.32.0 +pkgver=1.35.0 +_bootcargover=0.35.0 +_bootver=1.34.2 _llvmver=8 pkgrel=0 pkgdesc="The Rust Programming Language" @@ -51,16 +51,15 @@ source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.xz 0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch 0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch - 0008-test-enum-debug-Correct-minimum-LLVM-version.patch - 0009-test-use-extern-for-plugins-Don-t-assume-multilib.patch - 0010-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch - 0011-Ignore-broken-and-non-applicable-tests.patch - 0012-Link-stage-2-tools-dynamically-to-libstd.patch - 0013-Move-debugger-scripts-to-usr-share-rust.patch - 0014-Add-foxkit-target-specs.patch + 0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch + 0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch + 0010-Ignore-broken-and-non-applicable-tests.patch + 0011-Link-stage-2-tools-dynamically-to-libstd.patch + 0012-Move-debugger-scripts-to-usr-share-rust.patch + 0013-Add-foxkit-target-specs.patch 0030-libc-linkage.patch + 0031-typenum-pmmx.patch 0040-rls-atomics.patch - 0050-LLVM-8.0-compatibility.patch " builddir="$srcdir/rustc-$pkgver-src" _rlibdir="/usr/lib/rustlib/$CTARGET/lib" @@ -139,8 +138,6 @@ check() { src/test/pretty \ src/test/run-fail \ src/test/run-fail/pretty \ - src/test/run-fail-fulldeps \ - src/test/run-fail-fulldeps/pretty \ src/test/run-make \ src/test/run-make-fulldeps \ src/test/run-pass \ @@ -189,6 +186,7 @@ gdb() { install_if="$pkgname=$pkgver-r$pkgrel gdb" _mv "$pkgdir"/usr/bin/rust-gdb "$subpkgdir"/usr/bin + _mv "$pkgdir"/usr/bin/rust-gdbgui "$subpkgdir"/usr/bin _mv "$pkgdir"/usr/share/rust/gdb_*.py "$subpkgdir"/usr/share/rust || true } @@ -290,24 +288,23 @@ _mv() { mkdir -p "$dest" mv "$@" } -sha512sums="3291e4e19f75f44c81e6fcf4c01edc7c9d326eca43722381231abcf2e99f4314059ba59a29b79f5511ad9421c358c45e8fe18584d6954d17fe2aabad0f9d9147 rustc-1.33.0-src.tar.xz -24caa7730dd41f61b97bb909d499f928cebab948e814b786e7d3836e92188ef27da48147532e063b3cec424e41a4374581274f21dc79bb95cf310f92c8609579 cargo-0.33.0-powerpc64-foxkit-linux-musl.tar.xz -c6d237d6daaae1e8a342691917bdc76fa6a59f5bd99a1df38baebf6d5c1ddc6f8460ac6e1db8168120accb9c5f90f652ea013b4d865c486c72e90244be753ebd rust-std-1.32.0-powerpc64-foxkit-linux-musl.tar.xz -8ff3bca961e146593f17e1581d20eaeae99768a4fac65258cf5ef80ef69b427a4980fd345b69b831028ca3e882d52d2ebd42a2eccab2c812da09e2bc28960ffe rustc-1.32.0-powerpc64-foxkit-linux-musl.tar.xz -a5e03a091b224b9cd3cd6d8a0b1ac70389f374c95ff09f55b01e739b3a98a8551d2208b2750137ebaacbb8628d1bb54a96aaeb938c961e4eb33a071594bce1dc 0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch -bf387aad3d117e30621bd1914c3a713a710db0639413d57802c3a9bba49bf422dedf5e03b4a3073ec1efbd571cbcd10b6a0b3f98f2b019555581db5599b84f44 0002-Fix-LLVM-build.patch -b931204afaf3ac4c73f41c29586b0cebdb06867bf401717a473c2367ebf25be1a42827f7ccccea50c15006c744cb73fc7ea9627816d0a2b53421546a4e478436 0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch -da362880f89a2df8223ed255d44803e9d7d8115666946fe3a4fe4a78030cd8ee40d6aabc1ceaab110e62e9a67af7631729348f71f2d514458ef0a60e6decff3b 0004-Require-static-native-libraries-when-linking-static-.patch -1bdc441cb068697c7f6984e16bdde28bdd17b7a2517c33b666851d55f1d987a76e4d7f034b7221538c663c0a33603d8ac1f60ffb167a4a5d01677a7b214ab21d 0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch -03580acc8391a7b32fb2a7880c6a924838803e8ce4771e465f24b7a09263b9b0ca7ae4fd84770c262cf25734d49ab0f838d57104b181224b901e26f25dc9d2e9 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch -8e06768d0723aca0dd292942381255061b83505da89bc45c8c8c280dcaf3184e1b05b3744559fc3ed576f9a726bd593d892a71e8fd81bfebee62bb86d62f5531 0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch -52138d4cc238ee44eafabfe281e3378298d510c9ffd9f123a5934f33b7e68b6fa262605c044bfce5943b18983d0145bdf33b9c168e030fee892247ef7ce4ec19 0008-test-enum-debug-Correct-minimum-LLVM-version.patch -34be92c7ce327f488b7a933e7232890615b3d07c08a09028d712c01aa53f89025b47aaaccdc5c2e1d52948eb967b40ea2c576b29b0102feadc7153d6d9984f79 0009-test-use-extern-for-plugins-Don-t-assume-multilib.patch -47b025edccb7e2d7c42353c3a8665714a3b5661a7d832a9bd71bf9bff75ffe7c6e90a9d55b765dadec54ce29c2539fa894801487718ac1053bd4528b413a487d 0010-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch -c32c5d807ec23f5e88f47f83220a117ff3f048cec4731e50d0cae082c971ea03993a6e4f95225046a0b06b406608ee97fb85671ad8f86e5da4970bba210388d6 0011-Ignore-broken-and-non-applicable-tests.patch -6b089c21b3b756d5d8b3198f4a914d8a2f90216ce25d491f7caeb0a637d0f729e9e5184dfa3e07b50570df5791576d1aa4bf2a1f33183c67bc2ba6ba36c0752e 0012-Link-stage-2-tools-dynamically-to-libstd.patch -d9568a3e21b60831b193c4a9554756d0be77d0c63d06d6c3ff1c7fd35822aaa3b2e2cf8acd29fe07eb698ebf48673245e052a6ddfa4d39bb687eea8c4c236e50 0013-Move-debugger-scripts-to-usr-share-rust.patch -f1269241ccddf4594752b97e6856dad98ca987d2491b1bd95f6123352eec52f3acb3f17dae1c2a42be55e25db4a7e0d6bb1fb2b468cc139ad14559e0753a4c87 0014-Add-foxkit-target-specs.patch -7197503a3bf1cdd6cb5ff3350add2682cc64f7d33f7a4b270c53321401e439de5c24ddb2f7c5a76bb3488c8b766237f674fedaa9202c480f53595d7837214f0f 0030-libc-linkage.patch -41ab9d6f361ee2fba267c9836c1a382dc86101d1bfb59cd942be8e8fc526ad65d845c9395cba7f760808d345d107f32e75af9057d67c450b8fbdd8a73636fb2e 0040-rls-atomics.patch -ba39acb52fb65eb203ad08735b5d1c9150e49f9d0abd5e87a849d40c22e5847043521154cbb529fb3cc39005b309cafda5422fbd5a3598dac519db4456f6c571 0050-LLVM-8.0-compatibility.patch" +sha512sums="477c10b780bd54776be7ecbda0ab970416253e4a87c3e701825a7d07bcbcd91601b8e61129c5d04d4259e89c2e81e87cdbdee853375a8de5c9cf8372be2c9129 rustc-1.35.0-src.tar.xz +042b4c8a45cc803a202517dd376a2eb2daca50e1da43e96c32b07270afbdce4daa7091c3f11479f908e92d1031c1503a27ac37c007c1fa24743a82abcf765a29 cargo-0.35.0-powerpc-foxkit-linux-musl.tar.xz +a25de7843a512b79d214066cb2f01c4e414ae17c053314c103261e3ac805700dcb2ebc6aa28801cb74dcb6211cc57181d3c266d2b8988e2d8835df4b409929bb rust-std-1.34.2-powerpc-foxkit-linux-musl.tar.xz +9988037ebe219a30faf5740e479c34b464feabd37c192a2a37330f04d67dfed8f8a26439cdf8de4e255fa4fb17959bee7e78d5f6de040522131fdc70ccce8af1 rustc-1.34.2-powerpc-foxkit-linux-musl.tar.xz +dbc74b875e9fab4fdcb815dea4ef855a59361215c291ea11013587340f9e3cabece4b6cc94a0e118e862b47f9ee27447e385c2c524bcb8847a3d775ae2f76fb3 0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch +456c247b50936a2594024b5cec493e8ddbc3159196ce2cc8ae5134f1c3ac2f0928ae3ffe4f3f4154fcc2bf596846b6b3b39005ad76d51076796a9d3988f1df62 0002-Fix-LLVM-build.patch +d20a03a06315c114c61eedfd1b536169d64bd428beb352a4d04abb0358f0b1a75a1c1108e2429c80f715536bd67ef16597f47bd61e75f0e1ddd9681b43197763 0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch +a6a413a0e2435697fb66b6a11e4d9da8365b2c2d51d10eccbcac32fba09579199dc8bcd13fff1fd74212d1724292db5607827b2c546d2c06122e6f1fb70d8c16 0004-Require-static-native-libraries-when-linking-static-.patch +2bf5696f493c8b11da77f27348498338ca0f094f69f357077d5507b1f96b6066fa86b711c5c30737d82f217a7eb1afc8a4ce9d25f0491830a800a034607e0c6a 0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch +fedd9f54ae8d0780091dadac2364595abfc7ef13ac21a3489b91de5ad29efa477179f42ef59cb9a2e0264e15f88164f72843fc176180cd72e54052f3b305703c 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch +19e17358f738c982bb7a393e0b12173de8b79f905a677fdc5c183d54219b58a1618607e993cfe12d3eb69a2cb25a0b7b52313eb8e60a91ec9d37bb5b0c140b43 0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch +0c943ddb3fbacfa47adfa43e8ec41137d0e9c719e59af3ff1e3e1a2a6576c8eeed2b1db77f3f6f252eea273f9f1320c573ecde22e56800dbffac3e2ef18862f3 0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch +22429c5dbbfda30cc2f08ed5591124fc8346d63d6ef200607be3d051e2524fdaf8a32264bef4e99f9186b22c05c805bf82e7c6d6d814a602dcefd9d4d8d708fd 0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch +ec851207a03d4b3bf2711e2db677170f520217f19de9f4f9817e62b5f9d10573eb468ced5e13c540bb5cda8c7006b259a0a0241cfa70e1f6f08386e656c86b79 0010-Ignore-broken-and-non-applicable-tests.patch +2a459b55386a4e3419b22efe1c5b5b37d75e2d1a11db4670ee5217ad5404df055eb6510378c74f5ff5662e940155c58d094f41b5738021f608c807f94a498e94 0011-Link-stage-2-tools-dynamically-to-libstd.patch +9e698d01cdb535beb364827d2a0bc87b543db65973c88a7fa64e8e19c671d1cf4cc4c8756018bff261a7581df102c8180599c434b347463a63c5ab2f575ad4c2 0012-Move-debugger-scripts-to-usr-share-rust.patch +a403a032180ee7d3c0d034d97b8de175426d8dd3368ebfcab5ad9c7202f9a0ca0197a72adc1eff13f422ecaed9c0a7e4cd22daf85061159ddaa12c335fd00914 0013-Add-foxkit-target-specs.patch +6c3aaa27adbe361cb354c9a7139b9da949f4acba81af6107e5972fa5c32fa47a972b5ad4567b9b54f4383650dbb3a3c590dfe6f23a5af16d7ff4ad3fb334e997 0030-libc-linkage.patch +0cb12e9165d198c1e04b258454dbaf5459e192ad24d64c9fa132ebe0f1bcd5da3550eae8dfdaa792fa809b505af62964ecf0219dc4373420ee8ad3e111539a09 0031-typenum-pmmx.patch +ab35bacf45ef5e46be110a8d27867fd4d5deb23cd5cbe8dc7f1da2177469945f9254f2a7915ee4fc430468a4421623429f0a01eb9eba14e047384efe3d3ec152 0040-rls-atomics.patch" diff --git a/user/sane/APKBUILD b/user/sane/APKBUILD index 1a5e2fc16..941402502 100644 --- a/user/sane/APKBUILD +++ b/user/sane/APKBUILD @@ -4,7 +4,7 @@ pkgname=sane _pkgname=sane-backends pkgver=1.0.27 -pkgrel=4 +pkgrel=5 pkgdesc="Scanner access library" url="http://www.sane-project.org/" arch="all" @@ -35,7 +35,8 @@ for _backend in $_backends; do subpackages="$subpackages $pkgname-backend-$_backend:_backend" done subpackages="$pkgname-doc $pkgname-dev $subpackages $pkgname-utils saned - $pkgname-udev::noarch $_pkgname::noarch" + saned-openrc:openrc:noarch $pkgname-udev::noarch $_pkgname::noarch + $pkgname-lang" source="http://distfiles.gentoo.org/distfiles/$_pkgname-$pkgver.tar.gz saned.initd include.patch @@ -81,6 +82,12 @@ saned() { mkdir -p "$subpkgdir"/etc/sane.d "$subpkgdir"/usr mv "$pkgdir"/etc/sane.d/saned.conf "$subpkgdir"/etc/sane.d mv "$pkgdir"/usr/sbin "$subpkgdir"/usr/ +} + +openrc() { + pkgdesc="Network scanner server (OpenRC runscripts)" + depends="saned" + install_if="saned=$pkgver-r$pkgrel openrc" install -Dm755 "$srcdir"/saned.initd "$subpkgdir"/etc/init.d/saned } @@ -101,7 +108,7 @@ udev() { backends() { local _backend; pkgdesc="$pkgdesc (metapackage)" - depends="$pkgname-utils $pkgname-saned" + depends="$pkgname-utils saned" for _backend in $_backends; do [ "$_backend" = "test" ] && continue depends="$depends $pkgname-backend-$_backend" diff --git a/user/sassc/APKBUILD b/user/sassc/APKBUILD index ee082659f..258dc3e3f 100644 --- a/user/sassc/APKBUILD +++ b/user/sassc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sassc -pkgver=3.5.0 +pkgver=3.6.1 pkgrel=0 pkgdesc="CSS preprocessor and extension language compiler" url="https://sass-lang.com/" @@ -13,14 +13,12 @@ subpackages="" source="sassc-$pkgver.tar.gz::https://github.com/sass/sassc/archive/$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare export SASSC_VERSION=$pkgver autoreconf --force --install } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,13 +28,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9c94056f66688016dd8eaae9cc791be4b397406b89f1289946c4481b5e1904486878d22fd65e695ed89f9b41a9f902932eb4074e7b0923ce3d4823ea3140334f sassc-3.5.0.tar.gz" +sha512sums="b6df8f481db0737ca08808c0849dcbd83e80799d883271d382607b7a74028153195f5f9c26768ffe1a9a92ee8c26be3c382ad7b3a5336eb6e4a0dad58132690e sassc-3.6.1.tar.gz" diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD index 94f03db23..6496110b7 100644 --- a/user/sddm/APKBUILD +++ b/user/sddm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sddm pkgver=0.18.1 -pkgrel=0 +pkgrel=1 pkgdesc="Simple Desktop Display Manager" url="https://github.com/sddm/sddm/" arch="all" @@ -11,7 +11,7 @@ depends="consolekit2" makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev upower-dev consolekit2-dev linux-pam-dev qt5-qtdeclarative-dev qt5-qttools-dev utmps-dev" -subpackages="$pkgname-lang $pkgname-xdm::noarch" +subpackages="$pkgname-lang $pkgname-openrc" install="sddm.post-install" langdir="/usr/share/sddm/translations" pkgusers="sddm" @@ -19,8 +19,9 @@ pkggroups="sddm" source="https://github.com/sddm/sddm/releases/download/v$pkgver/sddm-$pkgver.tar.xz ck2-support.patch pam-path-fix.patch + sddm.initd utmpx.patch - xdm.confd" + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -46,16 +47,16 @@ check() { package() { make DESTDIR="$pkgdir" install + install -D -m755 "$srcdir"/sddm.initd "$pkgdir"/etc/init.d/sddm } -xdm() { - pkgdesc="Package to use SDDM as the system X display manager" - depends="sddm=$pkgver-r$pkgrel" - install -D -m644 "$srcdir"/xdm.confd "$subpkgdir"/etc/conf.d/xdm +openrc() { + default_openrc + depends="sddm xorg-server" } sha512sums="ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 sddm-0.18.1.tar.xz 075e3baf24606cdea620737dbc00f7cf5c487ab6d88e37b23a581afcfbcf872c379753c89c80ad5c90c28fa27d3e5c5df64d4fd30764fdbfc0586e0f26666fe1 ck2-support.patch f0b4eb7ef0581701157f9decc637629156f36f6711b9a4bae517f94d7a1df614c81bbd891c918f07ac50e2a3d1519c43ccb9eefd80282c95dd79eca0e8d90904 pam-path-fix.patch -c42d8b3edbc0ae7e3d5ea7bb0080c5c50e0569f0ea947e1ba17bc794c8c0d67a214e62aad7eba0a51791c44b29a3017692bbe738250c63cb2219891bb1313422 utmpx.patch -5a03b3211e9d84ee762523631859a26b869aee2189f6845dc780c7a1e60a6658e2240e9ef9be05858708d2552ae77b594509dabe49794538f88d2ad6578d1fdf xdm.confd" +10cac48b821ff7ad39ece4cbc45a8e814d00251b0f8d02f9e42888ad97f465438320f078663be98c5b39630a0bbb26f4f0d76b44574c87a76b4871872add8b9f sddm.initd +c42d8b3edbc0ae7e3d5ea7bb0080c5c50e0569f0ea947e1ba17bc794c8c0d67a214e62aad7eba0a51791c44b29a3017692bbe738250c63cb2219891bb1313422 utmpx.patch" diff --git a/user/sddm/sddm.initd b/user/sddm/sddm.initd new file mode 100644 index 000000000..cf5c1af79 --- /dev/null +++ b/user/sddm/sddm.initd @@ -0,0 +1,17 @@ +#!/sbin/openrc-run + +depends() { + needs localmount + after bootmisc consolefont modules netmount keymaps + + use consolekit dbus +} + +description="Simple Desktop Display Manager" +command="/usr/bin/sddm" +command_args="${sddm_opts}" +start_stop_daemon_args="-m --background" +pidfile="/var/run/sddm.pid" + +# uses the openrc templates for start()/stop() + diff --git a/user/sddm/xdm.confd b/user/sddm/xdm.confd deleted file mode 100644 index 9a6cd65da..000000000 --- a/user/sddm/xdm.confd +++ /dev/null @@ -1 +0,0 @@ -DISPLAYMANAGER="sddm" diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index 738ca85f0..59311a701 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="33beadaa47b0f870727a0a70eea074435c98aca8858c791b5a34bbf82b91a1f0c4eb200a98f659feca6c80802af6190235d9ce2a302cf9ea0c1fd5dc60ea86ea spectacle-19.04.1.tar.xz +sha512sums="26c1323c57034c45a49637904fa3228f24a6ce1fa1d3dd1512e09e42b5762bdc234092fe955d430f8326212f7032aa16f4a5964a51a0ab724408c6fdce0183a1 spectacle-19.04.2.tar.xz 781e1611026a45232fa117b90a1520bed380e512ae2e0690785a960f897342284ce0c553d8fb22caf10fd34c3823ee7dacb770815c871808345c1bb05126b74f qt5.9.patch" diff --git a/user/speech-dispatcher/APKBUILD b/user/speech-dispatcher/APKBUILD index 8c12dd18f..bb931aa9d 100644 --- a/user/speech-dispatcher/APKBUILD +++ b/user/speech-dispatcher/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=speech-dispatcher -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=0 pkgdesc="High-level interface to speech synthesis libraries" url="https://freebsoft.org/speechd" @@ -10,7 +10,7 @@ license="LGPL-2.1-only AND (GPL-2.0+ AND LGPL-2.1+) AND LGPL-2.1+ AND GPL-2.0+" depends="flite" makedepends="alsa-lib-dev dotconf-dev flite-dev glib-dev intltool libsndfile-dev pulseaudio-dev" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://github.com/brailcom/speechd/releases/download/$pkgver/speech-dispatcher-$pkgver.tar.gz" build() { @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d72542531f58954e424d1cf956f6cb4fd42d585a1d4b955b13e8a426729a06407cf4085b2b4885eac110d36216c9a8403d37b401eca5c2398011786bdf041083 speech-dispatcher-0.9.0.tar.gz" +sha512sums="35adb353d22b8dff8884cb20f3836f96f4f74b272bbd442d522a10a3d3b91a0da6705e6c216764f295208b5446c2077da620de2a81cafe5a0c4dd826e33753c2 speech-dispatcher-0.9.1.tar.gz" diff --git a/user/spleen/APKBUILD b/user/spleen/APKBUILD index add08cb24..8d30613ad 100644 --- a/user/spleen/APKBUILD +++ b/user/spleen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spleen -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="Monospace bitmap typeface from OpenBSD" url="https://www.cambus.net/spleen-monospaced-bitmap-fonts/" @@ -14,7 +14,6 @@ subpackages="" source="https://github.com/fcambus/spleen/releases/download/$pkgver/spleen-$pkgver.tar.gz" package() { - cd "$builddir" local _font for _font in *.pcf; do gzip -9 $_font @@ -22,4 +21,4 @@ package() { done } -sha512sums="e97245e3a7f176e1160900ebb0390165184f2f298ab210c5b1a870ed3c556a35ef0c6d7aeadf129c1f850ed060718ed07d4e27b3f93873f8b808b9610925c880 spleen-1.0.4.tar.gz" +sha512sums="9da587274ba7c26ad4c77fd2e37a3872506b882830c564734e8e3e9d3d720b393d1ad419d04912cbead516335817c923318a97257fb59bffb4d574e3fe20b79a spleen-1.0.5.tar.gz" diff --git a/user/step/APKBUILD b/user/step/APKBUILD index 64bf6c909..08e518ab4 100644 --- a/user/step/APKBUILD +++ b/user/step/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=step -pkgver=19.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Interactive physics simulation" url="https://www.kde.org/applications/education/step/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d3744c0c5cee20cae0b3f51ce68fcea5ae74091f55a02acea5009f1f70902f5666fbb67f20db1b17d1bbaeee6d6d8cdeea4c2d5a79239c3297febb3b7bc3fd7d step-19.04.1.tar.xz" +sha512sums="1b48f40f58315dd1126861b18ecf783c2f7994ae046377c14039676015e4a30d5cdad13bc5e52a822b1ee69786b52152b79210a4986a9c41431243b3d41eedc6 step-19.04.2.tar.xz" diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD index 1d034aff3..582a2dfd9 100644 --- a/user/subversion/APKBUILD +++ b/user/subversion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=subversion -pkgver=1.11.1 +pkgver=1.12.0 pkgrel=0 pkgdesc="Version control system from 2000" url="https://subversion.apache.org/" @@ -64,6 +64,6 @@ kwallet() { mv "$pkgdir"/usr/lib/libsvn_auth_kwallet* "$subpkgdir"/usr/lib/ } -sha512sums="2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d subversion-1.11.1.tar.bz2 +sha512sums="87a00b23bdac63124fa00642e2ac7e6f7818b092bc6422cabdeb2ca8fbc8c481fb8c1e4fbd86aac94e8e1fc099fa163aa0609aca23265ceb96ef4ebe78a64c13 subversion-1.12.0.tar.bz2 71b22f08a972a51347af00f979c4ec540c5795b44f3ced07ab2fcf8b1294b59add945983af4a63815d9f5d3b0ba88c24320cf2ec21189bf48c0ec46c7c0b48cf apr-1.7.0.patch 1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a python3-bang.patch" diff --git a/user/tcsh/002-test_123-posix_fix.patch b/user/tcsh/002-test_123-posix_fix.patch deleted file mode 100644 index 6ed59de38..000000000 --- a/user/tcsh/002-test_123-posix_fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -Author: Dan Theisen <djt@hxx.in> -Date: Wed Jun 06 03:30:25 2018 -0800 - -The following lines have a subtle change around [:blank:], changing it -to [[:blank:]] instead. This is required because POSIX treats characters -inside of brackets as a group of characters to match against. In this case, -[[:space:]] means [] group of characters, and [:space:] is the group, as per: -IEEE Std 1003.1-2017 (Revision of IEEE Std 1003.1-2008), Chapter 9 -http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html - ---- tcsh-6.20.00/tests/lexical.at.old 2018-06-06 02:20:16.787145186 -0700 -+++ tcsh-6.20.00/tests/lexical.at 2018-06-06 02:21:09.537890842 -0700 -@@ -567,10 +567,10 @@ - ]]) - AT_DATA([uniformity_test.csh], - [[ --set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'` -+set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'` - echo -n "$SERVICE_NAME_LOG" > ./output1 - --cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2 -+cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2 - - diff -uprN ./output1 ./output2 >& /dev/null - -@@ -587,7 +587,7 @@ - echo "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP\)(HOST=db\)(PORT=1521\)\)(CONNECT_DATA=(SERVER=DEDICATED\)(SERVICE_NAME=bns03\)\)\)" > ./expected_result - - set string = "jdbc_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=db)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=bns03)))" --set SERVICE_NAME_LOG = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'` -+set SERVICE_NAME_LOG = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'` - - echo "$SERVICE_NAME_LOG" > ./actual_result - diff --git a/user/tcsh/APKBUILD b/user/tcsh/APKBUILD index 2fdfac0b2..ee876adff 100644 --- a/user/tcsh/APKBUILD +++ b/user/tcsh/APKBUILD @@ -1,10 +1,12 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=tcsh -pkgver=6.20.00 -pkgrel=2 +pkgver=6.21.00 +_pkgver=${pkgver%.*.*}_${pkgver#*.} +_pkgver=${_pkgver%.*}_${_pkgver#*.} +pkgrel=0 pkgdesc="extended C-shell" -url="http://www.tcsh.org" +url="https://www.tcsh.org" arch="all" license="BSD-3-Clause" depends="" @@ -13,10 +15,10 @@ makedepends="ncurses-dev ncurses-terminfo utmps-dev gettext-tiny-dev" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" subpackages="$pkgname-doc" options="!checkroot" -source="$pkgname-$pkgver.tar.gz::http://http.debian.net/debian/pool/main/t/tcsh/${pkgname}_${pkgver}.orig.tar.gz - 001-sysmalloc.patch - 002-test_123-posix_fix.patch" +source="$pkgname-$pkgver.tar.gz::https://github.com/tcsh-org/tcsh/archive/TCSH${_pkgver}.tar.gz + 001-sysmalloc.patch" +builddir="$srcdir/${pkgname}-TCSH${_pkgver}" build() { cd "$builddir" LIBS="-lutmps -lskarnet -ltinfo" ./configure \ @@ -42,6 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9 tcsh-6.20.00.tar.gz -40149d8eb2fc0fe5184f3c24c7a1b728e881cc0048ccd37a986c3b2d2094499ec1c37ae2bae4c209fb8a847aa943e83e81f79e3d2f55c59990bc00d9d07f5a94 001-sysmalloc.patch -b4c1afe04554d117b1402608bcdb243148c0c7b2442bdc10dde3ed6601db5e7c5a2341373f9bdc31fda8860e47a6e152cdcc4e3a8b273742037eebc624df282c 002-test_123-posix_fix.patch" +sha512sums="305380fd065ca4703ffba002358b41727056481573a78301cb8c2390d5fe1a4107af5d482db5abf26f0ce9f7193c8aeb0e34fedcc40971499be2e6dc13bf3405 tcsh-6.21.00.tar.gz +40149d8eb2fc0fe5184f3c24c7a1b728e881cc0048ccd37a986c3b2d2094499ec1c37ae2bae4c209fb8a847aa943e83e81f79e3d2f55c59990bc00d9d07f5a94 001-sysmalloc.patch" diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD index 33cad700d..5af50c850 100644 --- a/user/tellico/APKBUILD +++ b/user/tellico/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tellico -pkgver=3.1.4 -pkgrel=0 +pkgver=3.2 +pkgrel=1 pkgdesc="Collection manager" url="http://tellico-project.org/" arch="all" @@ -37,16 +37,16 @@ build() { } check() { - # imagejob: needs running X11 + # imagejob, cite, csv: needs running X11 # htmlexporter: needs plasma desktop # filelisting: needs dbus # tellicoread: needs network - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(filelisting|imagejob|htmlexporter|tellicoread)test' + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(cite|csv|filelisting|imagejob|htmlexporter|tellicoread)test' } package() { make DESTDIR="$pkgdir" install } -sha512sums="d09183bee13ae9f7c6c5114b76eeeb959a184def559ae239bb880ef9be964e33878530e9c4c0d3baa6f872bf8db155dffb94592e3a857623ab131d2f28f1f139 tellico-3.1.4.tar.xz +sha512sums="a24985200a70958f727bda3056de357d6cb74fc407197e9d9056573bc606cd6ffbd5bd971ef56acce3cb58f0b98865f5e89b431fe38c1d27b4dceafe49e78fdd tellico-3.2.tar.xz 4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch" diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD index 38c088160..c11154579 100644 --- a/user/thunar-volman/APKBUILD +++ b/user/thunar-volman/APKBUILD @@ -1,20 +1,19 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=thunar-volman -pkgver=0.9.1 -pkgrel=0 +pkgver=0.9.2 +pkgrel=1 pkgdesc="Volume manager for Thunar" url="https://xfce.org" arch="all" license="GPL-2.0+" -makedepends="intltool libxfce4ui-dev thunar-dev exo-dev libgudev-dev libnotify-dev" +makedepends="exo-dev intltool libgudev-dev libnotify-dev libxfce4ui-dev + thunar-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/thunar-volman/0.9/thunar-volman-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/thunar-volman/0.9/thunar-volman-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="73d9884dc667e4f8554d2b06f7116bbe25fa4e113300f0cd32bc2229c22001cc709333d5ac5618f7d5c8a35e58fb7a61e48ecafa634c7e239e9af329dc4149bc thunar-volman-0.9.1.tar.bz2" +sha512sums="808f3dfdf105911275b0c96705604bd1575cd9c5bddaaae96583949c995a3bc84a71ce154c05ed3ce395d4b4d78e4d67770f79b3226fd4a35c509f5e612de72f thunar-volman-0.9.2.tar.bz2" diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index 2cc4590c0..7e7210458 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=thunar -pkgver=1.8.4 -pkgrel=0 +pkgver=1.8.6 +pkgrel=1 pkgdesc="File manager for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -11,13 +11,11 @@ makedepends="intltool gtk+3.0-dev exo-dev libxfce4ui-dev vala-dev gobject-introspection-dev libsm-dev libgudev-dev libnotify-dev libexif-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/thunar/1.8/Thunar-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/thunar/1.8/Thunar-$pkgver.tar.bz2" builddir="$srcdir/Thunar-$pkgver" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -28,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="886c0789aa19c2ab2ef34892c4afd09c857585b4796140ea3c84ccb9e1e1ca2935cf7e3a760a6ca8d8c68a5866663412500b4779878c7f48c9365c3ac7bf0eec Thunar-1.8.4.tar.bz2" +sha512sums="086dc139627d8f11341b2db91358ef1831d2b8494d34abac49355dbaf850a21c30f979294f9adf2bc8548e5f817a4e165803a3db74cd989cd3867a4e228d74db Thunar-1.8.6.tar.bz2" diff --git a/user/tiff/APKBUILD b/user/tiff/APKBUILD index 7bb89ee3e..c3f0590f9 100644 --- a/user/tiff/APKBUILD +++ b/user/tiff/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tiff pkgver=4.0.10 -pkgrel=0 +pkgrel=1 pkgdesc="Library to read, create, and manipulate TIFF image files" url="http://www.libtiff.org/" arch="all" @@ -13,8 +13,13 @@ depends_dev="zlib-dev libjpeg-turbo-dev" makedepends="libtool autoconf automake $depends_dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-tools" source="http://download.osgeo.org/libtiff/$pkgname-$pkgver.tar.gz + CVE-2019-6128.patch + CVE-2019-7663.patch " -# secfixes: +# secfixes: libtiff +# 4.0.10-r1: +# - CVE-2019-6128 +# - CVE-2019-7663 # 4.0.9-r1: # - CVE-2017-18013 # 4.0.9-r0: @@ -64,4 +69,6 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8 tiff-4.0.10.tar.gz" +sha512sums="d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8 tiff-4.0.10.tar.gz +8dc336e6c863524e3622f61ec6583eebe13fde55649cd8c812e3f6752242a23ff72cfb680dfcbe47d1503a058f5f9001415ae112220729e4ab50fe81190e327e CVE-2019-6128.patch +6fb7e9aa0afbae96fd6e78c2401262e496f5d62980ea02712bc43f8749341d030df3625f10413f5ed3e130e88d609c2374ae69807a1f9e54ed91cbd8411aab62 CVE-2019-7663.patch" diff --git a/user/tiff/CVE-2019-6128.patch b/user/tiff/CVE-2019-6128.patch new file mode 100644 index 000000000..1b15b6f01 --- /dev/null +++ b/user/tiff/CVE-2019-6128.patch @@ -0,0 +1,49 @@ +From 0c74a9f49b8d7a36b17b54a7428b3526d20f88a8 Mon Sep 17 00:00:00 2001 +From: Scott Gayou <github.scott@gmail.com> +Date: Wed, 23 Jan 2019 15:03:53 -0500 +Subject: [PATCH] Fix for simple memory leak that was assigned CVE-2019-6128. + +pal2rgb failed to free memory on a few errors. This was reported +here: http://bugzilla.maptools.org/show_bug.cgi?id=2836. +--- + tools/pal2rgb.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c +index 01d8502e..9492f1cf 100644 +--- a/tools/pal2rgb.c ++++ b/tools/pal2rgb.c +@@ -118,12 +118,14 @@ main(int argc, char* argv[]) + shortv != PHOTOMETRIC_PALETTE) { + fprintf(stderr, "%s: Expecting a palette image.\n", + argv[optind]); ++ (void) TIFFClose(in); + return (-1); + } + if (!TIFFGetField(in, TIFFTAG_COLORMAP, &rmap, &gmap, &bmap)) { + fprintf(stderr, + "%s: No colormap (not a valid palette image).\n", + argv[optind]); ++ (void) TIFFClose(in); + return (-1); + } + bitspersample = 0; +@@ -131,11 +133,14 @@ main(int argc, char* argv[]) + if (bitspersample != 8) { + fprintf(stderr, "%s: Sorry, can only handle 8-bit images.\n", + argv[optind]); ++ (void) TIFFClose(in); + return (-1); + } + out = TIFFOpen(argv[optind+1], "w"); +- if (out == NULL) ++ if (out == NULL) { ++ (void) TIFFClose(in); + return (-2); ++ } + cpTags(in, out); + TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &imagewidth); + TIFFGetField(in, TIFFTAG_IMAGELENGTH, &imagelength); +-- +2.21.0 + diff --git a/user/tiff/CVE-2019-7663.patch b/user/tiff/CVE-2019-7663.patch new file mode 100644 index 000000000..8049566c6 --- /dev/null +++ b/user/tiff/CVE-2019-7663.patch @@ -0,0 +1,37 @@ +From 802d3cbf3043be5dce5317e140ccb1c17a6a2d39 Mon Sep 17 00:00:00 2001 +From: Thomas Bernard <miniupnp@free.fr> +Date: Tue, 29 Jan 2019 11:21:47 +0100 +Subject: [PATCH] TIFFWriteDirectoryTagTransferfunction() : fix NULL + dereferencing + +http://bugzilla.maptools.org/show_bug.cgi?id=2833 + +we must check the pointer is not NULL before memcmp() the memory +--- + libtiff/tif_dirwrite.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c +index c15a28db..ef30c869 100644 +--- a/libtiff/tif_dirwrite.c ++++ b/libtiff/tif_dirwrite.c +@@ -1893,12 +1893,14 @@ TIFFWriteDirectoryTagTransferfunction(TIFF* tif, uint32* ndir, TIFFDirEntry* dir + n=3; + if (n==3) + { +- if (!_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[2],m*sizeof(uint16))) ++ if (tif->tif_dir.td_transferfunction[2] == NULL || ++ !_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[2],m*sizeof(uint16))) + n=2; + } + if (n==2) + { +- if (!_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[1],m*sizeof(uint16))) ++ if (tif->tif_dir.td_transferfunction[1] == NULL || ++ !_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[1],m*sizeof(uint16))) + n=1; + } + if (n==0) +-- +2.21.0 + diff --git a/user/tigervnc/APKBUILD b/user/tigervnc/APKBUILD index 1bbfcb8dc..3acea2e2d 100644 --- a/user/tigervnc/APKBUILD +++ b/user/tigervnc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tigervnc pkgver=1.9.0 -pkgrel=3 +pkgrel=4 pkgdesc="High-performance, platform-neutral VNC remote desktop application" url="https://tigervnc.org/" arch="all" @@ -19,6 +19,7 @@ source="tigervnc-$pkgver.tar.gz::https://github.com/TigerVNC/tigervnc/archive/v$ 0001-CSecurityTLS-Use-size_t-as-argument-for-new.patch null-termination.patch initialise-var.patch + ensure-throw.patch " build() { @@ -47,4 +48,5 @@ sha512sums="333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a 189a51a542b368e4db22174d09f5b656848e94577bbf93b2388f54529f1c7c2d32e5b5283551b3fb067ba21f6464f60989e22d4cd11ed3d87d5c931301555b49 endian.patch f95328f6b669e6608b9971de3db25d5eb26a733fbe32f13291c309ed57eacba6c86461a516c3b8cdc12ff7482ee0249a45189864d473d52df81df0a3541d95b9 0001-CSecurityTLS-Use-size_t-as-argument-for-new.patch 82566734e5288e899048b918ce47f5abc3b94196e88d54fa0b0ef68c20d1fcd9d5854f36a0043d28f81dc6213c9ee8cf55fb187aeeb8add5fc31765f6a5b23bb null-termination.patch -a7fb612d7e3625b66db66ffc7e3f28f2e47f79b858ff1fd9e403576ef2b8ff7bc8cf83a6f67439de6242e4a11a0144119d040f8f9e917e17a8af512b47067360 initialise-var.patch" +a7fb612d7e3625b66db66ffc7e3f28f2e47f79b858ff1fd9e403576ef2b8ff7bc8cf83a6f67439de6242e4a11a0144119d040f8f9e917e17a8af512b47067360 initialise-var.patch +4656a617dcb2bd28b653932fa034b7d46c49a08be4ba90501a9d1ddfad2130209664abf7bf5227f0afc926a568eb83e8e5f25e73887bf2561b2077fb1dab84c9 ensure-throw.patch" diff --git a/user/tigervnc/ensure-throw.patch b/user/tigervnc/ensure-throw.patch new file mode 100644 index 000000000..da873fe21 --- /dev/null +++ b/user/tigervnc/ensure-throw.patch @@ -0,0 +1,59 @@ +From 78bdd1700c4e42b492286a2af25bea0825848f99 Mon Sep 17 00:00:00 2001 +From: Pierre Ossman <ossman@cendio.se> +Date: Tue, 26 Mar 2019 11:10:28 +0100 +Subject: [PATCH] Add missing throws for exception + +It is not enough to create an exception object, you need to throw +it as well. +--- + common/rfb/CSecurityTLS.cxx | 10 +++++----- + win/rfb_win32/Registry.cxx | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/common/rfb/CSecurityTLS.cxx b/common/rfb/CSecurityTLS.cxx +index c6d1e3103..aa1910909 100644 +--- a/common/rfb/CSecurityTLS.cxx ++++ b/common/rfb/CSecurityTLS.cxx +@@ -391,7 +391,7 @@ void CSecurityTLS::checkSession() + "authority:\n\n%s\n\nDo you want to save it and " + "continue?\n ", info.data); + if (len < 0) +- AuthFailureException("certificate decoding error"); ++ throw AuthFailureException("certificate decoding error"); + + vlog.debug("%s", info.data); + +@@ -417,16 +417,16 @@ void CSecurityTLS::checkSession() + + if (gnutls_x509_crt_export(crt, GNUTLS_X509_FMT_PEM, NULL, &out_size) + == GNUTLS_E_SHORT_MEMORY_BUFFER) +- AuthFailureException("Out of memory"); ++ throw AuthFailureException("Out of memory"); + + // Save cert + out_buf = new char[out_size]; + if (out_buf == NULL) +- AuthFailureException("Out of memory"); ++ throw AuthFailureException("Out of memory"); + + if (gnutls_x509_crt_export(crt, GNUTLS_X509_FMT_PEM, out_buf, &out_size) < 0) +- AuthFailureException("certificate issuer unknown, and certificate " +- "export failed"); ++ throw AuthFailureException("certificate issuer unknown, and certificate " ++ "export failed"); + + char *homeDir = NULL; + if (getvnchomedir(&homeDir) == -1) +diff --git a/win/rfb_win32/Registry.cxx b/win/rfb_win32/Registry.cxx +index 963a36a29..9cd501842 100644 +--- a/win/rfb_win32/Registry.cxx ++++ b/win/rfb_win32/Registry.cxx +@@ -254,7 +254,7 @@ TCHAR* RegKey::getRepresentation(const TCHAR* valname) const { + TCharArray result(required); + length = ExpandEnvironmentStrings(str.buf, result.buf, required); + if (required<length) +- rdr::Exception("unable to expand environment strings"); ++ throw rdr::Exception("unable to expand environment strings"); + return result.takeBuf(); + } else { + return tstrDup(_T("")); diff --git a/user/tmux-bash-completion/APKBUILD b/user/tmux-bash-completion/APKBUILD index e34f15ea5..8ddbcc875 100644 --- a/user/tmux-bash-completion/APKBUILD +++ b/user/tmux-bash-completion/APKBUILD @@ -1,5 +1,5 @@ # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: zlg <zlg+adelie@zlg.space> +# Maintainer: pkgname=tmux-bash-completion pkgver=1.0.0_git20170805 _commit=847eda60c4664bfca833a086a3e2167957c26be0 diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD index 385b2bd77..62883e32e 100644 --- a/user/ttf-sudo/APKBUILD +++ b/user/ttf-sudo/APKBUILD @@ -15,9 +15,9 @@ builddir="$srcdir/sudo" package() { cd "$builddir" - mkdir -p "$pkgdir"/usr/share/X11/TTF/${pkgname#*-} + mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} for i in *.ttf; do - install -Dm644 "$i" "$pkgdir"/usr/share/X11/TTF/${pkgname#*-} + install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} done } diff --git a/user/ttf-terminus/APKBUILD b/user/ttf-terminus/APKBUILD index 532c7fa36..ebb4f09f4 100644 --- a/user/ttf-terminus/APKBUILD +++ b/user/ttf-terminus/APKBUILD @@ -15,9 +15,9 @@ builddir="$srcdir/terminus-ttf-$pkgver" package() { cd "$builddir" - mkdir -p "$pkgdir"/usr/share/X11/TTF/${pkgname#*-} + mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} for i in *.ttf; do - install -Dm644 "$i" "$pkgdir"/usr/share/X11/TTF/${pkgname#*-} + install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} done } diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD index fbf615688..27f7ee2b2 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=tumbler -pkgver=0.2.3 -pkgrel=1 +pkgver=0.2.4 +pkgrel=2 pkgdesc="Thumbnail generation service for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -12,12 +12,10 @@ makedepends="intltool dbus-glib-dev gdk-pixbuf-dev curl-dev freetype-dev libjpeg-turbo-dev libgsf-dev poppler-dev ffmpegthumbnailer-dev libopenraw-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/tumbler/0.2/tumbler-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/tumbler/0.2/tumbler-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -28,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="aefe284c3baa1d8eaf79c9bdb3cfc044ee6a1f36be34efd67541e6310aa275b5235b29f68483b7b7b5a8df699a8b3db8dc75569ec2b90253756fd6285a2e3816 tumbler-0.2.3.tar.bz2" +sha512sums="cf1d9499ff293086176a0e5055181e5527d9ae39a7786d9fe15a47202e1b02218981c072229e736a7057e85bf0c6ceff34c1f55a12396b3df0b3ab9fda822d02 tumbler-0.2.4.tar.bz2" diff --git a/user/udisks2/APKBUILD b/user/udisks2/APKBUILD index 2374ff4ea..11d012c9e 100644 --- a/user/udisks2/APKBUILD +++ b/user/udisks2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=udisks2 -pkgver=2.8.2 +pkgver=2.8.3 pkgrel=0 pkgdesc="A Disk Manager" url="https://www.freedesktop.org/wiki/Software/udisks" @@ -49,5 +49,5 @@ libs() { "$subpkgdir"/usr/lib/ } -sha512sums="dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a udisks-2.8.2.tar.bz2 +sha512sums="6d1d9ed18cb1742de13aad48709356f3dd9b8324967fd47107bd0f1e16b697d0928bd722397062495bdea51190774a25309834d27a5160feb7915becb474468f udisks-2.8.3.tar.bz2 269ba55cc755e2a484670258bc530790691b66c9fce9479a2a17d78cff5d52dd1be89290979efd44a0ba82be665f52a356a57f2cbb67951d91fe09d4e24c2a6a O_CLOEXEC.patch" diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD index 6b2e8cfb0..b4eb7799a 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.04.1 +pkgver=19.04.2 pkgrel=0 pkgdesc="Software modelling tool and code generator" url="https://umbrello.kde.org/" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5efac3aa2a2ac6d135562503da7923c530cf74816f1c2fc4c580bf7f8b3f4cc0a50b76f1f64d3393e131ed47c5ab3fcef44f558cb056f83d0b75b38d5d5865c8 umbrello-19.04.1.tar.xz +sha512sums="024cb3a7efa559ae79144aeee7b3b1cd916d05ce021f87b99ac78ab1ab9deb8a681b9d664f251ca3d415b5873ebdfeca3722404f1f565f296551d550fbcaa777 umbrello-19.04.2.tar.xz fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch" diff --git a/user/unbound/APKBUILD b/user/unbound/APKBUILD index 8838db965..b68881e4f 100644 --- a/user/unbound/APKBUILD +++ b/user/unbound/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=unbound -pkgver=1.9.1 +pkgver=1.9.2 pkgrel=0 pkgdesc="A validating, recursive and caching DNS resolver" -url="https://unbound.net/" +url="https://nlnetlabs.nl/projects/unbound/about/" arch="all" options="!checkroot" license="BSD-3-Clause" @@ -70,6 +70,6 @@ python() { mv "$pkgdir/usr/lib/python"* "$subpkgdir" } -sha512sums="5dfac7ce3892f73109fdfe0f81863643b1f4c10cee2d4e2d1a28132f1b9ea4d4f89242e4e6348fdadf998f1c75d53577cbf4f719e98faa1342fc3c5de2e8903d unbound-1.9.1.tar.gz +sha512sums="118f0e53ee2d5cfb53ce1f792ca680cc01b5825bf81575e36bd3b24f3bdbe14e6631401bf1bf85eb2ac2a3fa0ee2ee3eb6a28b245d06d48d9975ce4cc260f764 unbound-1.9.2.tar.gz de9dc269553f5449c1757690c2a8a3b9f228964f5672d721cfdbc29e6fab8954907fa4fa3761dd6f705b3ccd2f729cc6e2fe870107feb68cca611589f8306b94 unbound.confd 6627cbcbcb4e04f596e7e0ffdbf80ceb54cdb59144cb89896e53503dfb41b99fd77d8b85d05e6670f77023b6eafec8885b00c0c8e4e34e3e638c52c037a7985e unbound.initd" diff --git a/user/unifont/APKBUILD b/user/unifont/APKBUILD index 70182158c..67e99c144 100644 --- a/user/unifont/APKBUILD +++ b/user/unifont/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Breno Leitao <breno.leitao@gmail.com> # Maintainer: pkgname=unifont -pkgver=12.0.01 +pkgver=12.1.02 pkgrel=0 pkgdesc="GNU font package with all Unicode 11 characters" url="http://unifoundry.com/unifont.html" @@ -24,4 +24,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e44678acbf696d0529f3c2fe7fe796d3d6908a54b8eaa3f7cd5717d5bebc2698aed7f4e5cde4a954330d8bcaac6a5886839afb854d271ac3a03b460f774215c1 unifont-12.0.01.tar.gz" +sha512sums="031336c5811957f211e442c9d3a3920cc3149f80681802a0f9e2a9c905ccce8f0434bf37f6000d30ff568aa5020d4017034906be2b38ead7ebb35b7dc8d47299 unifont-12.1.02.tar.gz" diff --git a/user/usbutils/APKBUILD b/user/usbutils/APKBUILD index f174c0265..69a6b1618 100644 --- a/user/usbutils/APKBUILD +++ b/user/usbutils/APKBUILD @@ -1,20 +1,20 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=usbutils -pkgver=010 -pkgrel=1 +pkgver=012 +pkgrel=0 pkgdesc="USB utilities" url="http://linux-usb.sourceforge.net/" arch="all" license="GPL-2.0+ AND GPL-2.0-only" subpackages="$pkgname-doc" depends="hwids-udev" -makedepends="eudev-dev libusb-dev" +makedepends="autoconf automake eudev-dev libusb-dev" source="https://mirrors.kernel.org/pub/linux/utils/usb/usbutils/$pkgname-$pkgver.tar.xz hwdata.patch " build() { - cd "$builddir" + ./autogen.sh ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,14 +24,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="8bc197307bc34b38c406c58c939be32f0b20ce9d3e7c977472fe4c3d47e791765432e381fd8d7393df621bbd4bf159ca24a08b22441770e7ae464e767f99a2e3 usbutils-010.tar.xz -8e2839ec483797f6f97c0258f8fda0b3a56858787a69fe04ce7c0e8a98fd0f4d6640c68df9294d0e9bc36c57f7c6a44d74882176477ea3ffe44716d5bbb35a82 hwdata.patch" +sha512sums="e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66 usbutils-012.tar.xz +73cd69a7d80e2d48f303d11cadc7c68f64857ff3f8fc0625b179c0fa320553a4691050e24790bcd98cbb8b7b3733f875b45a6d1ae47aae2eeeefe0ca5e7c7c7e hwdata.patch" diff --git a/user/usbutils/hwdata.patch b/user/usbutils/hwdata.patch index f7c081fd8..fdeb9d17d 100644 --- a/user/usbutils/hwdata.patch +++ b/user/usbutils/hwdata.patch @@ -1,20 +1,20 @@ ---- a/lsusb.py.in -+++ b/lsusb.py.in -@@ -96,7 +96,7 @@ - return True +--- usbutils-012/lsusb.py.in.old 2019-05-07 14:35:51.000000000 +0000 ++++ usbutils-012/lsusb.py.in 2019-06-20 05:12:17.940002816 +0000 +@@ -67,7 +67,7 @@ + return type('MyEnum', (), enums) def parse_usb_ids(): - "Parse /usr/share/usb.ids and fill usbvendors, usbproducts, usbclasses" + "Parse /usr/share/hwdata/usb.ids and fill usbvendors, usbproducts, usbclasses" - id = 0 - sid = 0 - mode = 0 -@@ -520,7 +520,7 @@ - print(" -c use colors") - print(" -e display endpoint info") - print(" -w display warning if usb.ids is not sorted correctly") -- print(" -f FILE override filename for /usr/share/usb.ids") -+ print(" -f FILE override filename for /usr/share/hwdata/usb.ids") + vid = 0 + did = 0 + modes = myenum('Vendor', 'Class', 'Misc') +@@ -463,7 +463,7 @@ + print(" -C, --no-color disable colors") + print(" -e, --endpoints display endpoint info") + print(" -f FILE, --usbids-path FILE") +- print(" override filename for /usr/share/usb.ids") ++ print(" override filename for /usr/share/hwdata/usb.ids") + print() print("Use lsusb.py -ciu to get a nice overview of your USB devices.") - return 2 diff --git a/user/utf8proc/APKBUILD b/user/utf8proc/APKBUILD index 8b3234adb..a878a0abd 100644 --- a/user/utf8proc/APKBUILD +++ b/user/utf8proc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=utf8proc -pkgver=2.3.0 +pkgver=2.4.0 pkgrel=0 pkgdesc="C library for processing UTF-8 data" url=" " @@ -12,13 +12,7 @@ makedepends="" subpackages="$pkgname-dev" source="utf8proc-$pkgver.tar.gz::https://github.com/JuliaStrings/utf8proc/archive/v$pkgver.tar.gz" -prepare() { - default_prepare - mkdir build -} - build() { - cd "$builddir"/build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,8 +22,8 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_C_FLAGS="$CFLAGS" \ ${CMAKE_CROSSOPTS} \ - .. - make + -Bbuild + make -C build } check() { @@ -38,8 +32,7 @@ check() { } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="3935cd280e14ed570caa89a983b2d56a981e74da9298a1ea26064da78ece288ff48a73306446d3e1d777e6ecd8ea881f7a29169eaae2153cb015daefb8df8656 utf8proc-2.3.0.tar.gz" +sha512sums="2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a utf8proc-2.4.0.tar.gz" diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD index 3e6b0d5b0..8637da4ff 100644 --- a/user/vala/APKBUILD +++ b/user/vala/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vala -pkgver=0.44.3 +pkgver=0.44.5 pkgrel=0 pkgdesc="Compiler for the Vala programming language" url="https://wiki.gnome.org/Projects/Vala" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f074d537db94772565003a097c6a29e0dfcd58680baeb321ad04dec8ea056319eb8b7059117c259523b7570841651c2935feef06c03e3d82a11a94a293349b5a vala-0.44.3.tar.xz" +sha512sums="898ed675e0bdfac1ca2367363f6a5b930f021b3b6bc848314b8c1d43f37a312abfc54492eaa5e35f0d83b5b688fe27e5555ea46f1aba89a92cde7e6e8173d4fe vala-0.44.5.tar.xz" diff --git a/user/valgrind/0001-Ensure-ELFv2-is-supported-on-PPC64.patch b/user/valgrind/0001-Ensure-ELFv2-is-supported-on-PPC64.patch index 5272406ec..5d7dbe29c 100644 --- a/user/valgrind/0001-Ensure-ELFv2-is-supported-on-PPC64.patch +++ b/user/valgrind/0001-Ensure-ELFv2-is-supported-on-PPC64.patch @@ -1,35 +1,35 @@ -From a5224eb31a4c8a680587e74cc402e5ed92ead216 Mon Sep 17 00:00:00 2001 +From 1278e5015f6925d86274d6363c4cedf2ce47bfcb Mon Sep 17 00:00:00 2001 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Thu, 27 Sep 2018 15:42:40 -0500 -Subject: [PATCH] Ensure ELFv2 is supported on PPC64 +Date: Tue, 14 May 2019 14:07:50 +0200 +Subject: [PATCH] [PATCH] Ensure ELFv2 is supported on PPC64 --- - coregrind/m_dispatch/dispatch-ppc64be-linux.S | 107 ++++++++++++++++-- - coregrind/m_initimg/initimg-linux.c | 5 +- + coregrind/m_dispatch/dispatch-ppc64be-linux.S | 101 ++++++++++++++++-- + coregrind/m_initimg/initimg-linux.c | 3 +- coregrind/m_libcsetjmp.c | 7 +- coregrind/m_machine.c | 3 +- - coregrind/m_main.c | 19 ++-- + coregrind/m_main.c | 21 ++-- coregrind/m_sigframe/sigframe-ppc64-linux.c | 3 +- coregrind/m_signals.c | 11 +- - coregrind/m_stacktrace.c | 12 +- + coregrind/m_stacktrace.c | 12 ++- coregrind/m_syscall.c | 9 +- coregrind/m_syswrap/syscall-ppc64be-linux.S | 19 +++- coregrind/m_syswrap/syswrap-ppc64-linux.c | 9 +- coregrind/m_trampoline.S | 4 +- - coregrind/m_translate.c | 23 ++-- + coregrind/m_translate.c | 26 ++--- coregrind/m_ume/elf.c | 8 +- - coregrind/pub_core_machine.h | 12 +- + coregrind/pub_core_machine.h | 12 ++- coregrind/vg_preloaded.c | 3 +- include/valgrind.h | 16 ++- memcheck/mc_leakcheck.c | 2 +- memcheck/mc_machine.c | 3 +- - 19 files changed, 206 insertions(+), 69 deletions(-) + 19 files changed, 205 insertions(+), 67 deletions(-) diff --git a/coregrind/m_dispatch/dispatch-ppc64be-linux.S b/coregrind/m_dispatch/dispatch-ppc64be-linux.S -index 91bd3b236..eb8026c7c 100644 +index c5592d4..292b236 100644 --- a/coregrind/m_dispatch/dispatch-ppc64be-linux.S +++ b/coregrind/m_dispatch/dispatch-ppc64be-linux.S -@@ -75,14 +75,26 @@ void VG_(disp_run_translations)( UWord* two_words, +@@ -88,14 +88,26 @@ void VG_(disp_run_translations)( UWord* two_words, .section ".text" .align 2 .globl VG_(disp_run_translations) @@ -56,7 +56,7 @@ index 91bd3b236..eb8026c7c 100644 /* r3 holds two_words */ /* r4 holds guest_state */ /* r5 holds host_addr */ -@@ -231,6 +243,11 @@ VG_(disp_run_translations): +@@ -244,6 +256,11 @@ VG_(disp_run_translations): /* Set up the guest state ptr */ mr 31,4 /* r31 (generated code gsp) = r4 */ @@ -68,7 +68,7 @@ index 91bd3b236..eb8026c7c 100644 /* and jump into the code cache. Chained translations in the code cache run, until for whatever reason, they can't -@@ -385,7 +402,9 @@ VG_(disp_run_translations): +@@ -398,7 +415,9 @@ VG_(disp_run_translations): mtlr 0 addi 1,1,624 /* stack_size */ blr @@ -79,7 +79,7 @@ index 91bd3b236..eb8026c7c 100644 /*----------------------------------------------------*/ /*--- Continuation points ---*/ -@@ -395,15 +414,25 @@ VG_(disp_run_translations): +@@ -408,14 +427,24 @@ VG_(disp_run_translations): .section ".text" .align 2 .globl VG_(disp_cp_chain_me_to_slowEP) @@ -97,17 +97,15 @@ index 91bd3b236..eb8026c7c 100644 .type .VG_(disp_cp_chain_me_to_slowEP),@function .globl .VG_(disp_cp_chain_me_to_slowEP) .VG_(disp_cp_chain_me_to_slowEP): -- /* We got called. The return address indicates +#if _CALL_ELF == 2 +0: addis 2, 12,.TOC.-0b@ha + addi 2,2,.TOC.-0b@l + .localentry VG_(disp_cp_chain_me_to_slowEP), .-VG_(disp_cp_chain_me_to_slowEP) +#endif -+ /* We got called. The return address indicates + /* We got called. The return address indicates where the patching needs to happen. Collect the return address and, exit back to C land, - handing the caller the pair (Chain_me_S, RA) */ -@@ -415,20 +444,33 @@ VG_(disp_cp_chain_me_to_slowEP): +@@ -428,20 +457,33 @@ VG_(disp_cp_chain_me_to_slowEP): */ subi 7,7,20+4+4 b .postamble @@ -143,7 +141,7 @@ index 91bd3b236..eb8026c7c 100644 where the patching needs to happen. Collect the return address and, exit back to C land, handing the caller the pair (Chain_me_S, RA) */ -@@ -440,20 +482,33 @@ VG_(disp_cp_chain_me_to_fastEP): +@@ -453,19 +495,32 @@ VG_(disp_cp_chain_me_to_fastEP): */ subi 7,7,20+4+4 b .postamble @@ -155,12 +153,11 @@ index 91bd3b236..eb8026c7c 100644 .section ".text" .align 2 .globl VG_(disp_cp_xindir) -- .section ".opd","aw" +#if _CALL_ELF == 2 + .type VG_(disp_cp_xindir),@function +VG_(disp_cp_xindir): +#else -+ .section ".opd","aw" + .section ".opd","aw" .align 3 VG_(disp_cp_xindir): .quad .VG_(disp_cp_xindir),.TOC.@tocbase,0 @@ -169,27 +166,23 @@ index 91bd3b236..eb8026c7c 100644 .type .VG_(disp_cp_xindir),@function .globl .VG_(disp_cp_xindir) .VG_(disp_cp_xindir): -- /* Where are we going? */ +#if _CALL_ELF == 2 +0: addis 2, 12,.TOC.-0b@ha + addi 2,2,.TOC.-0b@l + .localentry VG_(disp_cp_xindir), .-VG_(disp_cp_xindir) +#endif -+ /* Where are we going? */ - ld 3,OFFSET_ppc64_CIA(31) - - /* stats only */ -@@ -479,6 +534,9 @@ VG_(disp_cp_xindir): - /* Found a match. Jump to .host. */ - mtctr 7 - bctr + /* Where are we going? */ + ld 20, OFFSET_ppc64_CIA(31) + +@@ -584,44 +639,72 @@ VG_(disp_cp_xindir): + li 7,0 + b .postamble + /*NOTREACHED*/ +#if _CALL_ELF == 2 + .size VG_(disp_cp_xindir),.-VG_(disp_cp_xindir) +#endif - .fast_lookup_failed: - /* stats only */ -@@ -496,39 +554,64 @@ VG_(disp_cp_xindir): + /* ------ Assisted jump ------ */ .section ".text" .align 2 .globl VG_(disp_cp_xassisted) @@ -260,7 +253,7 @@ index 91bd3b236..eb8026c7c 100644 /* Let the linker know we don't need an executable stack */ MARK_STACK_NO_EXEC diff --git a/coregrind/m_initimg/initimg-linux.c b/coregrind/m_initimg/initimg-linux.c -index 61cc458bc..19df79705 100644 +index 8a7f0d0..6891641 100644 --- a/coregrind/m_initimg/initimg-linux.c +++ b/coregrind/m_initimg/initimg-linux.c @@ -1117,7 +1117,8 @@ void VG_(ii_finalise_image)( IIFinaliseImageInfo iifii ) @@ -274,7 +267,7 @@ index 61cc458bc..19df79705 100644 #endif diff --git a/coregrind/m_libcsetjmp.c b/coregrind/m_libcsetjmp.c -index c73180640..ed96f4739 100644 +index 85ffc12..51273a0 100644 --- a/coregrind/m_libcsetjmp.c +++ b/coregrind/m_libcsetjmp.c @@ -35,6 +35,7 @@ @@ -306,10 +299,10 @@ index c73180640..ed96f4739 100644 ".section \".toc\",\"aw\"" "\n" diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c -index 31b0e1b6b..eb3e6a4e1 100644 +index df842aa..de37070 100644 --- a/coregrind/m_machine.c +++ b/coregrind/m_machine.c -@@ -2035,7 +2035,8 @@ void* VG_(fnptr_to_fnentry)( void* f ) +@@ -2073,7 +2073,8 @@ void* VG_(fnptr_to_fnentry)( void* f ) || defined(VGP_ppc32_linux) || defined(VGP_ppc64le_linux) \ || defined(VGP_s390x_linux) || defined(VGP_mips32_linux) \ || defined(VGP_mips64_linux) || defined(VGP_arm64_linux) \ @@ -320,33 +313,38 @@ index 31b0e1b6b..eb3e6a4e1 100644 # elif defined(VGP_ppc64be_linux) /* ppc64-linux uses the AIX scheme, in which f is a pointer to a diff --git a/coregrind/m_main.c b/coregrind/m_main.c -index bf4a71284..102235dca 100644 +index 21df679..855c933 100644 --- a/coregrind/m_main.c +++ b/coregrind/m_main.c -@@ -2274,7 +2274,7 @@ static void final_tidyup(ThreadId tid) +@@ -2303,7 +2303,7 @@ static void final_tidyup(ThreadId tid) return; /* won't do it */ } -# if defined(VGP_ppc64be_linux) +# if defined(VGP_ppc64be_linux) && defined(VG_PLAT_USES_PPCTOC) - Addr r2 = VG_(get_tocptr)(freeres_wrapper); + Addr r2 = VG_(get_tocptr)(VG_(current_DiEpoch)(), + freeres_wrapper); if (r2 == 0) { - VG_(message)(Vg_UserMsg, -@@ -2306,9 +2306,11 @@ static void final_tidyup(ThreadId tid) - directly. However, we need to set R2 (the toc pointer) +@@ -2336,13 +2336,15 @@ static void final_tidyup(ThreadId tid) appropriately. */ VG_(set_IP)(tid, freeres_wrapper); + -# if defined(VGP_ppc64be_linux) +# if (defined(VGP_ppc64be_linux) || defined(VGP_ppc64le_linux)) \ + && defined(VG_PLAT_USES_PPCTOC) VG_(threads)[tid].arch.vex.guest_GPR2 = r2; + VG_TRACK(post_reg_write, Vg_CoreClientReq, tid, + offsetof(VexGuestPPC64State, guest_GPR2), + sizeof(VG_(threads)[tid].arch.vex.guest_GPR2)); -# elif defined(VGP_ppc64le_linux) +- /* setting GPR2 but not really needed, GPR12 is needed */ +# elif (defined(VGP_ppc64be_linux) || defined(VGP_ppc64le_linux)) \ + && !defined(VG_PLAT_USES_PPCTOC) - /* setting GPR2 but not really needed, GPR12 is needed */ ++ /* setting GPR2 but not really needed, GPR12 is needed */ VG_(threads)[tid].arch.vex.guest_GPR2 = freeres_wrapper; - VG_(threads)[tid].arch.vex.guest_GPR12 = freeres_wrapper; -@@ -2610,9 +2612,10 @@ asm("\n" + VG_TRACK(post_reg_write, Vg_CoreClientReq, tid, + offsetof(VexGuestPPC64State, guest_GPR2), +@@ -2657,9 +2659,10 @@ asm("\n" "\ttrap\n" ".previous\n" ); @@ -359,7 +357,7 @@ index bf4a71284..102235dca 100644 So we must have one, and that is what goes into the .opd section. */ "\t.align 2\n" "\t.global _start\n" -@@ -2656,9 +2659,9 @@ asm("\n" +@@ -2703,9 +2706,9 @@ asm("\n" "\tnop\n" "\ttrap\n" ); @@ -373,7 +371,7 @@ index bf4a71284..102235dca 100644 asm("\n" "\t.align 2\n" diff --git a/coregrind/m_sigframe/sigframe-ppc64-linux.c b/coregrind/m_sigframe/sigframe-ppc64-linux.c -index b16606c22..cc657838f 100644 +index b16606c..cc65783 100644 --- a/coregrind/m_sigframe/sigframe-ppc64-linux.c +++ b/coregrind/m_sigframe/sigframe-ppc64-linux.c @@ -263,7 +263,8 @@ void VG_(sigframe_create)( ThreadId tid, @@ -387,10 +385,10 @@ index b16606c22..cc657838f 100644 tst->arch.vex.guest_CIA = (Addr) ((ULong*)handler)[0]; #else diff --git a/coregrind/m_signals.c b/coregrind/m_signals.c -index e572f17cc..52d939057 100644 +index 7591eb3..51fce79 100644 --- a/coregrind/m_signals.c +++ b/coregrind/m_signals.c -@@ -889,7 +889,9 @@ extern void my_sigreturn(void); +@@ -897,7 +897,9 @@ extern void my_sigreturn(void); " sc\n" \ ".previous\n" @@ -401,7 +399,7 @@ index e572f17cc..52d939057 100644 # define _MY_SIGRETURN(name) \ ".align 2\n" \ ".globl my_sigreturn\n" \ -@@ -904,9 +906,10 @@ extern void my_sigreturn(void); +@@ -912,9 +914,10 @@ extern void my_sigreturn(void); " li 0, " #name "\n" \ " sc\n" @@ -416,7 +414,7 @@ index e572f17cc..52d939057 100644 # define _MY_SIGRETURN(name) \ ".align 2\n" \ diff --git a/coregrind/m_stacktrace.c b/coregrind/m_stacktrace.c -index 24f1409dd..9be4c6da9 100644 +index b3ac89f..5ff90ef 100644 --- a/coregrind/m_stacktrace.c +++ b/coregrind/m_stacktrace.c @@ -726,7 +726,8 @@ UInt VG_(get_StackTrace_wrk) ( ThreadId tid_if_known, @@ -460,7 +458,7 @@ index 24f1409dd..9be4c6da9 100644 ppc64-linux. If LR points to our magic return stub, then we are in a wrapped or intercepted function, in diff --git a/coregrind/m_syscall.c b/coregrind/m_syscall.c -index 5948cecf5..c1cdfab27 100644 +index 5948cec..c1cdfab 100644 --- a/coregrind/m_syscall.c +++ b/coregrind/m_syscall.c @@ -470,7 +470,8 @@ asm( @@ -493,7 +491,7 @@ index 5948cecf5..c1cdfab27 100644 asm( ".align 2\n" diff --git a/coregrind/m_syswrap/syscall-ppc64be-linux.S b/coregrind/m_syswrap/syscall-ppc64be-linux.S -index 16e9cedc0..db0d8b4aa 100644 +index 16e9ced..db0d8b4 100644 --- a/coregrind/m_syswrap/syscall-ppc64be-linux.S +++ b/coregrind/m_syswrap/syscall-ppc64be-linux.S @@ -76,11 +76,24 @@ @@ -534,7 +532,7 @@ index 16e9cedc0..db0d8b4aa 100644 /* export the ranges so that VG_(fixup_guest_state_after_syscall_interrupted) can do the diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c -index 6549dd1b3..4ecbe38a6 100644 +index eada099..7186fe3 100644 --- a/coregrind/m_syswrap/syswrap-ppc64-linux.c +++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c @@ -41,6 +41,7 @@ @@ -575,7 +573,7 @@ index 6549dd1b3..4ecbe38a6 100644 " .globl do_syscall_clone_ppc64_linux\n" " .section \".opd\",\"aw\"\n" diff --git a/coregrind/m_trampoline.S b/coregrind/m_trampoline.S -index 0488b54bd..d00916aef 100644 +index 0488b54..d00916a 100644 --- a/coregrind/m_trampoline.S +++ b/coregrind/m_trampoline.S @@ -469,11 +469,11 @@ VG_(ppctoc_magic_redirect_return_stub): @@ -593,7 +591,7 @@ index 0488b54bd..d00916aef 100644 .align 3 VG_(ppc64_linux_REDIR_FOR_strlen): diff --git a/coregrind/m_translate.c b/coregrind/m_translate.c -index 3602a4663..bdd1d50ee 100644 +index 3602a46..6dd2845 100644 --- a/coregrind/m_translate.c +++ b/coregrind/m_translate.c @@ -1006,7 +1006,8 @@ static IRExpr* mkU32 ( UInt n ) { @@ -606,7 +604,7 @@ index 3602a4663..bdd1d50ee 100644 static IRExpr* mkU8 ( UChar n ) { return IRExpr_Const(IRConst_U8(n)); } -@@ -1234,7 +1234,8 @@ static void gen_push_and_set_LR_R2 ( IRSB* bb, Addr new_R2_value ) +@@ -1234,7 +1235,8 @@ static void gen_push_and_set_LR_R2 ( IRSB* bb, Addr new_R2_value ) } #endif @@ -616,7 +614,7 @@ index 3602a4663..bdd1d50ee 100644 static void gen_pop_R2_LR_then_bLR ( IRSB* bb ) { -@@ -1263,7 +1264,8 @@ static void gen_pop_R2_LR_then_bLR ( IRSB* bb ) +@@ -1263,7 +1265,8 @@ static void gen_pop_R2_LR_then_bLR ( IRSB* bb ) } #endif @@ -626,7 +624,7 @@ index 3602a4663..bdd1d50ee 100644 static Bool mk_preamble__ppctoc_magic_return_stub ( void* closureV, IRSB* bb ) -@@ -1285,7 +1287,7 @@ Bool mk_preamble__ppctoc_magic_return_stub ( void* closureV, IRSB* bb ) +@@ -1285,7 +1288,7 @@ Bool mk_preamble__ppctoc_magic_return_stub ( void* closureV, IRSB* bb ) } #endif @@ -635,7 +633,7 @@ index 3602a4663..bdd1d50ee 100644 /* Generate code to push LR and R2 onto this thread's redir stack. Need to save R2 in case we redirect to a global entry point. The value of R2 is not preserved when entering the global entry point. -@@ -1366,9 +1368,7 @@ Bool mk_preamble__set_NRADDR_to_zero ( void* closureV, IRSB* bb ) +@@ -1366,9 +1369,7 @@ Bool mk_preamble__set_NRADDR_to_zero ( void* closureV, IRSB* bb ) gen_push_and_set_LR_R2 ( bb, VG_(get_tocptr)( VG_(current_DiEpoch)(), closure->readdr ) ); } @@ -646,16 +644,17 @@ index 3602a4663..bdd1d50ee 100644 VgCallbackClosure* closure = (VgCallbackClosure*)closureV; Int offB_GPR12 = offsetof(VexGuestArchState, guest_GPR12); addStmtToIRSB(bb, IRStmt_Put(offB_GPR12, mkU64(closure->readdr))); -@@ -1424,7 +1424,6 @@ Bool mk_preamble__set_NRADDR_to_nraddr ( void* closureV, IRSB* bb ) +@@ -1424,8 +1425,7 @@ Bool mk_preamble__set_NRADDR_to_nraddr ( void* closureV, IRSB* bb ) ); - gen_push_and_set_LR_R2 ( bb, VG_(get_tocptr)( closure->readdr ) ); + gen_push_and_set_LR_R2 ( bb, VG_(get_tocptr)( VG_(current_DiEpoch)(), + closure->readdr ) ); -# endif -#if defined(VGP_ppc64le_linux) +#elif defined(VGP_ppc64be_linux) || defined(VGP_ppc64le_linux) /* This saves the r2 before leaving the function. We need to move * guest_NRADDR_GPR2 back to R2 on return. */ -@@ -1648,7 +1647,8 @@ Bool VG_(translate) ( ThreadId tid, +@@ -1648,7 +1648,8 @@ Bool VG_(translate) ( ThreadId tid, preamble_fn = mk_preamble__set_NRADDR_to_nraddr; /* LE we setup the LR */ @@ -665,7 +664,7 @@ index 3602a4663..bdd1d50ee 100644 if (nraddr == (Addr)&VG_(ppctoc_magic_redirect_return_stub)) { /* If entering the special return stub, this means a wrapped or redirected function is returning. Make this translation one -@@ -1692,13 +1692,14 @@ Bool VG_(translate) ( ThreadId tid, +@@ -1692,13 +1693,14 @@ Bool VG_(translate) ( ThreadId tid, vex_abiinfo.guest_ppc_zap_RZ_at_bl = NULL; # endif @@ -683,7 +682,7 @@ index 3602a4663..bdd1d50ee 100644 vex_abiinfo.guest_ppc_zap_RZ_at_bl = const_True; vex_abiinfo.host_ppc_calls_use_fndescrs = False; diff --git a/coregrind/m_ume/elf.c b/coregrind/m_ume/elf.c -index 21eb52bcb..f1e6b4728 100644 +index 21eb52b..f1e6b47 100644 --- a/coregrind/m_ume/elf.c +++ b/coregrind/m_ume/elf.c @@ -847,8 +847,8 @@ Int VG_(load_ELF)(Int fd, const HChar* name, /*MOD*/ExeInfo* info) @@ -709,7 +708,7 @@ index 21eb52bcb..f1e6b4728 100644 info->init_toc = 0; /* meaningless on this platform */ #else diff --git a/coregrind/pub_core_machine.h b/coregrind/pub_core_machine.h -index d6af843df..400148d57 100644 +index d6af843..400148d 100644 --- a/coregrind/pub_core_machine.h +++ b/coregrind/pub_core_machine.h @@ -60,12 +60,20 @@ @@ -736,7 +735,7 @@ index d6af843df..400148d57 100644 # define VG_ELF_DATA2XXX ELFDATA2LSB # define VG_ELF_MACHINE EM_ARM diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c -index ad033432a..f300fbe80 100644 +index ad03343..f300fbe 100644 --- a/coregrind/vg_preloaded.c +++ b/coregrind/vg_preloaded.c @@ -45,6 +45,7 @@ @@ -757,7 +756,7 @@ index ad033432a..f300fbe80 100644 address for the client request, but return the function descriptor from this function. diff --git a/include/valgrind.h b/include/valgrind.h -index 577c8f05e..99e058ccf 100644 +index cc8c2b8..3d30e7f 100644 --- a/include/valgrind.h +++ b/include/valgrind.h @@ -143,12 +143,20 @@ @@ -786,7 +785,7 @@ index 577c8f05e..99e058ccf 100644 # define PLAT_arm_linux 1 #elif defined(__linux__) && defined(__aarch64__) && !defined(__arm__) diff --git a/memcheck/mc_leakcheck.c b/memcheck/mc_leakcheck.c -index 782244481..c239f5b10 100644 +index 7822444..c239f5b 100644 --- a/memcheck/mc_leakcheck.c +++ b/memcheck/mc_leakcheck.c @@ -653,7 +653,7 @@ static Bool aligned_ptr_above_page0_is_vtable_addr(Addr ptr) @@ -799,19 +798,19 @@ index 782244481..c239f5b10 100644 // more level of indirection to follow. if (seg == NULL diff --git a/memcheck/mc_machine.c b/memcheck/mc_machine.c -index 5ed101fca..70c64b361 100644 +index 4ce746e..e03ab33 100644 --- a/memcheck/mc_machine.c +++ b/memcheck/mc_machine.c @@ -132,7 +132,8 @@ static Int get_otrack_shadow_offset_wrk ( Int offset, Int szB ) return GOF(GPRn); by testing ox instead of o, and setting ox back 4 bytes when sz == 4. */ --#if defined(VGA_ppc64le) -+#if (defined(VGA_ppc64be) && (defined(_CALL_ELF) && _CALL_ELF == 2)) \ -+ || defined(VGA_ppc64le) +-# if defined(VGA_ppc64le) ++# if (defined(VGA_ppc64be) && (defined(_CALL_ELF) && _CALL_ELF == 2)) \ ++ || defined(VGA_ppc64le) Int ox = o; - #else + # else Int ox = sz == 8 ? o : (o - 4); -- -2.18.0 +2.21.0 diff --git a/user/valgrind/APKBUILD b/user/valgrind/APKBUILD index fc710b4b2..f676d18e8 100644 --- a/user/valgrind/APKBUILD +++ b/user/valgrind/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=valgrind -pkgver=3.13.0 -pkgrel=5 +pkgver=3.15.0 +pkgrel=0 pkgdesc="A tool to help find memory-management problems in programs" url="http://valgrind.org/" arch="all" @@ -65,8 +65,8 @@ package() { fi } -sha512sums="34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009 valgrind-3.13.0.tar.bz2 -71afb12748f69f0976a299c65572818b70cbce5d04f230a49a50f114351d8083c59a9e197cefbcb9145806797ff4d1d54488f50342b680c9a2b76e4a7f7cf305 0001-Ensure-ELFv2-is-supported-on-PPC64.patch +sha512sums="5695d1355226fb63b0c80809ed43bb077b6eed4d427792d9d7ed944c38b557a84fe3c783517b921e32f161228e10e4625bea0550faa4685872bb4454450cfa7f valgrind-3.15.0.tar.bz2 +250177c3f50940560de9ad885cf5d9d7aa060ac832ced04875e1109b9114ec34e358a5c2309c8548f657e293cf50d980306d47b2cdf5e429aeabd10ffe666104 0001-Ensure-ELFv2-is-supported-on-PPC64.patch 9ee297d1b2b86891584443ad0caadc4977e1447979611ccf1cc55dbee61911b0b063bc4ad936d86c451cedae410cb3219b5a088b2ad0aa17df182d564fe36cfe arm.patch 57086a768f3876b26b0e507bc159a73f0955f03d5af8cc30e21103e348ca67f2e58b5555a5a97f299751c6602692ad43d8346bb68a80917d740fb4d65bba9665 realloc.patch d011b2769d35ca3206967e6dac9f3fb24a6496e5bbfdc73342382245c89375b09d6948b10ba3cf8aa0050c79c0dd13b75764aec0ec5c6ac479fa930941067747 suppressions.patch diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index a06e293ed..f5be9f620 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=vlc -pkgver=3.0.6 -pkgrel=1 +pkgver=3.0.7.1 +pkgrel=0 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" pkgusers="vlc" @@ -12,34 +12,9 @@ url="https://www.videolan.org/vlc/" arch="all" license="GPL-2.0+" options="!checkroot textrel" -subpackages="$pkgname-dev $pkgname-doc $pkgname-qt $pkgname-xorg - $pkgname-daemon::noarch $pkgname-libs $pkgname-plugins - $pkgname-lang - - $pkgname-plugins-access:plugins_access - $pkgname-plugins-access_output:plugins_access_output - $pkgname-plugins-audio_filter:plugins_audio_filter - $pkgname-plugins-audio_mixer:plugins_audio_mixer - $pkgname-plugins-audio_output:plugins_audio_output - $pkgname-plugins-codec:plugins_codec - $pkgname-plugins-control:plugins_control - $pkgname-plugins-demux:plugins_demux - $pkgname-plugins-gui:plugins_gui - $pkgname-plugins-lua:plugins_lua - $pkgname-plugins-meta_engine:plugins_meta_engine - $pkgname-plugins-misc:plugins_misc - $pkgname-plugins-mux:plugins_mux - $pkgname-plugins-notify:plugins_notify - $pkgname-plugins-packetizer:plugins_packetizer - $pkgname-plugins-services_discovery:plugins_services_discovery - $pkgname-plugins-stream_filter:plugins_stream_filter - $pkgname-plugins-stream_out:plugins_stream_out - $pkgname-plugins-text_renderer:plugins_text_renderer - $pkgname-plugins-video_chroma:plugins_video_chroma - $pkgname-plugins-video_filter:plugins_video_filter - $pkgname-plugins-video_output:plugins_video_output - $pkgname-plugins-visualization:plugins_visualization" -depends="ttf-dejavu $pkgname-plugins" +subpackages="$pkgname-dev $pkgname-doc $pkgname-qt $pkgname-pulse + $pkgname-daemon::noarch $pkgname-libs $pkgname-lang" +depends="ttf-dejavu xdg-utils" # Generic dependencies, then X11, then multimedia libraries makedepends="autoconf automake bison eudev-dev flex libarchive-dev libgcrypt-dev libtool libxml2-dev lua5.3-dev ncurses-dev sysfsutils-dev @@ -58,6 +33,7 @@ makedepends="autoconf automake bison eudev-dev flex libarchive-dev libraw1394-dev>=2.0.1 librsvg-dev libshout-dev libtheora-dev libva-dev libvdpau-dev libvorbis-dev live-media-dev opus-dev pulseaudio-dev speex-dev speexdsp-dev taglib-dev v4l-utils-dev x264-dev x265-dev" +replaces="vlc-plugins vlc-xorg" source="https://get.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz check-headless.patch disable-sub-autodetect-fuzzy-1-test.patch @@ -165,43 +141,23 @@ check() { make check } -plugins() { - pkgdesc="$pkgname all plugins meta package" - depends="$pkgname-plugins-access - $pkgname-plugins-access_output - $pkgname-plugins-audio_filter - $pkgname-plugins-audio_mixer - $pkgname-plugins-audio_output - $pkgname-plugins-codec - $pkgname-plugins-control - $pkgname-plugins-demux - $pkgname-plugins-gui - $pkgname-plugins-lua - $pkgname-plugins-meta_engine - $pkgname-plugins-misc - $pkgname-plugins-mux - $pkgname-plugins-notify - $pkgname-plugins-packetizer - $pkgname-plugins-services_discovery - $pkgname-plugins-stream_filter - $pkgname-plugins-stream_out - $pkgname-plugins-text_renderer - $pkgname-plugins-video_chroma - $pkgname-plugins-video_filter - $pkgname-plugins-video_output - $pkgname-plugins-visualization" - mkdir -p "$subpkgdir" -} - _mv() { local dir=${1%/*} mkdir -p "$subpkgdir"/$dir mv "$1" "$subpkgdir"/$dir/ } +pulse() { + pkgdesc="PulseAudio support for VLC" + depends="" + install_if="vlc pulseaudio" + mkdir -p "$subpkgdir"/usr/lib/vlc + mv "$pkgdir"/usr/lib/vlc/libvlc_pulse* "$subpkgdir"/usr/lib/vlc/ +} + qt() { pkgdesc="Qt frontend for VLC" - depends="vlc-xorg=$pkgver-r$pkgrel" + depends="vlc=$pkgver-r$pkgrel" cd "$pkgdir" # scan for elf files that directly or indirectly depends on # libQt* libraries @@ -216,32 +172,6 @@ qt() { "$subpkgdir"/usr/bin/ } -xorg() { - pkgdesc="Video LAN X.org support" - depends="xdg-utils vlc=$pkgver-r$pkgrel" - - # scan for elf files that directly or indirectly depends on - # libX* libraries - cd "$pkgdir" - for i in $(find . -type f ); do - if ldd $i 2>/dev/null | grep -E -q "libX|x11|libxcb|libGL"; then - echo $i | grep libavcodec_plugin.so || _mv "$i" || return 1 - fi - done - - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/svlc \ - "$subpkgdir"/usr/bin - - mkdir -p "$subpkgdir"/usr/share/vlc - mv "$pkgdir"/usr/share/applications \ - "$pkgdir"/usr/share/icons \ - "$subpkgdir"/usr/share/ - - mv "$pkgdir"/usr/share/vlc/skins2 \ - "$subpkgdir"/usr/share/vlc -} - daemon() { pkgdesc="Support for running VLC as a daemon" install="vlc-daemon.pre-install" @@ -262,40 +192,7 @@ libs() { default_libs } -_mv_plugins() { - local plugin=$1 - pkgdesc="$pkgname $plugin plugin" - depends= - mkdir -p "$subpkgdir"/usr/lib/vlc/plugins - mv "$pkgdir"/usr/lib/vlc/plugins/"$plugin" \ - "$subpkgdir"/usr/lib/vlc/plugins -} - -plugins_access() { _mv_plugins access; } -plugins_access_output() { _mv_plugins access_output; } -plugins_audio_filter() { _mv_plugins audio_filter; } -plugins_audio_mixer() { _mv_plugins audio_mixer; } -plugins_audio_output() { _mv_plugins audio_output; } -plugins_codec() { _mv_plugins codec; } -plugins_control() { _mv_plugins control; } -plugins_demux() { _mv_plugins demux; } -plugins_gui() { _mv_plugins gui; } -plugins_lua() { _mv_plugins lua; } -plugins_meta_engine() { _mv_plugins meta_engine; } -plugins_misc() { _mv_plugins misc; } -plugins_mux() { _mv_plugins mux; } -plugins_notify() { _mv_plugins notify; } -plugins_packetizer() { _mv_plugins packetizer; } -plugins_services_discovery() { _mv_plugins services_discovery; } -plugins_stream_filter() { _mv_plugins stream_filter; } -plugins_stream_out() { _mv_plugins stream_out; } -plugins_text_renderer() { _mv_plugins text_renderer; } -plugins_video_chroma() { _mv_plugins video_chroma; } -plugins_video_filter() { _mv_plugins video_filter; } -plugins_video_output() { _mv_plugins video_output; } -plugins_visualization() { _mv_plugins visualization; } - -sha512sums="7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52 vlc-3.0.6.tar.xz +sha512sums="6b99ae0564630a7a7ca9187c3bb954c601e384522ce93460b73f2dbf31787ce5828daca9f31c781b97db77872d76b6a3e871ff3401d70f1b5829fee7c4e847fd vlc-3.0.7.1.tar.xz 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd4630948e30c4329d27bd928f95de20fe1050d5e839778a4d012 endian-fix.patch diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index bd9e7c4a5..0eee63bb6 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vte -pkgver=0.56.2 +pkgver=0.56.3 pkgrel=0 pkgdesc="Virtual terminal emulator library for Gnome" url="https://www.gnome.org" @@ -33,5 +33,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8327a77abdfd97d7feda358e767046054ee24f9302c9187f2979e22c0034d4a6e9bf271fc327b866a43b404d7fe50ac36d1a4aebd58340744bdde24ecaa415ad vte-0.56.2.tar.xz +sha512sums="f78b3d532ca47e53c1bb51db6780697ce4692d493c0030d2dc4beb63a2595e44a43eb409ee31b94e4551eae259ac1baa8f06825a02fd66df8352e192f4ea1988 vte-0.56.3.tar.xz 4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch" diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index b298be73a..5c8d91b84 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -2,8 +2,8 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=weechat -pkgver=2.4 -pkgrel=0 +pkgver=2.5 +pkgrel=1 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://www.weechat.org" arch="all" @@ -13,10 +13,11 @@ depends_dev="cmake aspell-dev curl-dev gnutls-dev libgcrypt-dev lua5.3-dev ncurses-dev perl-dev python3-dev zlib-dev" makedepends="$depends_dev" checkdepends="cpputest" -subpackages="$pkgname-dev $pkgname-aspell:_plugin $pkgname-lua:_plugin +subpackages="$pkgname-dev $pkgname-spell:_plugin $pkgname-lua:_plugin $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-lang" source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz libintl-fix.patch + python.patch " # secfixes: @@ -48,8 +49,8 @@ _plugin() { local _dir=usr/lib/weechat/plugins pkgdesc="WeeChat $_name plugin" depends="weechat" - if [ "$_name" = python ]; then - depends="$depends python3" + if [ "$_name" = spell ]; then + provides="$pkgname-aspell=$pkgver-r$pkgrel" fi mkdir -p "$subpkgdir"/$_dir @@ -61,5 +62,6 @@ check() { ctest -V } -sha512sums="3537c3032237b0f1d103849516ccb461a29e13bf37f021af7905c75a3dc7c70fa4a76be2e8559b0299165c114d0408f3267fb74eb21a70f1661e6dac35e3bb9a weechat-2.4.tar.gz -59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch" +sha512sums="1bf16c76e63668fc6d4b72d521f71980717b08bd2abc5c7f0825af32e6de9327c5c967067bfb025a0404eee627f54cecdd9f1f2b3618ea7a08798d8510a2487b weechat-2.5.tar.gz +59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch +b77bd5f31bf4547d1d5505fec5018b867f0b597ed0b6819d4ed0ff6a2b7f664f2308f6c1b094debc381673b4de6208f09ca36da3413eb72f40aca9924464d746 python.patch" diff --git a/user/weechat/python.patch b/user/weechat/python.patch new file mode 100644 index 000000000..a6e194719 --- /dev/null +++ b/user/weechat/python.patch @@ -0,0 +1,86 @@ +--- weechat-2.5/cmake/FindPython.cmake 2019-06-06 18:43:20.000000000 +0000 ++++ weechat-2.5/cmake/FindPython.cmake 2019-06-24 12:22:10.659972390 +0000 +@@ -25,7 +25,6 @@ + # + # PYTHON_EXECUTABLE = full path to the python binary + # PYTHON_INCLUDE_PATH = path to where python.h can be found +-# PYTHON_LIBRARY = path to where libpython.so* can be found + # PYTHON_LFLAGS = python compiler options for linking + + if(PYTHON_FOUND) +@@ -38,11 +37,19 @@ + NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python + PATHS /usr/bin /usr/local/bin /usr/pkg/bin + ) ++ find_program(PYTHON_CONFIG ++ NAMES python3-config ++ PATHS /usr/bin /usr/local/bin /usr/pkg/bin ++ ) + else() + find_program(PYTHON_EXECUTABLE + NAMES python2.7 python2.6 python2.5 python + PATHS /usr/bin /usr/local/bin /usr/pkg/bin + ) ++ find_program(PYTHON_CONFIG ++ NAMES python-config ++ PATHS /usr/bin /usr/local/bin /usr/pkg/bin ++ ) + endif() + + if(PYTHON_EXECUTABLE) +@@ -52,32 +59,17 @@ + ) + + execute_process( +- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBPL'))" +- OUTPUT_VARIABLE PYTHON_POSSIBLE_LIB_PATH +- ) +- +- execute_process( +- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBS') + ' ' + get_config_var('LINKFORSHARED'))" ++ COMMAND ${PYTHON_CONFIG} --libs + OUTPUT_VARIABLE PYTHON_LFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + find_path(PYTHON_INCLUDE_PATH + NAMES Python.h + HINTS ${PYTHON_INC_DIR} + ) +- if(ENABLE_PYTHON3) +- find_library(PYTHON_LIBRARY +- NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python +- HINTS ${PYTHON_POSSIBLE_LIB_PATH} +- ) +- else() +- find_library(PYTHON_LIBRARY +- NAMES python2.7 python2.6 python2.5 python +- HINTS ${PYTHON_POSSIBLE_LIB_PATH} +- ) +- endif() + +- if(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH) ++ if(PYTHON_LFLAGS AND PYTHON_INCLUDE_PATH) + execute_process( + COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])" + OUTPUT_VARIABLE PYTHON_VERSION +@@ -96,7 +88,6 @@ + mark_as_advanced( + PYTHON_EXECUTABLE + PYTHON_INCLUDE_PATH +- PYTHON_LIBRARY + PYTHON_LFLAGS + ) + +--- weechat-2.5/src/plugins/python/CMakeLists.txt 2019-06-06 18:43:20.000000000 +0000 ++++ weechat-2.5/src/plugins/python/CMakeLists.txt 2019-06-24 12:22:16.259972363 +0000 +@@ -24,8 +24,7 @@ + + if(PYTHON_FOUND) + include_directories(${PYTHON_INCLUDE_PATH}) +- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PYTHON_LFLAGS}") +- target_link_libraries(python ${PYTHON_LIBRARY} weechat_plugins_scripts coverage_config) ++ target_link_libraries(python ${PYTHON_LFLAGS} weechat_plugins_scripts coverage_config) + endif() + + install(TARGETS python LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins) diff --git a/user/wine/APKBUILD b/user/wine/APKBUILD index 99cf1f2dd..ea9384603 100644 --- a/user/wine/APKBUILD +++ b/user/wine/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Martell Malone <martell@marinelayer.io> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=wine -pkgver=3.0.2 +pkgver=4.0.1 pkgrel=0 pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -20,7 +20,7 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev libxcomposite-dev libxrender-dev libxinerama-dev zlib-dev cups-dev alsa-lib-dev libxml2-dev dbus-dev libxi-dev gnutls-dev tiff-dev v4l-utils-dev udisks2-dev autoconf automake - openal-soft-dev pulseaudio-dev sane-dev eudev-dev + openal-soft-dev pulseaudio-dev sane-dev eudev-dev mpg123-dev " source="http://dl.winehq.org/$pkgname/source/${pkgver%.[1-9]}/$pkgname-$pkgver.tar.xz no-pie.patch @@ -53,6 +53,7 @@ build() { --with-fontconfig \ --with-freetype \ --with-jpeg \ + --with-mpg123 \ --with-openal \ --with-opengl \ --with-png \ @@ -64,7 +65,7 @@ build() { --with-xcomposite \ --with-xinerama \ --with-xslt \ - $_win64 + $_win64 make } @@ -129,6 +130,6 @@ libs() { done } -sha512sums="dbd0f242c5eace297ad16e314b8ad139e7d430de7eb8ca52b2006d0b80db4809e28a0e785d404a65ea1acdb56e7f06ebfc9a50071db1edaa6180c8835e7c4b13 wine-3.0.2.tar.xz -d853875f7d659617bdfba364704abd75b760d12977f1f13acc73acb3c8fefec0549677fb79a4f8955e073d64078b3071d63d97262522e22b7832a66d3d820a9c no-pie.patch +sha512sums="dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc wine-4.0.1.tar.xz +a96b1e248447912ba522067b67fc920063f355f326eaf3fec760c79a1c6e46019fbdcfa8b95b9d389959a7e3d3ab794f9aaf78913ad6a73be32b5d34ca8a2267 no-pie.patch 522a94a31fc459e80ea7dd05f7aee64f6ae666ec05236d06614acde118d5c60002e0f253ae75edb5f02164f22937ca89578504b690d1a5611bd60f703c8f0c00 winhlp32-flex.patch" diff --git a/user/wine/no-pie.patch b/user/wine/no-pie.patch index 5fb5d87b6..2874e0af8 100644 --- a/user/wine/no-pie.patch +++ b/user/wine/no-pie.patch @@ -1,14 +1,11 @@ -diff --git a/loader/Makefile.in b/loader/Makefile.in -index 8190037..437d4d9 100644 ---- a/loader/Makefile.in -+++ b/loader/Makefile.in -@@ -26,7 +26,7 @@ wine64_DEPS = $(WINELOADER_DEPENDS) - wine64_LDFLAGS = $(LDEXECFLAGS) -lwine $(PTHREAD_LIBS) +--- wine-4.0.1/configure.ac ++++ wine-4.0.1/configure.ac +@@ -955,7 +955,7 @@ - wine_preloader_OBJS = preloader.o --wine_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -+wine_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -no-pie + WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], + [WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) +- WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000" ++ WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -no-pie" - wine64_preloader_OBJS = preloader.o --wine64_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -+wine64_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -no-pie + WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], + [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" diff --git a/user/wine/nopie.patch b/user/wine/nopie.patch deleted file mode 100644 index 54eb141be..000000000 --- a/user/wine/nopie.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/loader/Makefile.in b/loader/Makefile.in -index 8190037..b4f2902 100644 ---- a/loader/Makefile.in -+++ b/loader/Makefile.in -@@ -29,4 +29,4 @@ wine_preloader_OBJS = preloader.o - wine_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 - - wine64_preloader_OBJS = preloader.o --wine64_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -+wine64_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -no-pie diff --git a/user/wireguard-module-power8-64k/APKBUILD b/user/wireguard-module-power8-64k/APKBUILD index ed1fa1ba3..bbac9bafa 100644 --- a/user/wireguard-module-power8-64k/APKBUILD +++ b/user/wireguard-module-power8-64k/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Luis Ressel <aranea@aixah.de> # KEEP THIS IN SYNC with the other wireguard-module packages. _kflavour="-power8-64k" -_kver="4.14.88-mc13" -pkgver=0.0.20190406 +_kver="4.14.127-mc14" +pkgver=0.0.20190702 pkgrel=0 _pkgname="wireguard-module$_kflavour" pkgname="$_pkgname-$_kver" @@ -29,4 +29,4 @@ package() { make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install } -sha512sums="e3035030299f5a6ae3ac0c2e35dc2d54745cda8f31185b21c6590f1ddcc9c7a83bf7b71cc71f6d48ed6dc8f2b31f3c704f8fa85685d4113f4c560f7eba7b7d5e WireGuard-0.0.20190406.tar.xz" +sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501 WireGuard-0.0.20190702.tar.xz" diff --git a/user/wireguard-module-power8/APKBUILD b/user/wireguard-module-power8/APKBUILD index 260d22029..4405367b7 100644 --- a/user/wireguard-module-power8/APKBUILD +++ b/user/wireguard-module-power8/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Luis Ressel <aranea@aixah.de> # KEEP THIS IN SYNC with the other wireguard-module packages. _kflavour="-power8" -_kver="4.14.88-mc13" -pkgver=0.0.20190406 +_kver="4.14.127-mc14" +pkgver=0.0.20190702 pkgrel=0 _pkgname="wireguard-module$_kflavour" pkgname="$_pkgname-$_kver" @@ -29,4 +29,4 @@ package() { make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install } -sha512sums="e3035030299f5a6ae3ac0c2e35dc2d54745cda8f31185b21c6590f1ddcc9c7a83bf7b71cc71f6d48ed6dc8f2b31f3c704f8fa85685d4113f4c560f7eba7b7d5e WireGuard-0.0.20190406.tar.xz" +sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501 WireGuard-0.0.20190702.tar.xz" diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD index 4bb25ae3e..fbe32d2d7 100644 --- a/user/wireguard-module/APKBUILD +++ b/user/wireguard-module/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Luis Ressel <aranea@aixah.de> # KEEP THIS IN SYNC with the other wireguard-module packages. _kflavour="" -_kver="4.14.88-mc13" -pkgver=0.0.20190406 +_kver="4.14.127-mc14" +pkgver=0.0.20190702 pkgrel=0 _pkgname="wireguard-module$_kflavour" pkgname="$_pkgname-$_kver" @@ -29,4 +29,4 @@ package() { make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install } -sha512sums="e3035030299f5a6ae3ac0c2e35dc2d54745cda8f31185b21c6590f1ddcc9c7a83bf7b71cc71f6d48ed6dc8f2b31f3c704f8fa85685d4113f4c560f7eba7b7d5e WireGuard-0.0.20190406.tar.xz" +sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501 WireGuard-0.0.20190702.tar.xz" diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD index 493da9d37..97de72f1f 100644 --- a/user/wireguard-tools/APKBUILD +++ b/user/wireguard-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=wireguard-tools _pkgreal=WireGuard -pkgver=0.0.20190406 +pkgver=0.0.20190702 pkgrel=0 pkgdesc="Userland tools for the WireGuard VPN" url="https://www.wireguard.com/" @@ -43,4 +43,4 @@ _patch() { } -sha512sums="e3035030299f5a6ae3ac0c2e35dc2d54745cda8f31185b21c6590f1ddcc9c7a83bf7b71cc71f6d48ed6dc8f2b31f3c704f8fa85685d4113f4c560f7eba7b7d5e WireGuard-0.0.20190406.tar.xz" +sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501 WireGuard-0.0.20190702.tar.xz" diff --git a/user/wireless-regdb/APKBUILD b/user/wireless-regdb/APKBUILD index 678ec0bdd..610629eb5 100644 --- a/user/wireless-regdb/APKBUILD +++ b/user/wireless-regdb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=wireless-regdb -pkgver=2019.03.01 +pkgver=2019.06.03 pkgrel=0 pkgdesc="Database of regulatory radio restrictions" url="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb" @@ -19,4 +19,4 @@ package() { install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" db.txt } -sha512sums="f0b94e1f661d86f4fcd39384588e10d7353ad085563ddc40a98446b416ce0d7bd0cbe34f1d9620ac45a33f16b7bfe58419da915061942cd5f51d5a3bf9809d72 wireless-regdb-2019.03.01.tar.xz" +sha512sums="73209ca28c59d6760349ffb713f550300e80db1592bae52b6d252ac9401fa2bb2ace7e6c30cf55df7541da9cef4c8587f3790f7aa34529552468e4b63a3d8fdb wireless-regdb-2019.06.03.tar.xz" diff --git a/user/wpa_supplicant/APKBUILD b/user/wpa_supplicant/APKBUILD index 549bc4181..f427f5425 100644 --- a/user/wpa_supplicant/APKBUILD +++ b/user/wpa_supplicant/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=wpa_supplicant pkgver=2.8 -pkgrel=0 +pkgrel=1 pkgdesc="Utility providing key negotiation for WPA wireless networks" url="https://w1.fi/wpa_supplicant/" arch="all" @@ -14,6 +14,7 @@ makedepends="linux-headers openssl-dev dbus-dev libnl3-dev qt5-qtbase-dev" source="https://w1.fi/releases/$pkgname-$pkgver.tar.gz wpa_supplicant.initd wpa_supplicant.confd + wpa_supplicant.conf dbus.patch eloop.patch @@ -67,6 +68,8 @@ package() { "$pkgdir"/etc/init.d/wpa_supplicant install -Dm644 "$srcdir"/wpa_supplicant.confd \ "$pkgdir"/etc/conf.d/wpa_supplicant + install -Dm640 "$srcdir"/wpa_supplicant.conf \ + "$pkgdir"/etc/wpa_supplicant/wpa_supplicant.conf # work around netifrc braindamage mkdir -p "$pkgdir"/bin @@ -98,6 +101,7 @@ wpa_gui() { sha512sums="b37d254d32a4b7a1f95fcb18ec1be0ffb9d025e0b21c42c53acc4cd839be355df1b125b32cc073f9fe09b746807321e23dbe25dc2fc8a7cafa1e71add69f245b wpa_supplicant-2.8.tar.gz 11eed22f6e793f40c788d586c715deecae03c421d11761b7b4a376660bce812c54cc6f353c7d4d5da9c455aeffd778baefb9e76d380027a729574a756e54ddcc wpa_supplicant.initd 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 wpa_supplicant.confd +f8b224b6c5a8adf378d8224beb49f2a99817d303f7e6a724943ecb3313ae85ce0fdd8291a20c95563470681ebf5d991ffa31094b9171e470e9690b38bba25738 wpa_supplicant.conf dac56bc505a51167042ebe548f0e81a20a5578f753af9bb7ec3335a542d799c6e8739681ef7c8f7747a9bc954f8aa6f1a147250eacba17fd7fff80c4e53638ed dbus.patch 2be055dd1f7da5a3d8e79c2f2c0220ddd31df309452da18f290144d2112d6dbde0fc633bb2ad02c386a39d7785323acaf5f70e5969995a1e8303a094eb5fe232 eloop.patch 221660fa0350442a7d8371686b2118861052a4613fb352b7f80079e3750b82f4e48efc378b9d617455007d1106552b695fdca506a3c338283986641f3848b202 config diff --git a/user/wpa_supplicant/wpa_supplicant.conf b/user/wpa_supplicant/wpa_supplicant.conf new file mode 100644 index 000000000..b8876ffd6 --- /dev/null +++ b/user/wpa_supplicant/wpa_supplicant.conf @@ -0,0 +1,4 @@ +# Enable the control interface for wpa_cli and wpa_gui +ctrl_interface=/var/run/wpa_supplicant +ctrl_interface_group=wheel +update_config=1 diff --git a/user/xcalc/APKBUILD b/user/xcalc/APKBUILD index 752b66ba9..903f96f68 100644 --- a/user/xcalc/APKBUILD +++ b/user/xcalc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcalc -pkgver=1.0.7 +pkgver=1.1.0 pkgrel=0 pkgdesc="Graphical scientific calculator for X11" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="890cb9399e3c55816318ab5f0152ddba05ee141cbae6032759a3b762742ab54df8fcf0394dacc539299f93f27cbbb17aee5cbda5dde8b169a7099f20a1a38388 xcalc-1.0.7.tar.bz2" +sha512sums="877aab7bb08f409a21c26b841f4d91eb6993914ed0d26512e47d6b3d2b3e0b231158901415a106cfb45de43f03f253bf2a8733f986538d4ee810afe0e54f98d5 xcalc-1.1.0.tar.bz2" diff --git a/user/xf86-input-wacom/APKBUILD b/user/xf86-input-wacom/APKBUILD index da4162103..0804b1960 100644 --- a/user/xf86-input-wacom/APKBUILD +++ b/user/xf86-input-wacom/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-input-wacom -pkgver=0.36.1 +pkgver=0.37.0 pkgrel=0 pkgdesc="X.Org driver for Wacom tablets" url="https://linuxwacom.github.io/" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-$pkgver/xf86-input-wacom-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2618bb53f4d6ed4166cd738022efcd3f35b31e27b04b8293834a1650131f2cbe9e1f11594bbcfb309861360311ae68dfb179d86d27fcb57033847a7b26d6e832 xf86-input-wacom-0.36.1.tar.bz2" +sha512sums="74167e48be4e2e9e02c71b003bf806c8ba7d35900e8e621084a73142e4d1ea286e16bd190b5385224d3574443b512faa7f49210d63b9662a739433a78fd54bcf xf86-input-wacom-0.37.0.tar.bz2" diff --git a/user/xfburn/APKBUILD b/user/xfburn/APKBUILD index e9e904448..ee024e92d 100644 --- a/user/xfburn/APKBUILD +++ b/user/xfburn/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfburn pkgver=0.5.5 -pkgrel=0 +pkgrel=1 pkgdesc="CD burning utility for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+" makedepends="intltool libburn-dev libisofs-dev gtk+3.0-dev gtk+2.0-dev libxfce4ui-dev exo-dev libgudev-dev gstreamer-dev gst-plugins-base-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/xfburn/0.5/xfburn-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfburn/0.5/xfburn-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD index 575436450..a38613cc7 100644 --- a/user/xfce4-appfinder/APKBUILD +++ b/user/xfce4-appfinder/APKBUILD @@ -1,20 +1,18 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-appfinder -pkgver=4.13.2 -pkgrel=0 +pkgver=4.13.3 +pkgrel=1 pkgdesc="An application finder for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev garcon-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfce4-appfinder/4.13/xfce4-appfinder-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/xfce4-appfinder/4.13/xfce4-appfinder-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,13 +23,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="96ac782c785649ddf75f8659f9cf10f42c37bab647824f0c76714baca0b61904fa8ba6d23dc1574aae5fdf2538201936d26b42ea6c0f5d5f0f9d71c8ba0a51b8 xfce4-appfinder-4.13.2.tar.bz2" +sha512sums="47f69e8daf6f963b8130c0380f2201cdb2d02212cfb8b5c05fedbebb78222d3bd35db0fd422418cf3f9d1f2b90e66ee4d143bed57881f5673aefca8bc58e059a xfce4-appfinder-4.13.3.tar.bz2" diff --git a/user/xfce4-battery-plugin/APKBUILD b/user/xfce4-battery-plugin/APKBUILD index 9cb4c146c..b99788836 100644 --- a/user/xfce4-battery-plugin/APKBUILD +++ b/user/xfce4-battery-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-battery-plugin pkgver=1.1.2 -pkgrel=0 +pkgrel=1 pkgdesc="Battery monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+ AND LGPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-clipman-plugin/APKBUILD b/user/xfce4-clipman-plugin/APKBUILD index e96f04999..2ca1be37e 100644 --- a/user/xfce4-clipman-plugin/APKBUILD +++ b/user/xfce4-clipman-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-clipman-plugin pkgver=1.4.3 -pkgrel=0 +pkgrel=1 pkgdesc="Clipboard management plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev libqrencode-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.4/xfce4-clipman-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.4/xfce4-clipman-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-cpugraph-plugin/APKBUILD b/user/xfce4-cpugraph-plugin/APKBUILD index 3aef0d879..3c8e305a9 100644 --- a/user/xfce4-cpugraph-plugin/APKBUILD +++ b/user/xfce4-cpugraph-plugin/APKBUILD @@ -2,26 +2,23 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-cpugraph-plugin pkgver=1.0.5 -pkgrel=0 +pkgrel=1 pkgdesc="Graphical CPU monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare chmod a+w config.sub update_config_sub } build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -32,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-diskperf-plugin/APKBUILD b/user/xfce4-diskperf-plugin/APKBUILD index a1bac7cb1..3fdc09ddf 100644 --- a/user/xfce4-diskperf-plugin/APKBUILD +++ b/user/xfce4-diskperf-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-diskperf-plugin pkgver=2.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="Disk performance monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="BSD-2-Clause AND GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-indicator-plugin/APKBUILD b/user/xfce4-indicator-plugin/APKBUILD index db59691a5..c0d02810f 100644 --- a/user/xfce4-indicator-plugin/APKBUILD +++ b/user/xfce4-indicator-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-indicator-plugin pkgver=2.3.4 -pkgrel=0 +pkgrel=1 pkgdesc="Application information plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev libindicator-dev ido-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/2.3/xfce4-indicator-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/2.3/xfce4-indicator-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-netload-plugin/APKBUILD b/user/xfce4-netload-plugin/APKBUILD index 139ec29b5..2b72c4f2c 100644 --- a/user/xfce4-netload-plugin/APKBUILD +++ b/user/xfce4-netload-plugin/APKBUILD @@ -2,20 +2,18 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-netload-plugin pkgver=1.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Network monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.3/xfce4-netload-plugin-$pkgver.tar.bz2 +source="https://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.3/xfce4-netload-plugin-$pkgver.tar.bz2 no-sysctl.patch" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD index 29a9bcee3..5bc42afc4 100644 --- a/user/xfce4-notifyd/APKBUILD +++ b/user/xfce4-notifyd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-notifyd pkgver=0.4.4 -pkgrel=0 +pkgrel=1 pkgdesc="Notification service for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0-only AND GPL-2.0+" makedepends="intltool libice-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev xfce4-panel-dev libnotify-dev dbus-glib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-$pkgver.tar.bz2" build() { - cd "$builddir" - LIBS="-lX11" ./configure \ + LIBS="-lintl -lX11" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD index 4e70ac9d3..9c844b5ca 100644 --- a/user/xfce4-panel/APKBUILD +++ b/user/xfce4-panel/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-panel -pkgver=4.13.4 -pkgrel=0 +pkgver=4.13.5 +pkgrel=1 pkgdesc="Panel for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="LGPL-2.1+ AND GPL-2.0+" makedepends="intltool gtk+3.0-dev libice-dev libxfce4util-dev garcon-dev exo-dev libwnck-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfce4-panel/4.13/xfce4-panel-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/xfce4-panel/4.13/xfce4-panel-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="16a3680aa2ab7fa357ca9d477ea0e41ca159a2c626fe65454ccdca339bb501ff0979264f5a4ae4728e3c0efe24e193eb28e7b5d1e003fecad8ab36b8457203c8 xfce4-panel-4.13.4.tar.bz2" +sha512sums="3eb4034bd6eae38f8f533b8cd2cae4ec8b40cab5f0d6810639baad641b4adaf15d03254ec79cd49d04e3498d3a4752bd9e968a0383468e7337106b3665092c4e xfce4-panel-4.13.5.tar.bz2" diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD index dc6232180..9fac4619b 100644 --- a/user/xfce4-power-manager/APKBUILD +++ b/user/xfce4-power-manager/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-power-manager -pkgver=1.6.1 -pkgrel=0 +pkgver=1.6.2 +pkgrel=1 pkgdesc="Power management support for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,13 +10,10 @@ license="GPL-2.0+" makedepends="intltool gtk+3.0-dev libxfce4ui-dev libice-dev libnotify-dev upower-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfce4-power-manager/1.6/xfce4-power-manager-$pkgver.tar.bz2" -sha512sums="b81ce1b35892a6cd0b1d4fb590ccc25b906cde6f782de2fffbe78ea89e00df15e51ea1f47576c173b7512cd617f5142868fca8cf81519b6fe165a5ecc67a5478 xfce4-power-manager-1.6.1.tar.bz2" +source="https://archive.xfce.org/src/xfce/xfce4-power-manager/1.6/xfce4-power-manager-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -27,12 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } +sha512sums="d1c475ad3cf194c19a2ad1decc4c80a9f504d74b64dec71887c14c576cd5a2932799cd0068f6356a15590fa67c6d0434401ad36b7a2fa6a3b62d51290cd7b68c xfce4-power-manager-1.6.2.tar.bz2" diff --git a/user/xfce4-pulseaudio-plugin/APKBUILD b/user/xfce4-pulseaudio-plugin/APKBUILD index 8a1e6cb34..6d7f04117 100644 --- a/user/xfce4-pulseaudio-plugin/APKBUILD +++ b/user/xfce4-pulseaudio-plugin/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-pulseaudio-plugin pkgver=0.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="Pulseaudio plugin for the XFCE panel" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev pulseaudio-dev keybinder-3.0-dev libnotify-dev dbus-glib-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/$pkgname/0.4/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-sensors-plugin/APKBUILD b/user/xfce4-sensors-plugin/APKBUILD index 376b6786d..8682bc2c6 100644 --- a/user/xfce4-sensors-plugin/APKBUILD +++ b/user/xfce4-sensors-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-sensors-plugin pkgver=1.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="Hardware sensor monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-session/APKBUILD b/user/xfce4-session/APKBUILD index 05c391a80..45984c85d 100644 --- a/user/xfce4-session/APKBUILD +++ b/user/xfce4-session/APKBUILD @@ -1,22 +1,20 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-session -pkgver=4.13.1 -pkgrel=0 +pkgver=4.13.2 +pkgrel=1 pkgdesc="Session management for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+ AND LGPL-2.0+" +depends="iceauth cmd:which xdg-user-dirs" makedepends="intltool gtk+3.0-dev libice-dev libsm-dev libxfce4util-dev - libxfce4ui-dev libwnck-dev iceauth dbus-glib-dev" + libxfce4ui-dev libwnck-dev iceauth dbus-glib-dev polkit-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfce4-session/4.13/xfce4-session-$pkgver.tar.bz2" -sha512sums="5845e3591919e23ca176199e81075a097ef9d65cbcf23b34d84afc649a307bfa8c6492e3a01855cacff9328da809725213ec1fa9d76024c0a0c25cce3c51da1b xfce4-session-4.13.1.tar.bz2" +source="https://archive.xfce.org/src/xfce/xfce4-session/4.13/xfce4-session-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -27,12 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } +sha512sums="cb1e63a3df9c4ac3efcb0cce20cb5528f9d1a46731ad4b32634ad5f4a53711f05b40d98464bfd562b4e3d42b2555827ece03e63c6a433e879fa0f0a4ccda6a57 xfce4-session-4.13.2.tar.bz2" diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD index 4b894e6ee..70798f6ce 100644 --- a/user/xfce4-settings/APKBUILD +++ b/user/xfce4-settings/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-settings -pkgver=4.13.5 -pkgrel=0 +pkgver=4.13.6 +pkgrel=1 pkgdesc="GUI settings application for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+ AND MIT AND LGPL-2.0+" makedepends="intltool exo-dev garcon-dev libnotify-dev upower-dev libxklavier-dev xf86-input-libinput-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" source="http://archive.xfce.org/src/xfce/xfce4-settings/4.13/xfce4-settings-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -28,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="5e7b13b25767091ab0b1a5683359f33e4a86151dd9321681fc4d896fcd9cc569effaebfbab70bc734e07041e9fbb1c3015f9a177146de8a128c4a539462dba5e xfce4-settings-4.13.5.tar.bz2" +sha512sums="7fe4655a5644dec8688eebc508e23bace7af76c6b8eeb3821fa9a4ec79862cde64cf59ee2ac70a27ff378ef887ce6d109ef1b1d9e5f7e98f96fdb43604e024b6 xfce4-settings-4.13.6.tar.bz2" diff --git a/user/xfce4-systemload-plugin/APKBUILD b/user/xfce4-systemload-plugin/APKBUILD index 7545e3a0a..c29c895c9 100644 --- a/user/xfce4-systemload-plugin/APKBUILD +++ b/user/xfce4-systemload-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-systemload-plugin pkgver=1.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="System load monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="BSD-2-Clause" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-terminal/APKBUILD b/user/xfce4-terminal/APKBUILD index eca6f23c5..4ab646532 100644 --- a/user/xfce4-terminal/APKBUILD +++ b/user/xfce4-terminal/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-terminal pkgver=0.8.7.4 -pkgrel=0 +pkgrel=1 pkgdesc="Terminal for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool gtk+3.0-dev vte-dev libxfce4ui-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-time-out-plugin/APKBUILD b/user/xfce4-time-out-plugin/APKBUILD index 910bd6425..9a910af8d 100644 --- a/user/xfce4-time-out-plugin/APKBUILD +++ b/user/xfce4-time-out-plugin/APKBUILD @@ -2,26 +2,23 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-time-out-plugin pkgver=1.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Forced computer break plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare chmod a+w config.sub update_config_sub } build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -32,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-timer-plugin/APKBUILD b/user/xfce4-timer-plugin/APKBUILD index 6e76d0772..b59b00931 100644 --- a/user/xfce4-timer-plugin/APKBUILD +++ b/user/xfce4-timer-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-timer-plugin pkgver=1.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="Timer plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.7/xfce4-timer-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.7/xfce4-timer-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-verve-plugin/APKBUILD b/user/xfce4-verve-plugin/APKBUILD index b4b386853..935a39a5f 100644 --- a/user/xfce4-verve-plugin/APKBUILD +++ b/user/xfce4-verve-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-verve-plugin pkgver=2.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="Command-line plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/2.0/xfce4-verve-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/2.0/xfce4-verve-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index 09144df61..5486de7dd 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfconf -pkgver=4.13.6 -pkgrel=0 +pkgver=4.13.7 +pkgrel=1 pkgdesc="Configuration framework for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -11,12 +11,10 @@ license="LGPL-2.1+ AND GPL-2.0+" depends="dbus" makedepends="intltool gtk+3.0-dev libxfce4util-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfconf/4.13/xfconf-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/xfconf/4.13/xfconf-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -27,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -43,4 +39,4 @@ perl() { mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib } -sha512sums="0eaa1ad428be5bea97b891a6bf0488293064e31d4869b70389ded940a23f9d8cffd0801dd98932658a67e57d6a0da95998872202cf7756aa24caa8f9d2c5f755 xfconf-4.13.6.tar.bz2" +sha512sums="113fb22b449a318b0cca6521914eda6cfeb6b2056a1aad4d49a5e83c28661c843c9912bbf7eddb7d6cd1f172b532c73dd02259bf6fabe60a377024f9f8d5825d xfconf-4.13.7.tar.bz2" diff --git a/user/xfdashboard/APKBUILD b/user/xfdashboard/APKBUILD index b192385d0..af4013ff8 100644 --- a/user/xfdashboard/APKBUILD +++ b/user/xfdashboard/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfdashboard pkgver=0.7.5 -pkgrel=0 +pkgrel=1 pkgdesc="Gnome dashboard clone for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+" makedepends="intltool gtk+3.0-dev libwnck-dev libice-dev garcon-dev libxfce4ui-dev clutter-dev" subpackages="$pkgname-dev $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/xfdashboard/0.7/xfdashboard-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfdashboard/0.7/xfdashboard-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD index 75dcffed9..d4e435c18 100644 --- a/user/xfdesktop/APKBUILD +++ b/user/xfdesktop/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfdesktop -pkgver=4.13.3 -pkgrel=0 +pkgver=4.13.4 +pkgrel=1 pkgdesc="Desktop manager for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+" makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev exo-dev garcon-dev libnotify-dev thunar-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfdesktop/4.13/xfdesktop-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/xfdesktop/4.13/xfdesktop-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="5d828ad653b46ab1edc8300335321bab48e0ad2be1ae02944eff553375a6059513aeb363c73aaec1a6958dd3f1c873920287ad911cfe7b8096b447f1b8165ce3 xfdesktop-4.13.3.tar.bz2" +sha512sums="3943fc2af3ca3996a38900fea4a03004e1d3f8728a8517c988bd59744607ed8e4ba3f135d6075833af206df3c35464633f47e374c26fcbb8a20f0f1ecfdb7da6 xfdesktop-4.13.4.tar.bz2" diff --git a/user/xfmpc/APKBUILD b/user/xfmpc/APKBUILD index 0b13bd5a2..dc889ea14 100644 --- a/user/xfmpc/APKBUILD +++ b/user/xfmpc/APKBUILD @@ -1,20 +1,18 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfmpc -pkgver=0.2.3 -pkgrel=0 +pkgver=0.3.0 +pkgrel=1 pkgdesc="Graphical music player daemon client for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+ AND LGPL-2.0+" makedepends="intltool gtk+2.0-dev libxfce4ui-dev libmpd-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/xfmpc/0.2/xfmpc-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfmpc/${pkgver%.*}/xfmpc-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,13 +23,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3f592fdd559817051f7720bafc07fc66b39f682cc20286c12d54c4bd607e85bb0a722c567264a29224971b4ac14db51b0b44b233a16cccd9d17579a50549a3be xfmpc-0.2.3.tar.bz2" +sha512sums="6e876aca2c2a6764fe97f061c97dc0fa9ce72b7ab6a2597b5f54bdce39789cc73bd038a0ef69b87d826c225efb9c3a2d19aa9ed7872ce7ee9ac5d7bd275444a3 xfmpc-0.3.0.tar.bz2" diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index d560fff66..040bf7520 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfwm4 -pkgver=4.13.1 +pkgver=4.13.2 pkgrel=1 pkgdesc="Window manager for the XFCE desktop environment" url="https://xfce.org" @@ -10,13 +10,10 @@ license="GPL-2.0+" makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev gobject-introspection-dev vala-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-$pkgver.tar.bz2 - fix-mask-length.patch" +source="https://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -27,14 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320 xfwm4-4.13.1.tar.bz2 -88733a4d69b58b0c98f2f46694ccc8bda4e5bc1b565d952123cee466b3f89f95d72fc28c8e9c173dcc0aee606c9f4b085d891004d769b74ad0c7084d8dec00a9 fix-mask-length.patch" +sha512sums="85440a377cd7034e986b317e35c25ac6d4723bd4c1ce1e6951d8545a44f3c47340952fd0211f55cf19411539be6d86f4c34fca7b2219b0873654a6d311c95055 xfwm4-4.13.2.tar.bz2" diff --git a/user/xfwm4/fix-mask-length.patch b/user/xfwm4/fix-mask-length.patch deleted file mode 100644 index dd050c8dc..000000000 --- a/user/xfwm4/fix-mask-length.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru xfwm4-4.13.1.orig/src/device.c xfwm4-4.13.1/src/device.c ---- xfwm4-4.13.1.orig/src/device.c 2018-07-29 16:08:54.000000000 +0300 -+++ xfwm4-4.13.1/src/device.c 2018-09-12 08:49:18.130254993 +0300 -@@ -301,7 +301,7 @@ - guint i; - - xievent_mask->deviceid = XIAllMasterDevices; -- xievent_mask->mask_len = sizeof (mask); -+ xievent_mask->mask_len = len; - xievent_mask->mask = mask; - - for (i = 0; i < G_N_ELEMENTS (core_to_xi2); i++) diff --git a/user/xkeyboard-config/APKBUILD b/user/xkeyboard-config/APKBUILD index 9a49f7ffe..35f9769b4 100644 --- a/user/xkeyboard-config/APKBUILD +++ b/user/xkeyboard-config/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xkeyboard-config -pkgver=2.26 +pkgver=2.27 pkgrel=0 pkgdesc="Keyboard configuration files for X11" url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" @@ -32,4 +32,4 @@ package() { install -m755 -d "$pkgdir"/var/lib/xkb } -sha512sums="5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef xkeyboard-config-2.26.tar.bz2" +sha512sums="ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e xkeyboard-config-2.27.tar.bz2" diff --git a/user/xmlsec/APKBUILD b/user/xmlsec/APKBUILD index 171427b55..4b7f83509 100644 --- a/user/xmlsec/APKBUILD +++ b/user/xmlsec/APKBUILD @@ -1,25 +1,21 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=xmlsec pkgver=1.2.28 -_pkgver=1_2_28 -pkgrel=0 +_pkgname="$pkgname${pkgver%%.*}" +pkgrel=1 pkgdesc="C-based XML signature and encryption syntax and processing library" -url="https://github.com/lsh123/$pkgname/" +url="https://www.aleksey.com/xmlsec/" arch="all" -options="libtool" license="MIT" depends="" checkdepends="nss-tools" -makedepends="$depends_dev libxml2-dev libxslt-dev nss-dev openssl-dev - autoconf automake libtool" -subpackages="$pkgname-nss $pkgname-dev $pkgname-doc" -source="$url/archive/$pkgname-$_pkgver.tar.gz" -builddir="$srcdir/$pkgname-$pkgname-$_pkgver" - -prepare() { - default_prepare - ./autogen.sh -} +makedepends="libxml2-dev libxslt-dev openssl-dev + gnutls-dev libgcrypt-dev nss-dev" +subpackages="$pkgname-dev $pkgname-doc + $pkgname-gcrypt $pkgname-gnutls $pkgname-nss" +source="http://www.aleksey.com/xmlsec/download/$_pkgname-$pkgver.tar.gz + fix-tests.patch" +builddir="$srcdir/$_pkgname-$pkgver" build() { ./configure \ @@ -28,9 +24,9 @@ build() { --prefix=/usr \ --disable-static \ --enable-pkgconfig \ - --with-openssl=/usr \ - --without-gnutls \ - --without-gcrypt \ + --with-openssl \ + --with-gnutls \ + --with-gcrypt \ --with-default-crypto='openssl' make } @@ -46,6 +42,26 @@ package() { install -m644 'COPYING' "$pkgdir/usr/share/licenses/$pkgname/" } +dev() { + default_dev + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/xmlsec1Conf.sh "$subpkgdir"/usr/lib +} + +gcrypt() { + pkgdesc="xmlsec gcrypt plugin" + install_if="$pkgname=$pkgver-r$pkgrel gcrypt" + mkdir -p "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/lib/libxmlsec1-gcrypt.so* "$subpkgdir"/usr/lib/ +} + +gnutls() { + pkgdesc="xmlsec gnutls plugin" + install_if="$pkgname=$pkgver-r$pkgrel gnutls" + mkdir -p "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/lib/libxmlsec1-gnutls.so* "$subpkgdir"/usr/lib/ +} + nss() { pkgdesc="xmlsec NSS plugin" install_if="$pkgname=$pkgver-r$pkgrel nss" @@ -53,4 +69,5 @@ nss() { mv "$pkgdir"/usr/lib/libxmlsec1-nss.so* "$subpkgdir"/usr/lib/ } -sha512sums="fb0c775f6455ce5a5579a69bb91d60fe90c023e538c32bdf2a70aa413a53b22ef938349a3ce6b42bb23f8f70b4e00f1b9917f877487bb1507c927ec70c3d95f5 xmlsec-1_2_28.tar.gz" +sha512sums="17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480 xmlsec1-1.2.28.tar.gz +2f146b31460ae1843a696c77cef03b36a0bf212028189055834e2e50d7a3142f6a069ce18a5c6b2251b5846fad7e96a6d9e26a6445fd182ac4c44c70afc4f8a3 fix-tests.patch" diff --git a/user/xmlsec/fix-tests.patch b/user/xmlsec/fix-tests.patch new file mode 100644 index 000000000..73acdf800 --- /dev/null +++ b/user/xmlsec/fix-tests.patch @@ -0,0 +1,176 @@ +Backport of the following commits: + +b841f2c0b1e9cf24d991cc8b5d21e5a3b7c6ad80 +f25e8f07428b9475fa576bf78d77fb4fa366bc70 +106e7dbf39d96c46aedecf229d55a09e7593f1ec + +diff --git a/tests/testDSig.sh b/tests/testDSig.sh +index 77372311..f2014464 100755 +--- a/tests/testDSig.sh ++++ b/tests/testDSig.sh +@@ -805,98 +805,98 @@ execDSigTest $res_success \ + "signature-rsa-detached-b64-transform" \ + "base64 sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" + + execDSigTest $res_success \ + "phaos-xmldsig-three" \ + "signature-rsa-detached" \ + "sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" + + execDSigTest $res_success \ + "phaos-xmldsig-three" \ + "signature-rsa-detached-xpath-transform" \ + "xpath sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" + + execDSigTest $res_success \ + "phaos-xmldsig-three" \ + "signature-rsa-detached-xslt-transform-retrieval-method" \ + "xslt sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" + + execDSigTest $res_success \ + "phaos-xmldsig-three" \ + "signature-rsa-detached-xslt-transform" \ + "xslt sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" + + execDSigTest $res_success \ + "phaos-xmldsig-three" \ + "signature-rsa-enveloped" \ + "enveloped-signature sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00" + + execDSigTest $res_success \ + "phaos-xmldsig-three" \ + "signature-rsa-enveloping" \ + "sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00" + + execDSigTest $res_success \ + "phaos-xmldsig-three" \ + "signature-rsa-manifest-x509-data-cert-chain" \ + "sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" + + execDSigTest $res_success \ + "phaos-xmldsig-three" \ + "signature-rsa-manifest-x509-data-cert" \ + "sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" + + execDSigTest $res_success \ + "phaos-xmldsig-three" \ + "signature-rsa-manifest-x509-data-issuer-serial" \ + "sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" + + execDSigTest $res_success \ + "phaos-xmldsig-three" \ + "signature-rsa-manifest-x509-data-ski" \ + "sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" + + execDSigTest $res_success \ + "phaos-xmldsig-three" \ + "signature-rsa-manifest-x509-data-subject-name" \ + "sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" + + execDSigTest $res_success \ + "phaos-xmldsig-three" \ + "signature-rsa-manifest" \ + "sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161" + + execDSigTest $res_success \ + "phaos-xmldsig-three" \ + "signature-rsa-xpath-transform-enveloped" \ + "enveloped-signature xpath sha1 rsa-sha1" \ + "rsa x509" \ +- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00" ++ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00" + + + ########################################################################## +@@ -940,7 +940,7 @@ execDSigTest $res_fail \ + "merlin-xmldsig-twenty-three/signature-x509-crt-crl" \ + "sha1 rsa-sha1" \ + "rsa x509" \ +- "--X509-skip-strict-checks --trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format $url_map_xml_stylesheet_2018" ++ "--trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format $url_map_xml_stylesheet_2018" + + execDSigTest $res_fail \ + "" \ +diff --git a/tests/testrun.sh b/tests/testrun.sh +index ea65802b..fe0334c7 100755 +--- a/tests/testrun.sh ++++ b/tests/testrun.sh +@@ -59,7 +59,7 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then + elif [ "z$crypto" != "z" ] ; then + xmlsec_params="$xmlsec_params --crypto $crypto" + fi +-xmlsec_params="$xmlsec_params --X509-skip-strict-checks --crypto-config $crypto_config" ++xmlsec_params="$xmlsec_params --crypto-config $crypto_config" + + # + # Setup keys config +@@ -308,8 +308,8 @@ execDSigTest() { + # run tests + if [ -n "$params1" ] ; then + printf " Verify existing signature " +- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml" >> $curlogfile +- $VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile ++ echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml" >> $curlogfile ++ $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile + printRes $expected_res $? + if [ $? != 0 ]; then + failures=`expr $failures + 1` +@@ -328,8 +328,8 @@ execDSigTest() { + + if [ -n "$params3" -a -z "$PERF_TEST" ] ; then + printf " Verify new signature " +- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile" >> $curlogfile +- $VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile ++ echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile" >> $curlogfile ++ $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile + printRes $res_success $? + if [ $? != 0 ]; then + failures=`expr $failures + 1` +@@ -406,7 +406,7 @@ execEncTest() { + if [ -n "$params1" ] ; then + rm -f $tmpfile + printf " Decrypt existing document " +- echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 $full_file.xml" >> $curlogfile ++ echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 $full_file.xml" >> $curlogfile + $VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 --output $tmpfile $full_file.xml >> $curlogfile 2>> $curlogfile + res=$? + echo "=== TEST RESULT: $res; expected: $expected_res" >> $curlogfile diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index d76a21347..fc99a9870 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-server -pkgver=1.20.4 +pkgver=1.20.5 pkgrel=0 pkgdesc="X.Org X11 server" url="https://www.X.Org/" @@ -134,6 +134,6 @@ xwayland() { mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/ } -sha512sums="f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8 xorg-server-1.20.4.tar.bz2 +sha512sums="625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 xorg-server-1.20.5.tar.bz2 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch" diff --git a/user/xorgproto/APKBUILD b/user/xorgproto/APKBUILD index f1f802e13..d41ce1e2b 100644 --- a/user/xorgproto/APKBUILD +++ b/user/xorgproto/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorgproto -pkgver=2018.4 -pkgrel=1 +pkgver=2019.1 +pkgrel=0 pkgdesc="X11 protocol headers (combination)" url="https://www.X.Org/" arch="noarch" @@ -10,7 +10,6 @@ license="X11 AND MIT AND BSD-2-Clause" depends="" depends_dev="util-macros" makedepends="$depends_dev" -install="" subpackages="$pkgname-dev $pkgname-doc" # Taken from the .pc.in files. Check these at every bump! provides="bigreqsproto=1.1.2 @@ -30,7 +29,7 @@ provides="bigreqsproto=1.1.2 recordproto=1.14.2 renderproto=0.11.1 resourceproto=1.2.0 - scrnsaverproto=1.2.2 + scrnsaverproto=1.2.3 trapproto=3.4.3 videoproto=2.3.3 xcmiscproto=1.2.2 @@ -54,7 +53,6 @@ source="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$pkgver. " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -68,14 +66,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2db682d10280ca58cdc04d8eb9fef30c111d4cd379de9fec86cff317865b859a576de5426447be9231d24be9762cc1d684c57383a99ad499398e8b7d62b1c03c xorgproto-2018.4.tar.bz2 +sha512sums="f26c17f4a027acdc799b532fa65c3ea1b0e8c30794c7b7293060ee9d9dec84b4878966cd2dcda43584849232e73a208abd4213374f89b05c10e5aae92bdc00be xorgproto-2019.1.tar.bz2 18fc5228bb53eb15cfa0018f718e06faba0384a41e3aa0006fbf63e2a98779fdab527ea9eb8e22bb6a6f1ca02340ad8dad1260ee16e75f0416461ccefaa6df73 xprint.patch" diff --git a/user/xsane/APKBUILD b/user/xsane/APKBUILD index 05cf220e4..3c17b6f6d 100644 --- a/user/xsane/APKBUILD +++ b/user/xsane/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xsane pkgver=0.999 -pkgrel=1 +pkgrel=2 pkgdesc="Graphical scanning software" url=" " arch="all" @@ -12,15 +12,13 @@ depends="" makedepends="gtk+2.0-dev lcms2-dev libjpeg-turbo-dev libpng-dev sane-dev tiff-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="http://distfiles.gentoo.org/distfiles/xsane-$pkgver.tar.gz xsane-0.999-lcms2.patch xsane-0.999-libpng16.patch " build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -31,7 +29,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xsv/APKBUILD b/user/xsv/APKBUILD new file mode 100644 index 000000000..dab8647d5 --- /dev/null +++ b/user/xsv/APKBUILD @@ -0,0 +1,156 @@ +# Contributor: Gentoo Rust Maintainers <rust@gentoo.org> +# Contributor: Molly Miller <adelie@m-squa.red> +# Maintainer: Samuel Holland <samuel@sholland.org> +pkgname=xsv +pkgver=0.13.0 +pkgrel=0 +pkgdesc="A fast CSV command line toolkit written in Rust" +url="https://github.com/BurntSushi/xsv" +arch="all" +license="MIT OR Unlicense" +makedepends="cargo" +source="" + +# dependencies taken from Cargo.lock +cargo_deps="$pkgname-$pkgver +aho-corasick-0.7.3 +autocfg-0.1.4 +byteorder-1.3.2 +cfg-if-0.1.9 +chan-0.1.23 +csv-1.0.7 +csv-core-0.1.5 +csv-index-0.1.5 +docopt-1.1.0 +filetime-0.1.15 +fuchsia-cprng-0.1.1 +itoa-0.4.4 +lazy_static-1.3.0 +libc-0.2.58 +log-0.4.6 +memchr-2.2.0 +num-traits-0.2.8 +num_cpus-1.10.1 +proc-macro2-0.4.30 +quickcheck-0.6.2 +quote-0.6.12 +rand-0.3.23 +rand-0.4.6 +rand_core-0.3.1 +rand_core-0.4.0 +rdrand-0.4.0 +redox_syscall-0.1.54 +regex-1.1.7 +regex-syntax-0.6.7 +ryu-0.2.8 +serde-1.0.92 +serde_derive-1.0.92 +streaming-stats-0.2.2 +strsim-0.9.2 +syn-0.15.36 +tabwriter-1.1.0 +thread_local-0.3.6 +threadpool-1.7.1 +ucd-util-0.1.3 +unicode-width-0.1.5 +unicode-xid-0.1.0 +utf8-ranges-1.0.3 +winapi-0.3.7 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-x86_64-pc-windows-gnu-0.4.0 +" + +source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+)-([0-9.]+(-(alpha|beta|rc)[0-9.]+)?)#&.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" + +prepare() { + export CARGO_HOME="$srcdir/cargo-home" + export CARGO_VENDOR="$CARGO_HOME/adelie" + + (builddir=$srcdir; default_prepare) + + mkdir -p "$CARGO_VENDOR" + cat <<- EOF > "$CARGO_HOME/config" + [source.adelie] + directory = "${CARGO_VENDOR}" + + [source.crates-io] + replace-with = "adelie" + local-registry = "/nonexistant" + EOF + + for _dep in $cargo_deps; do + ln -s "$srcdir/$_dep" "$CARGO_VENDOR/$_dep" + _sum=$(sha256sum "$srcdir/$_dep.tar.gz" | cut -d' ' -f1) + cat <<- EOF > "$CARGO_VENDOR/$_dep/.cargo-checksum.json" + { + "package":"$_sum", + "files":{} + } + EOF + done +} + +build() { + export CARGO_HOME="$srcdir/cargo-home" + export PKG_CONFIG_ALL_DYNAMIC=1 + export RUSTONIG_SYSTEM_LIBONIG=1 + cargo build -j $JOBS --release +} + +check() { + export CARGO_HOME="$srcdir/cargo-home" + cargo test -j $JOBS --release +} + +package() { + export CARGO_HOME="$srcdir/cargo-home" + cargo install --path . --root="$pkgdir"/usr + rm "$pkgdir"/usr/.crates.toml +} + +sha512sums="6db4e6e13613feb645bd71d9a1c9b7c9150e04f9880731bea143248ceb5c460503799d6f487f3c983f613964a56c998ba9d325cc1b61def8db0b63e74e387ce1 xsv-0.13.0.tar.gz +4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9 aho-corasick-0.7.3.tar.gz +811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce autocfg-0.1.4.tar.gz +2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f byteorder-1.3.2.tar.gz +45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c cfg-if-0.1.9.tar.gz +87c669ad5e5216c03bec9c32136af45e8dc5e1d43fa6fc06374d2ea7dea9b13f87458ca41c4bf2f615686a128664f3360b911c8f74c9091b70431b4d3adc31bc chan-0.1.23.tar.gz +d3e69e0a93b55617b79a32e4429ea56eee03b5b01a9a62a132a41c0a4961db1bff418681ac3ebbfa30cb0c82ce2beeab2d9fa469a0514e5ff9ef64b969de4acb csv-1.0.7.tar.gz +fc223ef33b83ae306f6cc5a77b08323a802f8fa39054ad9c4cffc63ba3195344319bb66471d164fa6eed7ef3bec11fb8308b78a4fe42ff91413e9441f021d439 csv-core-0.1.5.tar.gz +a1e928d3879d1490ade4f7172fe0cfd4221d28637109a65f856d277b88e1c7d823f447c82143d541c1b2b6fcec3050b8ea88b3dc9d9ef2e36b5ff97d84de66da csv-index-0.1.5.tar.gz +f5dd97b4dbc9109811a83dba45bb09018f394adf3f5389cc62f7d42749c90dc337b7f5efdee569150a70194f5bda777a22107123ec7341a38c4f9923bb6f9f81 docopt-1.1.0.tar.gz +81d6e80f3da3ce12295ce8d85bf174eac3ee3dcc7d57e5a65f2ae91ab4f3dcf294582788af24db9ce2f18cb0e43080fb1baac76929dacec32d5ba4d09928b962 filetime-0.1.15.tar.gz +ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 fuchsia-cprng-0.1.1.tar.gz +f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d itoa-0.4.4.tar.gz +08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822 lazy_static-1.3.0.tar.gz +9127ad9a94f75655740fc3a2278c7a17d5f03c4cd12c8833c1a1ecb7a860ec8581fbc969f5c2e23b8eecb9131d9d8271131ad6a675b785f18fb55d830bcc0491 libc-0.2.58.tar.gz +3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb log-0.4.6.tar.gz +19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088 memchr-2.2.0.tar.gz +a3019e45744245837b2f146ab4213746c93a1ad701958dd418272af89451b843f9b643eac673c1397f6079da7709c7e9ff46e0e829a4cf6092772c9d77bbc534 num-traits-0.2.8.tar.gz +f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd num_cpus-1.10.1.tar.gz +73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0 proc-macro2-0.4.30.tar.gz +18483a244f83d64f298bcf6f71c137043dd1c28e22da6baf13760b2a39d77f84d2b7b651facb378b8559eb3d3a4cb53c16671128358e4a86e90e55e66d7ee41f quickcheck-0.6.2.tar.gz +5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798 quote-0.6.12.tar.gz +a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3 rand-0.3.23.tar.gz +a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a rand-0.4.6.tar.gz +5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz +f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845 rand_core-0.4.0.tar.gz +6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz +38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e redox_syscall-0.1.54.tar.gz +17a06dc448c1be0910ddf5c03979fcd151d0a40acec5fedf96febe0f0fc52bda0252c40f8e7a18dcf3fa13f82f8a5b406b18f59e43713aec2adc2cae068f9120 regex-1.1.7.tar.gz +630e998b26ea7571591ff4259a5119d7762567253564b4a958cfd0f3f4de5857894e12eda469d940d8ed5572712b345e2859de282cdebf89a5108b97da71a073 regex-syntax-0.6.7.tar.gz +15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4 ryu-0.2.8.tar.gz +a8a33cf76a4f899205b2ede5e91859e03d038b178f685a36991c1836ab0c37f91ff50db4145e825838ac0fb4c526c9f496d00f87ac1790d101f4e83779fc5124 serde-1.0.92.tar.gz +37da456bb1392e4eacad07118dd8a6590552f455151f35bf4b350305772eddc8b232b61c36940c287df85b61ccc9867602cfc7012f7b7b645ab97cff45baeaab serde_derive-1.0.92.tar.gz +520a8486f5d10b66a93e3b06e83ffb369bc0ee187fd53204d00076e62d402e37ab9fdcadc286723155a487f99324a64487cdea767b715d7494b82beba636d0fb streaming-stats-0.2.2.tar.gz +2054444ea844a25f573219a4993986b69ff8c5dc0dfd2dd06fff638d596c8c5b5a1bedafc2bef3a1b9c146dd47a0769bbe039c54fd8e2a5d9894f29ab9f32838 strsim-0.9.2.tar.gz +7cd22f17d3740223d94b64405ba6283fb90a4ec170bd55de652a409a537b5355717dfb09dab991e1bbb799e57d1d48fc07c061adbe35f5b7da3bcdcdc8723ddf syn-0.15.36.tar.gz +ed80e5e0d31f5941c63bf8f311b71919bf9fe84d872dcd31b37a1eac57a4efe4025b56784fd4083b952c7cae47f08562d10ed679cff0edb8b8dc57ff87ac7ee5 tabwriter-1.1.0.tar.gz +cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253 thread_local-0.3.6.tar.gz +e46733ea55a27a32868596562bbaf1e50508dea58359006cabd160b06cec4854c97b5d253cdcb8bfd60c7b3a33e496bec4159d0621efaa3cdcbc77255be4f275 threadpool-1.7.1.tar.gz +50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e ucd-util-0.1.3.tar.gz +bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2 unicode-width-0.1.5.tar.gz +cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d unicode-xid-0.1.0.tar.gz +24907ad7ae1a02713e6ecc62e0c73488abea338f0dd3b49291b914ca907b3a220cb90f8ca409c6aa57d2e0e5d8ca8c44cd310081ffe7be9208952d73ec53b9f8 utf8-ranges-1.0.3.tar.gz +6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134 winapi-0.3.7.tar.gz +a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz +4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz" diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 3c8e5f5b4..859f3ea61 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xterm -pkgver=344 +pkgver=346 pkgrel=0 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" @@ -45,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="872f69e13ad8e26de355f7611dabc7a66e2f6b00313b440b8054cc4fa0fbde936dd8d54ec09c892e8760080acaccbd8b7e72cdcbebb291dd92e01593eb14e91a xterm-344.tgz +sha512sums="ef0db8132a88b8bd980343007a61ca3c4c1b7ece23ef8e72245a17fa8305fa4dfed9cdf0613d8daf60da53fb8b03d41acd22aee04f2d51aeffb4a340268f51f7 xterm-346.tgz e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch" diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD index d7a2f6888..3aca3d46d 100644 --- a/user/youtube-dl/APKBUILD +++ b/user/youtube-dl/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=youtube-dl -pkgver=2019.04.17 +pkgver=2019.06.21 pkgrel=0 pkgdesc="Command-line program to download videos from YouTube and many other sites" url="https://youtube-dl.org" @@ -63,4 +63,4 @@ fishcomp() { "$subpkgdir/usr/share/fish/completions/" } -sha512sums="6277a96a6487d81be23e0772c8e6fa36337d5b2b90a50b9be328579334b92c6e1a6eb9634a66969435c0d47e734fb907e286578cbc2f693565055ed1111b8148 youtube-dl-2019.04.17.tar.gz" +sha512sums="b116f1b636b616e7bd2f5f3d8bbec3b9acebc956f2864391392cfa8bd2af91faa97603d528a13abb6e69ac861582d296870579469e4c6f4f4816dc674e0c27bb youtube-dl-2019.06.21.tar.gz" diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD index 2864319ac..5e72cbe9c 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.4 +pkgver=4.8.5 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="4660ba6ab33a6345b2e8396c332d4afcfc73eda66ceb2595a39f152df4d62a9ea0f349b0f9212389ba84ecba6bdae6ad9b62b376ba44dc4d9c74f80d7a818bf4 z3-4.8.4.tar.gz" +sha512sums="ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309 Z3-4.8.5.tar.gz" diff --git a/user/zola/APKBUILD b/user/zola/APKBUILD new file mode 100644 index 000000000..654c940e7 --- /dev/null +++ b/user/zola/APKBUILD @@ -0,0 +1,754 @@ +# Contributor: Gentoo Rust Maintainers <rust@gentoo.org> +# Contributor: Molly Miller <adelie@m-squa.red> +# Maintainer: Samuel Holland <samuel@sholland.org> +pkgname=zola +pkgver=0.8.0 +pkgrel=0 +pkgdesc="A fast static site generator in a single binary with everything built in" +url="https://github.com/getzola/zola" +arch="all" +license="BSD-3-Clause AND MIT" +makedepends="cargo oniguruma-dev openssl-dev zlib-dev" +subpackages=" + $pkgname-doc + $pkgname-bash-completion:bashcomp:noarch + $pkgname-fish-completion:fishcomp:noarch + $pkgname-zsh-completion:zshcomp:noarch" +source="$pkgname-$pkgver.tar.gz::https://github.com/getzola/zola/archive/v$pkgver.tar.gz" + +# dependencies taken from Cargo.lock +cargo_deps=" +actix-codec-0.1.2 +actix-connect-0.2.0 +actix-files-0.1.2 +actix-http-0.2.4 +actix-router-0.1.5 +actix-rt-0.2.3 +actix-server-0.5.1 +actix-server-config-0.1.1 +actix-service-0.4.1 +actix-threadpool-0.1.1 +actix-utils-0.4.1 +actix-web-1.0.2 +actix-web-codegen-0.1.2 +adler32-1.0.3 +aho-corasick-0.7.3 +ammonia-2.1.1 +ansi_term-0.11.0 +arc-swap-0.3.11 +arrayvec-0.4.10 +atty-0.2.11 +autocfg-0.1.4 +backtrace-0.3.30 +backtrace-sys-0.1.28 +base64-0.10.1 +bincode-1.1.4 +bitflags-1.1.0 +block-buffer-0.7.3 +block-padding-0.1.4 +bstr-0.1.4 +build_const-0.2.1 +byte-tools-0.3.1 +byteorder-1.3.2 +bytes-0.4.12 +cc-1.0.37 +cfg-if-0.1.9 +chrono-0.4.6 +clap-2.33.0 +cloudabi-0.0.3 +color_quant-1.0.1 +cookie-0.12.0 +cookie_store-0.7.0 +copyless-0.1.3 +core-foundation-0.6.4 +core-foundation-sys-0.6.2 +crc-1.8.1 +crc32fast-1.2.0 +crossbeam-channel-0.3.8 +crossbeam-deque-0.6.3 +crossbeam-deque-0.7.1 +crossbeam-epoch-0.7.1 +crossbeam-queue-0.1.2 +crossbeam-utils-0.6.5 +csv-1.0.7 +csv-core-0.1.5 +ctrlc-3.1.3 +deflate-0.7.19 +derive_more-0.14.1 +derive_more-0.15.0 +deunicode-0.4.3 +digest-0.8.0 +dtoa-0.4.4 +either-1.5.2 +elasticlunr-rs-2.3.5 +encoding-0.2.33 +encoding-index-japanese-1.20141219.5 +encoding-index-korean-1.20141219.5 +encoding-index-simpchinese-1.20141219.5 +encoding-index-singlebyte-1.20141219.5 +encoding-index-tradchinese-1.20141219.5 +encoding_index_tests-0.1.4 +encoding_rs-0.8.17 +enum-as-inner-0.2.1 +error-chain-0.12.1 +failure-0.1.5 +failure_derive-0.1.5 +fake-simd-0.1.2 +filetime-0.2.5 +flate2-1.0.9 +fnv-1.0.6 +foreign-types-0.3.2 +foreign-types-shared-0.1.1 +fs_extra-1.1.0 +fsevent-0.4.0 +fsevent-sys-2.0.1 +fuchsia-cprng-0.1.1 +fuchsia-zircon-0.3.3 +fuchsia-zircon-sys-0.3.3 +futf-0.1.4 +futures-0.1.27 +futures-cpupool-0.1.8 +generic-array-0.12.0 +getopts-0.2.19 +gif-0.10.2 +glob-0.3.0 +globset-0.4.3 +globwalk-0.7.1 +h2-0.1.24 +hashbrown-0.5.0 +heck-0.3.1 +hostname-0.1.5 +html5ever-0.23.0 +http-0.1.17 +http-body-0.1.0 +httparse-1.3.3 +humansize-1.1.0 +humantime-1.2.0 +hyper-0.12.30 +hyper-tls-0.3.2 +idna-0.1.5 +ignore-0.4.7 +image-0.21.2 +indexmap-1.0.2 +inflate-0.4.5 +inotify-0.6.1 +inotify-sys-0.1.3 +iovec-0.1.2 +ipconfig-0.2.1 +itoa-0.4.4 +jpeg-decoder-0.1.15 +kernel32-sys-0.2.2 +language-tags-0.2.2 +lazy_static-1.3.0 +lazycell-1.2.1 +libc-0.2.58 +line-wrap-0.1.1 +linked-hash-map-0.5.2 +lock_api-0.1.5 +lock_api-0.2.0 +log-0.4.6 +lru-cache-0.1.2 +lzw-0.10.0 +mac-0.1.1 +maplit-1.0.1 +markup5ever-0.8.1 +matches-0.1.8 +memchr-2.2.0 +memoffset-0.2.1 +mime-0.3.13 +mime_guess-2.0.0-alpha.6 +miniz-sys-0.1.12 +miniz_oxide-0.2.1 +miniz_oxide_c_api-0.2.1 +mio-0.6.19 +mio-extras-2.0.5 +mio-uds-0.6.7 +miow-0.2.1 +native-tls-0.2.3 +net2-0.2.33 +new_debug_unreachable-1.0.3 +nix-0.14.1 +nodrop-0.1.13 +nom-4.2.3 +notify-4.0.12 +num-derive-0.2.5 +num-integer-0.1.41 +num-iter-0.1.39 +num-rational-0.2.2 +num-traits-0.2.8 +num_cpus-1.10.1 +numtoa-0.1.0 +onig-4.3.2 +onig_sys-69.1.0 +opaque-debug-0.2.2 +openssl-0.10.23 +openssl-probe-0.1.2 +openssl-sys-0.9.47 +owning_ref-0.4.0 +parking_lot-0.7.1 +parking_lot-0.8.0 +parking_lot_core-0.4.0 +parking_lot_core-0.5.0 +percent-encoding-1.0.1 +pest-2.1.1 +pest_derive-2.1.0 +pest_generator-2.1.0 +pest_meta-2.1.1 +phf-0.7.24 +phf_codegen-0.7.24 +phf_generator-0.7.24 +phf_shared-0.7.24 +pkg-config-0.3.14 +plist-0.4.2 +png-0.14.1 +precomputed-hash-0.1.1 +proc-macro2-0.4.30 +publicsuffix-1.5.2 +pulldown-cmark-0.5.2 +quick-error-1.2.2 +quote-0.6.12 +rand-0.6.5 +rand_chacha-0.1.1 +rand_core-0.3.1 +rand_core-0.4.0 +rand_hc-0.1.0 +rand_isaac-0.1.1 +rand_jitter-0.1.4 +rand_os-0.1.3 +rand_pcg-0.1.2 +rand_xorshift-0.1.1 +rayon-1.1.0 +rayon-core-1.5.0 +rdrand-0.4.0 +redox_syscall-0.1.54 +redox_termios-0.1.1 +regex-1.1.7 +regex-syntax-0.6.7 +remove_dir_all-0.5.2 +reqwest-0.9.18 +resolv-conf-0.6.2 +rust-stemmers-1.1.0 +rustc-demangle-0.1.15 +rustc_version-0.2.3 +ryu-0.2.8 +safemem-0.3.0 +same-file-1.0.4 +sass-rs-0.2.2 +sass-sys-0.4.10 +schannel-0.1.15 +scoped_threadpool-0.1.9 +scopeguard-0.3.3 +scopeguard-1.0.0 +security-framework-0.3.1 +security-framework-sys-0.3.1 +semver-0.9.0 +semver-parser-0.7.0 +serde-1.0.92 +serde_derive-1.0.92 +serde_json-1.0.39 +serde_urlencoded-0.5.5 +sha-1-0.8.1 +sha1-0.6.0 +signal-hook-0.1.9 +signal-hook-registry-1.0.1 +siphasher-0.2.3 +slab-0.4.2 +slotmap-0.2.1 +slug-0.1.4 +smallvec-0.6.10 +socket2-0.3.9 +stable_deref_trait-1.1.1 +string-0.2.0 +string_cache-0.7.3 +string_cache_codegen-0.4.2 +string_cache_shared-0.3.0 +strsim-0.8.0 +strum-0.15.0 +strum_macros-0.15.0 +syn-0.15.37 +synstructure-0.10.2 +syntect-3.2.0 +tempfile-3.0.8 +tendril-0.4.1 +tera-1.0.0-beta.10 +termcolor-1.0.5 +termion-1.5.3 +textwrap-0.11.0 +thread_local-0.3.6 +threadpool-1.7.1 +tiff-0.2.2 +time-0.1.42 +tokio-0.1.21 +tokio-buf-0.1.1 +tokio-codec-0.1.1 +tokio-current-thread-0.1.6 +tokio-executor-0.1.7 +tokio-io-0.1.12 +tokio-reactor-0.1.9 +tokio-signal-0.2.7 +tokio-sync-0.1.6 +tokio-tcp-0.1.3 +tokio-threadpool-0.1.14 +tokio-timer-0.2.11 +tokio-trace-core-0.2.0 +tokio-udp-0.1.3 +toml-0.4.10 +toml-0.5.1 +trust-dns-proto-0.7.4 +trust-dns-resolver-0.11.1 +try-lock-0.2.2 +try_from-0.3.2 +typenum-1.10.0 +ucd-trie-0.1.1 +ucd-util-0.1.3 +unic-char-property-0.9.0 +unic-char-range-0.9.0 +unic-common-0.9.0 +unic-segment-0.9.0 +unic-ucd-segment-0.9.0 +unic-ucd-version-0.9.0 +unicase-1.4.2 +unicase-2.4.0 +unicode-bidi-0.3.4 +unicode-normalization-0.1.8 +unicode-segmentation-1.3.0 +unicode-width-0.1.5 +unicode-xid-0.1.0 +url-1.7.2 +utf-8-0.7.5 +utf8-ranges-1.0.3 +uuid-0.7.4 +v_escape-0.7.2 +v_escape_derive-0.5.3 +v_htmlescape-0.4.3 +vcpkg-0.2.6 +vec_map-0.8.1 +version_check-0.1.5 +void-1.0.2 +walkdir-2.2.8 +want-0.0.6 +widestring-0.4.0 +winapi-0.2.8 +winapi-0.3.7 +winapi-build-0.1.1 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-util-0.1.2 +winapi-x86_64-pc-windows-gnu-0.4.0 +wincolor-1.0.1 +winreg-0.6.0 +winutil-0.1.1 +ws-0.8.1 +ws2_32-sys-0.2.1 +xml-rs-0.8.0 +yaml-rust-0.4.3 +" + +source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+)-([0-9.]+(-(alpha|beta|rc)[0-9.]+)?)#&.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" + +prepare() { + export CARGO_HOME="$srcdir/cargo-home" + export CARGO_VENDOR="$CARGO_HOME/adelie" + + (builddir=$srcdir; default_prepare) + + mkdir -p "$CARGO_VENDOR" + cat <<- EOF > "$CARGO_HOME/config" + [source.adelie] + directory = "${CARGO_VENDOR}" + + [source.crates-io] + replace-with = "adelie" + local-registry = "/nonexistant" + EOF + + for _dep in $cargo_deps; do + ln -s "$srcdir/$_dep" "$CARGO_VENDOR/$_dep" + _sum=$(sha256sum "$srcdir/$_dep.tar.gz" | cut -d' ' -f1) + cat <<- EOF > "$CARGO_VENDOR/$_dep/.cargo-checksum.json" + { + "package":"$_sum", + "files":{} + } + EOF + done +} + +build() { + export CARGO_HOME="$srcdir/cargo-home" + export PKG_CONFIG_ALL_DYNAMIC=1 + export RUSTONIG_SYSTEM_LIBONIG=1 + cargo build -j $JOBS --release +} + +check() { + export CARGO_HOME="$srcdir/cargo-home" + cargo test -j $JOBS --release +} + +package() { + export CARGO_HOME="$srcdir/cargo-home" + cargo install --path . --root="$pkgdir"/usr + rm "$pkgdir"/usr/.crates.toml +} + +doc() { + default_doc + mkdir -p "$subpkgdir"/usr/share/doc + cp -r "$builddir"/docs \ + "$subpkgdir"/usr/share/doc/$pkgname +} + +bashcomp() { + pkgdesc="Bash completions for $pkgname" + depends="" + install_if="$pkgname=$pkgver-r$pkgrel bash-completion" + + mkdir -p "$subpkgdir"/usr/share/bash-completion/completions + cp "$builddir"/completions/$pkgname.bash \ + "$subpkgdir"/usr/share/bash-completion/completions +} + +fishcomp() { + pkgdesc="Fish completions for $pkgname" + depends="" + install_if="$pkgname=$pkgver-r$pkgrel fish" + + mkdir -p "$subpkgdir"/usr/share/fish/completions + cp "$builddir"/completions/$pkgname.fish \ + "$subpkgdir"/usr/share/fish/completions +} + +zshcomp() { + pkgdesc="Zsh completions for $pkgname" + depends="" + install_if="$pkgname=$pkgver-r$pkgrel zsh" + + mkdir -p "$subpkgdir/usr/share/zsh/site-functions" + cp "$builddir"/completions/_$pkgname \ + "$subpkgdir"/usr/share/zsh/site-functions +} + +sha512sums="be6a37eb489302c369f83a7c65dc9b1aafc7cea6994dab9297618ae2ecf5d0c2f838b8dd386bac8c17e0f24fa0d30d4fac2f4599e912f06a32525b4dce38215a zola-0.8.0.tar.gz +2d1658901c383003ff8181f366b1c691754de50fdf74a07a89001c97dbf9320864238797cbd20a44643e8ea8ec107c3b226c8573c4a6379f94ffd286fe8db025 actix-codec-0.1.2.tar.gz +506c2644e2b111f08243ef4d4eee2bdfd30d0e713f3ae1a6d2e382a1b0e2e3af41ae9828a642174995267afa1a91e3cfe6ccd9d182b893803a92ff730879b0b7 actix-connect-0.2.0.tar.gz +66cb9eb29ac54fb518869260ee2698c2c064d75ea64a748d02667d43a163e17ff7de8825f629e2da7669bad4039dc1823d70b04070e21ccbaf1d55ebcbafc328 actix-files-0.1.2.tar.gz +c96bb8e0e5bbad590861035697a713c98b0792436d3bcac87cd4b4649d3cb2485a9711355f2e6fbb3b0c90a7147eea8e0af5524ce75a761ff4b0929c3f7d9137 actix-http-0.2.4.tar.gz +a01be9391df3227764ca3445301b82bd85dacf502edb6233fd0bdac1447cc1a4a7514952effbbce0c1b267088db3ac17ae4455a2232232aed056f1efff562e5f actix-router-0.1.5.tar.gz +8ea50d7db80272f33eee1a0c73e32a8613330ff83410c1b7f55f7df71b44697a48d80aac40cc1af014b349ec6144f41e79487058f188b822cd09195bf57b9c26 actix-rt-0.2.3.tar.gz +850fe799de268cc6cf440faa1b6254de1f7a5ac25dbcfaa07adfc5e798156102b783d5eec02903e41babc67e31d269825d5f2afce794f2ae670985af706b6fff actix-server-0.5.1.tar.gz +fdebce2eb4266edb7b66f3c62b2f5295c7a6075d1bf02862885a4942b05fef38ca6270de4a4ea56f5db1345036cd98800e585dff54c00c2179db982165d9b0a9 actix-server-config-0.1.1.tar.gz +2dc85a307ad0ff304beea4a8afdac93ce82c943fa300033b3019bb6bb58fa5d5242705e84072679655e35e7d4f933a7150a9417ad5a9098e926e850f8381f0cc actix-service-0.4.1.tar.gz +c290bf7c84996bd529c53d0314174eedcfb9440cb1adf580f4626fe8345b2a64b5054ee7514d7882b2a786f90a4ac5de64db0da346f93ee88ea382ce9f40f693 actix-threadpool-0.1.1.tar.gz +99166ab2185f8a4b5f4a850a5cb050adc6098869a9bbb333ebd68f9a71e1b741854b9cf5841812f8abc2c062d049e64c0ba7ccfd0303da4da0f7b7022fc17e57 actix-utils-0.4.1.tar.gz +ddb3777b74afc0787ecba8621bdafae44f96bfc9f1545dac32f7289a509882996e4cec5c4c7300db9a4c3cfc3d0235b9c76bde5bd865a594704ab346f79ee901 actix-web-1.0.2.tar.gz +28c445b11556be5a482adade25fa67431b0557b620aa51cf76552a441171c854c66c2db889210d8cd0a09382795a76524b5a60f1fa93a531dcec07e03cf3f4a0 actix-web-codegen-0.1.2.tar.gz +2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459 adler32-1.0.3.tar.gz +4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9 aho-corasick-0.7.3.tar.gz +88081fd9d0eee866c287961de80e60f489a8c89302283138707a2169af79f864af97ecc5ef53d18e5e28535a5a888840b404cc1f648afe0e4e315094c401c029 ammonia-2.1.1.tar.gz +a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa ansi_term-0.11.0.tar.gz +6358a28edf997b475bd1ac5860469b97c1605e36f1aecf7108bc26a11ddc96073ed5596bd2a331214b3cb431dccd7f9301c3b86b7cbcc331531c84e2409c6f5c arc-swap-0.3.11.tar.gz +8aa327fcc18220da496c63c76a521c383c7d506e8c39448f5cc6535c47b8c70ca74f73322b0c368fae7b8a8cec11c9854ac45b4eb7e537fed34e007aa3ad175f arrayvec-0.4.10.tar.gz +9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79 atty-0.2.11.tar.gz +811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce autocfg-0.1.4.tar.gz +73eb9cecaa8baa9da571f49ac9a1e8e159d042e59b934df4b7474e4a49ade66aea69c49505b987855942856302790065f56f25b2e25657af00afc5afaf123c20 backtrace-0.3.30.tar.gz +4b16bc8500258d0e75db0c6cca3e2a68d9024106a0e8a4a46cf5865fe1e08304d9291a6723e4fd337b7d7f5bb14e9cec7b3aa2e40bbaa4642562764c803d345d backtrace-sys-0.1.28.tar.gz +674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535 base64-0.10.1.tar.gz +31f32a3dfcb76f113b2e993938b4c708d98d3c75efa9414d74168b2ef8af544bfe64fe39dbc4ea556842ec11100c56f14bbad15aaab919c67a7c5be1aa584f28 bincode-1.1.4.tar.gz +e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3 bitflags-1.1.0.tar.gz +74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf block-buffer-0.7.3.tar.gz +db06c66edf77b0a6860d75e053b84b74b3f168a320598a7f1de0e55fa6801dda22010328c5b50a56a27aafb09ed61e3e27ad7221d650b546b3798652b767b02b block-padding-0.1.4.tar.gz +e961d6ffaa4edd78fd7b6cac944013a29790cb6bee512498fb76594ca3fb2992cf69bc5d4ad7e0bac7316f4f4017ba37dbacefe794336bf1557eccffa3381051 bstr-0.1.4.tar.gz +4e210078ad781bd645381f469285f0e4d20cc8c416818c27d98c0033f070b708a6ab27933f9c3660c83e6cbfb3afcb7ec753f9c186b0c75b99db37dff1cde658 build_const-0.2.1.tar.gz +18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa byte-tools-0.3.1.tar.gz +2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f byteorder-1.3.2.tar.gz +5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250 bytes-0.4.12.tar.gz +85cf4679d16df14a815563c459227ae85206eb79826099fcbd5f602fdfdc052f36237916a842d65d9a5ab57c559c18e645bb219422d85aa3690c11c0a8dcc92c cc-1.0.37.tar.gz +45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c cfg-if-0.1.9.tar.gz +c869cab6da906d50531476c892510042eeccb3daf790ef13b3014121c805b3f8e23c7a6ffccb3bb11d15a1615e997df4180e41f0140a2c327cc816b94f28976d chrono-0.4.6.tar.gz +f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz +691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c cloudabi-0.0.3.tar.gz +690b0aecf48e5102efca22d4f25821159d4c3f726f5eac08159467bc586ab9f83eacd64aeab79162c006d434002930ceb1519037c846edd84745eda289a592b9 color_quant-1.0.1.tar.gz +4a802118306d25f1e53444e143913ca2a14a9e5584b26c5aca67b5ce0ac5111c4469fc5d7ee6b5877f8ac59143739b749edac83ceedcef7b53ba1e15cd97a821 cookie-0.12.0.tar.gz +40584ddc3189ee798b5ba262934d0a48455376d9cab4d715e6c4dd476b75c62ec09fe0c2f1b748b266d20f2b84fd97e58cf1ec88cc6b245290a572fb29fbc4d4 cookie_store-0.7.0.tar.gz +d6ab4606e32f8d09dced40830c6e44847dd0f33113224a756e6afc5ceb22569e4f0fe20e242b8249d4cf717bdd3a3d8d7792887a71bf7e00650c07f787922ef0 copyless-0.1.3.tar.gz +5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632 core-foundation-0.6.4.tar.gz +bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07 core-foundation-sys-0.6.2.tar.gz +db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a crc-1.8.1.tar.gz +2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0 crc32fast-1.2.0.tar.gz +9b4c4b9345276b0227041a64f7ea4971dcd37ac5a2d404408d7e1875cd9a1318cbbee0cd91d4ba4b73201927ae61cf35382d2c8ef9461f21d71e802d01063583 crossbeam-channel-0.3.8.tar.gz +a3248a310c10d09e5a9d394a4e7c571bb75c92c904924fd26b40a55d6fa97c054fa2f1a978ed52263d91b495702c5957dc69aa8793a5c42b4b9e83ac86d4f263 crossbeam-deque-0.6.3.tar.gz +6ea3f138aecb4e84b4f9754fa6abc164b5b558987b15bd34562b70cf93ffd9015d017f62098e578236ad8bc1db652b9bfa624edffd5a99f10c3618c3927d3fe2 crossbeam-deque-0.7.1.tar.gz +d527ea799c7f7f5dc960231aa5d24f27ed9389f3a92531046e77686d50740e8f35d1f42510a8e6695776c58e77a3be51aea0dbed459cf81cf8befee1ec573f84 crossbeam-epoch-0.7.1.tar.gz +f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444 crossbeam-queue-0.1.2.tar.gz +5bcf3eed8f28d608b675aa4588b133393ced515e2f7fa37b413b34aa5ee550100899d957906dd04fcaee68cea57d2c8f230e06d6903f5ef117c9313d6cdbc2a8 crossbeam-utils-0.6.5.tar.gz +d3e69e0a93b55617b79a32e4429ea56eee03b5b01a9a62a132a41c0a4961db1bff418681ac3ebbfa30cb0c82ce2beeab2d9fa469a0514e5ff9ef64b969de4acb csv-1.0.7.tar.gz +fc223ef33b83ae306f6cc5a77b08323a802f8fa39054ad9c4cffc63ba3195344319bb66471d164fa6eed7ef3bec11fb8308b78a4fe42ff91413e9441f021d439 csv-core-0.1.5.tar.gz +b77b0ccfe31110c514795b390b0500cb7349d4dfa2367f6d6b9612cce3d9dfa4cbbf96018da71ff4488258a0aeb2911e0436df35ea52c3e6a464bcbe027f12e8 ctrlc-3.1.3.tar.gz +f2aedb6cd5d09daf4b2449fcd139f27a8a3ee97bdbd54b9f04611f308b96d9627579beafd1421266c3ca15d017c68872b957ba90e6813dd7cb07de5c9ac6a4f9 deflate-0.7.19.tar.gz +703951b04d07f90225b08f3688c2afa1d78511c82433d4430827592c5c5cab3b442c914420c533e91c929caad02044586d3f81a6e74bc32c12b9d75b2345e13e derive_more-0.14.1.tar.gz +dd68892b97f104427a3df896680616b002c7f0cf2809279f7f6ed34287ce387fc7c41d95e91380ac93a8c3342645467af70e656d2515db0beba24ce456e2a8bb derive_more-0.15.0.tar.gz +f3b9ca2055cd64d2f3035799f809976a0909e59b38ebec62b56e9037f32582f5cc99b72b1774dfbcc72e4d978570946cec46eb034fe71145c67e2241b9f84cd5 deunicode-0.4.3.tar.gz +b5c4b7d0d1131d2b24fa010839019fa5fc825a88bcda12f4b170b5d7bc93500319895a8c6282eda98be59e880825147f06d21eb9bea43828752cafc998b23e56 digest-0.8.0.tar.gz +d2ca487cf950dbab9cfa20eb8b712e07276e40f2cb8b0c5c56f60719ae18d8a1c7fbed2bbea869255b0d5286b9890ad6fc6b3d7be2cc13af28c84c2882de8044 dtoa-0.4.4.tar.gz +88b4ad9854281d6748177b8e18a1cb1a9ac8948d2de8ebadbad94e72bf8b825361b142d890b6264106069af48328bb9844afd248f64b5469d2d2cb81d0ce5187 either-1.5.2.tar.gz +18d91518b575a20b2b56c666022783fe1f1ee119b4edc98e01b1c42cbb2025741897516bdad69d6c1a8e0001db66f5618941c4b6ce5f202a25feda4c8209b16a elasticlunr-rs-2.3.5.tar.gz +10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e encoding-0.2.33.tar.gz +879fa0b9a294f3a73a4b224318ce5e44bc1ad0496763a518cb9ee251a4cadeb08885df97eb72f27a1e331f36d46a96824f98b7d128d879c0639405a10e08b8e2 encoding-index-japanese-1.20141219.5.tar.gz +0e79eb9b01fe0354532dc7a8ca55e6332add19827905340560ef9b0e4725becda68ffedd5d18b9ac9d0c4a1b64fb337a9a31de5891b9e6469478fc974e5f9884 encoding-index-korean-1.20141219.5.tar.gz +caffc2a9b77545c2cc22bfcb38c886fba21e765ef49a3cfcfff88ebd76064432638bb432cd57a7ecd23bf2ea074c400c1f043a0589e5aa28024ed3ae0f59be75 encoding-index-simpchinese-1.20141219.5.tar.gz +648a5b9dcbdd40184b6026f6d0593df3b75c5eed554c19a199810c99aba857fccbab2acbf5b047ff42a75a6a3f6e8211a07e70e6fa4048f07144f9132af7d17a encoding-index-singlebyte-1.20141219.5.tar.gz +3b23213433947af7c56e9ea3e4eaf937b8083ce7e9e481b1351925a6da647be6a037b505116bab08ce73727bec75550bccb877ead6cb7fb0473bb3bd3d40833d encoding-index-tradchinese-1.20141219.5.tar.gz +0635e6a879d59aa3373e1c0cae6f61b9bd11138691a1113f3639a1d16ba894c1554f29a6d347353f02395508be4da8a4b16b17db3339cf970a62267874fe93a6 encoding_index_tests-0.1.4.tar.gz +db7a7d469d34feaa899195c336fb9211ee358c226597d0900850fbafac2ee39a89bff253663744ec737a055bf7582e96b9825e96e679da4bb9fb3b0cc59d1453 encoding_rs-0.8.17.tar.gz +37c8034c74e74e590d785af955f34989454bf8051608aed2968ec6e5609f492fa3fa4ca829404a13c1e2f987eb72403b8c9c3463e69b5bde0b5307fc4b8d7f8d enum-as-inner-0.2.1.tar.gz +1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc error-chain-0.12.1.tar.gz +8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc failure-0.1.5.tar.gz +c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a failure_derive-0.1.5.tar.gz +d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893 fake-simd-0.1.2.tar.gz +cf7e453250b22f58ecc0d177f7042ca3d4ad6f58b3b88bb62942acccf17fa3e13bae70c91dc31b778cf9ae5becda8523958198021bdac48bfa78fe3827e1e540 filetime-0.2.5.tar.gz +89ebe7b8cbd24542989b1a15cd8c4b0b32ca1c0e25f0c874824d9d9443fb1e97ef7064509ea2bd32035abaa412e5eff180813b48811cc3088d046fe473f75654 flate2-1.0.9.tar.gz +f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844 fnv-1.0.6.tar.gz +bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 foreign-types-0.3.2.tar.gz +bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a foreign-types-shared-0.1.1.tar.gz +c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a fs_extra-1.1.0.tar.gz +98d5e6998e3ae0cf3e0f383aa1e8f7fadd9b75154753168da4f6b87cc9a37b8830e7bed4b2169993ddf49646c9d47aa022d6af8a8a66370e7fc533932e70855f fsevent-0.4.0.tar.gz +4c7f96586c4564f804390c3ad22388456a138bef1902a5985463515ca9b56976fc14c993f08ac188897c449b2d2843890c2357398eb3ef5eb064326881e7167d fsevent-sys-2.0.1.tar.gz +ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 fuchsia-cprng-0.1.1.tar.gz +a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93 fuchsia-zircon-0.3.3.tar.gz +978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386 fuchsia-zircon-sys-0.3.3.tar.gz +4cd5ecbb8c180c9b390a6884edf65bfc3aff53ffe7b930cf2b432ff9c46a8c5a06001f3f412f99c41a60def52207e709ffa07a4b432ada488e77067fb5e1b3bf futf-0.1.4.tar.gz +5349e562640820de3f41662f40b3e0b2a76f8b63a34ef7f15318600a2e016d3d0e78a31ee3d3c35fffedae6f80d1bab9be7ca1ada573a6172aa703dd5ff5832a futures-0.1.27.tar.gz +49d7a75e2e0a6a6d2103212a9ad9474119f4f33cf3748b605dfbb461ec822330115cada6bbf6457f2093f4af4cc04b4db63dbab8c0faa8b25ee31fea29f660e6 futures-cpupool-0.1.8.tar.gz +ecad969ae86b7370ae0c68b67900216a63d0aaa39c50f541fbcb0c28c31c12f28290ba6d1ead061b563b8e7ccbb8a8867d69d3c57550c41c5627dc93fe7af5b4 generic-array-0.12.0.tar.gz +b9f344a10d67d99f7d4f21bfa0d940a677c9b50fb196718a5c3e08f5c46a4b9bb18983c7c12c9cf3d83136f3dce0a57bd2dca90c7461b9175bf26d733ca7eb62 getopts-0.2.19.tar.gz +dde1332c893d5bb74270f11f4942d8aef3de20eba339bd8836e4f0ebe543d47614494506fd8ba2bbb3c370b28223db04b8a07d3be7ea5a6e9551400c29f1dcdd gif-0.10.2.tar.gz +87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46 glob-0.3.0.tar.gz +255ffa4234c7014fc1de961fabb2a8b8f3285d72f84ac03d89f613467594767ef424b84bccaa4c68ae289ae603de189ddd4c44b0d156680aed1252ef961f748c globset-0.4.3.tar.gz +889445498d83d9fcd4cd91bcc6bb72a476f4bee4f2cb74260abff2a8a18206583d883afb7b9e8dff83b878d9acede81ce12c9f81bab3b93ca0f401e2681d724f globwalk-0.7.1.tar.gz +d4786ec756617eccdadfa4eff8ff2731e62c9eb9dfca056bf83d02f24b1c73f677cd02b72ac81759df160e82bfe832a7108037c27dc82a4c385f7f2b00dd0436 h2-0.1.24.tar.gz +96c878d0f9dd70eddb14be2c42df955956a334e768a021f6e14369244c9b0f199182566181d4cbdf137adf040f5a397a57d9ab3d503470fb3412f9edb44b2e01 hashbrown-0.5.0.tar.gz +134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6 heck-0.3.1.tar.gz +1b822bc6261cda2a52518c625790878eb4592fbccbea72b503da42322659b8e6c95ccac442753a6cf1d5d612413679221650e0c584bb06162c3b1c89d8bafb02 hostname-0.1.5.tar.gz +d3cc6419bb069394950e02e35fad5f619c996d9c41f9be51364c4b82033b09dbd3b8230d375c6a2d0aa312124dea2ffaa363494a1d24d19d01aa7012d80c951d html5ever-0.23.0.tar.gz +4ec143aec78ca3c0834eed20926ade333c282fedb81aa482b75f25daffb2584756ab337de5fa0e9e8d5d24f39d5f9976d51a9b08e94c50d162ab23564924cf23 http-0.1.17.tar.gz +b1c9fff799f6581160ef232ceff82a0c222a9f1ed3ec24760fb6b156d42739e06512086e4819323aee7e19b1d0b30ac8915f775f9c36d63b4f901546d331cc80 http-body-0.1.0.tar.gz +b7c3486fde1ec34c07b317df1ad03be6585c3a114a8abcc593dad4244ba372ff4faca9c25151c5c896609dce72523a9daceebd554efc396a937a0c80f87a2087 httparse-1.3.3.tar.gz +dfca883bddb8562e7538522a560624bc98a53fc8ee712fc3e023e502ffe85ac7bbcd9a68a2718331bb206014dfdb74445bdab7d4aefedd047994219ad1b216a8 humansize-1.1.0.tar.gz +718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb humantime-1.2.0.tar.gz +fc99009efd1bb656c94072be62d07194d4033fc163b6db5aff2ce1091ed9dd837ca993b540b99041fc218d70aa5ef05103e278a3a6e35811652e2cbd4c6e5b12 hyper-0.12.30.tar.gz +9179878b95e8e390b17d45bb02c24219066405f671fddc4e044ecac0a00646e9ae03e7cda31b0f6f7beddd8fbccfc873d28d52e6b46aab2d252a2472302a483c hyper-tls-0.3.2.tar.gz +217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a idna-0.1.5.tar.gz +8db0fcaa966e81b4407700131f3b609165aa3db4fa046410a56f7e4f5a571f5f0bde399b022610f3967f0a640a1da5e268580b6d0e59b6f1be60687f0d3e9685 ignore-0.4.7.tar.gz +e45716fe305af10bb95ddd38db33a48cc379a7e5e1ef7b4a43fc5d2482310eaa50ffff7aed69394d51a423c698ba218a1ecbbd70f6ac7d1421f2089c046f11c5 image-0.21.2.tar.gz +cfae9d222efcce9ab15c5a8368db2865fbdb6819b4fc317ca0aed55c32ea312b5c5ca13130d4aabf08af1803c34d465a1a1209dabbce37e7a1a911faf5cfcfe8 indexmap-1.0.2.tar.gz +1392402f72a8463dc5cdaf815d8933e8dfcc914fb3a91e69c38e54deb7d55b5211e157b640b7cfa999400fb4d2e233a4a1a678147594dfa0be300894126d17f2 inflate-0.4.5.tar.gz +f818c3a74f2525ae9e57e5a0f1625ac0b86a567f8e8ac92f93836371ae818a05b3ad92893f3e080d2f0e0f7d22d3f25ecb3de5cc744daebd8977301c9280b64c inotify-0.6.1.tar.gz +82ce82277ef2ef05888aae3a997461515d340c7286daefa4f54f7942fcdcbd1e29fbc60907ecdbcb00139db36462fb3c21ce64b9add2b785826adfaa54216a66 inotify-sys-0.1.3.tar.gz +3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223 iovec-0.1.2.tar.gz +b9c2e23476cebe74ba1f3ac15404a5c336f1d85c1320ef802cd4e3b23b8274855ee42545429c110fab88bb925799375753be3a2e78638c50be5f32666327691b ipconfig-0.2.1.tar.gz +f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d itoa-0.4.4.tar.gz +ad09e0bd9b06904cbed740d02c268a0e1568c1a5061f085cbd3488a69255cb66024a664954beb6ef48594267b71c7736aa8f197249e24ae2bdaa2d267708e5bc jpeg-decoder-0.1.15.tar.gz +682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b kernel32-sys-0.2.2.tar.gz +54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6 language-tags-0.2.2.tar.gz +08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822 lazy_static-1.3.0.tar.gz +de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2 lazycell-1.2.1.tar.gz +9127ad9a94f75655740fc3a2278c7a17d5f03c4cd12c8833c1a1ecb7a860ec8581fbc969f5c2e23b8eecb9131d9d8271131ad6a675b785f18fb55d830bcc0491 libc-0.2.58.tar.gz +31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb line-wrap-0.1.1.tar.gz +74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94 linked-hash-map-0.5.2.tar.gz +e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde lock_api-0.1.5.tar.gz +23ba50a3b69903a83de43c63c09c56bb24fb69e2c43d020d1dd5df61bf45ad2ee3f49ab4263e069e311a48b5b7220f3e2d1417c7c98e3c6350f0036007564a0e lock_api-0.2.0.tar.gz +3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb log-0.4.6.tar.gz +ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1 lru-cache-0.1.2.tar.gz +4f62b824a4ede1be1618e75734d109202ad85dcd219409412868433e92513f4f1953a3d85b570d5195cb9b6fcd7af08e0a56a9f1f4daea42d604b37f1218c2f2 lzw-0.10.0.tar.gz +dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a mac-0.1.1.tar.gz +8cb6d865e4a3e73d5af5e41bd48e7f971f1a361a5ac7999f915bbd7156d5a90caa07c4ae82d428217b12a6736c362fc64dcafc757b4e7fb66f645cfddc11b175 maplit-1.0.1.tar.gz +0a91337a75e3af1a50e15369b35c467a7fa23c4c75f8f1ef4214484ccd627ebf7ad2128ade98d831f5cd2a243f030988994571617247cdf430c5320aea9a3f9b markup5ever-0.8.1.tar.gz +98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590 matches-0.1.8.tar.gz +19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088 memchr-2.2.0.tar.gz +4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530 memoffset-0.2.1.tar.gz +92805a4eaebb1f6146facf1edd0b9cc710731949141af6bfc2226edb7fbd749b04bd8a921e79c2f4a31b79d11053e36a4b7b9dba9be1405a1174a8600654e320 mime-0.3.13.tar.gz +b32bdea0942443aede186317a7e3b3d2e36e3bda56e43794c040aad6ddc1fb847bd380f514299800e449f188208c218680d4d07f16ab30c9c7cbab02c5245733 mime_guess-2.0.0-alpha.6.tar.gz +e00ab08d024806ffe68f8d9d0404bf83e62c58d04398bd8b0f8993a6c60a38fcc3a50189cef7a699ad7a93682d9f2353a31f5596d62a72c5f6560d12cf0c0a02 miniz-sys-0.1.12.tar.gz +8f3cc13b919c6dca6c4601ccc66e0102fce505ad4082e1eaaa6b132182b9cecd5e564752ba3c62b8e9db9c353f46623afbd6415119b342c746c3b72e214ed5d9 miniz_oxide-0.2.1.tar.gz +2347504ac3a45e502ace4192dee292ac656771dd9dc6557f66648b94e97e77cf7ba763b99ab9b81de053cd33756a7dd5d3ed5d2741ec88c2164729071823a9cc miniz_oxide_c_api-0.2.1.tar.gz +a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097 mio-0.6.19.tar.gz +743fc56546d8bcb09efecda0d60007a175a2db2a75dc882b21fedeb8fc4fcfe98ac0a6d55b0e843b088aac4e24e57145d96b372cdfa39933efee2514ba2ebba9 mio-extras-2.0.5.tar.gz +fe16c8702eef599c2379a2b72a0408970c3318e240d6ed59077c7fcae142bfcda4d9e342e3185338671b82719f7c2ab156bb28a54818a54c249216dbb0f8bb04 mio-uds-0.6.7.tar.gz +b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72 miow-0.2.1.tar.gz +9964d627c922261ea730076a2c8447784e0ceebd8e6218f5a61093021f10682c2fa25815c10711831b7d41c84b7c77cc1128a663669058882b0af6d70ac0bc09 native-tls-0.2.3.tar.gz +e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9 net2-0.2.33.tar.gz +d12686d789b0c37ae0b05881223b61737fd04092f10217caf4e6c9b8604e0a7734c9ff81b01ac204966c687481758b4dfaebf3b4947736ff90291a0dbfed3caa new_debug_unreachable-1.0.3.tar.gz +c6393f47cdff2134cd51ca3d6becf0309697a11ac9956e3979a2d6cd00a86545d1af4efd63f6d5e417a80b2d9b247a7416b7182156d9966e00c6da25a3bfdcb3 nix-0.14.1.tar.gz +2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e nodrop-0.1.13.tar.gz +663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54 nom-4.2.3.tar.gz +4d278f28f94b3b470d4928b8164db4f3b74ffd1552afd85d7c5f502380aea5e5256201ca702067993daa691babd532ffa12d44309f3a688c45c6e66d1b9c6e1c notify-4.0.12.tar.gz +63ec8a69a964fc7c4d6286c04503fb77acb6e3609237b3b4619418c06b11e96bff88e7cb10898718ae690a187cec75c8b96b9c3d524e171ec1678eb457d354d9 num-derive-0.2.5.tar.gz +f979ace06e3c109e9b5217a85341117ad12bb6e8da1b7ad799d91a967e3da1eb785fb114294f049ed8a2022cd5269c1ff771bc319af3da0899df97a1e412297f num-integer-0.1.41.tar.gz +4f6e94c4f5e7ea1a95d76a61a4be4c5ac3b3e8ca0a2271b721c265881e47b0454525918aa207bcad738de8e19ca7c5e5c915a1c4c158d5c9c2e68d05649bdaf8 num-iter-0.1.39.tar.gz +cbe0dadf88b0704543005c96e2bac7bf981a90dabfd6595b06ee21973acb304591929dfaf51b3e860456dbbb812e60c5700a4793b46214595092f4defdf8159b num-rational-0.2.2.tar.gz +a3019e45744245837b2f146ab4213746c93a1ad701958dd418272af89451b843f9b643eac673c1397f6079da7709c7e9ff46e0e829a4cf6092772c9d77bbc534 num-traits-0.2.8.tar.gz +f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd num_cpus-1.10.1.tar.gz +41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354 numtoa-0.1.0.tar.gz +f8915e2d001c4f2dbc77bce91f673f07c0bea36f47c9f5579d36de6e68bdd0623d0700f0b3dc6e82b747e17f6b7f35fea84717bf658990dfb284f4bbe5bb66be onig-4.3.2.tar.gz +676884bf338fe2d9726956eec5d26297f3eba03642766ee3e64d7e2f5a945d6da93521c19c2c11881b5bb2785f24e5e91febfc08f12729fe58d74e4494f08ae6 onig_sys-69.1.0.tar.gz +3bbe9ada50d8fbeb46a0d3ee624a8e2a4f8012ba018f7a9e2408817756c6aeae2804b89537685509cd4872b1ac19bdbe01b6e09d7ba22995d9046b99587fa157 opaque-debug-0.2.2.tar.gz +655db50c88b5503dd80649f467acea5452896fb97d39d82180dafa24180d7d92a1ef2e75ad46b0596f8ac13c2fccee3c7447fd45b54afe94cd261c4e218ec897 openssl-0.10.23.tar.gz +4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a openssl-probe-0.1.2.tar.gz +8d3a38a5f403cbd957b069c60d80f790f2030490847113b3050afbe769b4c692b581ec763656042973167dee6ca70939fe0f15cc1150db67731fb3808d98b6cf openssl-sys-0.9.47.tar.gz +51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba owning_ref-0.4.0.tar.gz +d83d3c457e15ffce500d4fc82d0b9840ea2ed36d43d4eca841b05b0a9ee73ff6fcce07ccc3a6f0d06d950d7beff85db0c3d13dc1461adfef390d6b3d85367bed parking_lot-0.7.1.tar.gz +82937f87811a987652fad9c4018efa2dd214b4142c5a94c6629fc5bb0e9c49c13d9503783e3932fd0834f2a1afde6dce80aa488b2bcd32c95bf9a9d5ce139f93 parking_lot-0.8.0.tar.gz +25c0389e9d3d88725398fb304d3a4c20a3da0bf0d67f12c7cdca38f8068dc6ea7b57341579136cf4792cbb92fd64dd33cd91412463f4df8902e1b8c87ca08d08 parking_lot_core-0.4.0.tar.gz +fd90b0a82713d329045da37ad4ab6b66d1e860f0a6ddcdf102e8740b98badfc83d6c056210618fb339271f1f68545090287528590d337d34a31bd7fdb70b0dc8 parking_lot_core-0.5.0.tar.gz +6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9 percent-encoding-1.0.1.tar.gz +44573f10494b8710abbabce9ded07f2b33fb7791d607229133b8005395cb164e9a2702f621c3e8d35f9747de5bf4746dfdacde4960ec1bf8e0f0d6b0acc4f49b pest-2.1.1.tar.gz +4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba pest_derive-2.1.0.tar.gz +6d8bc7f0cfa61ca0d9f07d6b1c3d84e6b1d0bcfcd4a9166f40d6c4dcced1084057b05d0255be4f61f4495efc8a29e82cadd3bb395e5d4a1224e38a98503655f7 pest_generator-2.1.0.tar.gz +48eb9ec17cdb0e957c809109ffb7f282c4924b9239392e3877f4bc4ec8485942635c5838619834f2f8b4c948aff8d9d23215b2c418c9924376621b715f7d4614 pest_meta-2.1.1.tar.gz +0140e9acb7dbf6ac2d17110e8efc9ef515e2f54b1b3b213d98507da6b9e9e3eb0995173c69b31c34f536ca9b06eab108015ac26d2207af79bec4e20d19d62e44 phf-0.7.24.tar.gz +2f01538937b89c0bb3e4f779b4347ae0d0515e6a99a6692a57898b8c97e33a02dbf918757b95800333cbbb60748593471e40260b767f8b87cb48e2a23a90d664 phf_codegen-0.7.24.tar.gz +793d8d46fd2848f165099324ba36d6ee074a54e1c20236afa5c5429894bafd23740d1cb41f00b87e4d21fea1f78be7151ace7590e2e7cbc906d565e5eb7225f7 phf_generator-0.7.24.tar.gz +5d46e738eb9afa2c77c5d123ef47dc1f7ae767baa043cf3a937118faa64696e714dac57f01861bf58a39dac67048c55a301dd24401cbb1976a7f753873e49cca phf_shared-0.7.24.tar.gz +bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d pkg-config-0.3.14.tar.gz +667de29732a76dd6d7b9768c3e58edd8c21e62fe5dbbfe9a64a37de5488640aa42c04a8683596eee9a58b02dde1cb0f10e3edb9fc48b3d93e61dda0122357162 plist-0.4.2.tar.gz +bebe42859dcfc5a4bbdd3606c92d26d20dbd3b68a026756d1f65100759a872d119492f6d9042030911e4965d0faaa4a5341738ffb6cc87299df6100dbb5460b7 png-0.14.1.tar.gz +a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05 precomputed-hash-0.1.1.tar.gz +73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0 proc-macro2-0.4.30.tar.gz +e86c5212acab88eb507c63dbea90002ad37206aca082d76097e09d4533b20adb000e5ddbcc1b0889ab8213a3eaae031c45044520db5875147df04ae356452640 publicsuffix-1.5.2.tar.gz +766b7e0b7a8c1b2453942d47ee13fbd41e1475593047df55319272ee9884d2ec5364a88baff69ea6b2133f23b82f9114505796ed07d6591b6365de02a9753cef pulldown-cmark-0.5.2.tar.gz +f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b quick-error-1.2.2.tar.gz +5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798 quote-0.6.12.tar.gz +2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 rand-0.6.5.tar.gz +200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b rand_chacha-0.1.1.tar.gz +5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz +f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845 rand_core-0.4.0.tar.gz +808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f rand_hc-0.1.0.tar.gz +9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e rand_isaac-0.1.1.tar.gz +fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a rand_jitter-0.1.4.tar.gz +01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 rand_os-0.1.3.tar.gz +6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c rand_pcg-0.1.2.tar.gz +3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 rand_xorshift-0.1.1.tar.gz +6727fb0c2039d196f76c1844395393c0bdf0590f443419d55f2bf5414df98338ba0269d31d8c4531f7b02e473fdcff90eb123cd426e9561858b9d0c028f3b825 rayon-1.1.0.tar.gz +7221e0e629e923aae2a2ff8e000c58ecc06fd71c00c2988a7664bd452464e210609e5f738c72bf8985ebbefb751f574de657d73189921ce9ee113594e72ccec9 rayon-core-1.5.0.tar.gz +6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz +38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e redox_syscall-0.1.54.tar.gz +201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981 redox_termios-0.1.1.tar.gz +17a06dc448c1be0910ddf5c03979fcd151d0a40acec5fedf96febe0f0fc52bda0252c40f8e7a18dcf3fa13f82f8a5b406b18f59e43713aec2adc2cae068f9120 regex-1.1.7.tar.gz +630e998b26ea7571591ff4259a5119d7762567253564b4a958cfd0f3f4de5857894e12eda469d940d8ed5572712b345e2859de282cdebf89a5108b97da71a073 regex-syntax-0.6.7.tar.gz +d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd remove_dir_all-0.5.2.tar.gz +bce46740921eab319dcdb6053708512a4d0e71d798d45bb3a793ac2aa69e2419762b99b528eeea82155d04af07d3c0dda76a893ee63d7533b607cc62e7c133f7 reqwest-0.9.18.tar.gz +5065fffb8fcc6afb2c42ee82cb09ebe879605e6ef2a6f02decf4892967730271bf4e798de02fdf37b4b55b0610f76689ef749ca85870b6656669af4cfd859473 resolv-conf-0.6.2.tar.gz +8f6ad0906f32259af6a5877b10432d6bc001a60dd094c93fa89aca544dd1e061f55c484a4ac524510f634b4a3491e170dae0619dd7fb5da11891d20fcd3ef0c7 rust-stemmers-1.1.0.tar.gz +9d10aae8df45db86fcee7fd51edc60961221cf2e3e74e826360fd01c8aa4dbf64eb1de4431309e6db89966f8f88c0933a35156835696f4693fc6f9d5c2e5fd1c rustc-demangle-0.1.15.tar.gz +01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779 rustc_version-0.2.3.tar.gz +15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4 ryu-0.2.8.tar.gz +c7d56204b29e9c0fcf925ccc43a2c910f6cd74d232c500b61996559a783ced3938cefa058128d72759e94edea683bb8922ac5ea631d16e31b58de093d6650b0f safemem-0.3.0.tar.gz +bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea same-file-1.0.4.tar.gz +6932f30eaba7eec56783e0b976fd0321666a182529b604a2f0c8b7ef00018bbba5d93ea487d674d1043681a73a8b98b808255de6bcb7474313dba671c1afadbc sass-rs-0.2.2.tar.gz +a232662f69f15b0b1352d2086dc179baebabd605e398419c9e9d3732a1cffd8d92ba9ae59330ee9c4c6aed24ea0260fe529055cd224243f244631a5b92c23d65 sass-sys-0.4.10.tar.gz +9c6f3cf370b76b8fd37cd26a5dfd686b532c30d47ef477548fa6994195dcfa053edcc2e8a395736768d5815b9f18db175be2e9d099767dd4ff4d9a8a3157675b schannel-0.1.15.tar.gz +df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33 scoped_threadpool-0.1.9.tar.gz +57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719 scopeguard-0.3.3.tar.gz +4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37 scopeguard-1.0.0.tar.gz +69b1e32cc4cdd3a069e9f1de08d6b5563a90e094e0fce07b4949386072632cdfa5ee7711ae16904148936dafebd77321160b28acce239f0cbd5547ba1d77edc5 security-framework-0.3.1.tar.gz +28c731aba35ff80dedf73978ba18f47a80ed308ad6f123467ab435f825680386f665d06f93a5703b8dd0b6893f805f5ae6875a0a7c8669a478c71c69448b2a54 security-framework-sys-0.3.1.tar.gz +03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc semver-0.9.0.tar.gz +17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f semver-parser-0.7.0.tar.gz +a8a33cf76a4f899205b2ede5e91859e03d038b178f685a36991c1836ab0c37f91ff50db4145e825838ac0fb4c526c9f496d00f87ac1790d101f4e83779fc5124 serde-1.0.92.tar.gz +37da456bb1392e4eacad07118dd8a6590552f455151f35bf4b350305772eddc8b232b61c36940c287df85b61ccc9867602cfc7012f7b7b645ab97cff45baeaab serde_derive-1.0.92.tar.gz +7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036 serde_json-1.0.39.tar.gz +9c4a82907619aa211a5768628ae1cc749980b2df267f325cc1457031720d4166edb0b67e2144324e7f655384000583ac2ddeda33f7ab995a390324e2ef4de145 serde_urlencoded-0.5.5.tar.gz +7446e7564b5903e588911008f9367f9d9b0d96ae883d299ee4f10ec3d7a30abf1af1bc9c4f2172226f09071413116c12a8a67419246f7a7de95e9fdeec3aacb1 sha-1-0.8.1.tar.gz +32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c sha1-0.6.0.tar.gz +441ffe909ab91d83ff567b05f10a83e25ab6ef0a2b3860c2497f78d0150a81b8cb85cf1724b88e3fe9499cabf394caf46197e4dd1984e71e95c2897b99b581f5 signal-hook-0.1.9.tar.gz +d23ca7f974777b6a2053fd04ec05eae73c54735d0370173fafdc2a39dde6cab3cef78b94cce3930a9105e70760022ffe96968a1adbd350efebf83aac707217f7 signal-hook-registry-1.0.1.tar.gz +7bccf3a0c988da97c36d5f80518a5adaca58385f7000697cf10771ab246e88509746e2ec9a356122d25c98f0acd98eef97fb97f81a92959622ed51dff61b37d0 siphasher-0.2.3.tar.gz +f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661 slab-0.4.2.tar.gz +3659dbbfb5af247a88bfced29d0870aa24dc6d091f8d8c5c42827ca5d7736342cbb6a883922ad60cb5ffe52633f38229fc4f080ca8c117e5ad5950114d3caffe slotmap-0.2.1.tar.gz +2c85dabcca9400c5e2a3b409997403a6acb17357449df4ef9a7b27511c5a979bfcb1a4d80b7e7c36122233ee6d47e59507631dd6ac9e93d1610f54b9b160ee96 slug-0.1.4.tar.gz +802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4 smallvec-0.6.10.tar.gz +526b2ef0a928357c1ff3ed998842afffe1d1e758ba480f922b0fe12cbb48cc811278554f99de63345e6c12b5027b738448adbfb46a78fd50555dd87e6a701e47 socket2-0.3.9.tar.gz +ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4 stable_deref_trait-1.1.1.tar.gz +ef6728259f8c281fcaf68a72d81135e7b357461b29d29bc87efbf5c16cf838e6aa66f30e9d57d60254d17eb5821c9d1514e488845607c5f3651892b666289c10 string-0.2.0.tar.gz +4ee532350e951ff1423aba00c34054653e2a2e6fdda8fe86d4052407cbbcf51bf3765288e581e6dbd7031969cafc9727267b2ebaf23750eb3e866b855b567fc2 string_cache-0.7.3.tar.gz +1d0d91a6766a4985a833d5d0931b3331a37e1c97c82ccd4c85a92a8d338b3dfb6202a1a7c6c132e976a49f173d4fdbe5ff903120d20e6493d1be76af167b1026 string_cache_codegen-0.4.2.tar.gz +1ccae53f80c250bcb715c3276133295f3543d0a8708fe4a990c1ac81a5c783c23d9e7e080fa7bd159397d0908f90cf1eb3453975750c121c1c36c80d3fd3cca3 string_cache_shared-0.3.0.tar.gz +1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 strsim-0.8.0.tar.gz +85eb70f7a514dbc7a69a4b002fe82c0787b907d37d3ce83e78b3f35317b0dccdf9f247f4b3cc7265e3f572d2bf9685e1f06254258f95c135e2fa26ae98715d64 strum-0.15.0.tar.gz +fd0e363693bd34f0f8cd20d17a4fa12745e82b75de48d700ed5062312d202abba21d21bad434f22d4c467e9d6d3f8e4b1c5a7975aafed8418cc0c12d5f218f30 strum_macros-0.15.0.tar.gz +366963fdc56165ef699a5730e767159656ca0e893b995796a22673fd5eb5539ec84a0fa5d5223ce2acf7ddf6310e9609667cbd6f9634a2dd8c9b2591c5d28001 syn-0.15.37.tar.gz +48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458 synstructure-0.10.2.tar.gz +5b684a8f50f56b3f2a69fbde0623835a6a0ff44169ec6a558d6d0f702eb0921894061d9baf8edf9ec6802d7623f9073df365e68b4f33107bbb93807f32e4fadc syntect-3.2.0.tar.gz +88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00 tempfile-3.0.8.tar.gz +d94ef7c124d65317438de67e064616511df5e89081e3735982b315df0a8aab319ba16dc3b6513b1f92e0434da3d7aabdd9caf9b7ef28af9d84cf558ce662e693 tendril-0.4.1.tar.gz +f50844c06b4c2f1fd9f367cf6a3a55dfbe6ebcfab93a076e59c9f70a63b5a811160b1e587ebe07a7cb41aa88d568606db35983b0adfe1d004200c0fe8576b03a tera-1.0.0-beta.10.tar.gz +d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca termcolor-1.0.5.tar.gz +1cbe60f97d5f8b95e6a57ec9b7cfcf37459bc8dbcf8424b055f04b2ecdaf069e1bb52222364a2f380dc3f63039fe3823d424228af1c212a8b3790b7dd55d5deb termion-1.5.3.tar.gz +f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz +cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253 thread_local-0.3.6.tar.gz +e46733ea55a27a32868596562bbaf1e50508dea58359006cabd160b06cec4854c97b5d253cdcb8bfd60c7b3a33e496bec4159d0621efaa3cdcbc77255be4f275 threadpool-1.7.1.tar.gz +468fa2b798fa443761ffb2924c0a5b767834687460de4faadf22da36e760dd77ce4e72d8947d220b6baf653d2fba44130c66c18868e590c6537ffe86076a7c2c tiff-0.2.2.tar.gz +4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83 time-0.1.42.tar.gz +769d40887241e0b022cc2e6e0c079ba934f3f7a1de59af5c4a70dd539136a6eb4db24162545e51e8f54592830ec6a7ddea27bce6ec7eaf4b95f6a0f1b52f62fe tokio-0.1.21.tar.gz +42f5db4f9ff1d0c6728c9ca899b85e40eaa92910d23f01dd7570c5988178879f3977ee2ad14f0f224562fa73ff8b01687dc963def2c62e93ac471903d5ce4e81 tokio-buf-0.1.1.tar.gz +9c868545e8adc234a51b81966836b786019181ea25907bf14887ce26ed1cf5866f5df8898bbf6bb7c8d3626f145ce0465d3a79050d53f8dcffe98f71886f9044 tokio-codec-0.1.1.tar.gz +321d8b99ea18827400a6b7899755eea5a8299e53985f5640a6fd82bf6c3c5c45c68e9d125666968976d05be407d6c15401380870adc231233cc532eb979353f6 tokio-current-thread-0.1.6.tar.gz +cdec6f468096abb09b5544dd0c792a1de09f48306b5749b960da25b4d9e694362a47efa4a1093285020fcf77e654157ba9d80ee4b8bffe6dc36b05f15f5a08b4 tokio-executor-0.1.7.tar.gz +57c675ade48f2885ab8f42dac7297bf4bc5f7abef2302f7964dc145ce29d503c09e3ff890de01aedcf0c860fe22d2161f9837d658457695b6205e601fac74149 tokio-io-0.1.12.tar.gz +134c78b449646f1b7cf9dc87de0f39ebfdb894103e0271a2b5115320add04de02aa1899206f332f111a9471f1f54776fe89e3ff879648fa206100b2be12e24e1 tokio-reactor-0.1.9.tar.gz +60cc31f9ea58853498dd19d858a7ec72bbccb0255c7d7f316b55c7e4aa21291f5609611ce5ccd2751d505417d8a3860d7374d6377916cbacf52a18c649448d9f tokio-signal-0.2.7.tar.gz +bebfe2173d544595cbc162fce2afe1574f267a08b77c8e056358cc4e959a94f1e899e47e76927e374ab1f51751079b283e0d13479a4a40c7f754cacad2578a1f tokio-sync-0.1.6.tar.gz +ae42facabed1589764a8e4f789dabf5c7adfb3a67880a8bb6d7b0b6c082302a84b6acd8ec5f444dc59284407acad61518d60818eaeb34f874380f9593d540336 tokio-tcp-0.1.3.tar.gz +166c0298a70fb6290d7a3d2017d160cbd585f254f465ffd50556bc4ffa09b5749e7295c3426aa5f98047338d8c4164cffdbf21debb0d8b5835d2ce7d211743db tokio-threadpool-0.1.14.tar.gz +2bb534417425b88dd1b90231cffb89a8ab97512f1ea9e26cd4afeab5f3aa691433062f093a6789222d1892532a9cf29e1016fc668ce2939536f89e0441740d57 tokio-timer-0.2.11.tar.gz +78a77fcaf097619f11f8a22f75454da4727d139a7c7898123d01f632be57116b299fa5393160bd59b0904195c2c7a3e1e717ad25b80ae88d39f443422f1c061a tokio-trace-core-0.2.0.tar.gz +a2fd724ebe46b8fc8757558b6d267491b86ed5625ff91b212a6c77448231c72fa2b8e5c389cb27e93f2b924f48c88c154f23eb8721ecb93e7c1820c7c4dbead2 tokio-udp-0.1.3.tar.gz +15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160 toml-0.4.10.tar.gz +4b8b9212934b8a8bf8f09fc9c63219f3bd8d21a1bc5ec4f4208fa833743951ddb53cb99b5fa27b9b59d2223cc74a7274d6eb196255e44650bb633e24b2529073 toml-0.5.1.tar.gz +45822fcd375f01e8e93b91c1806be6c653d202ca93a719af45661b8b5e016a802535774a2adf7ac503d889d4f9589d945c02ec651aa4cb81f443b60e7f082611 trust-dns-proto-0.7.4.tar.gz +e44e36c9f51c80b858a976071f911081eca5c30fd82ed34ad5eccbf397b9782773f36340ecc3f0f8b4a19dbc7fe73cb50e9df36730deaf2e228b8728e3e00e6b trust-dns-resolver-0.11.1.tar.gz +aeb54abe3cc02d5dfd0d13010558454e5caab2568bd923a035dfef5ed5d3394b4bab9f7ab21dbaf82f1c20ccd95955bcf6ac2bdc976a824d9508d6f2a27ef330 try-lock-0.2.2.tar.gz +a619b8fefaf8c25037f1e2e7f8e64506144c8a7080ad930138fc3c4a2541dc7fc83ffd9c9a8c762ddd57028072cfd8dcb9db0c590e3ac30a4863f8d4fbb63739 try_from-0.3.2.tar.gz +9ff611df79e312b8ab32522007981220213f2beddd959118a855d08b94b7a7d35d38378694c8667c2d6aa324933307a47a4072a89cacf7e594537794385b9449 typenum-1.10.0.tar.gz +596383d8be0bae90e90ba4295d208b9e62911a2c7ffdd26ee269dfa9fa2ab270ca7189f0958bb31cc05c75621d8c6954e84c40a9235e6effdb30cb4791735212 ucd-trie-0.1.1.tar.gz +50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e ucd-util-0.1.3.tar.gz +ef969968c61eae6a7d68e6ccb0b40f6618a69bfc4714b51bf4ee8c5ec4532d10b9c6675a4cd5121c904a578ceec7c6471d1496fedbf121059f076ad1c5ccb70d unic-char-property-0.9.0.tar.gz +bb0ede1695f4f016bdf9ec83bb49639527248c175c71d24993b8651ea6be0a411251ed8518893101dd5e96fd2913cf15ec27799c677ddb08b8e408da06ae0ceb unic-char-range-0.9.0.tar.gz +9212f99afd4c694a3a671963d63e5349f81adde6d5f50c92ec39d15e7ee24aa91eee63ba578a857c8b21380937860968a8e13cd16bb0ee0c0ccd96b3094ad155 unic-common-0.9.0.tar.gz +cc2a27459dca554a78ce24fee42f0e4d0fbac37c42b4c5a1275f9e3b412cd1c813a4b4864857ddc33b549d99f10c9ce9c277b00f9fa7d93f130f5e47106d8fb3 unic-segment-0.9.0.tar.gz +04aab71f97785453dce7f561acfb2382a23d60a68735f3664577015a256191463dd6b1f90694e4440c4889eb9b6380c16c7a0ec2dfc2d49fc44a284eeca43c09 unic-ucd-segment-0.9.0.tar.gz +153219ff18be02e23ff3dc90bba11fa8c7cda11b972e0d84500d9a0742fb7d84466f2cc63ee278a24098c39634e50742af3317cd942f4ea882ef5a2a8e003d7b unic-ucd-version-0.9.0.tar.gz +f92ceb4b9b4757a813fcf23949c8a9770e5169aec19d43c7ea9c3b49b365a2d4ef619255693b5dc30b974e6fe5bed857fa0743caec0ad88abd5b5c80df96fcac unicase-1.4.2.tar.gz +d4b7d0e217a8a9180cd01cbce4d1e2bc80a9dbeee735954968c0372c9679f4f84b73294952947890340f20f4f9158b70ec2c13adc11b1f0cb53aa893755cff22 unicase-2.4.0.tar.gz +170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e unicode-bidi-0.3.4.tar.gz +4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547 unicode-normalization-0.1.8.tar.gz +6f32a36c8c69e80b3aacfcf68cde088a34b88587e20de6e49a14b24941caa51a0031623941ef05e6d36e5c99f50472c9bb26d670b5396749bae8373ae4bc7d4c unicode-segmentation-1.3.0.tar.gz +bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2 unicode-width-0.1.5.tar.gz +cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d unicode-xid-0.1.0.tar.gz +c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04 url-1.7.2.tar.gz +610dba6991597b117f3ec602c2c1df42da3a554bd452283f56867d53f1bdc7c0bac6e593b63ec3186016d886951397314ff7e0cf0bfae8015281a6afe77f19ec utf-8-0.7.5.tar.gz +24907ad7ae1a02713e6ecc62e0c73488abea338f0dd3b49291b914ca907b3a220cb90f8ca409c6aa57d2e0e5d8ca8c44cd310081ffe7be9208952d73ec53b9f8 utf8-ranges-1.0.3.tar.gz +5c0d5f85b05db505ba6736437c78fc62e7a961ec1fd7d262749c282ae41bc1b1adda373644790de64ebebf59a200f8e610767f3e5fe0caf87305ecd5a229c265 uuid-0.7.4.tar.gz +d17c6b8b9120a98417edabf13d13a1ac8e082084c0cc0334e2ab5c366d275e8ad2ae80740a3867cdff5488de1ebd530169566f22a724f0e51432b626c3ea942a v_escape-0.7.2.tar.gz +74bae0243070408f090f56f044d97d239f1f4a236d089790ecc46c0364c2a478d94ea348640b20b10c7ad61d617c2da5acf7de0b77d41cbd5840e4db447c262a v_escape_derive-0.5.3.tar.gz +3797660070690067eff29c90a3359b35662afbdaa4019859988f7dd537cfd184586c9e2ce74994ddce7c255618062326ad8cdc6a1a9476a7f3c31c5cc581e535 v_htmlescape-0.4.3.tar.gz +55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e vcpkg-0.2.6.tar.gz +026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 vec_map-0.8.1.tar.gz +cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362 version_check-0.1.5.tar.gz +1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1 void-1.0.2.tar.gz +c20ffc6485ccadcecd68aa21c356c27e11705828ceb3456b1dee4213363defc31b3f46a73cc00e0ea386d7765e333d095d34500f41707ff1a2569c45b5fd482d walkdir-2.2.8.tar.gz +65612379ffb46e5baeae46c7f6f3f3f03133ed9a99c5746bb405fd9b1bc3715739be199cf0f4ee3fa1ac5a2f624ca59fae75bfc14de19b4d5c80270c74f82a86 want-0.0.6.tar.gz +88d82fdddb268e35497cab9a17f9cd3845b25084bc9932a3ec1fa256a4ff59307ff46e112fc26144eba6c57b4a094eb9d9687a51cda1839e03f7f06744a19b32 widestring-0.4.0.tar.gz +115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe winapi-0.2.8.tar.gz +6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134 winapi-0.3.7.tar.gz +8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 winapi-build-0.1.1.tar.gz +a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz +54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a winapi-util-0.1.2.tar.gz +4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz +f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1 wincolor-1.0.1.tar.gz +2156d5c503b62f8c7300509bef337b2e57132071aca38a6d462cc3d2f572c91d16c8032ac72b1523d749741669fda7bb1300fd014e8fadac2a6fc66ffdc5dea5 winreg-0.6.0.tar.gz +68afe1dce3d5daaaa6a15d023dcbf91d26b06f4319ddd76d0993d97c10fd8d9f6c2a76c87290347d50281640609aefbb9fc8f691ebd18104f566a005d84c43bc winutil-0.1.1.tar.gz +4c11c37f30cdf4b04bdcb309e7aad16768a13fe73da7c9f2e1b4b6d5591bf1dfe739aa94812bf80dce833f0ed625bba3e70b1c9fc6a0ce34fa9f342e1ac047e3 ws-0.8.1.tar.gz +18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f ws2_32-sys-0.2.1.tar.gz +94f0bc729d58564d63b4708518313e3dc7fe7c6ff9ac94019df1507d7ce7bd6428f2bc16fb116a9d676415a94812ce1e54e30b469a2a9b5fe29dc82486c536cd xml-rs-0.8.0.tar.gz +31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3 yaml-rust-0.4.3.tar.gz" |