diff options
Diffstat (limited to 'user')
128 files changed, 618 insertions, 1863 deletions
diff --git a/user/bugzilla/APKBUILD b/user/bugzilla/APKBUILD index 897142939..5e0f6f31d 100644 --- a/user/bugzilla/APKBUILD +++ b/user/bugzilla/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bugzilla -pkgver=5.0.4 +pkgver=5.0.6 pkgrel=0 pkgdesc="Bug tracking software from Mozilla" url="https://www.bugzilla.org/" @@ -40,4 +40,4 @@ package() { mv bugzilla-$pkgver "$pkgdir"/usr/share/webapps/ } -sha512sums="508fdc5ab599f007f848a583907c726a876d4f3bc6d4e71d93c1efe82072f67309d229f5ba213443ad90a5f11e6e97e691fb11515ef2db71e36587e72fc849a8 bugzilla-5.0.4.tar.gz" +sha512sums="8ca47ea1be2b433a6ce68e1a595d72f3d0f0fede44d1194dc6bc9a116dbde3ab7285212c71995e200d31544876e4c3c57b63da1f877a0cb22747ab87a5d598de bugzilla-5.0.6.tar.gz" diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD index 12c8c21c6..7cf8693fe 100644 --- a/user/exiv2/APKBUILD +++ b/user/exiv2/APKBUILD @@ -3,7 +3,7 @@ pkgname=exiv2 pkgver=0.26 pkgrel=2 pkgdesc="Exif, IPTC and XMP metadata library and tools" -url="http://www.exiv2.org" +url="https://www.exiv2.org/" arch="all" options="!check" # No test suite. license="GPL-2.0+" diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index fdab8f0bd..dada6f23a 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpeg -pkgver=4.1.1 +pkgver=4.1.3 pkgrel=0 pkgdesc="Record, convert, and stream audio and video" url="https://ffmpeg.org/" @@ -100,5 +100,5 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="fe72680f1e4ca0b226199d1407803e1de11f00f5a88a23251182172cda4a7369cf1826c4ef86230bf60b0f9ff0d69382da5eeec26574a31eacd9935cf4eeb86f ffmpeg-4.1.1.tar.xz +sha512sums="0a540a0c5395f42c6079bc26d1b3baca453995693da7de21da469ce40b3a548bea14ff46a72c6f4c32256333855f9b86207cb8bf1d0dda33a17ddca54970daa3 ffmpeg-4.1.3.tar.xz 32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" diff --git a/user/free42/APKBUILD b/user/free42/APKBUILD index ba8814388..c0f490ea0 100644 --- a/user/free42/APKBUILD +++ b/user/free42/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=free42 pkgver=2.0.22 -pkgrel=1 +pkgrel=2 pkgdesc="Scientific programmable calculator" -url="http://thomasokken.com/free42/" +url="https://thomasokken.com/free42/" arch="all" options="!check" # No test suite. license="GPL-2.0-only AND Public-Domain" @@ -15,11 +15,12 @@ source="https://distfiles.adelielinux.org/source/free42-nologo-$pkgver.tgz free42.desktop libx11.patch patch.patch + unsigned-char.patch " -builddir="$srcdir/free42-nologo-$pkgver/gtk" +builddir="$srcdir/free42-nologo-$pkgver" build() { - cd "$builddir" + cd "$builddir"/gtk local SAVE_CFLAGS SAVE_CFLAGS=$CFLAGS unset CFLAGS @@ -29,13 +30,13 @@ build() { } package() { - cd "$builddir" - install -D -m755 free42dec "$pkgdir"/usr/bin/free42dec + install -D -m755 gtk/free42dec "$pkgdir"/usr/bin/free42dec install -D -m644 "$srcdir"/free42.desktop \ "$pkgdir"/usr/share/applications/free42.desktop } sha512sums="865e8cce86a882aba10e7e756308e195a6675f0b6db4b881e7b7df67de95f5169ca801005e25dd0e61a70a5a0cd6a374b0cf58003251cdc9dc526a2506e18e1d free42-nologo-2.0.22.tgz f52700d234719f4ee7cdd369fc5f28ade190ff77ed1a824cd2cdaeef62419700de3d85a28fd6ae378f904e018813dc4145ca4cc9f2669fdf50f3e13baa7ec634 free42.desktop -f8434fd1c20f0dd40de5773615eaf798329870231f7ce66785a1bc8e208fa0a64919f48ac3eea5ab9ceb818570ae93f61b0e81baec4261bbdfbf04237108ab6a libx11.patch -7b48609bff5466d81f42ed65405cd09e98fa675c087837b22caebab2b97420a34d1156399c3b18608bcae42896c12aa63a6f87515f5677587dfff6ed135dc760 patch.patch" +470eb88936c65a053860af94955bf979973bad48c4b1f593598818f8ff0c39c4869613a05ad0e82b7a3fc6ce19fa7b8642a38e726d4a48e3fe63a9cbac8a45d6 libx11.patch +33afc0d0deb88143b3ec0a09fd2ba3de14d6ad269c9ecff55c9e89348d7bf76e2bbf880e0eef9a2c71eedb1da9136051a471d4aaaf9aa5acd4e992964a69692b patch.patch +2e2e6c5a00de96f2ca1c61a0039a945bf0416c889b9131abf89c6eca4d8816ff0144c32634ac7c7b112fc1bd8cd6d816f22f2aed31bde59b96a79b9588235a02 unsigned-char.patch" diff --git a/user/free42/libx11.patch b/user/free42/libx11.patch index 54c4c6cc0..aa07ba2d1 100644 --- a/user/free42/libx11.patch +++ b/user/free42/libx11.patch @@ -1,5 +1,5 @@ ---- gtk/Makefile.old 2019-01-13 14:52:39.000000000 +0000 -+++ gtk/Makefile 2019-01-17 01:38:40.500000000 +0000 +--- free42/gtk/Makefile.old 2019-01-13 14:52:39.000000000 +0000 ++++ free42/gtk/Makefile 2019-01-17 01:38:40.500000000 +0000 @@ -35,7 +35,7 @@ -D_WCHAR_T_DEFINED diff --git a/user/free42/patch.patch b/user/free42/patch.patch index e84b3f7b8..f79bb6c8e 100644 --- a/user/free42/patch.patch +++ b/user/free42/patch.patch @@ -1,5 +1,5 @@ ---- gtk/intel-lib-linux.patch.old 2019-01-13 14:52:39.000000000 +0000 -+++ gtk/intel-lib-linux.patch 2019-01-17 01:27:01.470000000 +0000 +--- free42/gtk/intel-lib-linux.patch.old 2019-01-13 14:52:39.000000000 +0000 ++++ free42/gtk/intel-lib-linux.patch 2019-01-17 01:27:01.470000000 +0000 @@ -1668,3 +1668,62 @@ }
@@ -63,8 +63,8 @@ + else + __TMP := $(strip $(subst /, ,$(firstword $(CC)))) + CC_NAME := $(word $(words $(__TMP)), $(__TMP)) ---- gtk/intel-lib-linux.patch.old 2019-01-23 03:43:48.830000000 +0000 -+++ gtk/intel-lib-linux.patch 2019-01-23 03:46:18.170000000 +0000 +--- free42/gtk/intel-lib-linux.patch.old 2019-01-23 03:43:48.830000000 +0000 ++++ free42/gtk/intel-lib-linux.patch 2019-01-23 03:46:18.170000000 +0000 @@ -1727,3 +1727,14 @@ else __TMP := $(strip $(subst /, ,$(firstword $(CC)))) diff --git a/user/free42/unsigned-char.patch b/user/free42/unsigned-char.patch new file mode 100644 index 000000000..af3f47ef5 --- /dev/null +++ b/user/free42/unsigned-char.patch @@ -0,0 +1,15 @@ +This only breaks on platforms where 'char' is signed. + +(currently, pmmx and x86_64) + +--- free42/common/core_display.cc.old 2019-01-13 14:52:39.000000000 +0000 ++++ free42/common/core_display.cc 2019-04-17 23:01:56.398695993 +0000 +@@ -43,7 +43,7 @@ + #endif + + +-static char bigchars[130][5] = ++static unsigned char bigchars[130][5] = + { + { 0x08, 0x08, 0x2a, 0x08, 0x08 }, + { 0x22, 0x14, 0x08, 0x14, 0x22 }, diff --git a/user/http-parser/APKBUILD b/user/http-parser/APKBUILD index de3af464c..fd3fb7da4 100644 --- a/user/http-parser/APKBUILD +++ b/user/http-parser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=http-parser -pkgver=2.9.0 +pkgver=2.9.1 pkgrel=0 pkgdesc="Library for parsing HTTP messages in C" url=" " @@ -28,4 +28,4 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install } -sha512sums="40acecbf71b9f0b4ae857c74c3ec0784d7f341a0cb83cf82b308387d0c5b56d38b282241aaf8ca93816970f2a9e67989f3d9d456459f3986c29fe51ab520155e http-parser-2.9.0.tar.gz" +sha512sums="110a1861666cdd45857c3ab0e9bf8a3eb9d98f86fe001f7c620009e13186377de805d295f7751921cd5c9d4c2781807b3ae00f939af04d7365a3a45aa20b5052 http-parser-2.9.1.tar.gz" diff --git a/user/hwids/APKBUILD b/user/hwids/APKBUILD index 92d161907..1fcbe079d 100644 --- a/user/hwids/APKBUILD +++ b/user/hwids/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=hwids -pkgver=20180917 +pkgver=20190316 pkgrel=0 pkgdesc="Hardware identification databases" url="https://github.com/gentoo/hwids/" @@ -67,4 +67,4 @@ udev() { mv "$pkgdir"/etc "$subpkgdir"/ } -sha512sums="9fdcd5a7b3adca1bed886aa83e9cf3944391a819fc9f09b673bd815d95e6e70cecf40d8e87287207e34bfeb58c888188fc61b1c0ac13c1ecab0efbdb5100f8d9 hwids-20180917.tar.gz" +sha512sums="6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e hwids-20190316.tar.gz" diff --git a/user/iso-codes/APKBUILD b/user/iso-codes/APKBUILD index 599845de4..9fc122b61 100644 --- a/user/iso-codes/APKBUILD +++ b/user/iso-codes/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=iso-codes -pkgver=4.1 +pkgver=4.2 pkgrel=0 pkgdesc="Lists of country, language, and currency names" url=" " @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install } -sha512sums="cf02be0cfc43a1fb28334ccae552cac9a7dee70ca3969b6263eca4bd7fee8ddcc437bd23d290643ba2cd7e99b207661d7330daaf452dc59cde36fdd5919b5616 iso-codes-4.1.tar.xz" +sha512sums="1ee8505d2fb6da03d82ebe665ad963e6652ac0337a1cde16a0d6f4c04003f52330735dd7ab20131999e8c562eca09ac18edf8c4aadd7cb8bcfbe0f350a8b6987 iso-codes-4.2.tar.xz" diff --git a/user/itstool/APKBUILD b/user/itstool/APKBUILD index 7fdfc40cc..7936887b7 100644 --- a/user/itstool/APKBUILD +++ b/user/itstool/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=itstool -pkgver=2.0.5 +pkgver=2.0.6 pkgrel=0 pkgdesc="ITS-based XML translation tool" url="http://itstool.org/" @@ -38,5 +38,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="67c55b83e43b5a4626a6633305b2e48a06a5defdf7725e78b00409edea213d166cb3d870a58eb402c48968bddd7c1778d9852acfa0ddebdd363f34ac13f32aa7 itstool-2.0.5.tar.bz2 +sha512sums="51058bdcb208f6fb84810f71f9bf67e42b00bf157a9756be45f060849c0aff36f695f4403404193720d4446818fa77de61fa94eed9e8789d26c07a2926072eb7 itstool-2.0.6.tar.bz2 eb426e7cc9f151154f47b93ef46d6fcfb5fa0982be3bf78863ebf5ea009a89de252a6c63dfb090d76003c47107ebb5d1ac2a7d1ef7db08defe19e32f996dbdbd fix-segfault.patch" diff --git a/user/kaffeine/APKBUILD b/user/kaffeine/APKBUILD index 1e8c0e67a..039bd9dd8 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.15 +pkgver=2.0.16-2 pkgrel=0 pkgdesc="Media player with a focus on Digital TV (DVB)" url="https://www.kde.org/applications/multimedia/kaffeine/" @@ -13,6 +13,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev kxmlgui-dev solid-dev kdbusaddons-dev vlc-dev libxscrnsaver-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kaffeine/kaffeine-$pkgver.tar.xz" +builddir="$srcdir/kaffeine-$pkgver" +pkgver=2.0.16.2 build() { cd "$builddir" @@ -40,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d2b21df76710eb79395a0d4e762ecdde4610945de3d1105002a44a56725aea3f10003f4ebefe4cd67f58f561e79aa3f5561639ad5c3afba488146dcb9360f53d kaffeine-2.0.15.tar.xz" +sha512sums="1b39bf59127c777b34f3076a237c53973af827191d2a279d40e7f14891dcd3d7bba1444b0b456d0e614807bf6bff494568aed958632dfba54515de8de5b06f21 kaffeine-2.0.16-2.tar.xz" diff --git a/user/libassuan/APKBUILD b/user/libassuan/APKBUILD index a844a40f8..50c7b4f1f 100644 --- a/user/libassuan/APKBUILD +++ b/user/libassuan/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libassuan -pkgver=2.5.1 -pkgrel=1 +pkgver=2.5.3 +pkgrel=0 pkgdesc="IPC library for GnuPG" url="https://www.gnupg.org/software/libassuan/index.html" arch="all" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d libassuan-2.5.1.tar.bz2" +sha512sums="e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617 libassuan-2.5.3.tar.bz2" diff --git a/user/libblockdev/APKBUILD b/user/libblockdev/APKBUILD index 51200d04b..98eeda9dd 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.20 +pkgver=2.21 pkgrel=0 pkgdesc="Library for manipulating block devices" url="http://storaged.org/libblockdev/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7363e05c6854757649ed865f216c71ddc8afd7f1a102a73c0bb4809c4713973462446543d97b696f55f11ea15696e261802567cc545833d16535835c5250ac8b libblockdev-2.20.tar.gz" +sha512sums="7e6e12716e18c5e48f3b2207f132c242d99ce540f55de3b6932ac3427cb532d9074358c828d9702df71068a8454c642a4c0ff96e62a567ed1c1247c59ece432b libblockdev-2.21.tar.gz" diff --git a/user/libbluray/APKBUILD b/user/libbluray/APKBUILD index a9b6dce67..6d230fcb5 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.0.2 +pkgver=1.1.1 pkgrel=0 pkgdesc="Library for Blu-Ray disc playback" url="https://www.videolan.org/developers/libbluray.html" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e1360ad08aa6cc67a80efa81a09004faebbe31105f1961494f82f655e3e7378b198ee3bc534b0d0c2bfec726939b11b545cc8bbfa30794fc647432dadf71089b libbluray-1.0.2.tar.bz2" +sha512sums="0a3bcef06d2a58c51c3d46934c32941ec0606dc9b71fe36f72a6e34ab8113cf72cfb6e2fdd51f23e0a44ccd404323f5ac5c666aa1d839ae16cc775267cbce839 libbluray-1.1.1.tar.bz2" diff --git a/user/libdrm/APKBUILD b/user/libdrm/APKBUILD index f85bdcac5..4c59ef957 100644 --- a/user/libdrm/APKBUILD +++ b/user/libdrm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libdrm -pkgver=2.4.96 +pkgver=2.4.97 pkgrel=0 pkgdesc="Userspace interface to kernel DRM services" url="https://dri.freedesktop.org/" @@ -19,7 +19,6 @@ source="https://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,14 +33,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="008cb7658d953b44e11fa3cc6e00dfeb3efb59c7fdadd59f7066101aff138acbbc2f2508e9ebe0528340e39dc7693937755d1641816ddde135c10a13e7d81e3b libdrm-2.4.96.tar.bz2 +sha512sums="3e08ee9d6c9ce265d783a59b51e22449905ea73aa27f25a082a1e9e1532f7c99e1c9f7cb966eb0970be2a08e2e5993dc9aa55093b1bff548689fdb465e7145ed libdrm-2.4.97.tar.bz2 af52fef51aaa05a4dd17919371cb9d92a77480402730bf53ba223e54df52f3825be05a7f28e6aef8c904db5ee59fe38a6c15bc6aafa7f8d31a719e80399dd51f ioctl.patch" diff --git a/user/libetpan/APKBUILD b/user/libetpan/APKBUILD index 386ec21e5..474c2d67c 100644 --- a/user/libetpan/APKBUILD +++ b/user/libetpan/APKBUILD @@ -1,21 +1,21 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libetpan -pkgver=1.9.2 +pkgver=1.9.3 pkgrel=0 pkgdesc="Mail library for C" url="https://www.etpan.org/libetpan.html" arch="all" license="BSD-3-Clause" depends="" -depends_dev="" -makedepends="$depends_dev autoconf automake libtool - cyrus-sasl-dev db-dev expat-dev openssl-dev zlib-dev" +makedepends="autoconf automake cyrus-sasl-dev db-dev expat-dev libtool + openssl-dev zlib-dev" subpackages="$pkgname-dev" -source="libetpan-$pkgver.tar.gz::https://github.com/dinhviethoa/libetpan/archive/$pkgver.tar.gz" +source="libetpan-$pkgver.tar.gz::https://github.com/dinhviethoa/libetpan/archive/$pkgver.tar.gz + missing-header.patch + " build() { - cd "$builddir" ./autogen.sh \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +27,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3e2e1de77fae2212374e909d15ed8564eee90883c38fee0ca69f58785733b1ac2df848da1bda6f55577d647e0ad27bc3057199e70b6ef01f2a7e2823b24113ba libetpan-1.9.2.tar.gz" +sha512sums="66e504fbf82445819845a3f1dcb8dc48ad2440993134d43752c754463cee2434a30080718687cd05c579f0da8df6b0f6dfc7572f2882d0dd9dfd327b4ae11fd6 libetpan-1.9.3.tar.gz +df0ba883c9328b7cab408a54f38e6f9c7f5f603b0f016b7ea2e9fa49aa4118ff6723218bb9942f278028291e1c7e9da0bb1d48ab2c471b0ddf5edc3e78a8a1df missing-header.patch" diff --git a/user/libetpan/missing-header.patch b/user/libetpan/missing-header.patch new file mode 100644 index 000000000..603048962 --- /dev/null +++ b/user/libetpan/missing-header.patch @@ -0,0 +1,32 @@ +From da9fd7839c9affea48f74a159a789fbb183b4be1 Mon Sep 17 00:00:00 2001 +From: maxice8 <30738253+maxice8@users.noreply.github.com> +Date: Fri, 1 Feb 2019 01:58:08 -0200 +Subject: [PATCH] add missing stddef.h include for 'NULL' (#322) + +clientid.c: In function 'mailimap_clientid': +clientid.c:66:38: error: 'NULL' undeclared (first use in this function) + if (mailimap_read_line(session) == NULL) + ^~~~ +clientid.c:66:38: note: 'NULL' is defined in header '<stddef.h>'; did you forget to '#include <stddef.h>'? +clientid.c:39:1: ++#include <stddef.h> + +clientid.c:66:38: + if (mailimap_read_line(session) == NULL) +--- + src/low-level/imap/clientid.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/low-level/imap/clientid.c b/src/low-level/imap/clientid.c +index 1c346379..38880dd3 100644 +--- a/src/low-level/imap/clientid.c ++++ b/src/low-level/imap/clientid.c +@@ -33,6 +33,8 @@ + # include <config.h> + #endif + ++#include <stdlib.h> ++ + #include "mailimap_sender.h" + #include "clientid_sender.h" + #include "clientid.h" diff --git a/user/libfontenc/APKBUILD b/user/libfontenc/APKBUILD index 666a58e81..98813ad25 100644 --- a/user/libfontenc/APKBUILD +++ b/user/libfontenc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libfontenc -pkgver=1.1.3 -pkgrel=4 +pkgver=1.1.4 +pkgrel=0 pkgdesc="X11 font encoding library" url="https://www.X.Org/" arch="all" @@ -12,7 +12,6 @@ subpackages="$pkgname-dev" source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,13 +23,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="7346079a6980464f57f5da0e96025bbf4b13fbb7ed976b58d9c54b78525d9d0b4174b4783326a12048971cf5d05221bafe2f41c6b02931743913719cde21740c libfontenc-1.1.3.tar.bz2" +sha512sums="76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582 libfontenc-1.1.4.tar.bz2" diff --git a/user/libfs/APKBUILD b/user/libfs/APKBUILD index fd242d2f0..f6bfcb5cb 100644 --- a/user/libfs/APKBUILD +++ b/user/libfs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libfs -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="X11 Font Server client library" url="https://www.X.Org/" @@ -11,11 +11,10 @@ depends="xtrans" depends_dev="util-macros" makedepends="$depends_dev xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.x.org/releases/individual/lib/libFS-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libFS-$pkgver.tar.bz2" builddir="$srcdir/libFS-$pkgver" 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="3596e87710c14706ab345377799e9b2dbab79500fd75b4213f9615bf7db7df3265b4dbc65fdeca9d32343b848013780cfa1a43e76229665ce80246332bb8b96f libFS-1.0.7.tar.bz2" +sha512sums="466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f libFS-1.0.8.tar.bz2" diff --git a/user/libgda/APKBUILD b/user/libgda/APKBUILD index e585373cb..0e0c0731a 100644 --- a/user/libgda/APKBUILD +++ b/user/libgda/APKBUILD @@ -4,7 +4,7 @@ pkgname=libgda pkgver=5.2.8 pkgrel=0 pkgdesc="GNOME Database Access library" -url="http://www.gnome-db.org/" +url="https://www.gnome-db.org/" arch="all" options="!check" # "Disk I/O error" in multi-threaded. all others pass license="GPL-2.0+ AND LGPL-2.0+" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 76b3f44f7..8c2db00bb 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -1,22 +1,21 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput -pkgver=1.12.3 +pkgver=1.13.1 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" arch="all" +options="!check" # wow, such broken license="MIT" -makedepends="eudev-dev libevdev-dev libwacom-dev meson mtdev-dev" +makedepends="doxygen eudev-dev graphviz libevdev-dev libwacom-dev meson + mtdev-dev ninja py3-recommonmark py3-sphinx py3-sphinx-rtd-theme" checkdepends="check-dev valgrind" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" - # Docs disabled: requires sphinx now meson --prefix=/usr \ - -Ddocumentation=false \ -Dlibwacom=true \ -Ddebug-gui=false \ -Dtests=true builddir/ @@ -24,14 +23,12 @@ build() { } check() { - cd "$builddir" ninja -C builddir/ test } package() { - cd "$builddir" DESTDIR="$pkgdir" ninja -C builddir/ install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="cdc512cb53442ae85d5a23e10db9dd3548bcca0de24d7fcc48954a60773563d84d9b10278b6a693ade95d0789bb5d42bbb8b7cf1c178fe85401cb09a5402ff02 libinput-1.12.3.tar.xz" +sha512sums="a19deec802e704038df0901c103a82a3370f56e0299f4cc1b6aa84c1832a66fb638e6f9d0fa708b51df6c3b939cdc1271e4ff547c645c566be03dce0bc9ff7e0 libinput-1.13.1.tar.xz" diff --git a/user/libnotify/APKBUILD b/user/libnotify/APKBUILD index 21b1ee48d..ad021ad4f 100644 --- a/user/libnotify/APKBUILD +++ b/user/libnotify/APKBUILD @@ -1,33 +1,25 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libnotify -pkgver=0.7.7 -pkgrel=2 +pkgver=0.7.8 +pkgrel=0 pkgdesc="Desktop notification library" url="https://developer.gnome.org/notification-spec/" arch="all" options="!check" # Test suite requires running X11 license="LGPL-2.1+" depends="" -depends_dev="dbus-dev" -makedepends="$depends_dev gdk-pixbuf-dev glib-dev autoconf automake - gobject-introspection-dev" +makedepends="gdk-pixbuf-dev glib-dev gobject-introspection-dev gtk-doc + gtk+3.0-dev meson ninja" subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --disable-static \ - --disable-tests - make + meson --prefix=/usr builddir/ + ninja -C builddir/ } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="133874114407bf12267ef609f5941657181760bc7cf115c5973b1810cb72bf55072b621c143e32be1e7e8b49f244851925d14bc3f9f26457747b8a8695ee9954 libnotify-0.7.7.tar.xz" +sha512sums="9973d7a1af5dd7cfbaa0d0d2c9e72a40df9d814967fde47e95763a69690cc4ed32ecf713d75f91f3dff99a693eff9dab963be124e0530ebf231d517a44e75e94 libnotify-0.7.8.tar.xz" diff --git a/user/libqmatrixclient/APKBUILD b/user/libqmatrixclient/APKBUILD index 6d8a0ad5d..7dbe67024 100644 --- a/user/libqmatrixclient/APKBUILD +++ b/user/libqmatrixclient/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libqmatrixclient -pkgver=0.4.0 +pkgver=0.5.1.2 pkgrel=0 pkgdesc="Library to interface with Matrix chat systems using Qt 5" url="https://matrix.org/docs/projects/sdk/libqmatrixclient.html" @@ -9,12 +9,11 @@ arch="all" license="LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev" -makedepends="$depends_dev cmake" +makedepends="$depends_dev cmake qt5-qtmultimedia-dev" subpackages="$pkgname-dev" -source="libqmatrixclient-$pkgver.tar.gz::https://github.com/QMatrixClient/libqmatrixclient/archive/v$pkgver.tar.gz" +source="libqmatrixclient-$pkgver.tar.gz::https://github.com/QMatrixClient/libqmatrixclient/archive/$pkgver.tar.gz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,13 +29,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="552b866ef4adbde72518f96b42beb08dc99f80ff0388717e99c4287c463db21469d91e188b3d5c17850266ea313a36fed0cd01431f08632e3d1403f3b7725e40 libqmatrixclient-0.4.0.tar.gz" +sha512sums="4e7cac3cc6a1ffc2a5a5ebf5c38dec72c3293f96b56d533838dea745a9b0de9a1ab14da666efcdad4f7d7a70279b922a0dbb3a3e26d1ad83f5b98d04fc9912a2 libqmatrixclient-0.5.1.2.tar.gz" diff --git a/user/libsecret/APKBUILD b/user/libsecret/APKBUILD index 4fc79e95b..cb883270e 100644 --- a/user/libsecret/APKBUILD +++ b/user/libsecret/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libsecret -pkgver=0.18.7 +pkgver=0.18.8 pkgrel=0 pkgdesc="Library for storing and retrieving passphrases" url="https://wiki.gnome.org/Projects/Libsecret" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://ftp.acc.umu.se/pub/gnome/sources/libsecret/0.18/libsecret-$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="a8890ec52dcfba585fd665ee89e81f4a1d6a04b67bcf4f3422f27973a4ef6fc1281bf54e92160d39dd696ae08a633bab5fe25c1124baf32eb5b414e98ddfa084 libsecret-0.18.7.tar.xz" +sha512sums="9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4 libsecret-0.18.8.tar.xz" diff --git a/user/libtap/APKBUILD b/user/libtap/APKBUILD index 0c47e0468..b8a992768 100644 --- a/user/libtap/APKBUILD +++ b/user/libtap/APKBUILD @@ -1,27 +1,23 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libtap -pkgver=1.12.0 +pkgver=1.14.0 pkgrel=0 pkgdesc="C library implementing the Test Anything Protocol (TAP)" url="https://www.shlomifish.org/open-source/projects/libtap/" arch="all" license="BSD-3-Clause" depends="" -depends_dev="" makedepends="cmake perl" subpackages="$pkgname-dev $pkgname-doc" -source="http://web-cpan.shlomifish.org/downloads/libtap-$pkgver.tar.bz2" -builddir="$srcdir/libtap-$pkgver" +source="http://web-cpan.shlomifish.org/downloads/libtap-$pkgver.tar.xz" build() { - cd "$builddir" 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" \ @@ -31,13 +27,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="510f85a5b10525cf8b67a0bcc67213e43a9e752def5293fecbc97f7058d24256a85cd8ce8c0b408186ca676f3ca700ddbeea4c8c7558352665956b4233258d31 libtap-1.12.0.tar.bz2" +sha512sums="1d78f9ed5b554a7a9f8a2a6e3dcb30e09ba5bd4b98c77499e57599be615413f6c6dddb3dd498b6ac49a5449e54e1134a6a4816adaab5b993e3c0027edc2a2404 libtap-1.14.0.tar.xz" diff --git a/user/libtommath/APKBUILD b/user/libtommath/APKBUILD index 41e3a1ea1..826ecf131 100644 --- a/user/libtommath/APKBUILD +++ b/user/libtommath/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libtommath -pkgver=1.1.0_rc1 +pkgver=1.1.0 pkgrel=0 pkgdesc="Theoretic multiple-precision integer library" url="https://www.libtom.net/LibTomMath/" @@ -14,18 +14,15 @@ source="https://github.com/libtom/libtommath/releases/download/v${pkgver/_/-}/lt builddir="$srcdir/$pkgname-${pkgver/_/-}" build() { - cd "$builddir" make PREFIX=/usr -f makefile.shared } check() { - cd "$builddir" make PREFIX=/usr -f makefile.shared test_standalone } package() { - cd "$builddir" make PREFIX=/usr DESTDIR="$pkgdir" -f makefile.shared install } -sha512sums="4cee5d59cd2eaf14591ee280dcdcdd5915f38584b7259b5752e7316cd1a9966f1c969ee3b64d136ae7044c5834cfc8c781db300ede503ec2e657083de3692fd2 ltm-1.1.0-rc1.tar.xz" +sha512sums="6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91 ltm-1.1.0.tar.xz" diff --git a/user/libuninameslist/APKBUILD b/user/libuninameslist/APKBUILD index 1deffebdc..3b7102955 100644 --- a/user/libuninameslist/APKBUILD +++ b/user/libuninameslist/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libuninameslist -pkgver=20180701 +pkgver=20190305 pkgrel=0 pkgdesc="Library of Unicode names and annotation data" url=" " @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc py3-uninameslist:py3:noarch" source="https://github.com/fontforge/libuninameslist/releases/download/$pkgver/libuninameslist-dist-$pkgver.tar.gz" build() { - cd "$builddir" PYTHON=python3 ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -41,4 +38,4 @@ py3() { python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="839f8a0c3a81b4b19ce6ddfa08fa9ca99fdcefe2ef2b2c5515b276fab594fb5325ae9c83b58e19c559c033e880bd098687022c8ec3da028b143f4a72c471f19c libuninameslist-dist-20180701.tar.gz" +sha512sums="4dc30a4f0919722c7538ed2eda39c3e63d072ee17c809ca25e0b6546d29110607c27c6e969839439c1432b4b40fca3e888c428ed26d1e0328a5f481a2db3cc73 libuninameslist-dist-20190305.tar.gz" diff --git a/user/libvdpau/APKBUILD b/user/libvdpau/APKBUILD index a8febe21a..bb400cf77 100644 --- a/user/libvdpau/APKBUILD +++ b/user/libvdpau/APKBUILD @@ -1,20 +1,18 @@ # Contributor: Carlo Landmeter # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvdpau -pkgver=1.1.1 -pkgrel=2 +pkgver=1.2 +pkgrel=0 pkgdesc="Hardware-accelerated video playback library" url="https://cgit.freedesktop.org/~aplattner/libvdpau" arch="all" license="MIT" -depends= +depends="" makedepends="libx11-dev libxext-dev xorgproto-dev" -install= subpackages="$pkgname-dev $pkgname-doc" -source="https://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz" +source="https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/libvdpau-1.2.tar.bz2" build() { - cd "$builddir" LIBS="-lX11" \ ./configure \ --build=$CBUILD \ @@ -27,15 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } -sha512sums="e094494fc820c2395c9dbb4e69daa89334b9186e2ad1a6c06671c7f844568db191ce4d1d9df95c4536579864bcc8541eb6fd159c377bc73c228cdf2a0fea50fb libvdpau-1.1.1.tar.gz" +sha512sums="86aa3f2a39cb73a597bf417da2eeef73ff01160ed9f54dff3725785ff5a289f47040496de44e2f5292d59657d4746e369b3fa307c4f83a32f7cc28e4cd8bce6f libvdpau-1.2.tar.bz2" diff --git a/user/libvncserver/APKBUILD b/user/libvncserver/APKBUILD index 324da7fcb..0801da573 100644 --- a/user/libvncserver/APKBUILD +++ b/user/libvncserver/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvncserver -pkgver=0.9.11 -pkgrel=1 +pkgver=0.9.12 +pkgrel=0 pkgdesc="Library to make writing a vnc server easy" url="https://libvnc.github.io/" arch="all" @@ -14,8 +14,7 @@ depends_dev="libgcrypt-dev libjpeg-turbo-dev gnutls-dev libpng-dev libxi-dev libxinerama-dev libxrandr-dev libxtst-dev" makedepends="$depends_dev autoconf automake libtool" subpackages="$pkgname-dev" -source="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$pkgver.tar.gz - " +source="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$pkgver.tar.gz" builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver # secfixes: @@ -23,31 +22,27 @@ builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver # - CVE-2016-9941 # - CVE-2016-9942 -prepare() { - cd "$builddir" - default_prepare - ./autogen.sh -} - build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --disable-static + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} make } check() { - cd "$builddir" - make check + CTEST_OUTPUT_ON_FAILURE=TRUE ctest test/tjunittest } package() { - cd "$builddir" make install DESTDIR="$pkgdir" } -sha512sums="e473c081b68dd3cdd96a1756b4f4945ece79d3c8e4cef62140be1699671555fc16d3080e81d764197a14ea83203ffcd0e18c3cc182e012d036e3faae943003fb LibVNCServer-0.9.11.tar.gz" +sha512sums="60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8 LibVNCServer-0.9.12.tar.gz" diff --git a/user/libwacom/APKBUILD b/user/libwacom/APKBUILD index c5faa796f..52326df1f 100644 --- a/user/libwacom/APKBUILD +++ b/user/libwacom/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ivan Tham <pickfire@riseup.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libwacom -pkgver=0.32 +pkgver=0.33 pkgrel=0 pkgdesc="Tablet description library" url="http://linuxwacom.sourceforge.net/" @@ -14,27 +14,26 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/linuxwacom/libwacom/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --disable-static make + # conflicts with TS-6610 tablet + rm "$builddir"/data/huion-h420.tablet + rm "$builddir"/data/layouts/huion-h420.svg } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" install -dm755 "$pkgdir"/usr/lib/udev/rules.d/ tools/generate-udev-rules > "$pkgdir"/usr/lib/udev/rules.d/65-libwacom.rules } -sha512sums="d7001bb355d4b269e61bf95f0b71621088e76d6894a4a1d002b6a0904a20dd75e0b4fb85368fd20ccafbbfbb1c7ff17150a39962554c8f27f9fcad48c397125b libwacom-0.32.tar.bz2" +sha512sums="de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d libwacom-0.33.tar.bz2" diff --git a/user/libwpd/APKBUILD b/user/libwpd/APKBUILD index 20307c037..8a8c5a043 100644 --- a/user/libwpd/APKBUILD +++ b/user/libwpd/APKBUILD @@ -1,18 +1,17 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libwpd -pkgver=0.10.2 -pkgrel=1 +pkgver=0.10.3 +pkgrel=0 pkgdesc="Import filter and tools for WordPerfect documents" url="https://sourceforge.net/p/libwpd/" arch="all" options="!check" # No test suite. license="MPL-2.0 OR LGPL-2.1+" depends="" -depends_dev="librevenge-dev" -makedepends="$depends_dev doxygen" +makedepends="doxygen librevenge-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="http://downloads.sourceforge.net/project/libwpd/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/libwpd/$pkgname-$pkgver.tar.bz2" prepare() { update_config_sub @@ -20,7 +19,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,7 +31,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -42,4 +39,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="879f96b6290d9db7ed4a431e84d18a1f7e81826394a8c63e03c3b6b49c578bfb417056956209d1934e34080471df28a40d93f45ac4f8a976631610d3103d6b7c libwpd-0.10.2.tar.bz2" +sha512sums="cf3db714d424c32ecf5740b17d9f1721f228d3a7edbd1cc7a0f4b30f7ac9b1024cf45c0727b9f916b7672321e05f0d791c7f7f5ad5d47fedcea9ad9e886eb459 libwpd-0.10.3.tar.bz2" diff --git a/user/libwpg/APKBUILD b/user/libwpg/APKBUILD index 1985152e8..b1a62091a 100644 --- a/user/libwpg/APKBUILD +++ b/user/libwpg/APKBUILD @@ -1,26 +1,19 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libwpg -pkgver=0.3.2 -pkgrel=1 +pkgver=0.3.3 +pkgrel=0 pkgdesc="Import filter and tools for WordPerfect graphics" url="https://sourceforge.net/projects/libwpg/" arch="all" options="!check" # No test suite. license="MPL-2.0 OR LGPL-2.1+" depends="" -depends_dev="librevenge-dev" -makedepends="$depends_dev doxygen libwpd-dev" +makedepends="doxygen librevenge-dev libwpd-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="http://downloads.sourceforge.net/project/libwpg/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" - -prepare() { - update_config_sub - default_prepare -} +source="https://downloads.sourceforge.net/libwpg/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,7 +27,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -43,4 +35,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="af9bf007c1cd380cc6da543024e6f068c0eb49514ff0027b1e82170927c8496e69d6c7a2a502380f25c54fea1fc33865c70c7d24d4b38e4fbf1d064bf1f1e192 libwpg-0.3.2.tar.bz2" +sha512sums="4a4cc5d1492b50c8572289c508bec603067f532446c032ff7241d0dad9c33c251e55751dc68c24bacf7937f26697292fb7712f61c8b3f025cffeb9f86350be83 libwpg-0.3.3.tar.bz2" diff --git a/user/libxcomposite/APKBUILD b/user/libxcomposite/APKBUILD index 6ce9263b9..f390a1204 100644 --- a/user/libxcomposite/APKBUILD +++ b/user/libxcomposite/APKBUILD @@ -1,27 +1,19 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxcomposite -pkgver=0.4.4 -pkgrel=2 +pkgver=0.4.5 +pkgrel=0 pkgdesc="X11 Composite extension library" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" depends_dev="libxext-dev" makedepends="libx11-dev libxext-dev libxfixes-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXcomposite-$pkgver.tar.bz2" builddir="$srcdir"/libXcomposite-$pkgver -prepare() { - cd "$builddir" - chmod u+w config.sub - update_config_sub - default_prepare -} - build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,14 +23,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -sha512sums="b15f8fdbe4cb7488bdad161d73ef8e59ef603c5af92d7b573110ba136d7d4ce3749aac45972bce87662b0310b67e831cffad72c45c15bfff988b5b555d4c884b libXcomposite-0.4.4.tar.bz2" +sha512sums="502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5 libXcomposite-0.4.5.tar.bz2" diff --git a/user/libxcursor/APKBUILD b/user/libxcursor/APKBUILD index 857cc5114..6aff75fef 100644 --- a/user/libxcursor/APKBUILD +++ b/user/libxcursor/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxcursor -pkgver=1.1.15 -pkgrel=1 +pkgver=1.2.0 +pkgrel=0 pkgdesc="X cursor management library" url="https://www.X.Org/" arch="all" license="MIT" subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" makedepends="libx11-dev libxfixes-dev libxrender-dev util-macros xorgproto-dev" source="https://www.X.Org/releases/individual/lib/libXcursor-$pkgver.tar.bz2" builddir="$srcdir"/libXcursor-$pkgver @@ -17,7 +17,6 @@ builddir="$srcdir"/libXcursor-$pkgver # - CVE-2017-16612 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="53ad0fa2afd7b4cf1108b560e44ea71abdf5c55a18df243d7123942513589c927f5c105395f790d8769959e0129db54264e6aac7efd51a5f1aec270379b1f2f5 libXcursor-1.1.15.tar.bz2" +sha512sums="2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03 libXcursor-1.2.0.tar.bz2" diff --git a/user/libxdamage/APKBUILD b/user/libxdamage/APKBUILD index 0aa397c2e..5519f04e6 100644 --- a/user/libxdamage/APKBUILD +++ b/user/libxdamage/APKBUILD @@ -1,26 +1,18 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxdamage -pkgver=1.1.4 -pkgrel=2 +pkgver=1.1.5 +pkgrel=0 pkgdesc="X11 damaged region extension library" url="https://www.X.Org/" arch="all" license="MIT" -depends= +depends="" makedepends="libx11-dev libxfixes-dev util-macros xorgproto-dev" subpackages="$pkgname-dev" source="https://www.X.Org/releases/individual/lib/libXdamage-$pkgver.tar.bz2" builddir="$srcdir"/libXdamage-$pkgver -prepare() { - cd "$builddir" - chmod 644 "$builddir"/config.sub - update_config_sub - default_prepare -} - build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,13 +22,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="1058cef11a8f0edfcae7265837369e492b007c34d56ae04145b558e5f02a163827aba1d0b80656f4c8e5d1e9a40f5077d93b7ff4f5e704f7409060dceba03904 libXdamage-1.1.4.tar.bz2" +sha512sums="a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124 libXdamage-1.1.5.tar.bz2" diff --git a/user/libxdmcp/APKBUILD b/user/libxdmcp/APKBUILD index 3c7c41fe7..85ba59d65 100644 --- a/user/libxdmcp/APKBUILD +++ b/user/libxdmcp/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxdmcp -pkgver=1.1.2 -pkgrel=5 +pkgver=1.1.3 +pkgrel=0 pkgdesc="X11 Display Manager Control Protocol library" url="https://www.X.Org/" arch="all" license="MIT" -depends= +depends="" makedepends="xorgproto-dev libbsd-dev util-macros xmlto" subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXdmcp-$pkgver.tar.bz2" @@ -15,8 +15,8 @@ builddir="$srcdir/libXdmcp-$pkgver" # secfixes: # 1.1.2-r3: # - CVE-2017-2625 + build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } -sha512sums="f96005934b8bc752059106f8caf7df0574f5ef3c7a83bd797497b56ca556a7ff4dc1d28195e421259e82ea027b5c738094add3ec107a22544c9070725d8d46bb libXdmcp-1.1.2.tar.bz2" +sha512sums="cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec libXdmcp-1.1.3.tar.bz2" diff --git a/user/libxext/APKBUILD b/user/libxext/APKBUILD index 70f0f9b4e..3d601f744 100644 --- a/user/libxext/APKBUILD +++ b/user/libxext/APKBUILD @@ -1,21 +1,19 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxext -pkgver=1.3.3 -pkgrel=3 +pkgver=1.3.4 +pkgrel=0 pkgdesc="X11 miscellaneous extensions library" url="https://www.X.Org/" arch="all" license="X11" -depends= +depends="" depends_dev="libxau-dev" makedepends="$depends_dev libx11-dev util-macros xmlto xorgproto" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/lib/libXext-$pkgver.tar.bz2 - " +source="https://www.X.Org/releases/individual/lib/libXext-$pkgver.tar.bz2" builddir="$srcdir"/libXext-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="669d61545d10b999872addbf5628127840a221cbeaafb5ffa4328e0e0e1823583ece973bcafd5f13852ed58d4b0fe313a35f304ac80c6ed2b382cbbca977761a libXext-1.3.3.tar.bz2" +sha512sums="09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a libXext-1.3.4.tar.bz2" diff --git a/user/libxft/APKBUILD b/user/libxft/APKBUILD index f2454b32c..c8b3445db 100644 --- a/user/libxft/APKBUILD +++ b/user/libxft/APKBUILD @@ -1,21 +1,20 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxft -pkgver=2.3.2 -pkgrel=3 +pkgver=2.3.3 +pkgrel=0 pkgdesc="FreeType-based font drawing library for X11" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" depends_dev="zlib-dev" makedepends="$depends_dev fontconfig-dev freetype-dev libxrender-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXft-$pkgver.tar.bz2" builddir="$srcdir/libXft-$pkgver" build () { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,14 +24,11 @@ build () { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="eb2e0c46b4434198690a3ca2b613df14ad599c860b47d10a1e8efe3b4e812a78460f9f414eaf89db21d605613a4e18324dcb8a22928609c6bc15178330a05398 libXft-2.3.2.tar.bz2" +sha512sums="28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8 libXft-2.3.3.tar.bz2" diff --git a/user/libxkbfile/APKBUILD b/user/libxkbfile/APKBUILD index 109a9d9c1..11cbd4d9e 100644 --- a/user/libxkbfile/APKBUILD +++ b/user/libxkbfile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxkbfile -pkgver=1.0.9 -pkgrel=3 +pkgver=1.1.0 +pkgrel=0 pkgdesc="X11 keyboard file manipulation library" url="https://www.X.Org/" arch="all" @@ -12,7 +12,6 @@ subpackages="$pkgname-dev" source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,15 +21,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -D -m644 "$srcdir"/$pkgname-$pkgver/COPYING \ - "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="5fa268f10d7c4bd7b1e0c9f12adaa53d86b149f193d228fc620b3b81d360b37e4ede0192f5a0dc715bf830a57bd1388af01399fb33609413fc64623ee91cb8d1 libxkbfile-1.0.9.tar.bz2" +sha512sums="1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826 libxkbfile-1.1.0.tar.bz2" diff --git a/user/libxmu/APKBUILD b/user/libxmu/APKBUILD index 80ec63ade..854f806a3 100644 --- a/user/libxmu/APKBUILD +++ b/user/libxmu/APKBUILD @@ -1,23 +1,21 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxmu -pkgver=1.1.2 -pkgrel=2 +pkgver=1.1.3 +pkgrel=0 pkgdesc="X11 miscellaneous micro-utility library" url="https://www.X.Org/" arch="all" options="!check" # No test suite. license="X11 AND MIT" subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" depends_dev="util-linux-dev" makedepends="$depends_dev libsm-dev libx11-dev libxext-dev libxt-dev util-macros xmlto" source="https://www.X.Org/releases/individual/lib/libXmu-$pkgver.tar.bz2" builddir="$srcdir"/libXmu-$pkgver -build() -{ - cd "$builddir" +build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,10 +26,7 @@ build() } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 $srcdir/libXmu-$pkgver/COPYING \ - $pkgdir/usr/share/licenses/$pkgname/COPYING } -sha512sums="eba4e3d10f7d75ba8464881fb69f295a89774a4b37793197d75f3312e3a342b2df8b7e13e3f5c887962704329b5347ff2f3395e229af9dadf46a93b1e8613cfc libXmu-1.1.2.tar.bz2" +sha512sums="8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762 libXmu-1.1.3.tar.bz2" diff --git a/user/libxrandr/APKBUILD b/user/libxrandr/APKBUILD index 0e2d1f3e1..9316676d5 100644 --- a/user/libxrandr/APKBUILD +++ b/user/libxrandr/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxrandr -pkgver=1.5.1 -pkgrel=2 +pkgver=1.5.2 +pkgrel=0 pkgdesc="X11 RandR extension library" url="https://www.X.Org/" arch="all" license="MIT" -depends= +depends="" depends_dev="libxext-dev" makedepends="$depends_dev libx11-dev libxrender-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" @@ -14,7 +14,6 @@ source="https://www.X.Org/releases/individual/lib/libXrandr-$pkgver.tar.bz2" builddir="$srcdir"/libXrandr-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,14 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="ddcee1c50da8810412fd747b05a073ee5522b2f3b0a74e6a9b48b489ce9712356d1bc3009f8898aeee85671cdb44e2dafa04c8caf23d97963b36b1af9174445a libXrandr-1.5.1.tar.bz2" +sha512sums="fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87 libXrandr-1.5.2.tar.bz2" diff --git a/user/libxvmc/APKBUILD b/user/libxvmc/APKBUILD index c65e816d9..9953618d2 100644 --- a/user/libxvmc/APKBUILD +++ b/user/libxvmc/APKBUILD @@ -1,20 +1,19 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxvmc -pkgver=1.0.10 -pkgrel=2 +pkgver=1.0.11 +pkgrel=0 pkgdesc="X11 Video Motion Compensation extension library" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" depends_dev="libxext-dev" makedepends="libx11-dev libxv-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXvMC-$pkgver.tar.bz2" builddir="$srcdir"/libXvMC-$pkgver 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="db979627eda2e58dbc95f0705681aa4acf51dc375a078467ea0b1c78414963e52417e525bcf224b4642eab2e540619c168c1e4757fad97bac7d07b60b23b3e19 libXvMC-1.0.10.tar.bz2" +sha512sums="4fe49e956ac97a45d851292cbba7bf242706aaf3bd9eb7ea4d2fc50e40745115d857a4fe179d2b87bc7cb6f9ac93911e89a167f02f6d1ae25a59df9a517a2476 libXvMC-1.0.11.tar.bz2" diff --git a/user/libxxf86dga/APKBUILD b/user/libxxf86dga/APKBUILD index 9df55acd4..5de299edc 100644 --- a/user/libxxf86dga/APKBUILD +++ b/user/libxxf86dga/APKBUILD @@ -1,19 +1,18 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxxf86dga -pkgver=1.1.4 -pkgrel=2 +pkgver=1.1.5 +pkgrel=0 pkgdesc="X11 Direct Graphics Access extension library" url="https://www.X.Org/" arch="all" license="X11" -subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="libx11-dev libxext-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXxf86dga-$pkgver.tar.bz2" builddir="$srcdir"/libXxf86dga-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,13 +21,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="58d81a7850275fc8382018bcc56dbc65b4200828b1f1379dcee3da1878f12a83ee681a9d474bcd564d99bf93bedfeb7b243370e0ebb89177652b37cee158a3f2 libXxf86dga-1.1.4.tar.bz2" +sha512sums="0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89 libXxf86dga-1.1.5.tar.bz2" diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD index 1be241d58..280955e7f 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.52 +pkgver=1.4.53 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="3c604f441c001641681b958012524c9a2e801314b07d9741d4b5e086e7585d676516e3fe587e0ff69f1f937c11b9a290f2173866d6b90019117b6be299972a72 lighttpd-1.4.52.tar.xz +sha512sums="bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76 lighttpd-1.4.53.tar.xz f2f3c5c7731550237fd75a8de66275f427eaf897cffff7ac7ef44178328ad8fad6c4ec6654759bfc665cbaf7991ddcdf0aaa916831c8b6aa440192d57b242038 lighttpd.initd 9d2ab5deb7353ebf290e90936b511941df440859c78589d0bcf130ef69a5e9c79e4d318548b6b118df002083c46f7476230a28954b7a10a9dbd05040e02b1291 lighttpd.confd 0536b4f21d2e8659f7831b45998c13d9f6051ae7ecde13be01f372f837d255bfc4e211de48a7686cc743d53aa9c08ab3f10ec19788896dcf8356b90053ca7a16 lighttpd.logrotate diff --git a/user/links/APKBUILD b/user/links/APKBUILD index 572f9d977..b3ade3cb2 100644 --- a/user/links/APKBUILD +++ b/user/links/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=links -pkgver=2.17 +pkgver=2.19 pkgrel=0 pkgdesc="Text Web browser, similar to Lynx" url="http://links.twibright.com/" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="http://$pkgname.twibright.com/download/$pkgname-$pkgver.tar.bz2" build () { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,8 +25,7 @@ build () { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="871a3a2cbc210467f4ffd830ba2966f2ebc0ec9ed4a1de018d032cec4b550e58f6858875478647c627ec746bb76810a4b97603575f2d21b5ea650c612684c8d5 links-2.17.tar.bz2" +sha512sums="8716cea6feb5a02b59d7e2dd5bfd0af9b2ac2a4427c0f98a3c8a8eaabca31e7a96c16888c0de19976749485b3cdbf75cbff88a37cd3b58700c1f090acec328ea links-2.19.tar.bz2" diff --git a/user/lksctp-tools/APKBUILD b/user/lksctp-tools/APKBUILD index adeeec587..666515b81 100644 --- a/user/lksctp-tools/APKBUILD +++ b/user/lksctp-tools/APKBUILD @@ -1,20 +1,19 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lksctp-tools -pkgver=1.0.17 +pkgver=1.0.18 pkgrel=0 pkgdesc="Tools for using SCTP on Linux" url="http://lksctp.sourceforge.net/" arch="all" license="GPL-2.0-only AND LGPL-2.1-only" depends="" -makedepends="" +makedepends="autoconf automake" subpackages="$pkgname-dev $pkgname-doc" -source="https://downloads.sourceforge.net/lksctp/lksctp-tools-$pkgver.tar.gz" -builddir="$srcdir/lksctp-tools-$pkgver" +source="$pkgname-$pkgver.tar.gz::https://github.com/sctp/$pkgname/archive/v$pkgver.tar.gz" build() { - cd "$builddir" + ./bootstrap ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4 lksctp-tools-1.0.17.tar.gz" +sha512sums="1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055 lksctp-tools-1.0.18.tar.gz" diff --git a/user/makedepend/APKBUILD b/user/makedepend/APKBUILD index da9da0ee9..13d8c1e05 100644 --- a/user/makedepend/APKBUILD +++ b/user/makedepend/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=makedepend -pkgver=1.0.5 -pkgrel=1 +pkgver=1.0.6 +pkgrel=0 pkgdesc="Utility for making makefile dependencies" url="https://www.freedesktop.org/" arch="all" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/util/${pkgname}-${pkgver}.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,13 +22,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e28d71c3ce4f74ca6479771fcdd123c19ab18e3f2aa690a7798237f21f13fca4c4d66d7b7b1d708c2c214b8e17f8fe37e6cf5b75a4d2b88514c50addea2600cb makedepend-1.0.5.tar.bz2" +sha512sums="eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42 makedepend-1.0.6.tar.bz2" diff --git a/user/mkcomposecache/APKBUILD b/user/mkcomposecache/APKBUILD index dbd363bf0..d75231431 100644 --- a/user/mkcomposecache/APKBUILD +++ b/user/mkcomposecache/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mkcomposecache -pkgver=1.2 +pkgver=1.2.1 pkgrel=0 pkgdesc="Utility to manipulate X11 Compose key cache files" url="https://www.X.Org/" @@ -10,10 +10,14 @@ license="MIT" depends="" makedepends="libx11-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/mkcomposecache-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/mkcomposecache-$pkgver.tar.bz2" + +prepare() { + update_config_sub + default_prepare +} build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +29,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e81101dbf3324341a2aa6b12a6f1a67bf18484f69edc86e38f78f30b2e62d4d3a98d65dbd05540dfe437d739b5cdd330d1e381da87ec3fe4fe7c42fcef58aad7 mkcomposecache-1.2.tar.bz2" +sha512sums="97ce9e5e2f2534291fc0b3a121899e2936de3e71ec6a9929cfc6e1e0f41e6d57cccd08147a2b5d3c7d70d1769f14ed6c4745c398602d5b81a2ddb8c7490fcb5b mkcomposecache-1.2.1.tar.bz2" diff --git a/user/mkfontdir/APKBUILD b/user/mkfontdir/APKBUILD deleted file mode 100644 index 45629cd20..000000000 --- a/user/mkfontdir/APKBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=mkfontdir -pkgver=1.0.7 -pkgrel=3 -pkgdesc="Font file index utility from X.Org" -url="https://www.X.Org/" -arch="noarch" -license="X11 AND MIT" -depends="encodings mkfontscale" -makedepends="util-macros" -subpackages="$pkgname-doc" -triggers="$pkgname.trigger=/usr/share/fonts/* - $pkgname.trigger=/usr/share/fonts/X11/*" -source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" - -prepare() { - cd "$builddir" - update_config_sub - default_prepare -} - -build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr - make -} - -check() { - cd "$builddir" - make check -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="96d1920565514f90621e18a87fb5a2db9e052d1bffc6552d9659e065a21e252ab98b4e62013755032b98ed6d8c3381eb75c3c8e02651766ee4791ca622dcef1f mkfontdir-1.0.7.tar.bz2" diff --git a/user/mkfontdir/mkfontdir.trigger b/user/mkfontdir/mkfontdir.trigger deleted file mode 100644 index 3024d71f1..000000000 --- a/user/mkfontdir/mkfontdir.trigger +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -for i in "$@"; do - mkfontdir -e "/usr/share/fonts/X11/encodings" -e "/usr/share/fonts/X11/encodings/large" -- "$i" -done - diff --git a/user/mkfontscale/APKBUILD b/user/mkfontscale/APKBUILD index c2d81ec73..cfda36c89 100644 --- a/user/mkfontscale/APKBUILD +++ b/user/mkfontscale/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mkfontscale -pkgver=1.1.3 -pkgrel=1 +pkgver=1.2.1 +pkgrel=0 pkgdesc="Scalable font file creator for X.Org" url="https://www.X.Org/" arch="all" @@ -9,12 +9,12 @@ license="MIT" subpackages="$pkgname-doc" depends="" makedepends="freetype-dev libfontenc-dev util-macros xorgproto-dev zlib-dev" +provides="mkfontdir=$pkgver-r$pkgrel" triggers="$pkgname.trigger=/usr/share/fonts/* $pkgname.trigger=/usr/share/fonts/X11/*" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,13 +23,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62 mkfontscale-1.1.3.tar.bz2" +sha512sums="4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c mkfontscale-1.2.1.tar.bz2" diff --git a/user/mkfontscale/mkfontscale.trigger b/user/mkfontscale/mkfontscale.trigger index 2357e06dc..9b08da4b0 100644 --- a/user/mkfontscale/mkfontscale.trigger +++ b/user/mkfontscale/mkfontscale.trigger @@ -2,5 +2,6 @@ for i in "$@"; do mkfontscale "$i" + mkfontdir -e "/usr/share/fonts/X11/encodings" -e "/usr/share/fonts/X11/encodings/large" -- "$i" done diff --git a/user/ncompress/APKBUILD b/user/ncompress/APKBUILD index dab9c6d08..0a34a72fe 100644 --- a/user/ncompress/APKBUILD +++ b/user/ncompress/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ncompress -pkgver=4.2.4.4 -pkgrel=1 +pkgver=4.2.4.5 +pkgrel=0 pkgdesc="Fast, simple LZW compressor" url="https://github.com/vapier/ncompress" arch="all" @@ -13,15 +13,13 @@ source="https://downloads.sourceforge.net/ncompress/ncompress-$pkgver.tar.gz fix-9bit-compress.patch" build() { - cd "$builddir" make } package() { - cd "$builddir" install -D -m755 "$builddir"/compress "$pkgdir"/usr/bin/compress install -D -m644 "$builddir"/compress.1 "$pkgdir"/usr/share/man/man1/compress.1 } -sha512sums="abc7bd96daaab0b83d5ca18ef4b8b4c6528632653a0882a4e0eda4fb3f99e23aae60ee30193e79104ea2ac8fb5816ac3b0bdebb08322db6bde6b8ef1639527be ncompress-4.2.4.4.tar.gz +sha512sums="487e8d5ca743c3aba19cf69f7ec62bdc0784e43af5737f06d6d4257f2f33899eb3d293ed049f57b3164e344a0fddc077bc73437564977bad8de45816354c8bf3 ncompress-4.2.4.5.tar.gz b2e897679234f391fa3cf4d5b55a3894424cca632a3b16303b0085e908808bc72b66e6a9df3e56e1a26eac79340c0901f7e6ef2378cc61b710e93194d345c2ea fix-9bit-compress.patch" diff --git a/user/okteta/APKBUILD b/user/okteta/APKBUILD index 9a96a915b..24b9a6e6f 100644 --- a/user/okteta/APKBUILD +++ b/user/okteta/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okteta -pkgver=0.25.4 +pkgver=0.26.1 pkgrel=0 pkgdesc="Graphical hex/binary editor" url="https://www.kde.org/applications/utilities/okteta/" @@ -13,11 +13,10 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev kcrash-dev kdbusaddons-dev kdoctools-dev kiconthemes-dev kcmutils-dev knewstuff-dev kparts-dev kservice-dev kwidgetsaddons-dev kxmlgui-dev qca-dev shared-mime-info qt5-qttools-dev" -subpackages="$pkgname-doc $pkgname-lang" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/okteta/$pkgver/src/okteta-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,14 +32,12 @@ build() { } check() { - cd "$builddir" local _skip="libkasten-core-testdocumenttest|libkasten-core-documentmanagertest|oktetakasten-document-bytearraydocumenttest|kpart-oktetaparttest" CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "($_skip)" } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d9887a90efbad3bb2caa0d3bb12af27708b77d54a90cd0da82eace7ea6dfc2efbcea3d7dc720bf4a088a823a8ed9edf75ab1c3680aa6d99c640d5c9e4c385e16 okteta-0.25.4.tar.xz" +sha512sums="fa4e841c77ae255e9936b29e30fa0bc1f65594898820652ac8ba78497658ec5ef78cadf8b4d33cab09b2ee8da1d75b84377be28680b2d91c5af2dcdfe5da95e3 okteta-0.26.1.tar.xz" diff --git a/user/opengfx/APKBUILD b/user/opengfx/APKBUILD index b0ab22c55..e3f0dbaaf 100644 --- a/user/opengfx/APKBUILD +++ b/user/opengfx/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=opengfx -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=0 pkgdesc="Graphics files for OpenTTD" url="https://www.openttd.org/en/" @@ -11,7 +11,7 @@ license="GPL-2.0-only" depends="" makedepends="grfcodec nml" subpackages="" -source="http://bundles.openttdcoop.org/opengfx/releases/$pkgver/$pkgname-$pkgver-source.tar.xz +source="https://binaries.openttd.org/extra/opengfx/$pkgver/$pkgname-$pkgver-source.tar.xz Makefile.patch " builddir="$srcdir/$pkgname-$pkgver-source" @@ -30,5 +30,5 @@ package() { done } -sha512sums="42f8438c747b42a77cf9d86c5da60ce3ce84ed347d714c345f3871806f9e35f2ed4729b445e0ee319f3e2edd53458dfbaad5ca42e389c3a2e800bce19223cdb1 opengfx-0.5.4-source.tar.xz -f2cd513b6b244fcdd522e488c3becd27164f622f0bc723bd1f704ce1e76419ac628425cf3fc437beb50f851735923e85eae8a3f70e828f58edff4d632784bbf9 Makefile.patch" +sha512sums="952fb52e19bd790e335a9df0f11fa29b2fc570b49903419904956cc65883adde93d432160b16682366ab8b973b7852d2d30f574f1840f6fbd082e1addbe5bfe8 opengfx-0.5.5-source.tar.xz +a337ab4ade493a87d2687a7aa2fb05dcd5718725645950486975a6df309dd1e6631d4b04fa6dcbf590e869b45b037caa32468ea6f677ce458d61950f77c5a006 Makefile.patch" diff --git a/user/opengfx/Makefile.patch b/user/opengfx/Makefile.patch index 169df9668..1e4585311 100644 --- a/user/opengfx/Makefile.patch +++ b/user/opengfx/Makefile.patch @@ -11,15 +11,6 @@ # Graphics processing GIMP ?= gimp -@@ -196,7 +196,7 @@ - endif - - # Days of commit since 2000-1-1 00-00 --REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print (date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days") -+REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print ((date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days)") - - # Filename addition, if we're not building the default branch - REPO_BRANCH_STRING ?= $(shell if [ "$(REPO_BRANCH)" = "$(DEFAULT_BRANCH_NAME)" ]; then echo ""; else echo "-$(REPO_BRANCH)"; fi) @@ -719,7 +719,7 @@ $(_E) endif diff --git a/user/openjpeg/APKBUILD b/user/openjpeg/APKBUILD index 3b4c6dc49..6e2993bd6 100644 --- a/user/openjpeg/APKBUILD +++ b/user/openjpeg/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openjpeg -pkgver=2.3.0 -pkgrel=1 +pkgver=2.3.1 +pkgrel=0 pkgdesc="Open-source implementation of JPEG 2000 image codec" url="http://www.openjpeg.org/" arch="all" @@ -11,12 +11,9 @@ license="BSD-2-Clause-NetBSD" depends_dev="$pkgname-tools" makedepends="libpng-dev tiff-dev lcms2-dev doxygen cmake" subpackages="$pkgname-dev $pkgname-tools" -source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz - fix-include-path.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz" build() { - cd "$builddir" cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -41,7 +38,6 @@ build() { # - CVE-2016-9581 package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -51,5 +47,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568 openjpeg-2.3.0.tar.gz -354fb181a25eeabe231d28216bcb8e401648cf8e71ba476cabd25e297f46bbc1ea5b091b4d2d4450501422b8b20649bf109ff5b3f3b49f1492650dbb46ed6e22 fix-include-path.patch" +sha512sums="339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03 openjpeg-2.3.1.tar.gz" diff --git a/user/openjpeg/fix-include-path.patch b/user/openjpeg/fix-include-path.patch deleted file mode 100644 index f5ff1e60d..000000000 --- a/user/openjpeg/fix-include-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openjpeg-2.3.0/cmake/OpenJPEGConfig.cmake.in.old 2017-10-04 22:23:14.000000000 +0000 -+++ openjpeg-2.3.0/cmake/OpenJPEGConfig.cmake.in 2018-09-06 00:53:22.860000000 +0000 -@@ -26,7 +26,7 @@ - if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) - # This is an install tree - include(${SELF_DIR}/OpenJPEGTargets.cmake) -- get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) -+ get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) - set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT}) - - else() diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD index f1d84ba54..552c760c6 100644 --- a/user/openldap/APKBUILD +++ b/user/openldap/APKBUILD @@ -9,7 +9,7 @@ # - CVE-2017-9287 # pkgname=openldap -pkgver=2.4.46 +pkgver=2.4.47 pkgrel=0 pkgdesc="LDAP Server" url="http://www.openldap.org/" @@ -36,7 +36,6 @@ source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tg slapd.initd slapd.confd " -builddir="$srcdir/$pkgname-$pkgver" # SLAPD backends _backends="" @@ -203,7 +202,7 @@ _submv() { done } -sha512sums="eef39d43f04aa09c657a1422cefef060fe00368559ae40d0d97536c08ebeaaa1ab06207b3f121ba6afcde54abdc550027c3505e5217e5fd47ae6f8c001260186 openldap-2.4.46.tgz +sha512sums="d424079e34207e3d24383a2bea70a07ded40714982a6767174d2b2cb208cd94feab5ef12157accae915b8e404e5773a7547aaef65f06b44dc3cc09c6a64d5a11 openldap-2.4.47.tgz 5d34d49eabe7cb66cf8284cc3bd9730fa23df4932df68549e242d250ee50d40c434ae074ebc720d5fbcd9d16587c9333c5598d30a5f1177caa61461ab7771f38 openldap-2.4-ppolicy.patch 44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357 openldap-2.4.11-libldap_r.patch 8c4244d316a05870dd1147b2ab7ddbcfd7626b5dce2f5a0e72f066dc635c2edb4f1ea3be88c6fec2d5ab016001be16bedef70f2ce0695c3cd96f69e1614ff177 fix-manpages.patch diff --git a/user/openttd/APKBUILD b/user/openttd/APKBUILD index 63df0988e..2c185d8cb 100644 --- a/user/openttd/APKBUILD +++ b/user/openttd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openttd -pkgver=1.8.0 +pkgver=1.9.1 pkgrel=0 pkgdesc="Simulation game based on Transport Tycoon Deluxe" url="https://www.openttd.org/en/" @@ -12,9 +12,7 @@ depends="opengfx openmsx opensfx" makedepends="fontconfig-dev freetype-dev icu-dev libpng-dev libxdg-basedir-dev lzo-dev sdl-dev xz-dev zlib-dev" subpackages="$pkgname-doc" -source="https://binaries.openttd.org/releases/1.8.0/openttd-$pkgver-source.tar.xz - icu61.patch - " +source="https://proxy.binaries.openttd.org/openttd-releases/$pkgver/openttd-$pkgver-source.tar.xz" build() { cd "$builddir" @@ -32,5 +30,4 @@ package() { make install } -sha512sums="a2d61b3c94a550c8f3a581127df8c3459b1ddff5ba924942c468cbc70e88e0bf4405cecb68a91243b544ead64f215aa8d489a07b38dce507ae7d59e8ec155d7a openttd-1.8.0-source.tar.xz -db470433bcc68688b1a4cf71a514879c139300a778feb3f832bff0400b578d4b7720df6e259a86013334a661fce56c66d74aaf709d0027cf9638f006bebca10e icu61.patch" +sha512sums="44d907299a14fd09ebff980f7c212bbdbd5def880bc56bfe106c3efa8cb32472bbcafdbb145d3f4340a3bc96179418f78fe2ddc62dd067b464eca73313b477c1 openttd-1.9.1-source.tar.xz" diff --git a/user/openttd/icu61.patch b/user/openttd/icu61.patch deleted file mode 100644 index e4143d82f..000000000 --- a/user/openttd/icu61.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 19076c24c1f3baf2a22d1fa832d5688216cf54a3 Mon Sep 17 00:00:00 2001 -From: Charles Pigott <charlespigott@googlemail.com> -Date: Sun, 8 Apr 2018 01:06:18 +0100 -Subject: [PATCH] Fix #6690: Compilation with ICU 61 - ---- - src/language.h | 2 +- - src/strings.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/language.h b/src/language.h -index d33ba81892..ec241dbd8c 100644 ---- a/src/language.h -+++ b/src/language.h -@@ -105,7 +105,7 @@ extern LanguageList _languages; - extern const LanguageMetadata *_current_language; - - #ifdef WITH_ICU_SORT --extern Collator *_current_collator; -+extern icu::Collator *_current_collator; - #endif /* WITH_ICU_SORT */ - - bool ReadLanguagePack(const LanguageMetadata *lang); -diff --git a/src/strings.cpp b/src/strings.cpp -index 1c539d9343..fd7420259a 100644 ---- a/src/strings.cpp -+++ b/src/strings.cpp -@@ -52,7 +52,7 @@ const LanguageMetadata *_current_language = NULL; ///< The currently loaded lang - TextDirection _current_text_dir; ///< Text direction of the currently selected language. - - #ifdef WITH_ICU_SORT --Collator *_current_collator = NULL; ///< Collator for the language currently in use. -+icu::Collator *_current_collator = NULL; ///< Collator for the language currently in use. - #endif /* WITH_ICU_SORT */ - - static uint64 _global_string_params_data[20]; ///< Global array of string parameters. To access, use #SetDParam. -@@ -1795,7 +1795,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang) - - /* Create a collator instance for our current locale. */ - UErrorCode status = U_ZERO_ERROR; -- _current_collator = Collator::createInstance(Locale(_current_language->isocode), status); -+ _current_collator = icu::Collator::createInstance(icu::Locale(_current_language->isocode), status); - /* Sort number substrings by their numerical value. */ - if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status); - /* Avoid using the collator if it is not correctly set. */ diff --git a/user/phonon-vlc/APKBUILD b/user/phonon-vlc/APKBUILD index 4d1d8a3c2..19a7ec59e 100644 --- a/user/phonon-vlc/APKBUILD +++ b/user/phonon-vlc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=phonon-vlc -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=0 pkgdesc="Phonon backend utilising VLC for media playback" url="https://www.kde.org/" @@ -10,9 +10,9 @@ license="LGPL-2.1+" depends="vlc" makedepends="cmake extra-cmake-modules qt5-qtbase-dev phonon-dev vlc-dev" source="https://download.kde.org/stable/phonon/phonon-backend-vlc/$pkgver/phonon-backend-vlc-$pkgver.tar.xz" +builddir="$srcdir/phonon-backend-vlc-$pkgver" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,13 +29,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="fa94298a8236c29f792285d3f288140d244e0eacba02511a32ee56b5bace50f92a93a714b5c44dc5bafb15b2a9d5ae792231e78dce8ca1a45ab3a328492911df phonon-backend-vlc-0.10.1.tar.xz" +sha512sums="3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5 phonon-backend-vlc-0.10.2.tar.xz" diff --git a/user/phonon/APKBUILD b/user/phonon/APKBUILD index af4ac50f5..c89f68a37 100644 --- a/user/phonon/APKBUILD +++ b/user/phonon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=phonon -pkgver=4.10.1 +pkgver=4.10.2 pkgrel=0 pkgdesc="Qt library for playing multimedia files" url="https://phonon.kde.org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-designer" source="https://download.kde.org/stable/phonon/$pkgver/phonon-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -34,12 +33,10 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -52,4 +49,4 @@ designer() { rmdir "$pkgdir"/usr/lib/qt5/plugins || true # Never mind } -sha512sums="a1cc0960c587d09a2fb0f43ae82147df133c34cba7bf01f5720b4b27aca4dda1d83444e89e40fb2f25828d152f89ccfff56d2d4649007c57b7df9eca8c64c007 phonon-4.10.1.tar.xz" +sha512sums="205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e phonon-4.10.2.tar.xz" diff --git a/user/physfs/APKBUILD b/user/physfs/APKBUILD index 4c9fde504..86f57e0cc 100644 --- a/user/physfs/APKBUILD +++ b/user/physfs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=physfs -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=0 pkgdesc="Library to access various archives for game engines" url="https://www.icculus.org/physfs" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-tools" source="https://icculus.org/physfs/downloads/physfs-$pkgver.tar.bz2" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,12 +28,10 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -44,4 +41,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="ddf3b075ccb506da5e9a1ce96001be402752b9b777c2e816a85d48aff3626ff0886ea43eb07bd300fe3a9f59b9a002f54d822c51d483a4ee94b38378534c1879 physfs-3.0.1.tar.bz2" +sha512sums="4024b6c3348e0b6fc1036aac330192112dfe17de3e3d14773be9f06e9a062df5a1006869f21162b4e0b584989f463788a35e64186b1913225c073fea62754472 physfs-3.0.2.tar.bz2" diff --git a/user/pixman/APKBUILD b/user/pixman/APKBUILD index 332cc576d..0e545f547 100644 --- a/user/pixman/APKBUILD +++ b/user/pixman/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pixman -pkgver=0.38.0 +pkgver=0.38.4 pkgrel=0 pkgdesc="Low-level pixel manipulation library" url="https://www.X.Org/" @@ -31,5 +31,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f2279a30947df0c75064fdc36c3e0b735d9392d516191d99a9a66c9bae86778c538a552f1bf9eb75cdbd141891e3addb4836b37ef1553bc6d55285f214311b78 pixman-0.38.0.tar.bz2 +sha512sums="0683b7f67caa0881b23188b7e6f8487c7e0a1257a912686616b7d862efd5a9efdb51641c81ec54905a6f6b1029d796ca4e25c0909db28fc29fa3617bf09f9cf9 pixman-0.38.4.tar.bz2 3d75e7328e6eaaa6e8f4defa4402db815764369f94b81be38fba07933267fe24b03b591dd4c3f3544cb090650153728bfbdd81a91acaf19524c3d08f61427f63 stacksize-reduction.patch" diff --git a/user/powerpc-utils/APKBUILD b/user/powerpc-utils/APKBUILD index 878466c74..c16fd2d05 100644 --- a/user/powerpc-utils/APKBUILD +++ b/user/powerpc-utils/APKBUILD @@ -1,20 +1,18 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=powerpc-utils -pkgver=1.3.5 +pkgver=1.3.6 pkgrel=0 pkgdesc="Maintenance utilities for PowerPC computers" -url="https://github.com/nfont/powerpc-utils" +url="https://github.com/ibm-power-utilities/powerpc-utils" arch="ppc ppc64 ppc64le" options="!check" # No test suite. license="GPL-2.0+" depends="bash bc" makedepends="autoconf automake zlib-dev" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/nfont/$pkgname/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/ibm-power-utilities/$pkgname/archive/v$pkgver.tar.gz" build() { - cd "$builddir" - ./autogen.sh ./configure \ --build=$CBUILD \ @@ -26,8 +24,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="a01f8fc45abd91d0629f8f48e3c2877a863aa1f244907bb65fcc457c2c933e7043181666c237956723f956b7c3d7ce7a0cedc36eaf26ce3cf777aa8f0525244d powerpc-utils-1.3.5.tar.gz" +sha512sums="a30516ccdfe19a198cd5c1a7ad3646d15b599fb40f772cbc7ac95c6d3b364575a3ebb16708022886ba3bcd3184070a3f4d72b649427879fcdd2655406470e977 powerpc-utils-1.3.6.tar.gz" diff --git a/user/py3-cffi/APKBUILD b/user/py3-cffi/APKBUILD index 9c7e1124c..90d72670f 100644 --- a/user/py3-cffi/APKBUILD +++ b/user/py3-cffi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-cffi -pkgver=1.11.5 +pkgver=1.12.2 pkgrel=0 pkgdesc="Interface for Python to call in to C code" url="https://cffi.readthedocs.io/" @@ -11,22 +11,19 @@ depends="python3 py3-cparser" makedepends="libffi-dev python3-dev" checkdepends="py3-pytest" subpackages="" -source="https://files.pythonhosted.org/packages/e7/a7/4cd50e57cc6f436f1cc3a7e8fa700ff9b8b4d471620629074913e3735fb2/cffi-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/64/7c/27367b38e6cc3e1f49f193deb761fe75cda9f95da37b67b422e62281fcac/cffi-1.12.2.tar.gz" builddir="$srcdir/cffi-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="6770d5293cfd7405e733d60c96655641b5bcc5878fc66a737f4a8308f465d459ee0e3fcaa47893d8f57fb195e5534dd7e4728c868f33d7e657688f45e1fb1880 cffi-1.11.5.tar.gz" +sha512sums="af4fe47cf5d6f1126222898365cfa21e9f11d0e71b87d869014dbb37af30dca9ddf50c989030d0f610f50e8099e8dfd08a688d8c3629abbcc4f0294f5f91b817 cffi-1.12.2.tar.gz" diff --git a/user/py3-commonmark/APKBUILD b/user/py3-commonmark/APKBUILD new file mode 100644 index 000000000..90bc7fe56 --- /dev/null +++ b/user/py3-commonmark/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-commonmark +_pkgname=commonmark +pkgver=0.8.1 +pkgrel=0 +pkgdesc="Python parser for the CommonMark Markdown flavour" +url="https://pypi.org/project/CommonMark/" +arch="noarch" +license="BSD-3-Clause" +depends="python3" +makedepends="" +subpackages="" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + PYTHONPATH=. python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="dbab51d45c1973a8d0906148d785fb8ddc2b52177dfe0e69fe79bef2a5eb05a5a7ab8693852f4aaa8545af19d741569d04a24f06ea65171e6e80d9f66af47fdf commonmark-0.8.1.tar.gz" diff --git a/user/py3-lxml/APKBUILD b/user/py3-lxml/APKBUILD index 69e4721e7..fd522ca47 100644 --- a/user/py3-lxml/APKBUILD +++ b/user/py3-lxml/APKBUILD @@ -3,25 +3,24 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-lxml _pkgname=lxml -pkgver=4.2.5 +pkgver=4.3.3 pkgrel=0 pkgdesc="Python LXML Library" url="https://lxml.de/" arch="all" -license="BSD-3-Clause" options="!check" # No test suite. +license="BSD-3-Clause" +depends="" makedepends="python3-dev libxml2-dev libxslt-dev" source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="4cf336d3e1471e8a26492760a143881517d12eb1c2dad82f8786540471bfabd68f8c795d97b7362166418c2be3c7996816638fdbd5a594536b9981478b90fdfe lxml-4.2.5.tar.gz" +sha512sums="cbc1cd30bac4b9ac845d99949c8c231a7870398f942695df5a00586d70d0f6b6ebd457a1a9306806af7d0fd521a14c54d266902943263927a0d940abc3cdf5c0 lxml-4.3.3.tar.gz" diff --git a/user/py3-mako/APKBUILD b/user/py3-mako/APKBUILD index ac08c1f47..9cb68ea75 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.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="Fast templating language for Python" url="http://www.makotemplates.org/" @@ -10,23 +10,21 @@ arch="noarch" license="MIT" depends="python3" makedepends="python3-dev" -checkdepends="py3-pluggy py3-py py3-pytest py3-six" +checkdepends="py3-markupsafe py3-mock py3-pbr py3-pluggy py3-py py3-pytest + py3-six" source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="d67af6788bf8603010361ce8b6d0355b0191657c07f3b5845f9d5e91653c3e349a7b35d5b36aa9c7f291973c83911ce94075e1cad78e6935d0ed4ee9c6e2a571 Mako-1.0.7.tar.gz" +sha512sums="84da36cf798421528156a93c1b722fe604df5811a9db66244a9085af9ae17ce13d1e8057b3e53aa1af61acf457ce9d13ae240ebade3a7e60ea3cde1f1d9bf264 Mako-1.0.8.tar.gz" diff --git a/user/py3-recommonmark/APKBUILD b/user/py3-recommonmark/APKBUILD new file mode 100644 index 000000000..2b0d6db68 --- /dev/null +++ b/user/py3-recommonmark/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-recommonmark +_pkgname=recommonmark +pkgver=0.5.0 +pkgrel=0 +pkgdesc="Bridge between CommonMark and docutils" +url="https://pypi.org/project/recommonmark/" +arch="noarch" +options="!check" # Test data not shipped with tarball +license="MIT" +depends="python3 py3-commonmark py3-docutils py3-sphinx" +checkdepends="py3-future" +makedepends="" +subpackages="" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="581b3492e082ab4f0a53e50df0c9cfa3badda7ba9ee28dadbea85c55de96304257790e6aa06ebc793fba1d9ac399ce470fe821492106150b3a0db10dc734ee4b recommonmark-0.5.0.tar.gz" diff --git a/user/py3-sphinx-rtd-theme/APKBUILD b/user/py3-sphinx-rtd-theme/APKBUILD new file mode 100644 index 000000000..58f55ff89 --- /dev/null +++ b/user/py3-sphinx-rtd-theme/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-sphinx-rtd-theme +_pkgname=sphinx_rtd_theme +pkgver=0.4.3 +pkgrel=0 +pkgdesc="Sphinx documentation theme: Read the Docs" +url="https://pypi.org/project/sphinx-rtd-theme/" +arch="noarch" +license="MIT" +depends="python3 py3-sphinx" +checkdepends="py3-pytest" +makedepends="" +subpackages="" +source="https://files.pythonhosted.org/packages/source/s/sphinx-rtd-theme/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="44b9309ddd041181542747c70b6e180c07aaf8cd7ee9e4c7eb9e3948685b8bd578e815c022bd991cc7f4bc7d02bb3c7a6d213e5d0c2e8214aa85d50b73e53853 sphinx_rtd_theme-0.4.3.tar.gz" diff --git a/user/quaternion/APKBUILD b/user/quaternion/APKBUILD index 363e30f5c..47ad7253b 100644 --- a/user/quaternion/APKBUILD +++ b/user/quaternion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=quaternion -pkgver=0.0.9.3 +pkgver=0.0.9.4_rc2 pkgrel=0 pkgdesc="Qt5-based Matrix chat client" url="https://matrix.org/docs/projects/client/quaternion.html" @@ -9,13 +9,12 @@ arch="all" license="GPL-3.0+" depends="qt5-qtquickcontrols" makedepends="cmake libqmatrixclient-dev qt5-qtbase-dev qt5-qtdeclarative-dev - qt5-qttools-dev" + qt5-qtmultimedia-dev qt5-qttools-dev" subpackages="" -source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/v$pkgver.tar.gz" -builddir="$srcdir/Quaternion-$pkgver" +source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/${pkgver/_/-}.tar.gz" +builddir="$srcdir/Quaternion-${pkgver/_/-}" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,13 +29,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3836338cddc674b3a8b6e7d8376f0136db5c548788a0e56f27023fe7b238e2c07d77bf5e5b50e49cdb011c61f05700818b6a22a394ee8d52015f5f32b3fe4d47 quaternion-0.0.9.3.tar.gz" +sha512sums="543e760fb92ed8a94f124ba6b7de93633a2e074c977ffb5227e17251ac1b483978ef7c54ccbcf3662d0ffb7fa5dd0a418a10bc9360072a58fe3f3dc38cf6dd47 quaternion-0.0.9.4_rc2.tar.gz" diff --git a/user/scons/APKBUILD b/user/scons/APKBUILD index c3ebf5694..b2c55c08d 100644 --- a/user/scons/APKBUILD +++ b/user/scons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=scons -pkgver=3.0.4 +pkgver=3.0.5 pkgrel=0 pkgdesc="Python-based software building system" url="https://scons.org/" @@ -15,19 +15,16 @@ source="https://prdownloads.sourceforge.net/scons/scons-$pkgver.tar.gz " build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py check } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="064a604939460fa85aa247776e5a2083ce98cac5f49f6035886d207f5cf167255756ee10cc00dd8228278d0d1efbed2afd8793bf3ca736a3ac970fabc3c4b627 scons-3.0.4.tar.gz +sha512sums="0477038b014674049f12899b64584d44a85283d521b2422561e42020a5ae296a5af005684087c3ff410ed3fcbdcc5ff61998bc429eb29513f2a864138ffc4945 scons-3.0.5.tar.gz cb8be26f0d8cae7974dffcb3008c67254e8904bb8bb91f9732dd01a9942e33d57527101ec4104a866061096b991a336d00b344da48cf835489fc5d26fb1f331e python3-bang.patch" diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD index 954f978d8..94f03db23 100644 --- a/user/sddm/APKBUILD +++ b/user/sddm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sddm -pkgver=0.18.0 +pkgver=0.18.1 pkgrel=0 pkgdesc="Simple Desktop Display Manager" url="https://github.com/sddm/sddm/" @@ -23,7 +23,6 @@ source="https://github.com/sddm/sddm/releases/download/v$pkgver/sddm-$pkgver.tar xdm.confd" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -42,12 +41,10 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -57,7 +54,7 @@ xdm() { install -D -m644 "$srcdir"/xdm.confd "$subpkgdir"/etc/conf.d/xdm } -sha512sums="359ea6060d02bcc1c810c8338b836f1c8e76d7e3ec132c4ed2327374f4e52b8a56884626dd2d0df87465137b275deba7b6c48b2e992aafed4375f0929fafda6f sddm-0.18.0.tar.xz +sha512sums="ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 sddm-0.18.1.tar.xz 075e3baf24606cdea620737dbc00f7cf5c487ab6d88e37b23a581afcfbcf872c379753c89c80ad5c90c28fa27d3e5c5df64d4fd30764fdbfc0586e0f26666fe1 ck2-support.patch f0b4eb7ef0581701157f9decc637629156f36f6711b9a4bae517f94d7a1df614c81bbd891c918f07ac50e2a3d1519c43ccb9eefd80282c95dd79eca0e8d90904 pam-path-fix.patch c42d8b3edbc0ae7e3d5ea7bb0080c5c50e0569f0ea947e1ba17bc794c8c0d67a214e62aad7eba0a51791c44b29a3017692bbe738250c63cb2219891bb1313422 utmpx.patch diff --git a/user/shared-mime-info/APKBUILD b/user/shared-mime-info/APKBUILD index e28f8915f..3e132dee4 100644 --- a/user/shared-mime-info/APKBUILD +++ b/user/shared-mime-info/APKBUILD @@ -1,20 +1,19 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=shared-mime-info -pkgver=1.10 +pkgver=1.12 pkgrel=0 pkgdesc="MIME database for desktop software" url="https://freedesktop.org/wiki/Software/shared-mime-info" arch="all" license="GPL-2.0+" +depends="" makedepends="glib-dev intltool libxml2-dev libxml2-utils" -depends= +subpackages="$pkgname-doc $pkgname-lang" install="$pkgname.post-deinstall" triggers="$pkgname.trigger=/usr/share/mime" -subpackages="$pkgname-doc $pkgname-lang" -source="https://freedesktop.org/~hadess/$pkgname-$pkgver.tar.xz" +source="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ac_cv_func_fdatasync=no ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } -sha512sums="efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda shared-mime-info-1.10.tar.xz" +sha512sums="c9db138586fe4c789b5a89d3cdcf865d5b3258241accd254deecd7665e8b51fc538adeaeeda4fe332474f7d7ffa84f101cba26539a58e134201673d6d1495a2f shared-mime-info-1.12.tar.xz" diff --git a/user/speech-dispatcher/APKBUILD b/user/speech-dispatcher/APKBUILD index b35da35bd..8c12dd18f 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.8.8 +pkgver=0.9.0 pkgrel=0 pkgdesc="High-level interface to speech synthesis libraries" url="https://freebsoft.org/speechd" @@ -11,10 +11,9 @@ depends="flite" makedepends="alsa-lib-dev dotconf-dev flite-dev glib-dev intltool libsndfile-dev pulseaudio-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://freebsoft.org/pub/projects/speechd/speech-dispatcher-$pkgver.tar.gz" +source="https://github.com/brailcom/speechd/releases/download/$pkgver/speech-dispatcher-$pkgver.tar.gz" build() { - cd "$builddir" LIBS="-lasound" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,17 +21,18 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var + # gettext-tiny :( + cp src/api/python/speechd_config/speechd.desktop.in \ + src/api/python/speechd_config/speechd.desktop make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="7c7b9bf9b9ce541e790b5ae396cb614616c6b3883e75c0258603e91bf679850e3d63a6251daa3a1819b30d7518e3f552c83fe87b006274ffe1aa0f7e19c0b99b speech-dispatcher-0.8.8.tar.gz" +sha512sums="d72542531f58954e424d1cf956f6cb4fd42d585a1d4b955b13e8a426729a06407cf4085b2b4885eac110d36216c9a8403d37b401eca5c2398011786bdf041083 speech-dispatcher-0.9.0.tar.gz" diff --git a/user/spice-protocol/APKBUILD b/user/spice-protocol/APKBUILD index 33dd1bdb2..e31c8544a 100644 --- a/user/spice-protocol/APKBUILD +++ b/user/spice-protocol/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spice-protocol -pkgver=0.12.14 +pkgver=0.14.0 pkgrel=0 pkgdesc="Spice protocol header files" url="https://www.spice-space.org/" @@ -9,11 +9,10 @@ arch="noarch" license="BSD-3-Clause AND LGPL-2.1+" depends="" makedepends="" -source="https://www.spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2 - " +subpackages="" +source="https://www.spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,13 +21,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make pkgconfigdir=/usr/lib/pkgconfig DESTDIR="$pkgdir" install } -sha512sums="4266bcbef9f641a97a2ff72f1b01380a41e51f4b1a0dbb73fdf68baf552598a62d5cf0c526adf2997a55ee5d4fe9392927c3d7f4556827bfb2933f59bfab55bb spice-protocol-0.12.14.tar.bz2" +sha512sums="797df5f529731e9fd395b5946af2490ecf02c26982cc4a0aef24c1766887a35222f68525a996f8bc7459c2c4a25fde0c9a10c489ee6cab6eed7a68a9b5d90f76 spice-protocol-0.14.0.tar.bz2" diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD index 3d9a96a68..1d034aff3 100644 --- a/user/subversion/APKBUILD +++ b/user/subversion/APKBUILD @@ -1,25 +1,37 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=subversion -pkgver=1.10.4 +pkgver=1.11.1 pkgrel=0 pkgdesc="Version control system from 2000" url="https://subversion.apache.org/" arch="all" +options="!check" # Test suite no longer works with Python 3: + # https://issues.apache.org/jira/browse/SVN-4811 license="Apache-2.0" depends="" depends_dev="apr-dev apr-util-dev linux-headers" makedepends="apr-dev apr-util-dev cyrus-sasl-dev db-dev dbus-dev file-dev kdelibs4support-dev kwallet-dev libsecret-dev lz4-dev openssl-dev - serf-dev sqlite-dev utf8proc-dev zlib-dev" + serf-dev sqlite-dev utf8proc-dev zlib-dev autoconf automake python3" subpackages="$pkgname-dev $pkgname-doc $pkgname-gnome $pkgname-kwallet $pkgname-lang" source="https://www-eu.apache.org/dist/subversion/subversion-$pkgver.tar.bz2 + apr-1.7.0.patch python3-bang.patch " build() { - cd "$builddir" + # this is only needed for autogen.sh + _PATH=$PATH + ln -s /usr/bin/python3 "$srcdir"/python + export PATH=$srcdir:$PATH + ./autogen.sh + rm "$srcdir"/python + export PATH=$_PATH + # this is needed to fix the apr issue as well as the patch + # https://issues.apache.org/jira/browse/SVN-4813 + export CPPFLAGS="$CPPFLAGS -P" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +44,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" -j1 install } @@ -54,5 +64,6 @@ kwallet() { mv "$pkgdir"/usr/lib/libsvn_auth_kwallet* "$subpkgdir"/usr/lib/ } -sha512sums="c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434 subversion-1.10.4.tar.bz2 +sha512sums="2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d subversion-1.11.1.tar.bz2 +71b22f08a972a51347af00f979c4ec540c5795b44f3ced07ab2fcf8b1294b59add945983af4a63815d9f5d3b0ba88c24320cf2ec21189bf48c0ec46c7c0b48cf apr-1.7.0.patch 1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a python3-bang.patch" diff --git a/user/subversion/apr-1.7.0.patch b/user/subversion/apr-1.7.0.patch new file mode 100644 index 000000000..a74e5e454 --- /dev/null +++ b/user/subversion/apr-1.7.0.patch @@ -0,0 +1,18 @@ +--- subversion-1.11.1/build/ac-macros/swig.m4 ++++ subversion-1.11.1/build/ac-macros/swig.m4 +@@ -137,13 +137,13 @@ + AC_CACHE_CHECK([for apr_int64_t Python/C API format string], + [svn_cv_pycfmt_apr_int64_t], [ + if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd], ++ AC_EGREP_CPP([MaTcHtHiS +\"ll(\" *\")?d\" +EnDeNd], + [#include <apr.h> + MaTcHtHiS APR_INT64_T_FMT EnDeNd], + [svn_cv_pycfmt_apr_int64_t="L"]) + fi + if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r ++ AC_EGREP_CPP([MaTcHtHiS +\"l(\" *\")?d\" +EnDeNd],r + [#include <apr.h> + MaTcHtHiS APR_INT64_T_FMT EnDeNd], + [svn_cv_pycfmt_apr_int64_t="l"]) diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD index 0e8d933fb..33cad700d 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.3 -pkgrel=1 +pkgver=3.1.4 +pkgrel=0 pkgdesc="Collection manager" url="http://tellico-project.org/" arch="all" @@ -22,7 +22,6 @@ source="http://tellico-project.org/files/tellico-$pkgver.tar.xz " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -38,7 +37,6 @@ build() { } check() { - cd "$builddir" # imagejob: needs running X11 # htmlexporter: needs plasma desktop # filelisting: needs dbus @@ -47,9 +45,8 @@ check() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9024f423f0685e834ed46e7038c5b95fab5b684aaac00d6298e23493fb4290daeda994faf36a0f04973093a477be5506591e6b0e7f57ef5591fb10953ad8ec5e tellico-3.1.3.tar.xz +sha512sums="d09183bee13ae9f7c6c5114b76eeeb959a184def559ae239bb880ef9be964e33878530e9c4c0d3baa6f872bf8db155dffb94592e3a857623ab131d2f28f1f139 tellico-3.1.4.tar.xz 4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch" diff --git a/user/tinyxml2/APKBUILD b/user/tinyxml2/APKBUILD new file mode 100644 index 000000000..b210bfb7d --- /dev/null +++ b/user/tinyxml2/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=tinyxml2 +pkgver=7.0.1 +pkgrel=0 +pkgdesc="Small, efficient C++ XML parser" +url=" " +arch="all" +license="Zlib" +depends="" +makedepends="" +subpackages="$pkgname-dev" +source="tinyxml2-$pkgver.tar.gz::https://github.com/leethomason/tinyxml2/archive/$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="623cd7eff542d20b434a67111ac98110101c95a18767318bf906e5e56d8cc25622269f740f50477fe907a4c52d875b614cb6167f4760d42ab18dc55b9d4bf380 tinyxml2-7.0.1.tar.gz" diff --git a/user/trigger-rally/APKBUILD b/user/trigger-rally/APKBUILD index 3b1c6c29d..07e4de092 100644 --- a/user/trigger-rally/APKBUILD +++ b/user/trigger-rally/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=trigger-rally -pkgver=0.6.5 +pkgver=0.6.6.1 pkgrel=0 pkgdesc="Fast-paced rally racing game" url="http://trigger-rally.sourceforge.net/" @@ -10,7 +10,7 @@ options="!check" # No test suite. license="GPL-2.0-only" depends="" makedepends="freealut-dev glew-dev glu-dev openal-soft-dev physfs-dev sdl2-dev - sdl2_image-dev" + sdl2_image-dev tinyxml2-dev" subpackages="$pkgname-doc" source="https://downloads.sourceforge.net/trigger-rally/trigger-rally-$pkgver.tar.gz dont-strip.patch @@ -39,6 +39,6 @@ package() { "$pkgdir"/usr/share/icons/hicolor/scalable/apps/trigger.svg } -sha512sums="59f48c116b20e47559b4c07107fa4055a9ad516e9c147763e4ba5d2ead3a4a5101f7d690483a1ef0df847ca647c0f750937512ee579f4ae06908157d9eabf184 trigger-rally-0.6.5.tar.gz +sha512sums="feed805858ef63907bb10088761f1219b22fe55ead268511ef73b18aa0f18d79e87d4e2cbfb76361b1dec3949b59464af33efe31e81f06ae7e163430f3336669 trigger-rally-0.6.6.1.tar.gz a81781058177e012daaad58d72e4bdbdbc2730b1df76941ba03f06367545b213ba82a33bab46deba31570973deb1802a3d459704c3a963c38eec69ef82f228d5 dont-strip.patch -807f0c99cc148e34cfe29af13f62375ee7f79f079f29cfda3b90045e0ad8676944d9e8031ab7037429a93d7547da53740e8ce002c4d3c46d93c3d8c9eb2e4ae9 trigger-rally.desktop" +ddaf7d89353280f7952d6cffd06182ea28640473e18eff06809c48477349248f57922eaff9bf816261c32f8fdc167d933f345422f9885638041dd9f5e5ac0524 trigger-rally.desktop" diff --git a/user/trigger-rally/trigger-rally.desktop b/user/trigger-rally/trigger-rally.desktop index 74b67da0f..5802b2fee 100644 --- a/user/trigger-rally/trigger-rally.desktop +++ b/user/trigger-rally/trigger-rally.desktop @@ -5,4 +5,4 @@ Name=Trigger Comment=Fast-paced rally racing game Icon=trigger Exec=/usr/games/trigger-rally -Category=Game;Simlulation +Categories=Game;Simulation; diff --git a/user/udisks2/APKBUILD b/user/udisks2/APKBUILD index 66af86bad..2374ff4ea 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.1 +pkgver=2.8.2 pkgrel=0 pkgdesc="A Disk Manager" url="https://www.freedesktop.org/wiki/Software/udisks" @@ -18,7 +18,6 @@ source="https://github.com/storaged-project/udisks/releases/download/udisks-$pkg builddir="$srcdir"/udisks-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,16 +27,16 @@ build() { --infodir=/usr/share/info \ --localstatedir=/var \ --enable-compile-warnings=minimum + cp "$builddir"/data/org.freedesktop.UDisks2.policy.in \ + "$builddir"/data/org.freedesktop.UDisks2.policy make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -50,5 +49,5 @@ libs() { "$subpkgdir"/usr/lib/ } -sha512sums="a3c7d26cd1bbd9cce59b25d118076c34482a698d7dca9e0468b6f9c928f40c8dbdd0b1cb61cf288ae77151643dc4a3eacf31e22af2c7b35a2828e49ee335e70b udisks-2.8.1.tar.bz2 +sha512sums="dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a udisks-2.8.2.tar.bz2 269ba55cc755e2a484670258bc530790691b66c9fce9479a2a17d78cff5d52dd1be89290979efd44a0ba82be665f52a356a57f2cbb67951d91fe09d4e24c2a6a O_CLOEXEC.patch" diff --git a/user/upower/APKBUILD b/user/upower/APKBUILD index 05c783cee..ea8652b3e 100644 --- a/user/upower/APKBUILD +++ b/user/upower/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=upower -pkgver=0.99.9 +pkgver=0.99.10 pkgrel=0 pkgdesc="Power Management Services" url="https://upower.freedesktop.org" @@ -11,10 +11,9 @@ depends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" makedepends="dbus-glib-dev docbook-xsl gobject-introspection-dev gtk+-dev intltool libgudev-dev libusb-dev libxslt linux-headers polkit-dev" -source="https://gitlab.freedesktop.org/upower/upower/uploads/2282c7c0e53fb31816b824c9d1f547e8/upower-0.99.9.tar.xz" +source="https://gitlab.freedesktop.org/upower/upower/uploads/c438511024b9bc5a904f8775cfc8e4c4/upower-0.99.10.tar.xz" build() { - cd "$builddir" DATADIRNAME=share ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,13 +27,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f upower-0.99.9.tar.xz" +sha512sums="aefe1b2ff5a390f1ea9676fe7e753750bebc56034365a9183e946a8463904047da0a4ac71340eb2efedc16bce6f6d9ef4609ddca37dc1fc31b56bcdbfbbfa59d upower-0.99.10.tar.xz" diff --git a/user/utf8proc/APKBUILD b/user/utf8proc/APKBUILD index 8be033ef7..8b3234adb 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.2.0 +pkgver=2.3.0 pkgrel=0 pkgdesc="C library for processing UTF-8 data" url=" " @@ -13,7 +13,6 @@ subpackages="$pkgname-dev" source="utf8proc-$pkgver.tar.gz::https://github.com/JuliaStrings/utf8proc/archive/v$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare mkdir build } @@ -43,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ae19287e33bc4807475063963557c4d1d2f7d95577d61882ba8df380883662860eeb868e7391ac1b8111614ca2c1855f631925ade6eaa827d07d28cc4cdbab9c utf8proc-2.2.0.tar.gz" +sha512sums="3935cd280e14ed570caa89a983b2d56a981e74da9298a1ea26064da78ece288ff48a73306446d3e1d777e6ecd8ea881f7a29169eaae2153cb015daefb8df8656 utf8proc-2.3.0.tar.gz" diff --git a/user/uwsgi/APKBUILD b/user/uwsgi/APKBUILD index 3ec869b6e..c009e1ff2 100644 --- a/user/uwsgi/APKBUILD +++ b/user/uwsgi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=uwsgi -pkgver=2.0.17.1 +pkgver=2.0.18 pkgrel=0 pkgdesc="Web application server" url="https://projects.unbit.it/uwsgi" @@ -20,8 +20,6 @@ done source="https://projects.unbit.it/downloads/uwsgi-$pkgver.tar.gz" build() { - cd "$builddir" - echo 'plugin_dir = /usr/lib/uwsgi/plugins' >> buildconf/core.ini echo 'plugin_build_dir = .' >> buildconf/core.ini @@ -34,12 +32,10 @@ build() { } check() { - cd "$builddir" python3 uwsgiconfig.py --check } package() { - cd "$builddir" install -D -m755 "$builddir"/uwsgi "$pkgdir"/usr/bin/uwsgi } @@ -87,4 +83,4 @@ rack() { _plugpack rack "Ruby Rack" } -sha512sums="10d357961fde3a3f5f8e77986cc647313f95a33243e24c2afc482fce21df68a8ae48f90e7b5b76d7edc3cf8fd474d99823d6d60ef7477349abc65a319222f11b uwsgi-2.0.17.1.tar.gz" +sha512sums="6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61 uwsgi-2.0.18.tar.gz" diff --git a/user/wpa_supplicant/APKBUILD b/user/wpa_supplicant/APKBUILD index 240fb474c..abbcbaff0 100644 --- a/user/wpa_supplicant/APKBUILD +++ b/user/wpa_supplicant/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=wpa_supplicant -pkgver=2.6 -pkgrel=11 +pkgver=2.7 +pkgrel=0 pkgdesc="Utility providing key negotiation for WPA wireless networks" url="https://w1.fi/wpa_supplicant/" arch="all" @@ -12,18 +12,11 @@ subpackages="$pkgname-dbus::noarch $pkgname-doc $pkgname-openrc wpa_gui" depends="" makedepends="linux-headers openssl-dev dbus-dev libnl3-dev qt5-qtbase-dev" source="http://w1.fi/releases/$pkgname-$pkgver.tar.gz - rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch - rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch - rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch - rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch - rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch - rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch - rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch - rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch - wpa_supplicant.initd wpa_supplicant.confd + dbus.patch eloop.patch + undefined-ref.patch config wpa_cli.sh" @@ -41,7 +34,6 @@ source="http://w1.fi/releases/$pkgname-$pkgver.tar.gz # - CVE-2017-13088 prepare() { - cd "$builddir" default_prepare # Copy our configuration file to the build directory @@ -104,17 +96,11 @@ wpa_gui() { install -Dm755 wpa_gui-qt4/wpa_gui "$subpkgdir"/usr/bin/wpa_gui } -sha512sums="46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6 wpa_supplicant-2.6.tar.gz -f855fa792425f175ccc800eb49df42067b1c1f4b52ba2d24160af4dfbb74dcf8e81661b7e6c8d92fa408938b8a559fc74557d1677913e4a751bfd43706c14bb6 rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch -b4e413aa815572ea0002d33d24b69cd499aebb5efebed8fcaade8b29324bb5853a5db64e8b1dfdf24478e02c66196238b81a6ec777a7a28610435dce4d2c344e rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch -a6382d8e84b4829be33c46bf2f4c6f3232c9d924a4547a21dfe023bf5be8ee1c635920295f52be285359efaae95bcc1f12b512659cfd1653b871dd0bea7e5ace rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch -51ed806f0d5b3f588e26d4db4dcfc6be2cfb12002e26893a6cedd62c7cad0d0de75aed4a666223c4877fc1854b08dce6ddf6f6c4cfd752a5d8d58ad4a968b553 rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch -8707a123cd78149dfee9f5bd791761ee1eca605ef96580167044c2339c896920cf0e030b184a5afa9e310f5755afb30bef8ebd4522fc52753f3fbd6acead2cdf rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch -37d050b2e4a3598484912667d8b2705fbe84c5c562267f900d42b0c7b606fb1fed09ddca8b80e2131768baa8f3690aab6ba7a232dee6ff1e66150fdb8816c927 rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch -111e655cfbb3a86e3792040e0ea375490d31c42c9d43cbe911290d54df5f4db437e4c8ad0e937c51729dcefeb0db0989b8ab55b9523398683abd08ebfec18076 rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch -fc84edd8b30305cc42053c872554098f3f077292ec980ed6a442f37884087ff2f055738fd55977ed792bef1887dcc8c4626586465d78dd0258edb83dcd50a65a rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch +sha512sums="8b6eb5b5f30d351c73db63d73c09f24028a18166246539b4a4f89f0d226fb42751afa2ff72296df33317f615150325d285e8e7bda30e0d88abcdc9637ab731d3 wpa_supplicant-2.7.tar.gz 11eed22f6e793f40c788d586c715deecae03c421d11761b7b4a376660bce812c54cc6f353c7d4d5da9c455aeffd778baefb9e76d380027a729574a756e54ddcc wpa_supplicant.initd 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 wpa_supplicant.confd +dac56bc505a51167042ebe548f0e81a20a5578f753af9bb7ec3335a542d799c6e8739681ef7c8f7747a9bc954f8aa6f1a147250eacba17fd7fff80c4e53638ed dbus.patch 2be055dd1f7da5a3d8e79c2f2c0220ddd31df309452da18f290144d2112d6dbde0fc633bb2ad02c386a39d7785323acaf5f70e5969995a1e8303a094eb5fe232 eloop.patch +5e790b3ae50f3d29cb38f73cff30f8994798e7bdbecc9f852def910a8150c1724c051bbb52603fa9c6818c950a5fe347bccd21848427f31f54d641ae40621c3f undefined-ref.patch 221660fa0350442a7d8371686b2118861052a4613fb352b7f80079e3750b82f4e48efc378b9d617455007d1106552b695fdca506a3c338283986641f3848b202 config 45d3e70c47d0f7d6dc6730853af8cbcb40ed0713ee7b1069698f5a635939f273f66e72d4221e064c3c71a92154cf07841c8c0d4fc14d796dbb6fe0d92776ee2b wpa_cli.sh" diff --git a/user/wpa_supplicant/dbus.patch b/user/wpa_supplicant/dbus.patch new file mode 100644 index 000000000..0f340c956 --- /dev/null +++ b/user/wpa_supplicant/dbus.patch @@ -0,0 +1,13 @@ +diff --git a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c +index 45623f3..0fc3d08 100644 +--- a/wpa_supplicant/dbus/dbus_new_helpers.c ++++ b/wpa_supplicant/dbus/dbus_new_helpers.c +@@ -847,7 +847,7 @@ void wpa_dbus_mark_property_changed(struct wpas_dbus_priv *iface, + const struct wpa_dbus_property_desc *dsc; + int i = 0; + +- if (iface == NULL) ++ if (iface == NULL || path == NULL) + return; + + dbus_connection_get_object_path_data(iface->con, path, diff --git a/user/wpa_supplicant/libressl.patch b/user/wpa_supplicant/libressl.patch deleted file mode 100644 index 56146eab5..000000000 --- a/user/wpa_supplicant/libressl.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/src/crypto/crypto_openssl.c.orig -+++ b/src/crypto/crypto_openssl.c -@@ -611,7 +611,7 @@ - - void * dh5_init(struct wpabuf **priv, struct wpabuf **publ) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - DH *dh; - struct wpabuf *pubkey = NULL, *privkey = NULL; - size_t publen, privlen; -@@ -712,7 +712,7 @@ - - void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - DH *dh; - - dh = DH_new(); ---- a/src/crypto/tls_openssl.c.orig -+++ b/src/crypto/tls_openssl.c -@@ -919,7 +919,7 @@ - } - #endif /* OPENSSL_FIPS */ - #endif /* CONFIG_FIPS */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - SSL_load_error_strings(); - SSL_library_init(); - #ifndef OPENSSL_NO_SHA256 -@@ -1043,7 +1043,7 @@ - - tls_openssl_ref_count--; - if (tls_openssl_ref_count == 0) { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #ifndef OPENSSL_NO_ENGINE - ENGINE_cleanup(); - #endif /* OPENSSL_NO_ENGINE */ -@@ -2334,7 +2334,7 @@ - return 0; - - #ifdef PKCS12_FUNCS --#if OPENSSL_VERSION_NUMBER < 0x10002000L -+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) - /* - * Clear previously set extra chain certificates, if any, from PKCS#12 - * processing in tls_parse_pkcs12() to allow OpenSSL to build a new diff --git a/user/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/user/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch deleted file mode 100644 index 727684865..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch +++ /dev/null @@ -1,174 +0,0 @@ -From cf4cab804c7afd5c45505528a8d16e46163243a2 Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> -Date: Fri, 14 Jul 2017 15:15:35 +0200 -Subject: [PATCH 1/8] hostapd: Avoid key reinstallation in FT handshake - -Do not reinstall TK to the driver during Reassociation Response frame -processing if the first attempt of setting the TK succeeded. This avoids -issues related to clearing the TX/RX PN that could result in reusing -same PN values for transmitted frames (e.g., due to CCM nonce reuse and -also hitting replay protection on the receiver) and accepting replayed -frames on RX side. - -This issue was introduced by the commit -0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in -authenticator') which allowed wpa_ft_install_ptk() to be called multiple -times with the same PTK. While the second configuration attempt is -needed with some drivers, it must be done only if the first attempt -failed. - -Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> ---- - src/ap/ieee802_11.c | 16 +++++++++++++--- - src/ap/wpa_auth.c | 11 +++++++++++ - src/ap/wpa_auth.h | 3 ++- - src/ap/wpa_auth_ft.c | 10 ++++++++++ - src/ap/wpa_auth_i.h | 1 + - 5 files changed, 37 insertions(+), 4 deletions(-) - -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index 4e04169..333035f 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -1841,6 +1841,7 @@ static int add_associated_sta(struct hostapd_data *hapd, - { - struct ieee80211_ht_capabilities ht_cap; - struct ieee80211_vht_capabilities vht_cap; -+ int set = 1; - - /* - * Remove the STA entry to ensure the STA PS state gets cleared and -@@ -1848,9 +1849,18 @@ static int add_associated_sta(struct hostapd_data *hapd, - * FT-over-the-DS, where a station re-associates back to the same AP but - * skips the authentication flow, or if working with a driver that - * does not support full AP client state. -+ * -+ * Skip this if the STA has already completed FT reassociation and the -+ * TK has been configured since the TX/RX PN must not be reset to 0 for -+ * the same key. - */ -- if (!sta->added_unassoc) -+ if (!sta->added_unassoc && -+ (!(sta->flags & WLAN_STA_AUTHORIZED) || -+ !wpa_auth_sta_ft_tk_already_set(sta->wpa_sm))) { - hostapd_drv_sta_remove(hapd, sta->addr); -+ wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED); -+ set = 0; -+ } - - #ifdef CONFIG_IEEE80211N - if (sta->flags & WLAN_STA_HT) -@@ -1873,11 +1883,11 @@ static int add_associated_sta(struct hostapd_data *hapd, - sta->flags & WLAN_STA_VHT ? &vht_cap : NULL, - sta->flags | WLAN_STA_ASSOC, sta->qosinfo, - sta->vht_opmode, sta->p2p_ie ? 1 : 0, -- sta->added_unassoc)) { -+ set)) { - hostapd_logger(hapd, sta->addr, - HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_NOTICE, - "Could not %s STA to kernel driver", -- sta->added_unassoc ? "set" : "add"); -+ set ? "set" : "add"); - - if (sta->added_unassoc) { - hostapd_drv_sta_remove(hapd, sta->addr); -diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c -index 3587086..707971d 100644 ---- a/src/ap/wpa_auth.c -+++ b/src/ap/wpa_auth.c -@@ -1745,6 +1745,9 @@ int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event) - #else /* CONFIG_IEEE80211R */ - break; - #endif /* CONFIG_IEEE80211R */ -+ case WPA_DRV_STA_REMOVED: -+ sm->tk_already_set = FALSE; -+ return 0; - } - - #ifdef CONFIG_IEEE80211R -@@ -3250,6 +3253,14 @@ int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm) - } - - -+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm) -+{ -+ if (!sm || !wpa_key_mgmt_ft(sm->wpa_key_mgmt)) -+ return 0; -+ return sm->tk_already_set; -+} -+ -+ - int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, - struct rsn_pmksa_cache_entry *entry) - { -diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h -index 0de8d97..97461b0 100644 ---- a/src/ap/wpa_auth.h -+++ b/src/ap/wpa_auth.h -@@ -267,7 +267,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth, - u8 *data, size_t data_len); - enum wpa_event { - WPA_AUTH, WPA_ASSOC, WPA_DISASSOC, WPA_DEAUTH, WPA_REAUTH, -- WPA_REAUTH_EAPOL, WPA_ASSOC_FT -+ WPA_REAUTH_EAPOL, WPA_ASSOC_FT, WPA_DRV_STA_REMOVED - }; - void wpa_remove_ptk(struct wpa_state_machine *sm); - int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event); -@@ -280,6 +280,7 @@ int wpa_auth_pairwise_set(struct wpa_state_machine *sm); - int wpa_auth_get_pairwise(struct wpa_state_machine *sm); - int wpa_auth_sta_key_mgmt(struct wpa_state_machine *sm); - int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm); -+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm); - int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, - struct rsn_pmksa_cache_entry *entry); - struct rsn_pmksa_cache_entry * -diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c -index 42242a5..e63b99a 100644 ---- a/src/ap/wpa_auth_ft.c -+++ b/src/ap/wpa_auth_ft.c -@@ -780,6 +780,14 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) - return; - } - -+ if (sm->tk_already_set) { -+ /* Must avoid TK reconfiguration to prevent clearing of TX/RX -+ * PN in the driver */ -+ wpa_printf(MSG_DEBUG, -+ "FT: Do not re-install same PTK to the driver"); -+ return; -+ } -+ - /* FIX: add STA entry to kernel/driver here? The set_key will fail - * most likely without this.. At the moment, STA entry is added only - * after association has been completed. This function will be called -@@ -792,6 +800,7 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) - - /* FIX: MLME-SetProtection.Request(TA, Tx_Rx) */ - sm->pairwise_set = TRUE; -+ sm->tk_already_set = TRUE; - } - - -@@ -898,6 +907,7 @@ static int wpa_ft_process_auth_req(struct wpa_state_machine *sm, - - sm->pairwise = pairwise; - sm->PTK_valid = TRUE; -+ sm->tk_already_set = FALSE; - wpa_ft_install_ptk(sm); - - buflen = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + -diff --git a/src/ap/wpa_auth_i.h b/src/ap/wpa_auth_i.h -index 72b7eb3..7fd8f05 100644 ---- a/src/ap/wpa_auth_i.h -+++ b/src/ap/wpa_auth_i.h -@@ -65,6 +65,7 @@ struct wpa_state_machine { - struct wpa_ptk PTK; - Boolean PTK_valid; - Boolean pairwise_set; -+ Boolean tk_already_set; - int keycount; - Boolean Pair; - struct wpa_key_replay_counter { --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/user/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch deleted file mode 100644 index 1802d664a..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch +++ /dev/null @@ -1,250 +0,0 @@ -From 927f891007c402fefd1ff384645b3f07597c3ede Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> -Date: Wed, 12 Jul 2017 16:03:24 +0200 -Subject: [PATCH 2/8] Prevent reinstallation of an already in-use group key - -Track the current GTK and IGTK that is in use and when receiving a -(possibly retransmitted) Group Message 1 or WNM-Sleep Mode Response, do -not install the given key if it is already in use. This prevents an -attacker from trying to trick the client into resetting or lowering the -sequence counter associated to the group key. - -Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> ---- - src/common/wpa_common.h | 11 +++++ - src/rsn_supp/wpa.c | 116 ++++++++++++++++++++++++++++++------------------ - src/rsn_supp/wpa_i.h | 4 ++ - 3 files changed, 87 insertions(+), 44 deletions(-) - -diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h -index af1d0f0..d200285 100644 ---- a/src/common/wpa_common.h -+++ b/src/common/wpa_common.h -@@ -217,6 +217,17 @@ struct wpa_ptk { - size_t tk_len; - }; - -+struct wpa_gtk { -+ u8 gtk[WPA_GTK_MAX_LEN]; -+ size_t gtk_len; -+}; -+ -+#ifdef CONFIG_IEEE80211W -+struct wpa_igtk { -+ u8 igtk[WPA_IGTK_MAX_LEN]; -+ size_t igtk_len; -+}; -+#endif /* CONFIG_IEEE80211W */ - - /* WPA IE version 1 - * 00-50-f2:1 (OUI:OUI type) -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 3c47879..95bd7be 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -714,6 +714,15 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - const u8 *_gtk = gd->gtk; - u8 gtk_buf[32]; - -+ /* Detect possible key reinstallation */ -+ if (sm->gtk.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", -+ gd->keyidx, gd->tx, gd->gtk_len); -+ return 0; -+ } -+ - wpa_hexdump_key(MSG_DEBUG, "WPA: Group Key", gd->gtk, gd->gtk_len); - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Installing GTK to the driver (keyidx=%d tx=%d len=%d)", -@@ -748,6 +757,9 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - } - os_memset(gtk_buf, 0, sizeof(gtk_buf)); - -+ sm->gtk.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ - return 0; - } - -@@ -854,6 +866,48 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - } - - -+#ifdef CONFIG_IEEE80211W -+static int wpa_supplicant_install_igtk(struct wpa_sm *sm, -+ const struct wpa_igtk_kde *igtk) -+{ -+ size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); -+ u16 keyidx = WPA_GET_LE16(igtk->keyid); -+ -+ /* Detect possible key reinstallation */ -+ if (sm->igtk.igtk_len == len && -+ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", -+ keyidx); -+ return 0; -+ } -+ -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: IGTK keyid %d pn %02x%02x%02x%02x%02x%02x", -+ keyidx, MAC2STR(igtk->pn)); -+ wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", igtk->igtk, len); -+ if (keyidx > 4095) { -+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -+ "WPA: Invalid IGTK KeyID %d", keyidx); -+ return -1; -+ } -+ if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -+ broadcast_ether_addr, -+ keyidx, 0, igtk->pn, sizeof(igtk->pn), -+ igtk->igtk, len) < 0) { -+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -+ "WPA: Failed to configure IGTK to the driver"); -+ return -1; -+ } -+ -+ sm->igtk.igtk_len = len; -+ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ -+ return 0; -+} -+#endif /* CONFIG_IEEE80211W */ -+ -+ - static int ieee80211w_set_keys(struct wpa_sm *sm, - struct wpa_eapol_ie_parse *ie) - { -@@ -864,30 +918,14 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, - if (ie->igtk) { - size_t len; - const struct wpa_igtk_kde *igtk; -- u16 keyidx; -+ - len = wpa_cipher_key_len(sm->mgmt_group_cipher); - if (ie->igtk_len != WPA_IGTK_KDE_PREFIX_LEN + len) - return -1; -+ - igtk = (const struct wpa_igtk_kde *) ie->igtk; -- keyidx = WPA_GET_LE16(igtk->keyid); -- wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: IGTK keyid %d " -- "pn %02x%02x%02x%02x%02x%02x", -- keyidx, MAC2STR(igtk->pn)); -- wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", -- igtk->igtk, len); -- if (keyidx > 4095) { -- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -- "WPA: Invalid IGTK KeyID %d", keyidx); -- return -1; -- } -- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -- broadcast_ether_addr, -- keyidx, 0, igtk->pn, sizeof(igtk->pn), -- igtk->igtk, len) < 0) { -- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -- "WPA: Failed to configure IGTK to the driver"); -+ if (wpa_supplicant_install_igtk(sm, igtk) < 0) - return -1; -- } - } - - return 0; -@@ -2307,7 +2345,7 @@ void wpa_sm_deinit(struct wpa_sm *sm) - */ - void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - { -- int clear_ptk = 1; -+ int clear_keys = 1; - - if (sm == NULL) - return; -@@ -2333,11 +2371,11 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - /* Prepare for the next transition */ - wpa_ft_prepare_auth_request(sm, NULL); - -- clear_ptk = 0; -+ clear_keys = 0; - } - #endif /* CONFIG_IEEE80211R */ - -- if (clear_ptk) { -+ if (clear_keys) { - /* - * IEEE 802.11, 8.4.10: Delete PTK SA on (re)association if - * this is not part of a Fast BSS Transition. -@@ -2347,6 +2385,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - sm->tptk_set = 0; - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); -+ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+#ifdef CONFIG_IEEE80211W -+ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+#endif /* CONFIG_IEEE80211W */ - } - - #ifdef CONFIG_TDLS -@@ -2877,6 +2919,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) - os_memset(sm->pmk, 0, sizeof(sm->pmk)); - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); -+ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+#ifdef CONFIG_IEEE80211W -+ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+#endif /* CONFIG_IEEE80211W */ - #ifdef CONFIG_IEEE80211R - os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); - os_memset(sm->pmk_r0, 0, sizeof(sm->pmk_r0)); -@@ -2949,29 +2995,11 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - os_memset(&gd, 0, sizeof(gd)); - #ifdef CONFIG_IEEE80211W - } else if (subelem_id == WNM_SLEEP_SUBELEM_IGTK) { -- struct wpa_igtk_kde igd; -- u16 keyidx; -- -- os_memset(&igd, 0, sizeof(igd)); -- keylen = wpa_cipher_key_len(sm->mgmt_group_cipher); -- os_memcpy(igd.keyid, buf + 2, 2); -- os_memcpy(igd.pn, buf + 4, 6); -- -- keyidx = WPA_GET_LE16(igd.keyid); -- os_memcpy(igd.igtk, buf + 10, keylen); -- -- wpa_hexdump_key(MSG_DEBUG, "Install IGTK (WNM SLEEP)", -- igd.igtk, keylen); -- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -- broadcast_ether_addr, -- keyidx, 0, igd.pn, sizeof(igd.pn), -- igd.igtk, keylen) < 0) { -- wpa_printf(MSG_DEBUG, "Failed to install the IGTK in " -- "WNM mode"); -- os_memset(&igd, 0, sizeof(igd)); -+ const struct wpa_igtk_kde *igtk; -+ -+ igtk = (const struct wpa_igtk_kde *) (buf + 2); -+ if (wpa_supplicant_install_igtk(sm, igtk) < 0) - return -1; -- } -- os_memset(&igd, 0, sizeof(igd)); - #endif /* CONFIG_IEEE80211W */ - } else { - wpa_printf(MSG_DEBUG, "Unknown element id"); -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index f653ba6..afc9e37 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -31,6 +31,10 @@ struct wpa_sm { - u8 rx_replay_counter[WPA_REPLAY_COUNTER_LEN]; - int rx_replay_counter_set; - u8 request_counter[WPA_REPLAY_COUNTER_LEN]; -+ struct wpa_gtk gtk; -+#ifdef CONFIG_IEEE80211W -+ struct wpa_igtk igtk; -+#endif /* CONFIG_IEEE80211W */ - - struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ - --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/user/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch deleted file mode 100644 index e2937b851..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch +++ /dev/null @@ -1,184 +0,0 @@ -From 8280294e74846ea342389a0cd17215050fa5afe8 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Sun, 1 Oct 2017 12:12:24 +0300 -Subject: [PATCH 3/8] Extend protection of GTK/IGTK reinstallation of WNM-Sleep - Mode cases - -This extends the protection to track last configured GTK/IGTK value -separately from EAPOL-Key frames and WNM-Sleep Mode frames to cover a -corner case where these two different mechanisms may get used when the -GTK/IGTK has changed and tracking a single value is not sufficient to -detect a possible key reconfiguration. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/rsn_supp/wpa.c | 53 +++++++++++++++++++++++++++++++++++++--------------- - src/rsn_supp/wpa_i.h | 2 ++ - 2 files changed, 40 insertions(+), 15 deletions(-) - -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 95bd7be..7a2c68d 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -709,14 +709,17 @@ struct wpa_gtk_data { - - static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - const struct wpa_gtk_data *gd, -- const u8 *key_rsc) -+ const u8 *key_rsc, int wnm_sleep) - { - const u8 *_gtk = gd->gtk; - u8 gtk_buf[32]; - - /* Detect possible key reinstallation */ -- if (sm->gtk.gtk_len == (size_t) gd->gtk_len && -- os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { -+ if ((sm->gtk.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) || -+ (sm->gtk_wnm_sleep.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk_wnm_sleep.gtk, gd->gtk, -+ sm->gtk_wnm_sleep.gtk_len) == 0)) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", - gd->keyidx, gd->tx, gd->gtk_len); -@@ -757,8 +760,14 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - } - os_memset(gtk_buf, 0, sizeof(gtk_buf)); - -- sm->gtk.gtk_len = gd->gtk_len; -- os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ if (wnm_sleep) { -+ sm->gtk_wnm_sleep.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk_wnm_sleep.gtk, gd->gtk, -+ sm->gtk_wnm_sleep.gtk_len); -+ } else { -+ sm->gtk.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ } - - return 0; - } -@@ -852,7 +861,7 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - (wpa_supplicant_check_group_cipher(sm, sm->group_cipher, - gtk_len, gtk_len, - &gd.key_rsc_len, &gd.alg) || -- wpa_supplicant_install_gtk(sm, &gd, key_rsc))) { -+ wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0))) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "RSN: Failed to install GTK"); - os_memset(&gd, 0, sizeof(gd)); -@@ -868,14 +877,18 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - - #ifdef CONFIG_IEEE80211W - static int wpa_supplicant_install_igtk(struct wpa_sm *sm, -- const struct wpa_igtk_kde *igtk) -+ const struct wpa_igtk_kde *igtk, -+ int wnm_sleep) - { - size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); - u16 keyidx = WPA_GET_LE16(igtk->keyid); - - /* Detect possible key reinstallation */ -- if (sm->igtk.igtk_len == len && -- os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { -+ if ((sm->igtk.igtk_len == len && -+ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) || -+ (sm->igtk_wnm_sleep.igtk_len == len && -+ os_memcmp(sm->igtk_wnm_sleep.igtk, igtk->igtk, -+ sm->igtk_wnm_sleep.igtk_len) == 0)) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", - keyidx); -@@ -900,8 +913,14 @@ static int wpa_supplicant_install_igtk(struct wpa_sm *sm, - return -1; - } - -- sm->igtk.igtk_len = len; -- os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ if (wnm_sleep) { -+ sm->igtk_wnm_sleep.igtk_len = len; -+ os_memcpy(sm->igtk_wnm_sleep.igtk, igtk->igtk, -+ sm->igtk_wnm_sleep.igtk_len); -+ } else { -+ sm->igtk.igtk_len = len; -+ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ } - - return 0; - } -@@ -924,7 +943,7 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, - return -1; - - igtk = (const struct wpa_igtk_kde *) ie->igtk; -- if (wpa_supplicant_install_igtk(sm, igtk) < 0) -+ if (wpa_supplicant_install_igtk(sm, igtk, 0) < 0) - return -1; - } - -@@ -1574,7 +1593,7 @@ static void wpa_supplicant_process_1_of_2(struct wpa_sm *sm, - if (wpa_supplicant_rsc_relaxation(sm, key->key_rsc)) - key_rsc = null_rsc; - -- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc) || -+ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0) || - wpa_supplicant_send_2_of_2(sm, key, ver, key_info) < 0) - goto failed; - os_memset(&gd, 0, sizeof(gd)); -@@ -2386,8 +2405,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - sm->tptk_set = 0; - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); - os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); - #ifdef CONFIG_IEEE80211W - os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); - #endif /* CONFIG_IEEE80211W */ - } - -@@ -2920,8 +2941,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); - os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); - #ifdef CONFIG_IEEE80211W - os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); - #endif /* CONFIG_IEEE80211W */ - #ifdef CONFIG_IEEE80211R - os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); -@@ -2986,7 +3009,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - - wpa_hexdump_key(MSG_DEBUG, "Install GTK (WNM SLEEP)", - gd.gtk, gd.gtk_len); -- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc)) { -+ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 1)) { - os_memset(&gd, 0, sizeof(gd)); - wpa_printf(MSG_DEBUG, "Failed to install the GTK in " - "WNM mode"); -@@ -2998,7 +3021,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - const struct wpa_igtk_kde *igtk; - - igtk = (const struct wpa_igtk_kde *) (buf + 2); -- if (wpa_supplicant_install_igtk(sm, igtk) < 0) -+ if (wpa_supplicant_install_igtk(sm, igtk, 1) < 0) - return -1; - #endif /* CONFIG_IEEE80211W */ - } else { -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index afc9e37..9a54631 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -32,8 +32,10 @@ struct wpa_sm { - int rx_replay_counter_set; - u8 request_counter[WPA_REPLAY_COUNTER_LEN]; - struct wpa_gtk gtk; -+ struct wpa_gtk gtk_wnm_sleep; - #ifdef CONFIG_IEEE80211W - struct wpa_igtk igtk; -+ struct wpa_igtk igtk_wnm_sleep; - #endif /* CONFIG_IEEE80211W */ - - struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch b/user/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch deleted file mode 100644 index 22ee21794..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8f82bc94e8697a9d47fa8774dfdaaede1084912c Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> -Date: Fri, 29 Sep 2017 04:22:51 +0200 -Subject: [PATCH 4/8] Prevent installation of an all-zero TK - -Properly track whether a PTK has already been installed to the driver -and the TK part cleared from memory. This prevents an attacker from -trying to trick the client into installing an all-zero TK. - -This fixes the earlier fix in commit -ad00d64e7d8827b3cebd665a0ceb08adabf15e1e ('Fix TK configuration to the -driver in EAPOL-Key 3/4 retry case') which did not take into account -possibility of an extra message 1/4 showing up between retries of -message 3/4. - -Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> ---- - src/common/wpa_common.h | 1 + - src/rsn_supp/wpa.c | 5 ++--- - src/rsn_supp/wpa_i.h | 1 - - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h -index d200285..1021ccb 100644 ---- a/src/common/wpa_common.h -+++ b/src/common/wpa_common.h -@@ -215,6 +215,7 @@ struct wpa_ptk { - size_t kck_len; - size_t kek_len; - size_t tk_len; -+ int installed; /* 1 if key has already been installed to driver */ - }; - - struct wpa_gtk { -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 7a2c68d..0550a41 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -510,7 +510,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_sm *sm, - os_memset(buf, 0, sizeof(buf)); - } - sm->tptk_set = 1; -- sm->tk_to_set = 1; - - kde = sm->assoc_wpa_ie; - kde_len = sm->assoc_wpa_ie_len; -@@ -615,7 +614,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, - enum wpa_alg alg; - const u8 *key_rsc; - -- if (!sm->tk_to_set) { -+ if (sm->ptk.installed) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Do not re-install same PTK to the driver"); - return 0; -@@ -659,7 +658,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, - - /* TK is not needed anymore in supplicant */ - os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN); -- sm->tk_to_set = 0; -+ sm->ptk.installed = 1; - - if (sm->wpa_ptk_rekey) { - eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL); -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index 9a54631..41f371f 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -24,7 +24,6 @@ struct wpa_sm { - struct wpa_ptk ptk, tptk; - int ptk_set, tptk_set; - unsigned int msg_3_of_4_ok:1; -- unsigned int tk_to_set:1; - u8 snonce[WPA_NONCE_LEN]; - u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */ - int renew_snonce; --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/user/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch deleted file mode 100644 index c19c4c710..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 12fac09b437a1dc8a0f253e265934a8aaf4d2f8b Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Sun, 1 Oct 2017 12:32:57 +0300 -Subject: [PATCH 5/8] Fix PTK rekeying to generate a new ANonce - -The Authenticator state machine path for PTK rekeying ended up bypassing -the AUTHENTICATION2 state where a new ANonce is generated when going -directly to the PTKSTART state since there is no need to try to -determine the PMK again in such a case. This is far from ideal since the -new PTK would depend on a new nonce only from the supplicant. - -Fix this by generating a new ANonce when moving to the PTKSTART state -for the purpose of starting new 4-way handshake to rekey PTK. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/ap/wpa_auth.c | 24 +++++++++++++++++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - -diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c -index 707971d..bf10cc1 100644 ---- a/src/ap/wpa_auth.c -+++ b/src/ap/wpa_auth.c -@@ -1901,6 +1901,21 @@ SM_STATE(WPA_PTK, AUTHENTICATION2) - } - - -+static int wpa_auth_sm_ptk_update(struct wpa_state_machine *sm) -+{ -+ if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) { -+ wpa_printf(MSG_ERROR, -+ "WPA: Failed to get random data for ANonce"); -+ sm->Disconnect = TRUE; -+ return -1; -+ } -+ wpa_hexdump(MSG_DEBUG, "WPA: Assign new ANonce", sm->ANonce, -+ WPA_NONCE_LEN); -+ sm->TimeoutCtr = 0; -+ return 0; -+} -+ -+ - SM_STATE(WPA_PTK, INITPMK) - { - u8 msk[2 * PMK_LEN]; -@@ -2458,9 +2473,12 @@ SM_STEP(WPA_PTK) - SM_ENTER(WPA_PTK, AUTHENTICATION); - else if (sm->ReAuthenticationRequest) - SM_ENTER(WPA_PTK, AUTHENTICATION2); -- else if (sm->PTKRequest) -- SM_ENTER(WPA_PTK, PTKSTART); -- else switch (sm->wpa_ptk_state) { -+ else if (sm->PTKRequest) { -+ if (wpa_auth_sm_ptk_update(sm) < 0) -+ SM_ENTER(WPA_PTK, DISCONNECTED); -+ else -+ SM_ENTER(WPA_PTK, PTKSTART); -+ } else switch (sm->wpa_ptk_state) { - case WPA_PTK_INITIALIZE: - break; - case WPA_PTK_DISCONNECT: --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch b/user/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch deleted file mode 100644 index e1bd5a572..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 6c4bed4f47d1960ec04981a9d50e5076aea5223d Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Fri, 22 Sep 2017 11:03:15 +0300 -Subject: [PATCH 6/8] TDLS: Reject TPK-TK reconfiguration - -Do not try to reconfigure the same TPK-TK to the driver after it has -been successfully configured. This is an explicit check to avoid issues -related to resetting the TX/RX packet number. There was already a check -for this for TPK M2 (retries of that message are ignored completely), so -that behavior does not get modified. - -For TPK M3, the TPK-TK could have been reconfigured, but that was -followed by immediate teardown of the link due to an issue in updating -the STA entry. Furthermore, for TDLS with any real security (i.e., -ignoring open/WEP), the TPK message exchange is protected on the AP path -and simple replay attacks are not feasible. - -As an additional corner case, make sure the local nonce gets updated if -the peer uses a very unlikely "random nonce" of all zeros. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/rsn_supp/tdls.c | 38 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 36 insertions(+), 2 deletions(-) - -diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c -index e424168..9eb9738 100644 ---- a/src/rsn_supp/tdls.c -+++ b/src/rsn_supp/tdls.c -@@ -112,6 +112,7 @@ struct wpa_tdls_peer { - u8 tk[16]; /* TPK-TK; assuming only CCMP will be used */ - } tpk; - int tpk_set; -+ int tk_set; /* TPK-TK configured to the driver */ - int tpk_success; - int tpk_in_progress; - -@@ -192,6 +193,20 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - u8 rsc[6]; - enum wpa_alg alg; - -+ if (peer->tk_set) { -+ /* -+ * This same TPK-TK has already been configured to the driver -+ * and this new configuration attempt (likely due to an -+ * unexpected retransmitted frame) would result in clearing -+ * the TX/RX sequence number which can break security, so must -+ * not allow that to happen. -+ */ -+ wpa_printf(MSG_INFO, "TDLS: TPK-TK for the peer " MACSTR -+ " has already been configured to the driver - do not reconfigure", -+ MAC2STR(peer->addr)); -+ return -1; -+ } -+ - os_memset(rsc, 0, 6); - - switch (peer->cipher) { -@@ -209,12 +224,15 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - return -1; - } - -+ wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR, -+ MAC2STR(peer->addr)); - if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1, - rsc, sizeof(rsc), peer->tpk.tk, key_len) < 0) { - wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the " - "driver"); - return -1; - } -+ peer->tk_set = 1; - return 0; - } - -@@ -696,7 +714,7 @@ static void wpa_tdls_peer_clear(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - peer->cipher = 0; - peer->qos_info = 0; - peer->wmm_capable = 0; -- peer->tpk_set = peer->tpk_success = 0; -+ peer->tk_set = peer->tpk_set = peer->tpk_success = 0; - peer->chan_switch_enabled = 0; - os_memset(&peer->tpk, 0, sizeof(peer->tpk)); - os_memset(peer->inonce, 0, WPA_NONCE_LEN); -@@ -1159,6 +1177,7 @@ skip_rsnie: - wpa_tdls_peer_free(sm, peer); - return -1; - } -+ peer->tk_set = 0; /* A new nonce results in a new TK */ - wpa_hexdump(MSG_DEBUG, "TDLS: Initiator Nonce for TPK handshake", - peer->inonce, WPA_NONCE_LEN); - os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN); -@@ -1751,6 +1770,19 @@ static int wpa_tdls_addset_peer(struct wpa_sm *sm, struct wpa_tdls_peer *peer, - } - - -+static int tdls_nonce_set(const u8 *nonce) -+{ -+ int i; -+ -+ for (i = 0; i < WPA_NONCE_LEN; i++) { -+ if (nonce[i]) -+ return 1; -+ } -+ -+ return 0; -+} -+ -+ - static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr, - const u8 *buf, size_t len) - { -@@ -2004,7 +2036,8 @@ skip_rsn: - peer->rsnie_i_len = kde.rsn_ie_len; - peer->cipher = cipher; - -- if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0) { -+ if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0 || -+ !tdls_nonce_set(peer->inonce)) { - /* - * There is no point in updating the RNonce for every obtained - * TPK M1 frame (e.g., retransmission due to timeout) with the -@@ -2020,6 +2053,7 @@ skip_rsn: - "TDLS: Failed to get random data for responder nonce"); - goto error; - } -+ peer->tk_set = 0; /* A new nonce results in a new TK */ - } - - #if 0 --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch b/user/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch deleted file mode 100644 index 85ea1d62b..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 53c5eb58e95004f86e65ee9fbfccbc291b139057 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Fri, 22 Sep 2017 11:25:02 +0300 -Subject: [PATCH 7/8] WNM: Ignore WNM-Sleep Mode Response without pending - request - -Commit 03ed0a52393710be6bdae657d1b36efa146520e5 ('WNM: Ignore WNM-Sleep -Mode Response if WNM-Sleep Mode has not been used') started ignoring the -response when no WNM-Sleep Mode Request had been used during the -association. This can be made tighter by clearing the used flag when -successfully processing a response. This adds an additional layer of -protection against unexpected retransmissions of the response frame. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - wpa_supplicant/wnm_sta.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c -index 1b3409c..67a07ff 100644 ---- a/wpa_supplicant/wnm_sta.c -+++ b/wpa_supplicant/wnm_sta.c -@@ -260,7 +260,7 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, - - if (!wpa_s->wnmsleep_used) { - wpa_printf(MSG_DEBUG, -- "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode has not been used in this association"); -+ "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode operation has not been requested"); - return; - } - -@@ -299,6 +299,8 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, - return; - } - -+ wpa_s->wnmsleep_used = 0; -+ - if (wnmsleep_ie->status == WNM_STATUS_SLEEP_ACCEPT || - wnmsleep_ie->status == WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE) { - wpa_printf(MSG_DEBUG, "Successfully recv WNM-Sleep Response " --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/user/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch deleted file mode 100644 index b9678f681..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch +++ /dev/null @@ -1,82 +0,0 @@ -From b372ab0b7daea719749194dc554b26e6367603f2 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Fri, 22 Sep 2017 12:06:37 +0300 -Subject: [PATCH 8/8] FT: Do not allow multiple Reassociation Response frames - -The driver is expected to not report a second association event without -the station having explicitly request a new association. As such, this -case should not be reachable. However, since reconfiguring the same -pairwise or group keys to the driver could result in nonce reuse issues, -be extra careful here and do an additional state check to avoid this -even if the local driver ends up somehow accepting an unexpected -Reassociation Response frame. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/rsn_supp/wpa.c | 3 +++ - src/rsn_supp/wpa_ft.c | 8 ++++++++ - src/rsn_supp/wpa_i.h | 1 + - 3 files changed, 12 insertions(+) - -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 0550a41..2a53c6f 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -2440,6 +2440,9 @@ void wpa_sm_notify_disassoc(struct wpa_sm *sm) - #ifdef CONFIG_TDLS - wpa_tdls_disassoc(sm); - #endif /* CONFIG_TDLS */ -+#ifdef CONFIG_IEEE80211R -+ sm->ft_reassoc_completed = 0; -+#endif /* CONFIG_IEEE80211R */ - - /* Keys are not needed in the WPA state machine anymore */ - wpa_sm_drop_sa(sm); -diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c -index 205793e..d45bb45 100644 ---- a/src/rsn_supp/wpa_ft.c -+++ b/src/rsn_supp/wpa_ft.c -@@ -153,6 +153,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len, - u16 capab; - - sm->ft_completed = 0; -+ sm->ft_reassoc_completed = 0; - - buf_len = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + - 2 + sm->r0kh_id_len + ric_ies_len + 100; -@@ -681,6 +682,11 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, - return -1; - } - -+ if (sm->ft_reassoc_completed) { -+ wpa_printf(MSG_DEBUG, "FT: Reassociation has already been completed for this FT protocol instance - ignore unexpected retransmission"); -+ return 0; -+ } -+ - if (wpa_ft_parse_ies(ies, ies_len, &parse) < 0) { - wpa_printf(MSG_DEBUG, "FT: Failed to parse IEs"); - return -1; -@@ -781,6 +787,8 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, - return -1; - } - -+ sm->ft_reassoc_completed = 1; -+ - if (wpa_ft_process_gtk_subelem(sm, parse.gtk, parse.gtk_len) < 0) - return -1; - -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index 41f371f..56f88dc 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -128,6 +128,7 @@ struct wpa_sm { - size_t r0kh_id_len; - u8 r1kh_id[FT_R1KH_ID_LEN]; - int ft_completed; -+ int ft_reassoc_completed; - int over_the_ds_in_progress; - u8 target_ap[ETH_ALEN]; /* over-the-DS target AP */ - int set_ptk_after_assoc; --- -2.7.4 - diff --git a/user/wpa_supplicant/undefined-ref.patch b/user/wpa_supplicant/undefined-ref.patch new file mode 100644 index 000000000..97a8cc7f3 --- /dev/null +++ b/user/wpa_supplicant/undefined-ref.patch @@ -0,0 +1,38 @@ +From f2973fa39d6109f0f34969e91551a98dc340d537 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <j@w1.fi> +Date: Mon, 3 Dec 2018 12:00:26 +0200 +Subject: FT: Fix CONFIG_IEEE80211X=y build without CONFIG_FILS=y + +remove_ie() was defined within an ifdef CONFIG_FILS block while it is +now needed even without CONFIG_FILS=y. Remove the CONFIG_FILS condition +there. + +Fixes 8c41734e5de1 ("FT: Fix Reassociation Request IEs during FT protocol") +Signed-off-by: Jouni Malinen <j@w1.fi> +--- + wpa_supplicant/sme.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c +index 39c8069..f77f751 100644 +--- a/wpa_supplicant/sme.c ++++ b/wpa_supplicant/sme.c +@@ -1386,7 +1386,6 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data) + } + + +-#ifdef CONFIG_FILS + #ifdef CONFIG_IEEE80211R + static void remove_ie(u8 *buf, size_t *len, u8 eid) + { +@@ -1401,7 +1400,6 @@ static void remove_ie(u8 *buf, size_t *len, u8 eid) + } + } + #endif /* CONFIG_IEEE80211R */ +-#endif /* CONFIG_FILS */ + + + void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode, +-- +cgit v0.12 + diff --git a/user/x11perf/APKBUILD b/user/x11perf/APKBUILD index 2c3d265bb..eb39a1193 100644 --- a/user/x11perf/APKBUILD +++ b/user/x11perf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=x11perf -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=0 pkgdesc="X11 server benchmarking utility" url="https://www.X.Org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/x11perf-$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="a9508c9dd6db2663b5bd30f5e1f5f80b1d22ce5221ae3dc292e746f8e554fda2d3130f7311f2545e20244dceb51e867fe80fec82c9ac5911dcdc90a73b231623 x11perf-1.6.0.tar.bz2" +sha512sums="b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b x11perf-1.6.1.tar.bz2" diff --git a/user/xcalc/APKBUILD b/user/xcalc/APKBUILD index d15d905fc..752b66ba9 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.6 +pkgver=1.0.7 pkgrel=0 pkgdesc="Graphical scientific calculator for X11" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11" depends="" makedepends="libx11-dev libxaw-dev libxt-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xcalc-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xcalc-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="61b921b6a3fefea20bd9e7ad0b308f589f2aeaafe9316df94cc739a005be6c180bdafc981b8957230f46c9fc1c0e266829a55b473ae26b1377c705796175c908 xcalc-1.0.6.tar.bz2" +sha512sums="890cb9399e3c55816318ab5f0152ddba05ee141cbae6032759a3b762742ab54df8fcf0394dacc539299f93f27cbbb17aee5cbda5dde8b169a7099f20a1a38388 xcalc-1.0.7.tar.bz2" diff --git a/user/xclock/APKBUILD b/user/xclock/APKBUILD index f8b9e4a22..e2f55308a 100644 --- a/user/xclock/APKBUILD +++ b/user/xclock/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xclock -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="Clock applet for X11" url="https://www.X.Org/" @@ -11,10 +11,9 @@ depends="" makedepends="libx11-dev libxaw-dev libxkbfile-dev libxft-dev libxmu-dev libxrender-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xclock-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xclock-$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="56689bdae6c83e9e1da5c4c48cf1136ca8b4f45b177f27bc1deeb24758e2c180035b639e8df72e3ebf32dc301bceb59118309fcce2ffab54e5abe9bfa645e607 xclock-1.0.7.tar.bz2" +sha512sums="1272221ace3657505bae1b22f181e9ecbf1710900c89a860c8ceae47ae31ca5e75b6557c37dc0a881a0a24c9597b9a07f46200926feb1013f1e2e995111a7646 xclock-1.0.8.tar.bz2" diff --git a/user/xcompmgr/APKBUILD b/user/xcompmgr/APKBUILD index 27c149441..6149de629 100644 --- a/user/xcompmgr/APKBUILD +++ b/user/xcompmgr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcompmgr -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=0 pkgdesc="Small compositing manager for X11" url="https://www.X.Org/" @@ -11,10 +11,9 @@ depends="" makedepends="libxcomposite-dev libxdamage-dev libxext-dev libxfixes-dev libxrender-dev util-macros" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xcompmgr-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xcompmgr-$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="f93a6be78169dd41ff08d71409e28746fd62902810a2f6930c0ac44f1415bc7391a8fb885b074fd40afedd7f1c1590aa7c67fc101c3b6488ddaa74495b42149c xcompmgr-1.1.7.tar.bz2" +sha512sums="ccf29426ffb0797a53653d1ce152de5eee0cec284811fed4b8e634ea0d948180531e4619d96f47e4f9594432c57322624fe0fdaee2c9200efac427fc0904953d xcompmgr-1.1.8.tar.bz2" diff --git a/user/xcursor-themes/APKBUILD b/user/xcursor-themes/APKBUILD index e61f4a537..72a65a9b9 100644 --- a/user/xcursor-themes/APKBUILD +++ b/user/xcursor-themes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcursor-themes -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=0 pkgdesc="Built-in cursor themes for X11" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11" depends="" makedepends="libxcursor-dev util-macros xcursorgen" subpackages="" -source="https://www.x.org/releases/individual/data/xcursor-themes-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/data/xcursor-themes-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f41e1de0d5deafba33106dcad81576d1888fca052a962c202f2221104aa2d8236b066d8d8fc3dcfbdc166db63f84e60980dfc54059b20a26c7415de71ed07a5b xcursor-themes-1.0.5.tar.bz2" +sha512sums="2ad3586a5571a5ddc0001187362b54b839644916164834213af98e58698044aec4392dd6e1e42f1794fda85c8fedf259b09214a9636bd0e71a1629c710f198d3 xcursor-themes-1.0.6.tar.bz2" diff --git a/user/xcursorgen/APKBUILD b/user/xcursorgen/APKBUILD index 395dfb95b..7e00406e0 100644 --- a/user/xcursorgen/APKBUILD +++ b/user/xcursorgen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcursorgen -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=0 pkgdesc="Cursor generator for X11" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="MIT" depends="" makedepends="libpng-dev libx11-dev libxcursor-dev util-macros" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xcursorgen-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xcursorgen-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3b464b7be3cec8c6d2bf4538266108bdc09e1dae4053d573f7f38e004929b41be0d996aa54918490fa040655644e2b0d4fab1ec24cca014d77bdb91c41ab1db4 xcursorgen-1.0.6.tar.bz2" +sha512sums="bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2 xcursorgen-1.0.7.tar.bz2" diff --git a/user/xditview/APKBUILD b/user/xditview/APKBUILD index 6902402e2..7de93902e 100644 --- a/user/xditview/APKBUILD +++ b/user/xditview/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xditview -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="X11 ditroff viewer" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11" depends="" makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xditview-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xditview-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="7a0d023cd28ffc63c771814e028e79d20f8b56671a7a558c41ef062ef2d40079b5d37a5cf026b7ad3670da6866a087ae4888cea96d6d9e8a137e115174d637d2 xditview-1.0.4.tar.bz2" +sha512sums="e20c903f38394b496111267e142d84d11e69a3b89f91869652d1f2ee5c997a13f90bfa2966651b42cd3979a330b348a6e397cc6a74c45b1f3f91643e7c06765d xditview-1.0.5.tar.bz2" diff --git a/user/xev/APKBUILD b/user/xev/APKBUILD index 951fb10c4..ba8aafedd 100644 --- a/user/xev/APKBUILD +++ b/user/xev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xev -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=0 pkgdesc="X11 input event monitor" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11" depends="" makedepends="libx11-dev libxrandr-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xev-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xev-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="453fc18072e4d4fd088a1b2e918f3772aaa2c56b36c082deb41ec4d434d1579de75f447fc4e0507086c170152e02d6db8b60dc7fd87ae18a2e817448bd628fca xev-1.2.2.tar.bz2" +sha512sums="47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e xev-1.2.3.tar.bz2" diff --git a/user/xf86-input-libinput/APKBUILD b/user/xf86-input-libinput/APKBUILD index 655c9319f..4c168bea9 100644 --- a/user/xf86-input-libinput/APKBUILD +++ b/user/xf86-input-libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-input-libinput -pkgver=0.28.1 +pkgver=0.28.2 pkgrel=0 pkgdesc="X.Org generic input driver using libinput" url="https://www.X.Org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,14 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="2b8cabfbc3490edbe928771ed9d62a0d4a423bc1373fc6cf9d3a6b5937e17ddc48ebb1b70f1191e507024e4b8220c137495cbba825292b51e50709daa7d31623 xf86-input-libinput-0.28.1.tar.bz2" +sha512sums="da6eb632180649853b3aa2fb88debd6aafe5ede24a5f4a04a21cf18fa97fd414d300b86cdf8a42027c98ac89f1b9f88034fc9e364ac3a02fa38872e57b542a84 xf86-input-libinput-0.28.2.tar.bz2" diff --git a/user/xf86-video-ati/APKBUILD b/user/xf86-video-ati/APKBUILD index d1a8d21c7..4212237c5 100644 --- a/user/xf86-video-ati/APKBUILD +++ b/user/xf86-video-ati/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-ati -pkgver=18.1.0 +pkgver=19.0.1 pkgrel=0 pkgdesc="ATI video driver for X11" url="https://www.X.Org/" @@ -14,7 +14,6 @@ makedepends="eudev-dev libdrm-dev libxi-dev mesa-dev pixman-dev util-macros source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure \ @@ -26,9 +25,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="7a58c9a6cb4876bd2ff37d837372b4e360e81fec7de6a6c7a48d70a5338d62745f734f5d4207f30aa368ff2d9ef44f5f1ef36afd73802a618998c16fe395ed53 xf86-video-ati-18.1.0.tar.bz2" +sha512sums="e04c5395e3a49d81b8f7a4b0e11fe8c9ebd17af056a4eab4541873796dce05b103c93fb185f3a00873010df0655cd7311e6d27e177aeb7345c4c8017bbd1eb17 xf86-video-ati-19.0.1.tar.bz2" diff --git a/user/xf86-video-nouveau/APKBUILD b/user/xf86-video-nouveau/APKBUILD index dd6bd27cd..40c9b8f82 100644 --- a/user/xf86-video-nouveau/APKBUILD +++ b/user/xf86-video-nouveau/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-nouveau -pkgver=1.0.15 -pkgrel=2 +pkgver=1.0.16 +pkgrel=0 pkgdesc="Libre Nvidia video driver for X11" url="https://nouveau.freedesktop.org/" arch="all" @@ -10,12 +10,9 @@ license="MIT" depends="mesa-dri-nouveau" makedepends="eudev-dev libdrm-dev util-macros xorgproto-dev xorg-server-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/archive/individual/driver/$pkgname-$pkgver.tar.bz2 - dont-strcmp-null.patch - " +source="https://www.X.Org/archive/individual/driver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure \ --build=$CBUILD \ @@ -28,14 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="69a8f8e7920d893f17d14fd9f05e35de246d980a243f3b3b00c05deae7f6bd97e0f51e6ddfa322b4d0815233fe5f656d4e55f54461249f3f24c3bc025a682285 xf86-video-nouveau-1.0.15.tar.bz2 -4cd8b3b9996989a8c9302a5ba77aa9f794fde7559d9f131d5bb4b3174d68be85140834719384c22686b63c89242bdf09696c0c1a98b632f7e3a4f46522f49c3b dont-strcmp-null.patch" +sha512sums="41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0 xf86-video-nouveau-1.0.16.tar.bz2" diff --git a/user/xf86-video-nouveau/dont-strcmp-null.patch b/user/xf86-video-nouveau/dont-strcmp-null.patch deleted file mode 100644 index 23c4fd216..000000000 --- a/user/xf86-video-nouveau/dont-strcmp-null.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 69aecdd305defdd014bc92b82acc6000988511cf Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Tue, 13 Jun 2017 09:23:42 -0400 -Subject: modesetting: Validate the atom for enum properties - -The client could have said anything here, and if what they said doesn't -actually name an atom NameForAtom() will return NULL, and strcmp() will -be unhappy about that. - -[copied from xserver d4995a3936ae283b9080fdaa0905daa669ebacfc] - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- - src/drmmode_display.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index 2b71c9c..04a0b57 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -1081,7 +1081,8 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property, - if (value->type != XA_ATOM || value->format != 32 || value->size != 1) - return FALSE; - memcpy(&atom, value->data, 4); -- name = NameForAtom(atom); -+ if (!(name = NameForAtom(atom))) -+ return FALSE; - - /* search for matching name string, then set its value down */ - for (j = 0; j < p->mode_prop->count_enums; j++) { --- -cgit v1.1 - diff --git a/user/xf86-video-tdfx/APKBUILD b/user/xf86-video-tdfx/APKBUILD index 62b9217cc..7f8252934 100644 --- a/user/xf86-video-tdfx/APKBUILD +++ b/user/xf86-video-tdfx/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-tdfx -pkgver=1.4.7 +pkgver=1.5.0 pkgrel=0 pkgdesc="3Dfx video driver for X11" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="MIT" depends="" makedepends="util-macros xorgproto-dev xorg-server-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/driver/xf86-video-tdfx-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/driver/xf86-video-tdfx-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="573eea7a6b05ed33a963f8e2f80ac1cb14632b7fd10d8d90da16c07db432e73641ced885ee979f68e4ead8429b39506b2f231ca4ac296a0780c9f6d223c3b405 xf86-video-tdfx-1.4.7.tar.bz2" +sha512sums="eca3359c7db56183a1cfcce7295e41ccc349005ee1cbcf75209f1e4e8e04e887ba511712ef35efc11c940713c8327b0b8ab8b6c86facf02062b3e84c0b1af5ff xf86-video-tdfx-1.5.0.tar.bz2" diff --git a/user/xfd/APKBUILD b/user/xfd/APKBUILD index 5011b28d4..ca4f5188d 100644 --- a/user/xfd/APKBUILD +++ b/user/xfd/APKBUILD @@ -1,20 +1,19 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xfd -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=0 pkgdesc="Display all characters in X11 fonts" url="https://www.X.Org/" arch="all" license="X11" depends="" -makedepends="fontconfig-dev libxaw-dev libxft-dev libxmu-dev libxrender-dev - util-macros xorgproto-dev" +makedepends="fontconfig-dev libxaw-dev libxft-dev libxkbfile-dev libxmu-dev + libxrender-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xfd-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xfd-$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="3a158f697dd40c5b650b3d80ad1692d668d9d9bcf586a437fd3dcebf9e8fffb773855df290260995464d5f36cb22e768d1d71de8e61d7cca80eaa4d25c029745 xfd-1.1.2.tar.bz2" +sha512sums="68e2d4ce5e24215353b6f3231191d69639c4dd90a703e03ccf152bbfe4012da071c387ba289f918fb0336a3be9ee49dc05cbec7273fa85f5e476ead7e10795f0 xfd-1.1.3.tar.bz2" diff --git a/user/xfsinfo/APKBUILD b/user/xfsinfo/APKBUILD index 932c744c8..4c3805eff 100644 --- a/user/xfsinfo/APKBUILD +++ b/user/xfsinfo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xfsinfo -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=0 pkgdesc="Display information about X11 font servers" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11 AND MIT" depends="" makedepends="libfs-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xfsinfo-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xfsinfo-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="49fcbe91ac121022ccecd4a2f0e55a9a5cce7ba12b713be78b3b7f2847e622631bca6f6647256a956910fda591a87b524b966d5c849b8b2526d6f1a1960fe57f xfsinfo-1.0.5.tar.bz2" +sha512sums="901fc3817d7c95f2ba75ed0c51de91abd8efa67bbb93ad6b7d66e56a2f721af9db364e92f9ef2e719835fd48e934a5ea7402e5565c0ccd9b6b82633e869dc57b xfsinfo-1.0.6.tar.bz2" diff --git a/user/xinit/APKBUILD b/user/xinit/APKBUILD index 0fd2879c0..37556cb27 100644 --- a/user/xinit/APKBUILD +++ b/user/xinit/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xinit -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=0 pkgdesc="X.Org initialisation program" url="https://www.X.Org/" @@ -17,7 +17,6 @@ source="https://www.X.Org/releases/individual/app/xinit-$pkgver.tar.bz2 xserverrc" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install chmod +x "$pkgdir"/usr/bin/startx install -m755 -d "$pkgdir"/etc/skel @@ -46,7 +43,7 @@ package() { mkdir -p "$pkgdir"/etc/X11/xinit/xinitrc.d } -sha512sums="53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e xinit-1.4.0.tar.bz2 +sha512sums="6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340 xinit-1.4.1.tar.bz2 2296c10a5d74bff42d9642a4787dc3f2b77492fc81174af48dc88cd3c8fa49c7f70147b790d8c82c2df6c910d9d412965999e7a342ca28697a97b5d522669edd 06_move_serverauthfile_into_tmp.patch 1b19f800d1f64e49b533929ea6b9580d6dc24b680e1461edcc5784ba9fbb387fef57576b1e3d4bc67cb0ff2b248b670c148a3c7a350e1062bb9b95e9a2ba7805 xinitrc 448bc6c7987a4735b6584e307cd5c53092b1a338043293f5f110d11818dd1b80508401a3b6f09525c82a16a88f293b37011d8ca112460b0f95d26897e3e0619e xsession.skel diff --git a/user/xkeyboard-config/APKBUILD b/user/xkeyboard-config/APKBUILD index c884ad87b..9a49f7ffe 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.25 +pkgver=2.26 pkgrel=0 pkgdesc="Keyboard configuration files for X11" url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" @@ -12,8 +12,6 @@ subpackages="$pkgname-lang" source="https://www.X.Org/releases/individual/data/xkeyboard-config/xkeyboard-config-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,16 +23,13 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -f "$pkgdir"/usr/share/X11/xkb/compiled install -m755 -d "$pkgdir"/var/lib/xkb - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb xkeyboard-config-2.25.tar.bz2" +sha512sums="5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef xkeyboard-config-2.26.tar.bz2" diff --git a/user/xlogo/APKBUILD b/user/xlogo/APKBUILD index 6ed763de5..ff675f734 100644 --- a/user/xlogo/APKBUILD +++ b/user/xlogo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xlogo -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="Display the X11 logo" url="https://www.X.Org/" @@ -13,14 +13,7 @@ makedepends="libsm-dev libx11-dev libxaw-dev libxext-dev libxmu-dev libxt-dev subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xlogo-$pkgver.tar.bz2" -prepare() { - cd "$builddir" - default_prepare - update_config_sub -} - build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="cbfcd48425e697950907ddeaec2f06e0607ebf2e93e6799bd263230f036b3021279c2f379de55fae15b403af5f18292caa79159ed544a4a3314b90c85ac9804d xlogo-1.0.4.tar.bz2" +sha512sums="0d78e269b0be3c5de71de7f362b896bfd9934ecd9d0361b3302399b1269e029c4a9f35418d792121a1edc34405d753f9d69c996cc3a69ac717f2b0d1f736406b xlogo-1.0.5.tar.bz2" diff --git a/user/xlsatoms/APKBUILD b/user/xlsatoms/APKBUILD index bc05dceb0..5e9ff64a0 100644 --- a/user/xlsatoms/APKBUILD +++ b/user/xlsatoms/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xlsatoms -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=0 pkgdesc="List interned atoms in an X11 server" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11" depends="" makedepends="libxcb-dev util-macros" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xlsatoms-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xlsatoms-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f29001de22818792212312f1b9daee1bf7afa2ef2ae945cd8c14bdc1a7bb40064d3878c5efea60458ac0bf515ab1ece16fa90cbd2b0a879a5f07f3aa3e6a0baa xlsatoms-1.1.2.tar.bz2" +sha512sums="c267ccfdc5a83e834bfb5c3b144e22642badcadef4eb146eeec2df6fe6f85e9379500ae4219912c70fa2e535036a1a96cf496381f5d814e79af075e03c975f30 xlsatoms-1.1.3.tar.bz2" diff --git a/user/xmodmap/APKBUILD b/user/xmodmap/APKBUILD index 58e14c998..abf6c45ba 100644 --- a/user/xmodmap/APKBUILD +++ b/user/xmodmap/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xmodmap -pkgver=1.0.9 -pkgrel=3 +pkgver=1.0.10 +pkgrel=0 pkgdesc="Utility for modifying key and mouse button mappings in X11" url="https://www.X.Org/" arch="all" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build () { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,14 +24,11 @@ build () { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="6e50f2ba072ec171bd3fc34f75b21c63f9834f3c0f1608c857f80a4b2c8a9696b03dde79f8342bf67504b759297bc24a64056a625d295a4f89dd31eb938400ac xmodmap-1.0.9.tar.bz2" +sha512sums="324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04 xmodmap-1.0.10.tar.bz2" diff --git a/user/xmore/APKBUILD b/user/xmore/APKBUILD index bf2d861bd..75514d1f1 100644 --- a/user/xmore/APKBUILD +++ b/user/xmore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xmore -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=0 pkgdesc="Display text files using X11" url="https://www.X.Org/" @@ -10,16 +10,9 @@ license="X11" depends="" makedepends="libxaw-dev util-macros" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xmore-$pkgver.tar.bz2" - -prepare() { - cd "$builddir" - default_prepare - update_config_sub -} +source="https://www.X.Org/releases/individual/app/xmore-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="718ad254beaae57475cead3815fc7625692699c76749c64e3aeb722daf5e1cecbea9d1207e3427d6a5d0aa240a6aaf678ea1656d6731b9f47e1a8045d62c3efb xmore-1.0.2.tar.bz2" +sha512sums="e3e44831cd87a54bb585f80ef0d87f69dc35f6c834a73241aad9f6e2b0999b53c51a0a3f915a94ae4d6dc9bdfb9f60b6576f0bdcec441443abd98efa6c51b1d3 xmore-1.0.3.tar.bz2" diff --git a/user/xprop/APKBUILD b/user/xprop/APKBUILD index 6ea54cbb0..1339105a2 100644 --- a/user/xprop/APKBUILD +++ b/user/xprop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xprop -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=0 pkgdesc="X11 property inspector" url="https://cgit.freedesktop.org/xorg/app/xprop/" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.X.Org/archive/individual/app/xprop-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,13 +21,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ad7987fec11ae19b7adc3b0f683fc393e95155f3b6c753d1d8744aedcfb360452eee5735a4c380152b286905931515f3e1a28676b5531001eb8dd93b7249916a xprop-1.2.3.tar.bz2" +sha512sums="6e770cb89ba87ae057858cc9f0f5498979e78c3ef66ce86361b7c646cc0b70c41a18d76e55ed7225fe715b22b62bc07c56272519a2631b92832e9403ce260da7 xprop-1.2.4.tar.bz2" diff --git a/user/xrdb/APKBUILD b/user/xrdb/APKBUILD index cf528a143..b82a20f35 100644 --- a/user/xrdb/APKBUILD +++ b/user/xrdb/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xrdb -pkgver=1.1.1 +pkgver=1.2.0 pkgrel=0 pkgdesc="Utility to manipulate the X11 server resources database" url="https://www.X.Org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="20c342004ef911fc4d3ef4ac3ac15d1c30bb946b8156f3a6916c242e470be0cb63261563462fd1e2e07b1a7cc527b8cacf5f913e31b02196629a95043cf8d13f xrdb-1.1.1.tar.bz2" +sha512sums="14e1cdfb2152fb28f1f4641b177ab236648d7e967a95b952bf4cfce8d3e1ef085e85385354e3381aaf644462e8888a1847f755ab4016ecb4cb4a715b001dd2ef xrdb-1.2.0.tar.bz2" diff --git a/user/xstdcmap/APKBUILD b/user/xstdcmap/APKBUILD index 5c2622cf3..076ac3256 100644 --- a/user/xstdcmap/APKBUILD +++ b/user/xstdcmap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xstdcmap -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="Define standard X11 colour map properties" url="https://www.X.Org/" @@ -10,17 +10,9 @@ license="X11" depends="" makedepends="libx11-dev libxmu-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xstdcmap-$pkgver.tar.bz2" - -prepare() { - cd "$builddir" - default_prepare - chmod a+w config.sub - update_config_sub -} +source="https://www.X.Org/releases/individual/app/xstdcmap-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="8037ddb9c6b8f3a65d35637a1fca2b1b6c7e76afce5c13b1947cf72c3ca87679aa2ed05caf308d90549432b7fe029a522a99f32701bd0087c140bf4fafdb4d49 xstdcmap-1.0.3.tar.bz2" +sha512sums="2adbb0aec1766341e04090efa962241ff6c9e32c612851b7221cec0ee16852107d406a08ec5251070f39df882c13e3c8c9edcd88f278187a9f373e1727643a8f xstdcmap-1.0.4.tar.bz2" diff --git a/user/xtrans/APKBUILD b/user/xtrans/APKBUILD index 7a3a74a93..a65dd7dc3 100644 --- a/user/xtrans/APKBUILD +++ b/user/xtrans/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xtrans -pkgver=1.3.5 -pkgrel=1 +pkgver=1.4.0 +pkgrel=0 pkgdesc="X transport library" url="https://www.X.Org/" arch="noarch" @@ -12,7 +12,6 @@ subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -21,14 +20,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="049fb996313e8a1625b66e1645a5f56d8a26c5dd91afe5869269716fce05f6c97c84f8ce4a6df2057106b47982c8291cecc223bef241f694174434c981a7029b xtrans-1.3.5.tar.bz2" +sha512sums="4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214 xtrans-1.4.0.tar.bz2" diff --git a/user/xvinfo/APKBUILD b/user/xvinfo/APKBUILD index 82d0e29ad..311f48b01 100644 --- a/user/xvinfo/APKBUILD +++ b/user/xvinfo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xvinfo -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=0 pkgdesc="View information about video adaptors attached to X11" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11" depends="" makedepends="libxv-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xvinfo-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xvinfo-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="df8356898390d2aec4fbd15cee1627bb86b57ff8af41a527d4f6f6703a81f399a3098da342b94af6d4cf4a817d9fda1946a206bfbe3995e87ceb9910bb8b51bc xvinfo-1.1.3.tar.bz2" +sha512sums="85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e xvinfo-1.1.4.tar.bz2" diff --git a/user/zstd/APKBUILD b/user/zstd/APKBUILD index b930a1a1e..dc23629a8 100644 --- a/user/zstd/APKBUILD +++ b/user/zstd/APKBUILD @@ -1,31 +1,27 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=zstd -pkgver=1.3.7 +pkgver=1.3.8 pkgrel=0 pkgdesc="Fast real-time compression algorithm" url="https://facebook.github.io/zstd/" arch="all" license="BSD-3-Clause AND GPL-2.0-only" depends="" -depends_dev="" -makedepends="$depends_dev lz4-dev xz-dev zlib-dev" +makedepends="lz4-dev xz-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/facebook/zstd/releases/download/v$pkgver/zstd-$pkgver.tar.gz" build() { - cd "$builddir" make PREFIX="/usr" } check() { - cd "$builddir" make PREFIX="/usr" check } package() { - cd "$builddir" make PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="fb9ac61b79b22a628e602e68f7c59c85a00020f7f25b8653076895da7589ca1203adc7fe3d9b865f36648bc30d765b9630cf0955f970596253da74c089b97af1 zstd-1.3.7.tar.gz" +sha512sums="5c1c0a7a998b814a9edc1466f6d321b0d8ffcf927295fd5499137c9075a8823be03d98f61ea5212d1969f8d52b32e940b1cc10d1507d7702424ea2eea0e79a1b zstd-1.3.8.tar.gz" |