diff options
431 files changed, 3314 insertions, 2636 deletions
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD index 257a11ad0..53d53a818 100644 --- a/system/abuild/APKBUILD +++ b/system/abuild/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abuild pkgver=3.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Script to build APK packages" url="https://code.foxkit.us/adelie/abuild" arch="all" @@ -20,6 +20,7 @@ subpackages="abuild-rootbld:_rootbld:noarch $pkgname-doc" install="$pkgname.pre-install $pkgname.pre-upgrade" source="https://distfiles.adelielinux.org/source/abuild-$pkgver.tar.xz apkpath.patch + fix-apk-invocation.patch keyhole.patch " @@ -56,4 +57,5 @@ _rootbld() { sha512sums="6446171cc68d8341b5267816e7a05e0dc7b8a4e89c8c8410ae61e9501b163cc32db888476b14f032c16ef15bdd4dd4844e087394c2d061db8281f7bdfb34d450 abuild-3.4.1.tar.xz bc373c93344d498a48675256bb26cf9bebac74f54d8e53a09c0975e3047c481ee35c6b88e5de392efd2d0ce2a8de23ebbf0822e1a093ee01ea99349f238c62f7 apkpath.patch +4ae8a0d7efb94e8390250c2c43294ba40afcf27409257cccffb9315f00e887972e29573ddbfb830a82eab473c6d292fe7a1bf30fb9761b6fa24b8fe8c0940c79 fix-apk-invocation.patch 757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d keyhole.patch" diff --git a/system/abuild/fix-apk-invocation.patch b/system/abuild/fix-apk-invocation.patch new file mode 100644 index 000000000..71bc3d1c9 --- /dev/null +++ b/system/abuild/fix-apk-invocation.patch @@ -0,0 +1,29 @@ +From 9f703d3222a6a8d52ac560035fb1a988d2f9bff7 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Thu, 27 Feb 2020 04:41:04 -0600 +Subject: [PATCH] abuild: Use $APK instead of apk + +This is the only appearance of `apk` in the source. Appears accidental. + +Fixes: 41343329 ("abuild: fix dependency tracing for cross builds") +Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> +--- + abuild.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index 2212789..7daa366 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -1255,7 +1255,7 @@ trace_apk_deps() { + autodeps="$autodeps pc:$pcprefix$i" + elif subpkg_provides_pc "$i" \ + || $APK $apkroot info --quiet --installed "pc:$i"; then +- local provider="$(apk $apkroot search --quiet "pc:$i")" ++ local provider="$($APK $apkroot search --quiet "pc:$i")" + if list_has "$provider" $depends_dev; then + warning "$provider should be removed from depends_dev" + fi +-- +2.25.1 + diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD index d1ff33d3b..aaa5fc26c 100644 --- a/system/bc/APKBUILD +++ b/system/bc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bc -pkgver=2.5.1 +pkgver=2.5.3 pkgrel=0 pkgdesc="An arbitrary precision numeric processing language (calculator)" url="https://github.com/gavinhoward/bc" @@ -25,4 +25,4 @@ package() { make install } -sha512sums="a2dec8f520a2c64df582a41bacb2f3ea275fbf01400668a7bcea1d3a90c0490516c20fd79932157ec0e313e845a34d100cf05985e8cdea456308c2aa8843bab4 bc-2.5.1.tar.xz" +sha512sums="97c0722969c4f2fd907786e0a89f9b403662b1bcdd1aab59418ab3fe140c50584b45eb346008ad94916335418f08433d2634b52b94ae1d7463b665a746f1a608 bc-2.5.3.tar.xz" diff --git a/system/cmake/APKBUILD b/system/cmake/APKBUILD index e4ae8c5f8..f8570efd9 100644 --- a/system/cmake/APKBUILD +++ b/system/cmake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cmake -pkgver=3.16.3 +pkgver=3.16.4 pkgrel=0 pkgdesc="Cross-platform build system" url="https://cmake.org" @@ -53,4 +53,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ca9e0a142369735ef6469afb97f4463c981404bd59c7d48c1ef454dd705460a31a5dcffa4949b84b1ac723f5b7e79d67b250126fb42e1f15dab0ac2a17603672 cmake-3.16.3.tar.gz" +sha512sums="4aa36608bac3b9e29ea765003cdc684733c025d7b18fbae057f3be1f726a159d4b0231b8b1be269206aa7dbd7177fe0110d5bac8d72fb0f6ad392bb284b1fce3 cmake-3.16.4.tar.gz" diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index 48414d60e..c840c960e 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -5,7 +5,7 @@ _kflavour="" _patchver=0 _pkgname=easy-kernel$_kflavour pkgver=5.4.5 -pkgrel=1 +pkgrel=2 pkgname=$_pkgname-$pkgver-mc$_patchver pkgdesc="The Linux kernel, packaged for your convenience" url="https://kernel.org/" @@ -134,13 +134,13 @@ src() { sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f linux-5.4.tar.xz 37c85fcec3bd54d586523f74cfb56db6158152cfbb407469f0da12b24e5de01cbe273ad4e59d41df75011c163922dadf2fe5e919cb6b16f74872e80c28bba1b1 linux-5.4-mc0-patches.tar.xz -ec86baafbfc22fdb08872276284eac7dce695c192a02c3b7d35a5d67861b98be18475ccfbb366ff988ffce27f0a4248cafc4a4b4699142616f236d612017a5d7 config-ppc64 -9a0d59885382d4ed848e8c1e580a255911f6c88d06dcc736109d2c167ebf0183a06ae984d5f4aab02e2f8f8fdb62d9dcbad8d4a994f9eaef892603ea9f2b7a1f config-ppc -0903a465a8ef658d00bd25d0917ef7ba3983cb4f595b9a2ce01f5a406771df79a4c68806d5dfc5c5c9f9544be0c714a2fc2dc5e2f4eb8a6223c3260443bf668e config-x86_64 -689e0f9c84afb7060a7438e5c1aee8342ace50983562745ef04d02be7b3ca5f61c02259cd0dffdb46d7d5857ea3cf3fee6b65c28eba0bf2341000e265ed60885 config-pmmx -baefddb2e1de0105f9333702121d3dd2c1f1d54ce22ee7f7d3a54d4fa1028e9b5dadeecb6cca8a717d30c7bc083daa652b0281fb1b39a85f191954ac5a95fecd config-aarch64 -430d968f60cfd33d3ba1e7c2fec8b1d1eedee8086c7cebebf162223b058b0e1d873033e46e05f63d8a50c61397eaf1036b1e4b3a60581f08c6482810aa25df7f config-sparc64 -1b99310e2de81267fdb1668ad6f52f26d8798d94c0a952cfe9992ff40e5d7331ddfb324b8f99bfa300240aa568bbd4525150e0c774c797d85756714163fd0fa5 config-m68k +8278765408dbeb860f2b125207f4e47f52c323d7b1596da426510af8a8acdf36decde26d581a902496042b8b7834f5377c4327458b2038f6a10eb653ce7208df config-ppc64 +89b7e2055586a3a71674ebe41cb3f6302b318cc24d8794a970150a1dfe236df4838c8126d6e43b951bbab2680a83b391b03b74317aa794b0371e91426c198008 config-ppc +072143e5cfb4ba60b2af8de923e5ab8c71224ffee4a97ce6f3a35223afd83e8d86faa15f1d86219d3f8cc4c1b9c2eb4bdc5b0421be7501e5b00916bf63aa0763 config-x86_64 +c699a9499058a2df0692272bd15d7398745459458eb62c99813e0b4de28f359117c6c727be77d75ae08db23cb1824a3bf1f045aaadf88bc53b8267b2c0f6992f config-pmmx +9d5ae66c32060c90074d2e217ade8dc700262bb737a46e5d7242cb24bb98b54c3d27eb19685fcef1875fbb6bd2283f2a8fda8c37940ea49fa58e891524893046 config-aarch64 +67d61164e5cfebb4127ba3ef265339bfce834f9b8bca1f82d4acdd5cefb673fdb456a837c090667fd6659a28fe7a9480dbbfceac6550e24245c260561cdc6070 config-sparc64 +7b240485f3adc7da4f08612d11c3001e40ab7b50cfdf492eb23aed335bcbf742c92afa39aa1764d8f85599d009a07c8dca77a1e19676d4729d232410bdd36905 config-m68k 4b2cd7dd0010aaec617c756e7587be7fad6ff0ab3dbc1ed038e3dc72c9308fc9e347c6e5296c30711d914e286aa254600586e2ad954a5da226e6e4c1522b75b5 asound-syntax-fix.patch 61dcd633d72876566b7738dd08856b26850c935b4a81ab2364711335fe01c397083160f530b3382bbc239c6a8135be6a032e93039083ec2cefdae2902429a2e0 kernel.h 6f309a18c65c991240265afd200cc79a706f5d9e5d072838a9a641ab3676a5e4c32033f9767fc723ff4c45ee462169a0f77bd7dfe63b547d521dadd073f827a7 uapi-iphdr.patch" diff --git a/system/easy-kernel/config-aarch64 b/system/easy-kernel/config-aarch64 index bc77f49ec..4a6a7889b 100644 --- a/system/easy-kernel/config-aarch64 +++ b/system/easy-kernel/config-aarch64 @@ -2856,7 +2856,7 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set # CONFIG_INPUT_AXP20X_PEK is not set -# CONFIG_INPUT_UINPUT is not set +CONFIG_INPUT_UINPUT=y # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_PWM_VIBRA is not set diff --git a/system/easy-kernel/config-m68k b/system/easy-kernel/config-m68k index 839cee3e1..1b8be2d03 100644 --- a/system/easy-kernel/config-m68k +++ b/system/easy-kernel/config-m68k @@ -1721,7 +1721,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_M68K_BEEP=m # CONFIG_INPUT_MMA8450 is not set # CONFIG_INPUT_KXTJ9 is not set -# CONFIG_INPUT_UINPUT is not set +CONFIG_INPUT_UINPUT=y CONFIG_HP_SDC_RTC=m # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_ADXL34X is not set diff --git a/system/easy-kernel/config-pmmx b/system/easy-kernel/config-pmmx index e63f6f891..68358793f 100644 --- a/system/easy-kernel/config-pmmx +++ b/system/easy-kernel/config-pmmx @@ -3379,7 +3379,7 @@ CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m # CONFIG_INPUT_REGULATOR_HAPTIC is not set -CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_UINPUT=y CONFIG_INPUT_PCF8574=m # CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_PWM_VIBRA is not set diff --git a/system/easy-kernel/config-ppc b/system/easy-kernel/config-ppc index 3f1af97ac..60dfb0409 100644 --- a/system/easy-kernel/config-ppc +++ b/system/easy-kernel/config-ppc @@ -181,7 +181,6 @@ CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_FUTEX_PI=y -CONFIG_HAVE_FUTEX_CMPXCHG=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y @@ -2647,7 +2646,33 @@ CONFIG_MOUSE_APPLETOUCH=y # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_ATMEL_CAPTOUCH is not set +# CONFIG_INPUT_BMA150 is not set +# CONFIG_INPUT_E3X0_BUTTON is not set +# CONFIG_INPUT_MSM_VIBRATOR is not set +# CONFIG_INPUT_MMA8450 is not set +# CONFIG_INPUT_GP2A is not set +# CONFIG_INPUT_GPIO_BEEPER is not set +# CONFIG_INPUT_GPIO_DECODER is not set +# CONFIG_INPUT_GPIO_VIBRA is not set +CONFIG_INPUT_ATI_REMOTE2=m +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_KXTJ9 is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +# CONFIG_INPUT_REGULATOR_HAPTIC is not set +CONFIG_INPUT_UINPUT=y +# CONFIG_INPUT_PCF8574 is not set +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +# CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_IMS_PCU is not set +# CONFIG_INPUT_CMA3000 is not set +# CONFIG_INPUT_DRV260X_HAPTICS is not set +# CONFIG_INPUT_DRV2665_HAPTICS is not set +# CONFIG_INPUT_DRV2667_HAPTICS is not set # CONFIG_RMI4_CORE is not set # diff --git a/system/easy-kernel/config-ppc64 b/system/easy-kernel/config-ppc64 index 6f1fab9f5..1bdb0d81b 100644 --- a/system/easy-kernel/config-ppc64 +++ b/system/easy-kernel/config-ppc64 @@ -2767,7 +2767,10 @@ CONFIG_INPUT_FF_MEMLESS=y # # Userland interfaces # -# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_MOUSEDEV=m +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set @@ -2801,7 +2804,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_CAP11XX is not set CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_PS2 is not set -# CONFIG_MOUSE_SERIAL is not set +CONFIG_MOUSE_SERIAL=m # CONFIG_MOUSE_APPLETOUCH is not set # CONFIG_MOUSE_BCM5974 is not set # CONFIG_MOUSE_CYAPA is not set @@ -2812,7 +2815,26 @@ CONFIG_INPUT_MOUSE=y # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_ATMEL_CAPTOUCH is not set +# CONFIG_INPUT_BMA150 is not set +# CONFIG_INPUT_E3X0_BUTTON is not set +# CONFIG_INPUT_MSM_VIBRATOR is not set +# CONFIG_INPUT_MMA8450 is not set +CONFIG_INPUT_ATI_REMOTE2=m +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_KXTJ9 is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +CONFIG_INPUT_UINPUT=y +# CONFIG_INPUT_PCF8574 is not set +# CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_IMS_PCU is not set +# CONFIG_INPUT_CMA3000 is not set +# CONFIG_INPUT_DRV2665_HAPTICS is not set +# CONFIG_INPUT_DRV2667_HAPTICS is not set # CONFIG_RMI4_CORE is not set # diff --git a/system/easy-kernel/config-sparc64 b/system/easy-kernel/config-sparc64 index b0fc2c803..8230ed3f2 100644 --- a/system/easy-kernel/config-sparc64 +++ b/system/easy-kernel/config-sparc64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/sparc 5.4.5-mc0 Kernel Configuration +# Linux/sparc64 5.4.5-mc0 Kernel Configuration # # @@ -2383,7 +2383,27 @@ CONFIG_MOUSE_SERIAL=y # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_ATMEL_CAPTOUCH is not set +# CONFIG_INPUT_BMA150 is not set +# CONFIG_INPUT_E3X0_BUTTON is not set +# CONFIG_INPUT_MSM_VIBRATOR is not set +# CONFIG_INPUT_SPARCSPKR is not set +# CONFIG_INPUT_MMA8450 is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_KXTJ9 is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +CONFIG_INPUT_UINPUT=y +# CONFIG_INPUT_PCF8574 is not set +# CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_IMS_PCU is not set +# CONFIG_INPUT_CMA3000 is not set +# CONFIG_INPUT_DRV2665_HAPTICS is not set +# CONFIG_INPUT_DRV2667_HAPTICS is not set # CONFIG_RMI4_CORE is not set # diff --git a/system/easy-kernel/config-x86_64 b/system/easy-kernel/config-x86_64 index c795eca20..84397a343 100644 --- a/system/easy-kernel/config-x86_64 +++ b/system/easy-kernel/config-x86_64 @@ -3450,7 +3450,7 @@ CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m # CONFIG_INPUT_REGULATOR_HAPTIC is not set -CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_UINPUT=y CONFIG_INPUT_PCF8574=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 0440b0f0b..45d7b033b 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=git -pkgver=2.25.0 +pkgver=2.25.1 pkgrel=0 pkgdesc="Distributed version control system" url="https://www.git-scm.com/" @@ -173,7 +173,7 @@ subtree_doc() { gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1 } -sha512sums="8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191 git-2.25.0.tar.xz +sha512sums="15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344 git-2.25.1.tar.xz 0a0935d876024d96156df3aeec06b47fd9e370484d4552786c450cb500ae671a631e64c30994ec39f43a2f313f75d68909688ea92b47327d1af65e365dc77480 dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" diff --git a/system/iproute2/APKBUILD b/system/iproute2/APKBUILD index ab8c16d73..ee22a4922 100644 --- a/system/iproute2/APKBUILD +++ b/system/iproute2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iproute2 -pkgver=5.3.0 +pkgver=5.5.0 pkgrel=0 pkgdesc="Advanced IP routing and network device configuration tools" url="https://wiki.linuxfoundation.org/networking/iproute2" @@ -55,4 +55,4 @@ bashcomp() { rmdir -p "$pkgdir"/usr/share 2>/dev/null || true } -sha512sums="c20ce477cb3ec24194ea56d3d9037795e26975ffde188b63ba974a0aa671dd169f356e9446bf43dc56523e01c0bafa442b91d83da9b2302daee18e237f2f3157 iproute2-5.3.0.tar.xz" +sha512sums="a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78 iproute2-5.5.0.tar.xz" diff --git a/system/libarchive/APKBUILD b/system/libarchive/APKBUILD index 00af8aeb7..a805b3b10 100644 --- a/system/libarchive/APKBUILD +++ b/system/libarchive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libarchive -pkgver=3.4.1 +pkgver=3.4.2 pkgrel=0 pkgdesc="Multi-format archive and compression library" url="https://libarchive.org/" @@ -17,6 +17,8 @@ source="https://github.com/libarchive/libarchive/releases/download/v$pkgver/$pkg " # secfixes: +# 3.4.2-r0: +# - CVE-2020-9308 # 3.3.2-r1: # - CVE-2017-14166 @@ -54,5 +56,5 @@ tools() { ln -s bsdcpio "$subpkgdir"/usr/bin/cpio } -sha512sums="fa7e9e5c8c00cd7e98f0ff373c300771f0a87317bca031c3030bac29b96b02ab66cf34905147e4135824bf9cdfdd1dedf3032e93d6d706c9a11e968da1ed8dad libarchive-3.4.1.tar.gz +sha512sums="a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021 libarchive-3.4.2.tar.gz ff2567f243ba7e9ce20bc4f7fa422a922c5c23049004efdd8f71f29f93ab9be9aadd4c100e8c6dca318442d583fbad9bd6466017a23f83af18b9808c718b9fce seek-error.patch" diff --git a/system/libgpg-error/APKBUILD b/system/libgpg-error/APKBUILD index 62b7b421e..31c22df59 100644 --- a/system/libgpg-error/APKBUILD +++ b/system/libgpg-error/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgpg-error -pkgver=1.36 +pkgver=1.37 pkgrel=0 pkgdesc="GnuPG runtime library" url="https://www.gnupg.org" @@ -36,4 +36,4 @@ lisp() { mv "$pkgdir"/usr/share "$subpkgdir"/usr/share/ } -sha512sums="6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346 libgpg-error-1.36.tar.bz2" +sha512sums="fa12977237fcc872e944cda39ca43ee7d2cc9c52e243ede6077f4a31ae135e322dc848b4b55cffdc4ec53f27601ba30ddb368b090a94cd00d9345a55b323f179 libgpg-error-1.37.tar.bz2" diff --git a/system/libpipeline/APKBUILD b/system/libpipeline/APKBUILD index ffe0494e2..906945653 100644 --- a/system/libpipeline/APKBUILD +++ b/system/libpipeline/APKBUILD @@ -1,13 +1,15 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libpipeline -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=0 pkgdesc="C pipeline manipulation library" url="http://libpipeline.nongnu.org/" arch="all" license="GPL-3.0+" +depends="" checkdepends="check-dev" +makedepends="" subpackages="$pkgname-dev $pkgname-doc" source="https://download.savannah.nongnu.org/releases/libpipeline/libpipeline-$pkgver.tar.gz" @@ -30,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9252c114bc59925eaf73ec9e8bb76b5649ccf985766edd2dc665630ec6de04c341298c74f8dc31c56e9ce20ad83da59df33eb3cc367e18a8012fd693cb823de6 libpipeline-1.5.1.tar.gz" +sha512sums="721024cea4e8dd85ba31af23e6f65b6ab2323e4006a769674d18101744a5a990aa9ee9fcd9b35360fa1442a6d4a72bfed0227665d4eacba541808b1c48bc9a53 libpipeline-1.5.2.tar.gz" diff --git a/system/libxml2/APKBUILD b/system/libxml2/APKBUILD index 1d1664047..73b6eb2a0 100644 --- a/system/libxml2/APKBUILD +++ b/system/libxml2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxml2 pkgver=2.9.10 -pkgrel=0 +pkgrel=1 pkgdesc="XML parsing library" url="http://www.xmlsoft.org/" arch="all" @@ -16,6 +16,8 @@ subpackages="$pkgname-doc $pkgname-dev py-libxml2:py" provides="$pkgname-utils=$pkgver-r$pkgrel" source="ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz python-segfault-fix.patch + CVE-2019-20388.patch + CVE-2020-7595.patch " # secfixes: @@ -25,6 +27,9 @@ source="ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz # - CVE-2016-9318 # 2.9.4-r4: # - CVE-2017-5969 +# 2.9.10-r1: +# - CVE-2019-20388 +# - CVE-2020-7595 prepare() { default_prepare @@ -62,4 +67,6 @@ py() { } sha512sums="0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed libxml2-2.9.10.tar.gz -384b3d2031cd8f77528190bbb7652faa9ccb22bc604bcf4927e59046d38830dac38010828fe1568b6514976f725981a6d3ac1aa595d31477a36db2afe491452c python-segfault-fix.patch" +384b3d2031cd8f77528190bbb7652faa9ccb22bc604bcf4927e59046d38830dac38010828fe1568b6514976f725981a6d3ac1aa595d31477a36db2afe491452c python-segfault-fix.patch +48ea30bd8035f3b60825ce24185fbec1e7423e683f64626405fd96daaaa14011e7f7c180a7a87d7ff8f73983b0e221974cbce619d04b932c1db2110a13be014e CVE-2019-20388.patch +90db832e60c700e971669f57a54fdb297660c42602089b4e77e013a7051c880f380f0c98c059d9f54de99855b2d9be78fcf0639443f3765a925b52fc093fb4d9 CVE-2020-7595.patch" diff --git a/system/libxml2/CVE-2019-20388.patch b/system/libxml2/CVE-2019-20388.patch new file mode 100644 index 000000000..49ff6fbe0 --- /dev/null +++ b/system/libxml2/CVE-2019-20388.patch @@ -0,0 +1,33 @@ +From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie <xiezhipeng1@huawei.com> +Date: Tue, 20 Aug 2019 16:33:06 +0800 +Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream + +When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun +alloc a new schema for ctxt->schema and set vctxt->xsiAssemble +to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize +vctxt->xsiAssemble to 0 again which cause the alloced schema +can not be freed anymore. + +Found with libFuzzer. + +Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com> +--- + xmlschemas.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xmlschemas.c b/xmlschemas.c +index 301c8449..39d92182 100644 +--- a/xmlschemas.c ++++ b/xmlschemas.c +@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { + vctxt->nberrors = 0; + vctxt->depth = -1; + vctxt->skipDepth = -1; +- vctxt->xsiAssemble = 0; + vctxt->hasKeyrefs = 0; + #ifdef ENABLE_IDC_NODE_TABLES_TEST + vctxt->createIDCNodeTables = 1; +-- +2.24.1 + diff --git a/system/libxml2/CVE-2020-7595.patch b/system/libxml2/CVE-2020-7595.patch new file mode 100644 index 000000000..3dd677497 --- /dev/null +++ b/system/libxml2/CVE-2020-7595.patch @@ -0,0 +1,32 @@ +From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie <xiezhipeng1@huawei.com> +Date: Thu, 12 Dec 2019 17:30:55 +0800 +Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities + +When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef +return NULL which cause a infinite loop in xmlStringLenDecodeEntities + +Found with libFuzzer. + +Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com> +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index d1c31963..a34bb6cd 100644 +--- a/parser.c ++++ b/parser.c +@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + else + c = 0; + while ((c != 0) && (c != end) && /* non input consuming loop */ +- (c != end2) && (c != end3)) { ++ (c != end2) && (c != end3) && ++ (ctxt->instate != XML_PARSER_EOF)) { + + if (c == 0) break; + if ((c == '&') && (str[1] == '#')) { +-- +2.24.1 + diff --git a/system/libxslt/APKBUILD b/system/libxslt/APKBUILD index c387c6d45..752f2a8a5 100644 --- a/system/libxslt/APKBUILD +++ b/system/libxslt/APKBUILD @@ -1,18 +1,16 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxslt -pkgver=1.1.33 -pkgrel=2 +pkgver=1.1.34 +pkgrel=0 pkgdesc="XML stylesheet transformation library" url="http://xmlsoft.org/XSLT/" arch="all" license="SGI-B-2.0" +depends="" makedepends="libxml2-dev libgcrypt-dev libgpg-error-dev python3-dev" subpackages="$pkgname-doc $pkgname-dev" -source="ftp://xmlsoft.org/$pkgname/$pkgname-$pkgver.tar.gz - CVE-2019-11068.patch - CVE-2019-13117.patch - CVE-2019-13118.patch" +source="ftp://xmlsoft.org/$pkgname/$pkgname-$pkgver.tar.gz" # secfixes: # 1.1.29-r1: @@ -39,7 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0 libxslt-1.1.33.tar.gz -48982b7486351d1eb2853f963db14381dd983c2b4347b7cbeb4507258146ebd8fca125506b2d15d4cbfd2e9ef3fef6341de41a2bfdffc3b0f6bea272b37d9e41 CVE-2019-11068.patch -b311e253a5c4f425f84344397974562a76b253ca14f63b48af7aa0faa561d5f728cb73ee63024993fad3ee7fc7eddb9c9d7310ab8faa5f6a14fd1c6d0037999f CVE-2019-13117.patch -44d3bb5dda6965f48e3af96c77ffa5f1f2e3c191cf1f28ac1b7b3501420393b5628b12b99fe4008b5056384dfebfdcbbee7625f0644cfc27101424a051415da0 CVE-2019-13118.patch" +sha512sums="1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b libxslt-1.1.34.tar.gz" diff --git a/system/libxslt/CVE-2019-11068.patch b/system/libxslt/CVE-2019-11068.patch deleted file mode 100644 index db0de8a55..000000000 --- a/system/libxslt/CVE-2019-11068.patch +++ /dev/null @@ -1,120 +0,0 @@ -From e03553605b45c88f0b4b2980adfbbb8f6fca2fd6 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer <wellnhofer@aevum.de> -Date: Sun, 24 Mar 2019 09:51:39 +0100 -Subject: [PATCH] Fix security framework bypass - -xsltCheckRead and xsltCheckWrite return -1 in case of error but callers -don't check for this condition and allow access. With a specially -crafted URL, xsltCheckRead could be tricked into returning an error -because of a supposedly invalid URL that would still be loaded -succesfully later on. - -Fixes #12. - -Thanks to Felix Wilhelm for the report. ---- - libxslt/documents.c | 18 ++++++++++-------- - libxslt/imports.c | 9 +++++---- - libxslt/transform.c | 9 +++++---- - libxslt/xslt.c | 9 +++++---- - 4 files changed, 25 insertions(+), 20 deletions(-) - -diff --git a/libxslt/documents.c b/libxslt/documents.c -index 3f3a7312..4aad11bb 100644 ---- a/libxslt/documents.c -+++ b/libxslt/documents.c -@@ -296,10 +296,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const xmlChar *URI) { - int res; - - res = xsltCheckRead(ctxt->sec, ctxt, URI); -- if (res == 0) { -- xsltTransformError(ctxt, NULL, NULL, -- "xsltLoadDocument: read rights for %s denied\n", -- URI); -+ if (res <= 0) { -+ if (res == 0) -+ xsltTransformError(ctxt, NULL, NULL, -+ "xsltLoadDocument: read rights for %s denied\n", -+ URI); - return(NULL); - } - } -@@ -372,10 +373,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const xmlChar *URI) { - int res; - - res = xsltCheckRead(sec, NULL, URI); -- if (res == 0) { -- xsltTransformError(NULL, NULL, NULL, -- "xsltLoadStyleDocument: read rights for %s denied\n", -- URI); -+ if (res <= 0) { -+ if (res == 0) -+ xsltTransformError(NULL, NULL, NULL, -+ "xsltLoadStyleDocument: read rights for %s denied\n", -+ URI); - return(NULL); - } - } -diff --git a/libxslt/imports.c b/libxslt/imports.c -index 874870cc..3783b247 100644 ---- a/libxslt/imports.c -+++ b/libxslt/imports.c -@@ -130,10 +130,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, xmlNodePtr cur) { - int secres; - - secres = xsltCheckRead(sec, NULL, URI); -- if (secres == 0) { -- xsltTransformError(NULL, NULL, NULL, -- "xsl:import: read rights for %s denied\n", -- URI); -+ if (secres <= 0) { -+ if (secres == 0) -+ xsltTransformError(NULL, NULL, NULL, -+ "xsl:import: read rights for %s denied\n", -+ URI); - goto error; - } - } -diff --git a/libxslt/transform.c b/libxslt/transform.c -index 13793914..0636dbd0 100644 ---- a/libxslt/transform.c -+++ b/libxslt/transform.c -@@ -3493,10 +3493,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNodePtr node, - */ - if (ctxt->sec != NULL) { - ret = xsltCheckWrite(ctxt->sec, ctxt, filename); -- if (ret == 0) { -- xsltTransformError(ctxt, NULL, inst, -- "xsltDocumentElem: write rights for %s denied\n", -- filename); -+ if (ret <= 0) { -+ if (ret == 0) -+ xsltTransformError(ctxt, NULL, inst, -+ "xsltDocumentElem: write rights for %s denied\n", -+ filename); - xmlFree(URL); - xmlFree(filename); - return; -diff --git a/libxslt/xslt.c b/libxslt/xslt.c -index 780a5ad7..a234eb79 100644 ---- a/libxslt/xslt.c -+++ b/libxslt/xslt.c -@@ -6763,10 +6763,11 @@ xsltParseStylesheetFile(const xmlChar* filename) { - int res; - - res = xsltCheckRead(sec, NULL, filename); -- if (res == 0) { -- xsltTransformError(NULL, NULL, NULL, -- "xsltParseStylesheetFile: read rights for %s denied\n", -- filename); -+ if (res <= 0) { -+ if (res == 0) -+ xsltTransformError(NULL, NULL, NULL, -+ "xsltParseStylesheetFile: read rights for %s denied\n", -+ filename); - return(NULL); - } - } --- -2.21.0 - diff --git a/system/libxslt/CVE-2019-13117.patch b/system/libxslt/CVE-2019-13117.patch deleted file mode 100644 index 78ebb9075..000000000 --- a/system/libxslt/CVE-2019-13117.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c5eb6cf3aba0af048596106ed839b4ae17ecbcb1 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer <wellnhofer@aevum.de> -Date: Sat, 27 Apr 2019 11:19:48 +0200 -Subject: [PATCH] Fix uninitialized read of xsl:number token - -Found by OSS-Fuzz. ---- - libxslt/numbers.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libxslt/numbers.c b/libxslt/numbers.c -index 89e1f668..75c31eba 100644 ---- a/libxslt/numbers.c -+++ b/libxslt/numbers.c -@@ -382,7 +382,10 @@ xsltNumberFormatTokenize(const xmlChar *format, - tokens->tokens[tokens->nTokens].token = val - 1; - ix += len; - val = xmlStringCurrentChar(NULL, format+ix, &len); -- } -+ } else { -+ tokens->tokens[tokens->nTokens].token = (xmlChar)'0'; -+ tokens->tokens[tokens->nTokens].width = 1; -+ } - } else if ( (val == (xmlChar)'A') || - (val == (xmlChar)'a') || - (val == (xmlChar)'I') || --- -2.21.0 - diff --git a/system/libxslt/CVE-2019-13118.patch b/system/libxslt/CVE-2019-13118.patch deleted file mode 100644 index b377f4bd6..000000000 --- a/system/libxslt/CVE-2019-13118.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 6ce8de69330783977dd14f6569419489875fb71b Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer <wellnhofer@aevum.de> -Date: Mon, 3 Jun 2019 13:14:45 +0200 -Subject: [PATCH] Fix uninitialized read with UTF-8 grouping chars - -The character type in xsltFormatNumberConversion was too narrow and -an invalid character/length combination could be passed to -xsltNumberFormatDecimal, resulting in an uninitialized read. - -Found by OSS-Fuzz. ---- - libxslt/numbers.c | 5 +++-- - tests/docs/bug-222.xml | 1 + - tests/general/bug-222.out | 2 ++ - tests/general/bug-222.xsl | 6 ++++++ - 4 files changed, 12 insertions(+), 2 deletions(-) - create mode 100644 tests/docs/bug-222.xml - create mode 100644 tests/general/bug-222.out - create mode 100644 tests/general/bug-222.xsl - -diff --git a/libxslt/numbers.c b/libxslt/numbers.c -index f1ed8846..20b99d5a 100644 ---- a/libxslt/numbers.c -+++ b/libxslt/numbers.c -@@ -1298,13 +1298,14 @@ OUTPUT_NUMBER: - number = floor((scale * number + 0.5)) / scale; - if ((self->grouping != NULL) && - (self->grouping[0] != 0)) { -+ int gchar; - - len = xmlStrlen(self->grouping); -- pchar = xsltGetUTF8Char(self->grouping, &len); -+ gchar = xsltGetUTF8Char(self->grouping, &len); - xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0], - format_info.integer_digits, - format_info.group, -- pchar, len); -+ gchar, len); - } else - xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0], - format_info.integer_digits, -diff --git a/tests/docs/bug-222.xml b/tests/docs/bug-222.xml -new file mode 100644 -index 00000000..69d62f2c ---- /dev/null -+++ b/tests/docs/bug-222.xml -@@ -0,0 +1 @@ -+<doc/> -diff --git a/tests/general/bug-222.out b/tests/general/bug-222.out -new file mode 100644 -index 00000000..e3139698 ---- /dev/null -+++ b/tests/general/bug-222.out -@@ -0,0 +1,2 @@ -+<?xml version="1.0"?> -+1⠢0 -diff --git a/tests/general/bug-222.xsl b/tests/general/bug-222.xsl -new file mode 100644 -index 00000000..e32dc473 ---- /dev/null -+++ b/tests/general/bug-222.xsl -@@ -0,0 +1,6 @@ -+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> -+ <xsl:decimal-format name="f" grouping-separator="⠢"/> -+ <xsl:template match="/"> -+ <xsl:value-of select="format-number(10,'#⠢0','f')"/> -+ </xsl:template> -+</xsl:stylesheet> --- -2.21.0 - diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD index f0cb77a92..4bb0d5d0c 100644 --- a/system/lvm2/APKBUILD +++ b/system/lvm2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lvm2 -pkgver=2.03.05 -pkgrel=2 +pkgver=2.03.08 +pkgrel=0 pkgdesc="Logical Volume Manager 2 utilities" url="https://sourceware.org/lvm2/" arch="all" @@ -11,12 +11,11 @@ license="GPL-2.0+ AND LGPL-2.1-only" # lvm2 will dlopen libs so we need to add explicit depend depends="lvm2-libs=$pkgver-r$pkgrel util-linux" depends_dev="linux-headers" -makedepends_build="coreutils libaio-dev" +makedepends_build="bash coreutils libaio-dev" makedepends_host="$depends_dev util-linux-dev" makedepends="$makedepends_build $makedepends_host" replaces="device-mapper $pkgname-dmeventd" source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz - dash.patch fix-stdio-usage.patch mallinfo.patch mlockall-default-config.patch @@ -60,7 +59,7 @@ build () { --with-thin-dump=/sbin/thin_dump \ --with-thin-repair=/sbin/thin_repair \ --with-dmeventd-path=/sbin/dmeventd - make + make SHELL=/bin/bash } package() { @@ -88,9 +87,8 @@ udev() { } -sha512sums="3b00f53771e99faa6459ae73353bff06ae37c64bd2659586ec25d0bb43bc3ff8ba5f713c68617fd7662a5f6cb65bca1ad0aea554819048d79c1cce20bf67c50a LVM2.2.03.05.tgz -9dbdda2b5b35777ea22be5eedd585de6594e856bf168416f11d003683dad9cc3d8dae5a14e5ae22f251d20809960173cd2e7ea0889949d5d1c1d1e2d10f81508 dash.patch -6ea4efad03f8632f2883f33f9d9f8ca295f7d8d2aa1bfbfa7738e7d711727a511758848dde5776b222bd74e6fb60bed8b56a3cd2f74ca448b8d86f50470a42b9 fix-stdio-usage.patch +sha512sums="411c76de2acd8d7d707b60a4aab3f846004a1fbdc7b1d3f34d21af8ed45716adc0516b11491a26261580da7396d13a506e3994b32f5d1cefdf49c97e5d62d2e3 LVM2.2.03.08.tgz +62dd89e626adc86d1f9d7c575517b4454a362868e2fd3399813b61c1cc407316156456348cd4e8148542ee26124739d6c0e72f3dddee66662a40ca86f1bc3abd fix-stdio-usage.patch 9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch d190c40a137b006d7b63298069c93ff08d2804b990e85d44739cd7c48beec9a569903b98f0d940895fc7365723ba886acd7ef0e08f1f65a1a391d1c448ce080e mlockall-default-config.patch a853078660fd2fd943538924f56e81dc5793294e26b8f61d93e6188893f15f4a438d33792b341c1865d61e03f4a371b7c7ee0db5f4130ef7cb7aeaeb9290086a lvm.initd diff --git a/system/lvm2/dash.patch b/system/lvm2/dash.patch deleted file mode 100644 index d2ab014f8..000000000 --- a/system/lvm2/dash.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- LVM2.2.03.05/configure -+++ LVM2.2.03.05/configure -@@ -3077,7 +3077,7 @@ if test -z "$CFLAGS"; then : - fi - case "$host_os" in - linux*) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" -+ CLDFLAGS="${CLDFLAGS:-"$LDFLAGS"} -Wl,--version-script,.export.sym" - # equivalent to -rdynamic - ELDFLAGS="-Wl,--export-dynamic" - # FIXME Generate list and use --dynamic-list=.dlopen.sym -@@ -3098,7 +3098,7 @@ case "$host_os" in - ;; - darwin*) - CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS:-"$LDFLAGS"}" - ELDFLAGS= - CLDWHOLEARCHIVE="-all_load" - CLDNOWHOLEARCHIVE= -@@ -3111,7 +3111,7 @@ case "$host_os" in - BLKDEACTIVATE=no - ;; - *) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS:-"$LDFLAGS"}" - ;; - esac - ---- LVM2.2.03.05/tools/Makefile.in -+++ LVM2.2.03.05/tools/Makefile.in -@@ -167,7 +167,7 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX) - - command-count.h: $(srcdir)/command-lines.in Makefile - @echo " [GEN] $@" -- $(Q) set -o pipefail && \ -+ $(Q) \ - ( cat $(top_srcdir)/tools/license.inc && \ - echo "/* Do not edit. This file is generated by the Makefile. */" && \ - echo -n "#define COMMAND_COUNT " && \ -@@ -176,7 +176,7 @@ command-count.h: $(srcdir)/command-lines.in Makefile - - cmds.h: $(srcdir)/command-lines.in Makefile - @echo " [GEN] $@" -- $(Q) set -o pipefail && \ -+ $(Q) \ - ( cat $(top_srcdir)/tools/license.inc && \ - echo "/* Do not edit. This file is generated by the Makefile. */" && \ - echo "cmd(CMD_NONE, none)" && \ -@@ -186,11 +186,11 @@ cmds.h: $(srcdir)/command-lines.in Makefile - - command-lines-input.h: $(srcdir)/command-lines.in Makefile - @echo " [GEN] $@" -- $(Q) set -o pipefail && \ -+ $(Q) \ - ( cat $(top_srcdir)/tools/license.inc && \ - echo "/* Do not edit. This file is generated by the Makefile. */" && \ -- echo -en "const char _command_input[] =\n\n\"" && \ -+ printf "const char _command_input[] =\n\n\"" && \ - $(EGREP) -v '^#|\-\-\-|^$$' $(srcdir)/command-lines.in | $(AWK) 'BEGIN {ORS = "\\n\"\n\""} //' && \ -- echo "\\n\";" \ -+ printf "%s\n" "\\n\";" \ - ) > $@ - diff --git a/system/lvm2/fix-stdio-usage.patch b/system/lvm2/fix-stdio-usage.patch index 39ba2e1b4..d5cc43f65 100644 --- a/system/lvm2/fix-stdio-usage.patch +++ b/system/lvm2/fix-stdio-usage.patch @@ -27,23 +27,3 @@ printf("stderr stream open: %s\n", strerror(errno)); return 0; ---- ./lib/commands/toolcontext.c.orig -+++ ./lib/commands/toolcontext.c -@@ -1860,7 +1860,7 @@ - /* FIXME Make this configurable? */ - reset_lvm_errno(1); - --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - /* Set in/out stream buffering before glibc */ - if (set_buffering) { - /* Allocate 2 buffers */ -@@ -2241,7 +2241,7 @@ - if (cmd->libmem) - dm_pool_destroy(cmd->libmem); - --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - if (cmd->linebuffer) { - /* Reset stream buffering to defaults */ - if (is_valid_fd(STDIN_FILENO) && diff --git a/system/man-db/APKBUILD b/system/man-db/APKBUILD index 411767d07..5ee93c438 100644 --- a/system/man-db/APKBUILD +++ b/system/man-db/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=man-db -pkgver=2.8.6.1 +pkgver=2.9.0 pkgrel=0 pkgdesc="The man command and related utilities for examining on-line help files" url="https://www.nongnu.org/man-db/" @@ -40,5 +40,5 @@ package() { rm -r "${pkgdir}"/usr/lib/tmpfiles.d # systemd } -sha512sums="0c43cdddf2e07cd4a2225e098ea4cbfb2842a9bbf08bfb073058be0d66efac3a77ca0f8725564677c8f61e671f471c76f1dbba77a7601d7a63bb81350ef51bb5 man-db-2.8.6.1.tar.xz -76a5b13d3018627cbc5a72cb51da3c78022245ad574c742699e7c4ab152ec2222ce7f34af5594de74b436dd23008af6c43739ee66973e049b07d82882e4965c6 man-db-2.8.5-iconv.patch" +sha512sums="7deb4421c7944276c6edf974b1336ee2f6605ee470c98d374544e2fcaa32ec2afe077c5fd020fc1f74df058384a293b8ad5a92d86b1c15a949573af46ba09cda man-db-2.9.0.tar.xz +0a68260fc48488408dc11855858aa2569efa3aeefd765c425b8fc988e7fee3e1d42e19eb299e518afc9b2ae54c5d37911176127124a43d5041f1137af0457097 man-db-2.8.5-iconv.patch" diff --git a/system/man-db/man-db-2.8.5-iconv.patch b/system/man-db/man-db-2.8.5-iconv.patch index 8c006fd9c..c2232920d 100644 --- a/system/man-db/man-db-2.8.5-iconv.patch +++ b/system/man-db/man-db-2.8.5-iconv.patch @@ -1,6 +1,6 @@ --- man-db-2.8.5/src/man.c 2018-06-18 22:44:35.672743065 -0500 +++ man-db-2.8.5/src/man.c 2018-06-18 22:46:35.032624890 -0500 -@@ -1569,15 +1569,13 @@ +@@ -1516,15 +1516,13 @@ { debug ("add_output_iconv: source %s, target %s\n", source, target); if (source && target && !STREQ (source, target)) { @@ -19,23 +19,19 @@ --- man-db-2.8.5/src/manconv.c +++ man-db-2.8.5/src/manconv.c -@@ -106,10 +106,9 @@ static int try_iconv (pipeline *p, const char *try_from_code, const char *to, - static char *utf8 = NULL, *output = NULL; - size_t utf8left = 0; +@@ -111,6 +111,5 @@ static int try_iconv (pipeline *p, const char *try_from_code, const char *to, iconv_t cd_utf8, cd = NULL; -- int to_utf8 = STREQ (try_to_code, "UTF-8") || -- STRNEQ (try_to_code, "UTF-8//", 7); +- bool to_utf8 = STREQ (try_to_code, "UTF-8") || +- STRNEQ (try_to_code, "UTF-8//", 7); - const char *utf8_target = last ? "UTF-8//IGNORE" : "UTF-8"; -- int ignore_errors = (strstr (try_to_code, "//IGNORE") != NULL);; -+ int to_utf8 = STREQ (try_to_code, "UTF-8"); +- bool ignore_errors = (strstr (try_to_code, "//IGNORE") != NULL); ++ bool to_utf8 = STREQ (try_to_code, "UTF-8"); + const char *utf8_target = "UTF-8"; -+ int ignore_errors = 0; ++ bool ignore_errors = 0; int ret = 0; - - debug ("trying encoding %s -> %s\n", try_from_code, try_to_code); --- man-db-2.8.5/src/manconv_client.c +++ man-db-2.8.5/src/manconv_client.c -@@ -105,7 +105,7 @@ void add_manconv (pipeline *p, const char *source, const char *target) +@@ -102,7 +102,7 @@ void add_manconv (pipeline *p, const char *source, const char *target) codes->from[2] = NULL; name = appendstr (name, "UTF-8:", source, (void *) 0); } @@ -58,7 +54,7 @@ debug_level = 1; --- man-db-2.8.5/src/whatis.c +++ man-db-2.8.5/src/whatis.c -@@ -974,7 +974,7 @@ int main (int argc, char *argv[]) +@@ -945,7 +945,7 @@ int main (int argc, char *argv[]) display_seen = hashtable_create (&null_hashtable_free); #ifdef HAVE_ICONV diff --git a/system/man-pages/APKBUILD b/system/man-pages/APKBUILD index 659ffb853..b543f78c6 100644 --- a/system/man-pages/APKBUILD +++ b/system/man-pages/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=man-pages -pkgver=5.03 +pkgver=5.05 _posixver=2013-a pkgrel=0 pkgdesc="Linux man pages" @@ -49,5 +49,5 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/localedef* } -sha512sums="e7e0d1952abe75dd2503fd7bd7fbe34532ef22b70d82f299099e38e08a92604df0f23ed83267b57ca6d9d90e697651c46f6a95c1a077e3f193ba89f6293af7be man-pages-5.03.tar.xz +sha512sums="4f1b9f69c44fb054de9834ad4356fc633416ce98285d137fc616967129f326c8dd28eba05d4fe12a385aced9ff478ed42dde777631be124b2ddc7569ee27a395 man-pages-5.05.tar.xz e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14 man-pages-posix-2013-a.tar.xz" diff --git a/system/mawk/APKBUILD b/system/mawk/APKBUILD index 9c84905f8..d8fd88b7d 100644 --- a/system/mawk/APKBUILD +++ b/system/mawk/APKBUILD @@ -1,12 +1,14 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mawk -pkgver=1.3.4.20190203 +pkgver=1.3.4.20200120 pkgrel=0 pkgdesc="Pattern scanning and text processing language" url="https://invisible-island.net/mawk/mawk.html" arch="all" license="BSD-3-Clause" +depends="" +makedepends="" subpackages="$pkgname-doc" _dlver="${pkgver%.*}-${pkgver##*.}" source="https://invisible-mirror.net/archives/$pkgname/$pkgname-$_dlver.tgz" @@ -23,13 +25,13 @@ build() { make } +check() { + make check +} + package() { make DESTDIR="$pkgdir" install ln -s mawk "$pkgdir"/usr/bin/awk } -check() { - make check -} - -sha512sums="64d5b1838d34d30e32966f46cb7457c865caccfe9fe1049d2645ba301b1ddb4efc18588115dbcf96234a2a0b791211a7f82264a3c81899459dc3029e65837646 mawk-1.3.4-20190203.tgz" +sha512sums="14d9a6642ce931bf6457d248fc2d6da4f0ea7541976ca282ea708b26df048f86fdf92c27f72d497501ccd43a244d1d1a606f1a2f266a7558306fea35dcc3041b mawk-1.3.4-20200120.tgz" diff --git a/system/nspr/APKBUILD b/system/nspr/APKBUILD index 533d31b8c..44b067c67 100644 --- a/system/nspr/APKBUILD +++ b/system/nspr/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nspr -pkgver=4.22 +pkgver=4.25 pkgrel=0 pkgdesc="Netscape Portable Runtime" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" @@ -13,7 +13,6 @@ depends_dev="nspr" makedepends="autoconf automake" subpackages="$pkgname-dev" source="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$pkgver/src/nspr-$pkgver.tar.gz - fix-getproto.patch stacksize.patch " @@ -57,6 +56,5 @@ package() { "$pkgdir"/usr/include/nspr/md } -sha512sums="d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b nspr-4.22.tar.gz -ee654f609a90b9a95c1901ad1d56cdef7cce8bca9efc092198607944f142f8fec924b13219ca6663facd0f0d59b671b8b3de58ab3449c4c863d42e2937f02184 fix-getproto.patch +sha512sums="b9aa576e0da37e8729088fe559d94030cf18f277c1f7a30104d3088a804913343ed884645c0adb62144da475e20934b359f897bf3ae9a6ebb5f9daf283d5a562 nspr-4.25.tar.gz 1f694fc151f6578080449e3aa999c520486bbe117b8237150966ec43092db4156e81412ac889045e0c0c3bf65d459af5bdc1cf19c9fa3dab120405a60732f15a stacksize.patch" diff --git a/system/nspr/fix-getproto.patch b/system/nspr/fix-getproto.patch deleted file mode 100644 index a96d14730..000000000 --- a/system/nspr/fix-getproto.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./nspr/pr/src/misc/prnetdb.c.orig -+++ ./nspr/pr/src/misc/prnetdb.c -@@ -61,9 +61,7 @@ - #define _PR_HAVE_GETPROTO_R_POINTER - #endif - --#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \ -- || (defined(LINUX) && defined(_REENTRANT) \ -- && defined(__GLIBC__) && __GLIBC__ < 2) -+#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) - #define _PR_HAVE_GETPROTO_R - #define _PR_HAVE_GETPROTO_R_POINTER - #endif diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD index 763b753e4..0e233e589 100644 --- a/system/nss/APKBUILD +++ b/system/nss/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nss -pkgver=3.47 +pkgver=3.50 _ver=$(printf '%s' "$pkgver" | tr . _) pkgrel=0 pkgdesc="Mozilla Network Security Services" @@ -146,7 +146,7 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="99d04d28c38092826f5aab125662780865de49a97743ff0ab49a191bafae3ba3a937369cd6909ab23e7dcaf06482c8852b31ef057dc12c758f2681e03822e247 nss-3.47.tar.gz +sha512sums="d6bcaf8ad65b5a97c42cd6cbbc68add5c4b49db74b2debcedb2a007f72511ac0e9bd21fd2dec041bc1975cfc8af26a48450aa0d1b962f755931ab2ac45c795b1 nss-3.50.tar.gz 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in 0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09 nss-util.pc.in 09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15 nss-softokn.pc.in diff --git a/system/pcre/APKBUILD b/system/pcre/APKBUILD index 4fa4ab7bc..3bfe4dff3 100644 --- a/system/pcre/APKBUILD +++ b/system/pcre/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pcre -pkgver=8.43 -pkgrel=2 +pkgver=8.44 +pkgrel=0 pkgdesc="Perl-compatible regular expression library" url="https://pcre.org" arch="all" @@ -22,7 +22,7 @@ source="https://ftp.pcre.org/pub/pcre/$pkgname-$pkgver.tar.bz2 # - CVE-2017-11164 build() { - local _enable_jit="--enable-jit" + _enable_jit="--enable-jit" [ "$CARCH" = "s390x" ] && _enable_jit="" ./configure \ --build=$CBUILD \ @@ -79,5 +79,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7 pcre-8.43.tar.bz2 +sha512sums="f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac pcre-8.44.tar.bz2 a088304318f7a04f90263efbab20b423e67fb6e3d829e7bc080fd44c29e98bc29cab992b73ed1b992af89cdf4606667af20572558a3a96549b7bd9479d0e6d88 stack-frame-size-detection.patch" diff --git a/system/pkgconf/APKBUILD b/system/pkgconf/APKBUILD index 1110b56e0..49d76d0ae 100644 --- a/system/pkgconf/APKBUILD +++ b/system/pkgconf/APKBUILD @@ -3,13 +3,12 @@ pkgname=pkgconf pkgver=1.6.3 pkgrel=0 pkgdesc="Toolkit for maintaining development package metadata" -url="https://git.dereferenced.org/pkgconf/pkgconf/" +url="http://pkgconf.org/" arch="all" license="ISC" depends="" checkdepends="kyua atf" makedepends="" -replaces="pkgconfig" provides="pkgconfig=1" subpackages="$pkgname-doc $pkgname-dev" source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz" diff --git a/system/procps/0001-pt_BR-fix-translation-error.patch b/system/procps/0001-pt_BR-fix-translation-error.patch deleted file mode 100644 index 68b06406f..000000000 --- a/system/procps/0001-pt_BR-fix-translation-error.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8e56c510e49330031c454481380552623eadf38f Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Sat, 16 Jun 2018 21:37:27 -0500 -Subject: [PATCH] pt_BR: fix translation error - -"agora" means "now"; "gora" is not a Portuguese word. - -\a is 'bell' character, which means the string will cause a bell to -sound instead of printing the correct word. ---- - po/pt_BR.po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/po/pt_BR.po b/po/pt_BR.po -index e7a859f..3f0106e 100644 ---- a/po/pt_BR.po -+++ b/po/pt_BR.po -@@ -3072,7 +3072,7 @@ msgstr "nome de campo não reconhecido \"%s\"" - - #: top/top_nls.c:429 - msgid "even using field names only, window is now too small" --msgstr "mesmo usando nomes de campo apenas, janela é pequena demais \agora" -+msgstr "mesmo usando nomes de campo apenas, janela é pequena demais agora" - - #: top/top_nls.c:431 - msgid "Open Files" --- -2.15.0 - diff --git a/system/procps/APKBUILD b/system/procps/APKBUILD index 65b740d62..32fe9fdd0 100644 --- a/system/procps/APKBUILD +++ b/system/procps/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=procps -pkgver=3.3.15 -pkgrel=1 +pkgver=3.3.16 +pkgrel=0 pkgdesc="Utilities for monitoring your system and processes on your system" url="https://gitlab.com/procps-ng/procps" arch="all" @@ -12,8 +12,8 @@ makedepends_build="autoconf automake libtool gettext-tiny" makedepends_host="ncurses-dev utmps-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libproc" source="https://gitlab.com/procps-ng/procps/-/archive/v$pkgver/procps-v$pkgver.tar.bz2 - 0001-pt_BR-fix-translation-error.patch - use-utmpx.patch" + use-utmpx.patch + " builddir="$srcdir/$pkgname-v$pkgver" prepare() { @@ -69,6 +69,5 @@ libproc() { mv "$pkgdir"/lib "$subpkgdir"/ } -sha512sums="0c50ef0f19305f1b53089f20f29d8058b23dde20983dbed759ea0fe8128b22518fd137dec389c3630988b6bbf0cf485418a328153b89ec4e1dfbf6d89322c064 procps-v3.3.15.tar.bz2 -d63c8df42f74f08f19276a8f4d0260624313801b138aa2b430a105328c3230427d3e81bc016ddde9fc995575e97961a3be8e4f5ded34c874cc613c645605a976 0001-pt_BR-fix-translation-error.patch +sha512sums="633c6fe90e753f5c489de7f8728ca5fe4647663a3e58ab66f77229a5991f6e7a7d174ddec2d2dfcd3b65146dd04ac6ea9c98697457edf785cb516ec3ec120f0b procps-v3.3.16.tar.bz2 6683b94f64848721ebce8254461fbd70a3efd048bf9579c5bbe298bd1ec00594c05640327f0e03475e583607f1f7405139b93fc9f06592d5593174cbf6d4119f use-utmpx.patch" diff --git a/system/rhash/APKBUILD b/system/rhash/APKBUILD index 1a3d8d0f1..cc97c89a9 100644 --- a/system/rhash/APKBUILD +++ b/system/rhash/APKBUILD @@ -1,12 +1,13 @@ # Contributor: Przemyslaw Pawelczyk <przemoc@zoho.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rhash -pkgver=1.3.8 +pkgver=1.3.9 pkgrel=0 pkgdesc="Utility for calculation and verification of hash sums and magnet links" url="http://rhash.sourceforge.net/" arch="all" license="MIT" +depends="" makedepends="openssl-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-lang $pkgname-libs" source="$pkgname-$pkgver.tar.gz::https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.gz" @@ -30,4 +31,4 @@ package() { make -j1 DESTDIR="$pkgdir" install install-gmo install-lib-headers install-lib-so-link install-man } -sha512sums="9dba4fa4dd49d323f2e440c5b93eac1ef62eb4046ec4ef611f0978c12c1739002f1ac1f1ec5e61bd359dc89e9ed612db71be91a795184ac5d5433280d27fa4c1 rhash-1.3.8.tar.gz" +sha512sums="6fae0587cdeb42df59d542c58bad734259d1ff39fba92531c10a469b51310644669ffbe0453e72d85c2cf38b176962f6dca9062a121ac019f1b30f207a176e60 rhash-1.3.9.tar.gz" diff --git a/system/rsync/APKBUILD b/system/rsync/APKBUILD index e93da8552..728a32fbc 100644 --- a/system/rsync/APKBUILD +++ b/system/rsync/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=rsync pkgver=3.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="File transfer program to keep remote files in sync" url="https://rsync.samba.org/" arch="all" license="GPL-3.0+" depends="" checkdepends="fakeroot" -makedepends="perl acl-dev attr-dev popt-dev" +makedepends="perl acl-dev attr-dev popt-dev zlib-dev" subpackages="$pkgname-doc $pkgname-openrc rrsync::noarch" source="https://download.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz rsyncd.initd @@ -18,6 +18,13 @@ source="https://download.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz rsyncd.logrotate " +# secfixes: +# 3.1.3-r2: +# - CVE-2016-9840 +# - CVE-2016-9841 +# - CVE-2016-9842 +# - CVE-2016-9843 + build() { # Force IPv6 enabled, upstream bug https://bugzilla.samba.org/show_bug.cgi?id=10715 CFLAGS="$CFLAGS -DINET6" \ @@ -29,7 +36,8 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --enable-acl-support \ - --enable-xattr-support + --enable-xattr-support \ + --with-included-zlib=no make } diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD index 696dc21ed..879a86235 100644 --- a/system/strace/APKBUILD +++ b/system/strace/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=strace -pkgver=5.4 +pkgver=5.5 pkgrel=0 pkgdesc="A useful diagnositic, instructional, and debugging tool" url="https://strace.io/" @@ -54,5 +54,5 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7 strace-5.4.tar.xz +sha512sums="317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231 strace-5.5.tar.xz 6616161b6e015c5e56b7171995d28ab63a865156b7f9826b4be26beaac863f0ebc341014910ea53157a810c6afafc10ce80b2d31f4d649d28718a9be78795c6c nlattr-fix.patch" diff --git a/system/sysklogd/APKBUILD b/system/sysklogd/APKBUILD index d8046befd..717a03340 100644 --- a/system/sysklogd/APKBUILD +++ b/system/sysklogd/APKBUILD @@ -4,13 +4,13 @@ pkgname=sysklogd pkgver=1.5.1 pkgrel=2 pkgdesc="System and kernel log daemons" -url="http://www.infodrom.org/projects/sysklogd/" +url="https://www.infodrom.org/projects/sysklogd/" arch="all" options="!check" # requires kernel sources to build oops.ko license="GPL-2.0+ AND BSD-4-Clause-UC" -subpackages="$pkgname-doc $pkgname-openrc" depends="" makedepends="linux-headers utmps-dev" +subpackages="$pkgname-doc $pkgname-openrc" source="http://www.infodrom.org/projects/$pkgname/download/$pkgname-$pkgver.tar.gz sysklogd.logrotate sysklogd.daily diff --git a/system/util-linux/APKBUILD b/system/util-linux/APKBUILD index 48bf1387d..6d03248ad 100644 --- a/system/util-linux/APKBUILD +++ b/system/util-linux/APKBUILD @@ -2,14 +2,14 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=util-linux -pkgver=2.34 +pkgver=2.35.1 case $pkgver in *.*.*) _v=${pkgver%.*};; *.*) _v=$pkgver;; esac -pkgrel=1 +pkgrel=0 pkgdesc="Official Linux system management utilities" url="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" arch="all" @@ -94,5 +94,5 @@ libmount() { mv "$pkgdir"/lib/libmount.so.* "$subpkgdir"/lib/ } -sha512sums="2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7 util-linux-2.34.tar.xz +sha512sums="6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a util-linux-2.35.1.tar.xz 876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h" diff --git a/system/xfsprogs/APKBUILD b/system/xfsprogs/APKBUILD index 0c77d7617..b1083da33 100644 --- a/system/xfsprogs/APKBUILD +++ b/system/xfsprogs/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xfsprogs -pkgver=5.3.0 +pkgver=5.4.0 pkgrel=0 pkgdesc="XFS filesystem utilities" -url="http://xfs.org/index.php/Main_Page" +url="https://xfs.org/index.php/Main_Page" arch="all" options="!check" # No test suite. license="GPL-1.0-only" @@ -48,6 +48,6 @@ base() { mv "$subpkgdir"/sbin/xfs_scrub "$pkgdir"/sbin/ } -sha512sums="b33f203625a98d2e56c854b90b5933b00202435be69395da740e9642a6f8072b948c5bec94e759716ed2c31aa09c82e96714bb3d3f566ebcab66e035e24e7137 xfsprogs-5.3.0.tar.gz +sha512sums="4d520881f4556976c3d64c5f72f51ea5531c7f380b22c48a1fb72bfde078ac725c70899c8c58263aa2a7aed2213de604121f2863e88b5cf8fb0dcc54446e133e xfsprogs-5.4.0.tar.gz c23d5dca744c4589ede517701fc8ea02f9b7a59568d907269048741806d2e6c9e56ed3493163d63dbf16193ff99471206548b25efcda18e3e5dff14eb38066d4 fix-mmap.patch 29c77c550fa8f7a0b3794649d278a2cb3a65c9368db19415866910160adb6d5a52f1be4f8713b58c5c87f149b6212c068ae27a4547a6c4e4fe7b1584e1261dae no-utmp-header.patch" diff --git a/system/zsh/APKBUILD b/system/zsh/APKBUILD index 3bc96b226..53bf5587b 100644 --- a/system/zsh/APKBUILD +++ b/system/zsh/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=zsh -pkgver=5.7.1 -pkgrel=3 +pkgver=5.8 +pkgrel=0 pkgdesc="A very advanced and programmable command interpreter (shell)" url="https://www.zsh.org/" arch="all" @@ -25,6 +25,8 @@ subpackages="$pkgname-doc [ "$CBUILD" != "$CHOST" ] || subpackages="$subpackages $pkgname-zftp" # secfixes: +# 5.8-r0: +# - CVE-2019-20044 # 5.6.2-r0: # - CVE-2018-0502 # - CVE-2018-13259 @@ -44,7 +46,6 @@ _comps="android-tools:Unix/_adb graphicsmagick:Unix/_graphicsmagick imagemagick:Unix/_imagemagick lynx:Unix/_lynx - mercurial:Unix/_hg rsync:Unix/_rsync subversion:Unix/_subversion tmux:Unix/_tmux @@ -178,7 +179,7 @@ _submv() { mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/ } -sha512sums="a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0 zsh-5.7.1.tar.xz +sha512sums="96198ecef498b7d7945fecebbe6bf14065fa8c5d81a7662164579eba8206b79575812d292adea1864bc7487ac0818ba900e25f9ab3802449340de80417c2c533 zsh-5.8.tar.xz d820fcf65bb3c52f23e968110b5df1188fc0b64079312f64d22ffe35de3b4f3055d4d629b3b0f97a1bfaddf62dbc80676af31c3a1a79645632082abfc854cf97 skel 63167188e22bf8933eb420a5ba068ab897531b90c8d8b8ec892f26a9180267a971013046a72b810d5b9d3add427cf650df608b0e008cd0789681ed1371b172c3 zprofile 1675e016f97333cad89b587f4292d81b6bc10e27b75482e3e0c3808539c95bd49b907b6579fb98d817f77f2f2384c0df5afa3e2b6f43b6ae9b466925cd9ccffc zshrc" diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD index 659f5fff3..8681e7991 100644 --- a/user/akonadi-contacts/APKBUILD +++ b/user/akonadi-contacts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-contacts -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Library for integrating contact lists with Akonadi" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e007f28a80e63fd4a2c8dce10ef4b8d0b74ae619590d7e54e5f95ea64907b3494580756aeaa7c5e5686d944c6ca57d5f6f44a5125fa7aeaf2bad2cf2a2085f5d akonadi-contacts-19.12.2.tar.xz" +sha512sums="23f896114ba66cce06069538768559c665e6d0bf7bc24b3cd2d801d41e7421f2f79f670a0af740dfbcd3fdc48584ff77cf2e156159450e484b0b8b137cdee4c2 akonadi-contacts-19.12.3.tar.xz" diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD index 48f77498f..013d8e49c 100644 --- a/user/akonadi-mime/APKBUILD +++ b/user/akonadi-mime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-mime -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Libraries to implement basic MIME message handling" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fffa2bb6169fc7b5d8b3ee290a4c9a3c7024381e95236abf722158648592398922575df55ad39c0323d5b79440b5b936a5d2a0a9ec531025d71ae5f6e451640e akonadi-mime-19.12.2.tar.xz" +sha512sums="d8c22ae1a2a349990248f209be017ceb2976bbb138ed25dc1e67993738d91c426897371f0844e6baecf095b5b39240b8dd836babb970c50b61af3aecc45dc251 akonadi-mime-19.12.3.tar.xz" diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD index 520c0217f..2b8ba158a 100644 --- a/user/akonadi/APKBUILD +++ b/user/akonadi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Libraries and storage system for PIM data" url="https://community.kde.org/KDE_PIM/Akonadi" @@ -47,5 +47,5 @@ package() { "$pkgdir"/usr/share/config/akonadi } -sha512sums="940ce14b637bcde5f77fa57e90e49d5606b07d2920f0734c12dd801fc3dd79bfa8e7278cfcec725ea2a5c7024ba71f4eaf389a2255176b376079dd409a48fe73 akonadi-19.12.2.tar.xz +sha512sums="d8eb31948a649e4f3ba4d5d000a384d1188075aee8971fea401cfb9e392e111c4f2b19888783ea4a9430443c9c216ea7a2a8275555935cc3965335bfc07296b0 akonadi-19.12.3.tar.xz b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc" diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD index b744f3029..f4e12d964 100644 --- a/user/analitza/APKBUILD +++ b/user/analitza/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=analitza -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Mathematical object library" url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7393bdd2a8adfc2bd0963cff361bfcd69aff33cb958e62f696c64ae070bd158e37b595d2bb18ecb14f0785bf6c96b5f8a2c4a18e8762daaeda913541050c8ecc analitza-19.12.2.tar.xz" +sha512sums="3b858af0a79174ec8c7ae28a703d067a6d2545dd5319a2d37d72831bba9f6196c6a6cedf6d277eb5ede812fb39ffab297f966da6c40926b26c0943ca10426eb9 analitza-19.12.3.tar.xz" diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index 3b2f33de0..f6240a428 100644 --- a/user/ark/APKBUILD +++ b/user/ark/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ark -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="158b25ff9cd8b9b53bb7cb58326ed2c0017bfa534522436eedcd7a2041cac428b2314c8e4b9000fdf84051b767a7619c630b7060153630e8f9a93f2595ed7949 ark-19.12.2.tar.xz" +sha512sums="0f1a155bcfaca1b28b5035943a3d881de89a68c5e8bac156dd1304aa431c5700b6da6dc70e43e82560594bc5aab0ee1d3f3ec50ed4dd15e7f3dd053acbb1a14a ark-19.12.3.tar.xz" diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD index eac67c1ed..a66845948 100644 --- a/user/artikulate/APKBUILD +++ b/user/artikulate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=artikulate -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Pronunciation trainer for languages" url="https://www.kde.org/applications/education/artikulate/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ef316a11304f6fb131628de8b5a8848ba332fe7709ad7c0c641548518469248432a05af04ae1e78d0bc8d8953aa1b2aaaedc0bac78fe834b65e218bae6dedba8 artikulate-19.12.2.tar.xz" +sha512sums="aaf8054d928a7e76ac868ca0bbf99edde6d3402dd175880cb04088f18b8b23d15c7281775d694be0b0bef4ec37a2101f5cf1873a6d933ff5a3cdf4352b017e32 artikulate-19.12.3.tar.xz" diff --git a/user/attica/APKBUILD b/user/attica/APKBUILD index 655ea83b5..7688326f4 100644 --- a/user/attica/APKBUILD +++ b/user/attica/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=attica -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Qt 5-based implementation of Open Collaboration Services" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59965df4eea792563cb46fd6d6ae8604dff5547917ea22a0ae00659d692ec05851768f66860de15c37631f918c1b54fc07264e9df123da3235c5a43576105cd7 attica-5.67.0.tar.xz" +sha512sums="225bec1c0e54ce1c13273aeb8ea2350c15f147c0d68c6a4427b5da381f72dfb5817eabb5f2a798cece49d14b111ca205b21576222ed8eeb8000b7fa760a1d30d attica-5.68.0.tar.xz" diff --git a/user/autoconf-archive/APKBUILD b/user/autoconf-archive/APKBUILD new file mode 100644 index 000000000..8a87a30fa --- /dev/null +++ b/user/autoconf-archive/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: +# Maintainer: +pkgname=autoconf-archive +pkgver=2019.01.06 +pkgrel=0 +pkgdesc="GNU Autoconf Macro Archive" +url="https://www.gnu.org/software/autoconf-archive/" +arch="noarch" +license="GPL-3.0+" +subpackages="$pkgname-dev $pkgname-doc" +source="https://ftpmirror.gnu.org/$pkgname/$pkgname-$pkgver.tar.xz" +builddir="$srcdir/$pkgname-$pkgver/" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="14bf8d0bf8be4a4dc078677de1977e496d4d9cf095bc897c174e331311b722cd3a34054e74c2146fff4b5c84269463e6a6fc61907d77d1c51bb221c8fb124fcb autoconf-archive-2019.01.06.tar.xz" diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD index f7e7feebc..dcdb6d85e 100644 --- a/user/baloo-widgets/APKBUILD +++ b/user/baloo-widgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=baloo-widgets -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Widgets that utilise the Baloo desktop indexing engine" url="https://www.KDE.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="810901328fed4f2f53e28dcd2c447c881af626e4261763dd3fc0a3dba527a196c7a0a4b619a05768b6c8503cf974ece577b134313e316c54fd9c0896a53f39fd baloo-widgets-19.12.2.tar.xz" +sha512sums="99c4f0aef513015371c9dce10e25e64b3eb7bf2e9dd741451332d141459bce777a0b0be29f2fb5cb198193ce6055d53744e84e9e5be089d958e829c39eb79f0f baloo-widgets-19.12.3.tar.xz" diff --git a/user/baloo/APKBUILD b/user/baloo/APKBUILD index d003e8bb3..4f84cbb32 100644 --- a/user/baloo/APKBUILD +++ b/user/baloo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=baloo -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Semantic desktop search framework" url="https://www.kde.org/" @@ -54,5 +54,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="065fb29c86e29a848c0bcac68851eb6b02b46e9f32269175a6d8cae80325dc619e020ac1c1f564998381a678d8918c1d7ddb81697e475663816eecb127831d5c baloo-5.67.0.tar.xz +sha512sums="54aa3d9a8e135fbc76b0583b2e5261bf027163addafabc7179e990a6c8c92eadc49195b6f66d77408a3ad74c2f7a3ab4328bc7afb243d1be519e78d0223ea2a6 baloo-5.68.0.tar.xz a65c36808c56dff4bc3bb91e791fcc9cba3cdaca686a214adf51e4d87d86ef7ee07d9dd8e0634dfc53a732b77668c6942322c993be5054bc4fc51e7bd69908ac initialise-variable.patch" diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD index 9eef3c5b6..5135228af 100644 --- a/user/bind/APKBUILD +++ b/user/bind/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=bind -pkgver=9.14.9 +pkgver=9.14.10 _p=${pkgver#*_p} _ver=${pkgver%_p*} _major=${pkgver%%.*} @@ -41,6 +41,8 @@ source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz builddir="$srcdir/$pkgname-$_ver" # secfixes: +# 9.14.9-r0: +# - CVE-2019-6477 # 9.14.7-r0: # - CVE-2019-6475 # - CVE-2019-6476 @@ -151,7 +153,7 @@ tools() { done } -sha512sums="aa6b1273f06fc16c842b7012a4d09cb65325a44ee88fea8bea8264ffa907ef4a6f8d5e09384599b2d6f5cea66c0dc220765c245814f54b2f09a5b6e65f97964b bind-9.14.9.tar.gz +sha512sums="81d453c4e90fea3a21b2485bea2f5321ca8a7ef58eb9a9bc1eaa1463989aefa439e4e45c9a43b1ec6a62c52f0e73d82ebd91cd084ad6ef2a67b705736e9e8d00 bind-9.14.10.tar.gz 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015 named.initd 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD index cbd6262c5..1ec66b771 100644 --- a/user/blinken/APKBUILD +++ b/user/blinken/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=blinken -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Memory enhancement game" url="https://www.kde.org/applications/education/blinken/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="609f44a0eb705c9d1f46e64bc4beb1ff760137dd0e4ad821108040824c064f763af7c03332e6ad86bc64fd568b3d478116cfc63f230d7ecd3f81aa37b504ab2e blinken-19.12.2.tar.xz" +sha512sums="2903269216465affa06a82bab2e91bc81be98e780ee6005b652a3f08781911d4fff5a441b835780711cda9f765e9b1008c1a38ac5ba379ceb08f424cfa7f3938 blinken-19.12.3.tar.xz" diff --git a/user/bluedevil/APKBUILD b/user/bluedevil/APKBUILD new file mode 100644 index 000000000..3c6c4bc9d --- /dev/null +++ b/user/bluedevil/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=bluedevil +pkgver=5.18.2 +pkgrel=0 +pkgdesc="Bluetooth framework for KDE" +url="https://userbase.kde.org/Bluedevil" +arch="all" +license="GPL-2.0+ AND LGPL-2.0+ AND (LGPL-2.1-only OR LGPL-3.0-only) AND GPL-3.0+" +depends="kded shared-mime-info" +makedepends="bluez-qt-dev cmake extra-cmake-modules kauth-dev kcodecs-dev + kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev + kded-dev kiconthemes-dev kio-dev kitemviews-dev kjobwidgets-dev + knotifications-dev kpackage-dev kservice-dev kwidgetsaddons-dev + kwindowsystem-dev kxmlgui-dev plasma-framework-dev qt5-qtbase-dev + qt5-qtdeclarative-dev solid-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/bluedevil-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="b1f00b35b44d14d52ba8eb68d6519af0486cb3db2dba4607860730ca2afa825e473d93383097e733e5e322ba9868415d154c81b1f377dd93ed312329a2d840bb bluedevil-5.18.2.tar.xz" diff --git a/user/bluez-qt/APKBUILD b/user/bluez-qt/APKBUILD new file mode 100644 index 000000000..2f4fc80a2 --- /dev/null +++ b/user/bluez-qt/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=bluez-qt +pkgver=5.68.0 +pkgrel=0 +pkgdesc="Qt integration with BlueZ" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires running D-Bus server. +license="LGPL-2.1-only OR LGPL-3.0-only" +depends="" +makedepends="cmake doxygen extra-cmake-modules qt5-qtbase-dev + qt5-qtdeclarative-dev qt5-qttools-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/bluez-qt-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_QCH:BOOL=ON \ + -DBUILD_TESTING:BOOL=OFF \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="c11a43b29f1c04fc67abf2c7f5a2e53e098cdeeddde84ed88a46a15d1dce537442d24422c245f23506840aef2d84d5d828b4c7951362537725b59d31a9a402c7 bluez-qt-5.68.0.tar.xz" diff --git a/user/bluez/APKBUILD b/user/bluez/APKBUILD index 7a05abb09..af4f09ba8 100644 --- a/user/bluez/APKBUILD +++ b/user/bluez/APKBUILD @@ -1,43 +1,63 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bluez -pkgver=5.52 -pkgrel=0 +pkgver=5.53 +pkgrel=1 pkgdesc="Linux Bluetooth protocol stack" url="http://www.bluez.org/" arch="all" license="GPL-2.0+" depends="consolekit2 dbus" makedepends="alsa-lib-dev dbus-dev eudev-dev glib-dev libical-dev - linux-headers" + linux-headers ncurses-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bccmd $pkgname-btmon $pkgname-cups $pkgname-deprecated $pkgname-hid2hci - $pkgname-obexd $pkgname-openrc" + $pkgname-obexd $pkgname-openrc $pkgname-tools" source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz + https://ftp.gnu.org/gnu/readline/readline-8.0.tar.gz bluetooth.initd rfcomm.initd rfcomm.confd - 001-bcm43xx-Add-bcm43xx-3wire-variant.patch - 002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch - 003-Increase-firmware-load-timeout-to-30s.patch - 004-Move-the-43xx-firmware-into-lib-firmware.patch - bluez-5.40-obexd_without_systemd-1.patch + 001-bcm43xx-Add-bcm43xx-3wire-variant.patch + 002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch + 003-Increase-firmware-load-timeout-to-30s.patch + 004-Move-the-43xx-firmware-into-lib-firmware.patch + dbus-without-systemd.patch + mesh-without-systemd.patch + obex-without-systemd.patch disable-lock-test.patch fix-endianness.patch + time64.patch " -build() { +prepare() { + default_prepare + + cd "$srcdir"/readline-8.0 ./configure \ --build=$CBUILD \ --host=$CHOST \ + --prefix="$srcdir"/readline \ + --enable-static \ + --disable-shared + make install +} + +build() { + CFLAGS="$CFLAGS -I$srcdir/readline/include -L$srcdir/readline/lib" \ + CPPFLAGS="$CPPFLAGS -I$srcdir/readline/include" LIBS="-ltinfo" ./configure \ + --build=$CBUILD \ + --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ --libexecdir=/usr/lib \ --disable-systemd \ - --disable-client \ + --enable-client \ --enable-library \ - --enable-deprecated + --enable-deprecated \ + --enable-experimental \ + --enable-tools make } @@ -56,33 +76,33 @@ package() { } bccmd() { - pkgdesc="Bluez utility for the CSR BCCMD interface" + pkgdesc="BlueZ utility for the CSR BCCMD interface" mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/bccmd "$subpkgdir"/usr/bin/ } btmon() { - pkgdesc="Bluez bluetooth monitor" + pkgdesc="BlueZ Bluetooth monitor" mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/btmon "$subpkgdir"/usr/bin/ } cups() { - pkgdesc="Bluez backend for CUPS" + pkgdesc="BlueZ backend for CUPS" depends="cups" mkdir -p "$subpkgdir"/usr/lib/ mv "$pkgdir"/usr/lib/cups "$subpkgdir"/usr/lib/ } hid2hci() { - pkgdesc="Put HID proxying bluetooth HCI's into HCI mode" + pkgdesc="Put HID proxying Bluetooth HCIs into HCI mode" replaces="bluez" mkdir -p "$subpkgdir" mv "$pkgdir"/lib "$subpkgdir"/ } deprecated() { - pkgdesc="Deprecated bluetooth tools" + pkgdesc="Deprecated Bluetooth tools" mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/ciptool \ "$pkgdir"/usr/bin/hciattach \ @@ -95,12 +115,21 @@ deprecated() { } obexd() { - pkgdesc="Bluez OBEX daemon" + pkgdesc="BlueZ OBEX daemon" mkdir -p "$subpkgdir"/usr/lib/bluetooth mv "$pkgdir"/usr/lib/bluetooth/obexd "$subpkgdir"/usr/lib/bluetooth } -sha512sums="9024481910d1dee85578bf3d7a4fc4be2bece516e6216c91aa1a7ac18537f092b47c41c4a5506ddd7e279599d58002e98203c5439745c01df4dbc22a75234c84 bluez-5.52.tar.xz +tools() { + pkgdesc="Bluetooth tools" + mkdir -p "$subpkgdir"/usr/bin + for _tool in bluetooth-player mpris-proxy; do + install -Dm755 "$builddir"/tools/$_tool "$subpkgdir"/usr/bin/$_tool + done +} + +sha512sums="62956e6293ec2517ec453dc7a6c82d34a8c446df8add8fe411b0a45fd5604817f3a19fbc646ad6f68df435f3cd2bd10ae040890e30db83b022f90b54cc6b3c74 bluez-5.53.tar.xz +41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f readline-8.0.tar.gz fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e bluetooth.initd 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd @@ -108,6 +137,9 @@ a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b34841 d5fd1c962bd846eaa6fff879bab85f753eb367d514f82d133b5d3242e1da989af5eddd942c60a87d5b67783e060f91bfa0f74fb1e8e6699cdee6e5bbe6a431ea 002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch 784e9644c8de4e2693e2eeed988a245608b8cb14e1fc0dff8795c60c527b2e8d0c87862cfbfd6b850b47ae80cdf993a5ed3f477078ea1068fd7374899c7a1a77 003-Increase-firmware-load-timeout-to-30s.patch 42ac04044a8c66e07487598b3a75ef52efc32999ebce4e7c63f6198e2f603f4a1442e74600e43a0938cb4f52d4db0298aa99050b18144b84990cda71748e9de5 004-Move-the-43xx-firmware-into-lib-firmware.patch -b7640a78cb33b3628564ebb2d8bcaf4255bddf5a25068838a9cc5fbd26d5d8dbf51e4b6b6fd2137fccae593482b2927ba13cb166be255be02d72a245ea60c3ff bluez-5.40-obexd_without_systemd-1.patch +a681a98178f9374ab882984058559752d1e1f3261412f450b38f1a06c3dfb5ce45e2cce35aa152f3c5761a9f7695fb0990cfdcc394706304470e6d1a8dbef682 dbus-without-systemd.patch +59fa8b90d5b8ac5922b730b01fbeb8a237075cd537705fe2665f15c7626bc6a8bd8128a3e899b0c620b6cb4f86862c2a416b2af8c2575d0724b26c8132aff251 mesh-without-systemd.patch +9aa78fdd9a84dd2a20cd6a4f5105e88af16896ae81a76a9a9f86902a9988d58af1102948c2d87397df36d747ce206d06a7bf1795c3ceb6a4617d95a26be3526f obex-without-systemd.patch 04c4889372c8e790bb338dde7ffa76dc32fcf7370025c71b9184fcf17fd01ade4a6613d84d648303af3bbc54043ad489f29fc0cd4679ec8c9029dcb846d7e026 disable-lock-test.patch -118d55183860f395fc4bdc93efffb13902ebf7388cad722b9061cd2860d404333e500af521741c3d92c0f8a161f6810348fbeb6682e49c372383f417aed8c76a fix-endianness.patch" +118d55183860f395fc4bdc93efffb13902ebf7388cad722b9061cd2860d404333e500af521741c3d92c0f8a161f6810348fbeb6682e49c372383f417aed8c76a fix-endianness.patch +da2ca90b0de1afb90914370dbc482f78ab9a270e60142ed7901eff408d02611d7fe423ae4677bce49fe829d59aa9aa971f9d0039d6e9134d3346aeb51b62ba9c time64.patch" diff --git a/user/bluez/bluez-5.40-obexd_without_systemd-1.patch b/user/bluez/bluez-5.40-obexd_without_systemd-1.patch deleted file mode 100644 index 17433fccd..000000000 --- a/user/bluez/bluez-5.40-obexd_without_systemd-1.patch +++ /dev/null @@ -1,61 +0,0 @@ -Submitted By: Armin K. <krejzi at email dot com> -Date: 2013-04-29 -Initial Package Version: 5.17 -Upstream Status: unknown -Origin: Arch Linux (Giovanni Campagna) -Description: Allow using obexd without systemd in the user session - -Not all sessions run systemd --user (actually, the majority -doesn't), so the dbus daemon must be able to spawn obexd -directly, and to do so it needs the full path of the daemon. ---- - Makefile.obexd | 4 ++-- - obexd/src/org.bluez.obex.service | 4 ---- - obexd/src/org.bluez.obex.service.in | 4 ++++ - 3 files changed, 6 insertions(+), 6 deletions(-) - delete mode 100644 obexd/src/org.bluez.obex.service - create mode 100644 obexd/src/org.bluez.obex.service.in - -diff --git a/Makefile.obexd b/Makefile.obexd -index 3760867..142e7c3 100644 ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -1,12 +1,12 @@ - if SYSTEMD - systemduserunitdir = $(SYSTEMD_USERUNITDIR) - systemduserunit_DATA = obexd/src/obex.service -+endif - - dbussessionbusdir = $(DBUS_SESSIONBUSDIR) - dbussessionbus_DATA = obexd/src/org.bluez.obex.service --endif - --EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service -+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in - - obex_plugindir = $(libdir)/obex/plugins - -diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service -deleted file mode 100644 -index a538088..0000000 ---- a/obexd/src/org.bluez.obex.service -+++ /dev/null -@@ -1,4 +0,0 @@ --[D-BUS Service] --Name=org.bluez.obex --Exec=/bin/false --SystemdService=dbus-org.bluez.obex.service -diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in -new file mode 100644 -index 0000000..9c815f2 ---- /dev/null -+++ b/obexd/src/org.bluez.obex.service.in -@@ -0,0 +1,4 @@ -+[D-BUS Service] -+Name=org.bluez.obex -+Exec=@libexecdir@/obexd -+SystemdService=dbus-org.bluez.obex.service --- -1.8.3.1 - - diff --git a/user/bluez/dbus-without-systemd.patch b/user/bluez/dbus-without-systemd.patch new file mode 100644 index 000000000..5b9c7dc70 --- /dev/null +++ b/user/bluez/dbus-without-systemd.patch @@ -0,0 +1,34 @@ +From 2625ab38ae27754205d060f09e3a18f7648d5167 Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh <congdanhqx@gmail.com> +Date: Thu, 3 Oct 2019 12:57:09 +0700 +Subject: [PATCH 1/9] enable dbus without systemd + +--- + Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 404e6a460..0884156fa 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -40,14 +40,14 @@ conf_DATA = + + statedir = $(localstatedir)/lib/bluetooth + state_DATA = ++ ++dbussystembusdir = $(DBUS_SYSTEMBUSDIR) ++dbussystembus_DATA = src/org.bluez.service + endif + + if SYSTEMD + systemdsystemunitdir = $(SYSTEMD_SYSTEMUNITDIR) + systemdsystemunit_DATA = src/bluetooth.service +- +-dbussystembusdir = $(DBUS_SYSTEMBUSDIR) +-dbussystembus_DATA = src/org.bluez.service + endif + + EXTRA_DIST += src/bluetooth.service.in src/org.bluez.service +-- +2.23.0 + diff --git a/user/bluez/mesh-without-systemd.patch b/user/bluez/mesh-without-systemd.patch new file mode 100644 index 000000000..2cf6f7344 --- /dev/null +++ b/user/bluez/mesh-without-systemd.patch @@ -0,0 +1,29 @@ +From 32a425c3f9b42a55824c044a6b486c9c12e65a65 Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh <congdanhqx@gmail.com> +Date: Thu, 3 Oct 2019 12:58:18 +0700 +Subject: [PATCH 3/9] allow mesh on non-systemd system + +--- + Makefile.mesh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.mesh b/Makefile.mesh +index 90979cbc0..9e6e2c2ca 100644 +--- a/Makefile.mesh ++++ b/Makefile.mesh +@@ -2,11 +2,11 @@ if MESH + + if DATAFILES + dbus_DATA += mesh/bluetooth-mesh.conf ++dbussystembus_DATA += mesh/org.bluez.mesh.service + endif + + if SYSTEMD + systemdsystemunit_DATA += mesh/bluetooth-mesh.service +-dbussystembus_DATA += mesh/org.bluez.mesh.service + endif + + mesh_sources = mesh/mesh.h mesh/mesh.c \ +-- +2.23.0 + diff --git a/user/bluez/obex-without-systemd.patch b/user/bluez/obex-without-systemd.patch new file mode 100644 index 000000000..c011d2307 --- /dev/null +++ b/user/bluez/obex-without-systemd.patch @@ -0,0 +1,54 @@ +From 5f27d3887b60c95cbcdefaeae5dea38f020c390e Mon Sep 17 00:00:00 2001 +From: Doan Tran Cong Danh <congdanhqx@gmail.com> +Date: Thu, 3 Oct 2019 12:57:55 +0700 +Subject: [PATCH 2/8] allow obexd on non-systemd system + +--- + Makefile.obexd | 6 +++--- + .../{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (74%) + +diff --git a/Makefile.obexd b/Makefile.obexd +index de59d297b..cb04bb1e2 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -1,12 +1,12 @@ + if SYSTEMD + systemduserunitdir = $(SYSTEMD_USERUNITDIR) + systemduserunit_DATA = obexd/src/obex.service ++endif + + dbussessionbusdir = $(DBUS_SESSIONBUSDIR) + dbussessionbus_DATA = obexd/src/org.bluez.obex.service +-endif + +-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service ++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in + + if OBEX + +@@ -107,6 +107,6 @@ obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources) + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@ + +-CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service ++CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service obexd/src/org.bluez.obex.service + + EXTRA_DIST += obexd/src/genbuiltin +diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in +similarity index 74% +rename from obexd/src/org.bluez.obex.service +rename to obexd/src/org.bluez.obex.service.in +index a53808884..543d7bc07 100644 +--- a/obexd/src/org.bluez.obex.service ++++ b/obexd/src/org.bluez.obex.service.in +@@ -1,4 +1,4 @@ + [D-BUS Service] + Name=org.bluez.obex +-Exec=/bin/false ++Exec=@pkglibexecdir@/obexd + SystemdService=dbus-org.bluez.obex.service +-- +2.23.0 + diff --git a/user/bluez/time64.patch b/user/bluez/time64.patch new file mode 100644 index 000000000..782255817 --- /dev/null +++ b/user/bluez/time64.patch @@ -0,0 +1,82 @@ +--- bluez-5.53/monitor/packet.c.old 2020-02-15 18:33:56.000000000 +0000 ++++ bluez-5.53/monitor/packet.c 2020-02-25 09:24:09.629224611 +0000 +@@ -364,7 +364,7 @@ + } + + if (filter_mask & PACKET_FILTER_SHOW_TIME) { +- n = sprintf(ts_str + ts_pos, " %02d:%02d:%02d.%06lu", ++ n = sprintf(ts_str + ts_pos, " %02d:%02d:%02d.%06"PRIu64, + tm.tm_hour, tm.tm_min, tm.tm_sec, tv->tv_usec); + if (n > 0) { + ts_pos += n; +@@ -373,7 +373,7 @@ + } + + if (filter_mask & PACKET_FILTER_SHOW_TIME_OFFSET) { +- n = sprintf(ts_str + ts_pos, " %lu.%06lu", ++ n = sprintf(ts_str + ts_pos, " %"PRIu64".%06"PRIu64, + tv->tv_sec - time_offset, tv->tv_usec); + if (n > 0) { + ts_pos += n; +--- bluez-5.53/tools/parser/parser.h.old 2015-10-30 03:30:13.000000000 +0000 ++++ bluez-5.53/tools/parser/parser.h 2020-02-25 09:26:51.471579651 +0000 +@@ -26,6 +26,7 @@ + #define __PARSER_H + + #include <time.h> ++#include <inttypes.h> + #include <sys/time.h> + #include <netinet/in.h> + +@@ -133,11 +134,11 @@ + struct tm tm; + time_t t = f->ts.tv_sec; + localtime_r(&t, &tm); +- printf("%04d-%02d-%02d %02d:%02d:%02d.%06lu ", ++ printf("%04d-%02d-%02d %02d:%02d:%02d.%06"PRIu64" ", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, f->ts.tv_usec); + } else +- printf("%8lu.%06lu ", f->ts.tv_sec, f->ts.tv_usec); ++ printf("%8"PRIu64".%06"PRIu64" ", f->ts.tv_sec, f->ts.tv_usec); + } + printf("%c ", (f->in ? '>' : '<')); + parser.state = 1; +--- bluez-5.53/tools/rctest.c.old 2019-09-19 18:51:03.000000000 +0000 ++++ bluez-5.53/tools/rctest.c 2020-02-25 09:24:56.994060632 +0000 +@@ -36,6 +36,7 @@ + #include <getopt.h> + #include <syslog.h> + #include <signal.h> ++#include <inttypes.h> + #include <sys/time.h> + #include <sys/ioctl.h> + #include <sys/socket.h> +@@ -513,7 +514,7 @@ + timestamp = 0; + memset(ts, 0, sizeof(ts)); + } else { +- sprintf(ts, "[%ld.%ld] ", ++ sprintf(ts, "[%"PRId64".%"PRId64"] ", + tv.tv_sec, tv.tv_usec); + } + } +--- bluez-5.53/tools/l2test.c.old 2019-09-19 18:51:03.000000000 +0000 ++++ bluez-5.53/tools/l2test.c 2020-02-25 09:27:47.325490145 +0000 +@@ -38,6 +38,7 @@ + #include <getopt.h> + #include <syslog.h> + #include <signal.h> ++#include <inttypes.h> + #include <sys/time.h> + #include <poll.h> + #include <sys/ioctl.h> +@@ -915,7 +916,7 @@ + timestamp = 0; + memset(ts, 0, sizeof(ts)); + } else { +- sprintf(ts, "[%ld.%ld] ", ++ sprintf(ts, "[%"PRId64".%"PRId64"] ", + tv.tv_sec, tv.tv_usec); + } + } diff --git a/user/bolt/APKBUILD b/user/bolt/APKBUILD new file mode 100644 index 000000000..b14289263 --- /dev/null +++ b/user/bolt/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=bolt +pkgver=0.8 +pkgrel=0 +pkgdesc="Thunderbolt 3 device manager" +url=" " +arch="all" +license="LGPL-2.1-only" +depends="" +makedepends="eudev-dev glib-dev meson ninja polkit-dev" +subpackages="" +source="https://gitlab.freedesktop.org/bolt/bolt/-/archive/$pkgver/bolt-$pkgver.tar.gz + wakeup.patch + " + +build() { + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + . output + ninja -C output +} + +check() { + ninja -C output test +} + +package() { + DESTDIR="$pkgdir" ninja -C output install +} + +sha512sums="0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09 bolt-0.8.tar.gz +487f2c7824edba318692d40ffc4e55f893602587b1380b18877d9dca3b5b22b14e27001b3547369a8ec1a6c5fe7a5facc1fa97e92b3a5011a67ec967afce25ea wakeup.patch" diff --git a/user/bolt/wakeup.patch b/user/bolt/wakeup.patch new file mode 100644 index 000000000..a10d420c4 --- /dev/null +++ b/user/bolt/wakeup.patch @@ -0,0 +1,50 @@ +From ea3e3e30eb3ce76f6a0ae816a0f35809872f4edf Mon Sep 17 00:00:00 2001 +From: Christian Kellner <christian@kellner.me> +Date: Mon, 13 Jan 2020 17:38:47 +0100 +Subject: [PATCH] manager: ignore wakeup device uevents for probing + +The probing detection code should ignore wakeup device uevents +because these virtual devices can be added (and removed) without +and correspondence to any physical thunderbolt device (un-)plug +events. +--- + boltd/bolt-manager.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/boltd/bolt-manager.c b/boltd/bolt-manager.c +index 877c008..c8b60da 100644 +--- a/boltd/bolt-manager.c ++++ b/boltd/bolt-manager.c +@@ -2043,6 +2043,16 @@ device_is_thunderbolt_root (struct udev_device *dev) + bolt_streq (driver, "thunderbolt"); + } + ++static gboolean ++device_is_wakeup (struct udev_device *dev) ++{ ++ const char *subsys; ++ ++ subsys = udev_device_get_subsystem (dev); ++ ++ return bolt_streq (subsys, "wakeup"); ++} ++ + static gboolean + probing_add_root (BoltManager *mgr, + struct udev_device *dev) +@@ -2080,6 +2090,12 @@ manager_probing_device_added (BoltManager *mgr, + if (syspath == NULL) + return; + ++ /* ignore events for wakeup devices which get removed ++ * and added at random time without any connection to ++ * any physical thunderbolt device */ ++ if (device_is_wakeup (dev)) ++ return; ++ + roots = mgr->probing_roots; + for (guint i = 0; i < roots->len; i++) + { +-- +2.24.1 + diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD index 1f288b743..029cb84a2 100644 --- a/user/bomber/APKBUILD +++ b/user/bomber/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bomber -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Arcade bombing game" url="https://www.kde.org/applications/games/bomber/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ba581ce80021650562d294cebeb8621ca91949785f63a3c17d7746f14c83fb6aeda4fffe4cfbeffacd93aa64d1f2490f30c0597fdd2442edf305919f9eaae89 bomber-19.12.2.tar.xz" +sha512sums="09eed297e60bf05aa2197c70deb4b5c67c59a4bef61a78496a90a03241eb379a950f56ac1102d89cba6f4abd15a528f79b5496d90ceab4831f08aa0108ed90fb bomber-19.12.3.tar.xz" diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD index a04476f92..4f98235e9 100644 --- a/user/bovo/APKBUILD +++ b/user/bovo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bovo -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Gomoku or Connect Five game" url="https://www.kde.org/applications/games/bovo/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="288d6f28aba818745e0bdc7577774c76e942ddcc90dd5b20b1f919544bbba66c1447306a881952442a364cea14d08fb2f30d6f1f6cca28d6270ea5f772f6048f bovo-19.12.2.tar.xz" +sha512sums="a2b13a7e59c39188b642c7c5d43b071a7702cd770497ffef5f0f4b44d8b6117c3aa61e0e7d8db3fcf4c9f8db72d1a57c7cb4afc5831d13eb56aa723b35763855 bovo-19.12.3.tar.xz" diff --git a/user/breeze-grub/APKBUILD b/user/breeze-grub/APKBUILD new file mode 100644 index 000000000..2c62f2f6a --- /dev/null +++ b/user/breeze-grub/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=breeze-grub +pkgver=5.18.2 +pkgrel=0 +pkgdesc="KDE Breeze theme for GRUB boot screen" +url="https://www.kde.org/" +arch="noarch" +options="!check" # Theme files, no code. +license="GPL-3.0+" +depends="grub" +makedepends="" +subpackages="" +install_if="grub breeze" +source="https://download.kde.org/stable/plasma/$pkgver/breeze-grub-$pkgver.tar.xz" + +package() { + mkdir -p "$pkgdir"/usr/share/grub/themes + cp -r breeze "$pkgdir"/usr/share/grub/themes/ +} + +sha512sums="39636bec70735e05dca3e544f541fd4483e90b57394fb514a12f80ec71fa96db7bb29ed5f122499a39fff2a81d7b0c69cbc1e48b3a00b48f0e94a93b51c3ae3f breeze-grub-5.18.2.tar.xz" diff --git a/user/breeze-gtk/APKBUILD b/user/breeze-gtk/APKBUILD index 16bf8e884..8308c281a 100644 --- a/user/breeze-gtk/APKBUILD +++ b/user/breeze-gtk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=breeze-gtk -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="GTK+ style that matches KDE Breeze" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ef156b514c50f154c091dd3a39f51c69039ff43147d52cded28d474ce75f1128713f1a06fcd4326c6a39aa634290bfe7cf22a98f4b979dab8351ceb311890983 breeze-gtk-5.18.0.tar.xz" +sha512sums="124a55280936a24519bcf1fd17009c7da7dc3b7b96c86101e2fc2fe1628b1740f5aeb04fd019f60a15a73c64f2d035c7d9815a2b40c59d37e6519f5c7c1b491a breeze-gtk-5.18.2.tar.xz" diff --git a/user/breeze-icons/APKBUILD b/user/breeze-icons/APKBUILD index e7348531b..2142678a6 100644 --- a/user/breeze-icons/APKBUILD +++ b/user/breeze-icons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=breeze-icons -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Modern, coherent icon set for desktops" url="https://www.kde.org/" @@ -25,16 +25,18 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} . - make + ${CMAKE_CROSSOPTS} \ + -B build \ + . + make -C build } check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } dark() { @@ -43,4 +45,4 @@ dark() { mv "$pkgdir"/usr/share/icons/breeze-dark "$subpkgdir"/usr/share/icons/ } -sha512sums="2b35f780888f21600230ed29b4e7d1f3b06981fb5f899f267a895d0d8a3aa3b85c915b3a262bf2864989202d0130fb7f79df76c1c856fdf7e97170b5a7ced9af breeze-icons-5.67.0.tar.xz" +sha512sums="d66ee651d8d69e5e162cf2f74f1f84255db121e90e8a2150813a06a918af8642b41a23b3b5885b8b10d23ec0a3bdb654affca78790b6d2158833a34e7bc1d7d3 breeze-icons-5.68.0.tar.xz" diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD index 0104f1b42..6b0122e72 100644 --- a/user/breeze/APKBUILD +++ b/user/breeze/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=breeze -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Default KDE Plasma 5 style" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dfa2a2ac4cf933509136774665219d5540719d769dfdcb2635a3bfa711d0bf8ca2e76e19200294dbd0123997484e1e209c643581438b26bd407323e5de28b40c breeze-5.18.0.tar.xz" +sha512sums="ebd888aeb2b81043e8d389b5596c44b5da585015d603978509bf0551c0cec145db042b277483061cef71e55ff36eb762fe184f7b7c71094247fcb249f4d19310 breeze-5.18.2.tar.xz" diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD index 2d3d81de5..e7e1a9b11 100644 --- a/user/cantor/APKBUILD +++ b/user/cantor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cantor -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE worksheet interface for popular mathematical applications" url="https://edu.kde.org/cantor/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bc13824d41d6752700b6881eeb1316e422dc2908c7d628dd1401e348b74690e0acf3b6d6b096a7034ecb09a91b96f4c9b30d00b160bb994ffaf065287e81fcbc cantor-19.12.2.tar.xz" +sha512sums="83324f7a1702b5ed5d74ecab7664b653b8f318b03b6c856c7a70133b2aaf0927cf8b16a8ba9e27a7224d4d8d5900f1dcdbc89e70f40871f000db29f6f072668a cantor-19.12.3.tar.xz" diff --git a/user/ccache/APKBUILD b/user/ccache/APKBUILD index 4bca128ec..9076bbb09 100644 --- a/user/ccache/APKBUILD +++ b/user/ccache/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ccache -pkgver=3.7.6 +pkgver=3.7.7 pkgrel=0 pkgdesc="A fast C/C++ compiler cache" url="https://ccache.dev/" @@ -47,4 +47,4 @@ package() { done } -sha512sums="c92a699b9761bbbde1666a9bc2718070a5beb24f7054d91226790c7903fe2e26a02d0782822bc811aaffcd88df3cd3e011a19061eb69569ed7140765cef8d6ba ccache-3.7.6.tar.xz" +sha512sums="f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816 ccache-3.7.7.tar.xz" diff --git a/user/claws-mail/APKBUILD b/user/claws-mail/APKBUILD index f59ff40e1..880f8fafb 100644 --- a/user/claws-mail/APKBUILD +++ b/user/claws-mail/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=claws-mail -pkgver=3.17.4 -pkgrel=2 +pkgver=3.17.5 +pkgrel=0 pkgdesc="User-friendly, lightweight, and fast email client" url="https://www.claws-mail.org/" arch="all" @@ -11,16 +11,9 @@ depends="compface" makedepends="compface-dev curl-dev dbus-glib-dev enchant-dev gnutls-dev gpgme-dev gtk+2.0-dev libcanberra-gtk2 libcanberra-dev libetpan-dev libical-dev libnotify-dev librsvg-dev openldap-dev - startup-notification-dev autoconf automake libtool" + startup-notification-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz - etpan.patch - " - -prepare() { - default_prepare - autoreconf -vif -} +source="https://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz" build() { ./configure \ @@ -43,5 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012 claws-mail-3.17.4.tar.xz -39e70ba2edfad857d4c042db0fa38ac806cf188d1cf7642b92d0115e162349919df7b98ade49da822fb1b299c5ef06d221b5c600e218ed33e0e8a48c3635d0a2 etpan.patch" +sha512sums="a1d3576eba70b83a6fe70aafead3d80681e6372d146b573f5d43fee63bdcf84b5350d4dc8a4290b11d11320381417253d893daee8169c110e294178d10ea542f claws-mail-3.17.5.tar.xz" diff --git a/user/claws-mail/etpan.patch b/user/claws-mail/etpan.patch deleted file mode 100644 index 572380d2e..000000000 --- a/user/claws-mail/etpan.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 412a3f014..6a80c2a92 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -908,38 +908,62 @@ fi - dnl Libetpan - AC_MSG_CHECKING([whether to use libetpan]) - if test x"$enable_libetpan" = xyes; then -- AC_MSG_RESULT(yes) -- libetpan_result=no -- AC_PATH_PROG(libetpanconfig, [libetpan-config]) -- if test "x$libetpanconfig" != "x"; then -- CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`" -- AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes]) -- if test "x$libetpan_result" = "xyes"; then -- AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine]) -- LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`" -- AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no]) -- AC_MSG_RESULT([$libetpan_result]) -- fi -- fi -- if test "x$libetpan_result" = "xyes"; then -- LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`" -- LIBETPAN_LIBS="`$libetpanconfig --libs`" -- LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'` -- if test "$LIBETPAN_VERSION" -lt "57"; then -- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/]) -- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) -+ AC_MSG_RESULT(yes) -+ -+ libetpan_config=no -+ libetpan_result=no -+ libetpan_versiontype=0 -+ -+ # since 1.9.4, libetpan uses pkg-config -+ PKG_CHECK_MODULES([LIBETPAN], [libetpan >= 1.9.4], -+ [ -+ LIBETPAN_VERSION=`pkg-config --modversion | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'` -+ libetpan_config=yes -+ ], -+ [ -+ # before 1.9.4, libetpan uses its own libetpan-config script -+ AC_PATH_PROG(libetpanconfig, [libetpan-config]) -+ if test "x$libetpanconfig" != "x"; then -+ LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`" -+ LIBETPAN_LIBS="`$libetpanconfig --libs`" -+ # support libetpan version like x.x and x.x.x -+ libetpan_versiontype=`$libetpanconfig --version | tr -dc . | wc -c` -+ if test $libetpan_versiontype -eq 1; then -+ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'` -+ else -+ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'` -+ fi -+ libetpan_config=yes -+ fi -+ ]) -+ if test "x$libetpan_config" = "xyes"; then -+ CPPFLAGS="$CPPFLAGS $LIBETPAN_FLAGS" -+ AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes]) -+ if test "x$libetpan_result" = "xyes"; then -+ AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine]) -+ LIBS="$LIBS $LIBETPAN_LIBS" -+ AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no]) -+ AC_MSG_RESULT([$libetpan_result]) -+ fi -+ fi -+ if test "x$libetpan_result" = "xyes"; then -+ if test $libetpan_versiontype -eq 1; then -+ if test "$LIBETPAN_VERSION" -lt "57"; then -+ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/]) -+ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) - AC_MSG_ERROR([libetpan 0.57 not found]) -- fi -- AC_SUBST(LIBETPAN_FLAGS) -- AC_SUBST(LIBETPAN_LIBS) -- AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.) -- else -- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ]) -- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) -- AC_MSG_ERROR([libetpan 0.57 not found]) -- fi -+ fi -+ fi -+ AC_SUBST(LIBETPAN_FLAGS) -+ AC_SUBST(LIBETPAN_LIBS) -+ AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNit TP support.) -+ else -+ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ]) -+ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) -+ AC_MSG_ERROR([libetpan 0.57 not found]) -+ fi - else -- AC_MSG_RESULT(no) -+ AC_MSG_RESULT(no) - fi - AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes") - diff --git a/user/dhcpcd/APKBUILD b/user/dhcpcd/APKBUILD index ce37435d9..19b63bc1a 100644 --- a/user/dhcpcd/APKBUILD +++ b/user/dhcpcd/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=dhcpcd -pkgver=8.1.5 +pkgver=8.1.6 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="https://roy.marples.name/projects/dhcpcd" @@ -42,6 +42,6 @@ package() { "$pkgdir"/etc/init.d/dhcpcd } -sha512sums="59c8ae255b18b6678b22d4bd5f6797ac20e762d1d22e5ba4c0aefce5ec0d4f863876c06c03dd4c5e71f4d65884474cef9c29f95658eac55097603becd96e3846 dhcpcd-8.1.5.tar.xz +sha512sums="f4d7ea5f4c139a2735e795e13be68f6edac89d86d97589c2cdd67f89b890a093675dcc207c681332e2163b1094da8ce75bda2ee614c19bafd01410d9fadf19df dhcpcd-8.1.6.tar.xz 1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch e777432c2efc84285b41e63a4687f3bd543f6864218d037529ab78b5ad934de154f28f478bd9facb56628f2953aad8a932bc2eb8b1dfffa0ce2278ffcfc4d880 dhcpcd.initd" diff --git a/user/djvulibre/APKBUILD b/user/djvulibre/APKBUILD index 2b4a3ed0e..fa2ce6059 100644 --- a/user/djvulibre/APKBUILD +++ b/user/djvulibre/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=djvulibre pkgver=3.5.27 -pkgrel=1 +pkgrel=2 pkgdesc="Format for distributing documents and images" url="http://djvu.sourceforge.net/" arch="all" @@ -15,7 +15,9 @@ source="https://downloads.sourceforge.net/djvu/djvulibre-$pkgver.tar.gz CVE-2019-15142.patch CVE-2019-15143.patch CVE-2019-15144.patch - CVE-2019-15145.patch" + CVE-2019-15145.patch + CVE-2019-18804.patch + " # secfixes: # 3.5.27-r1: @@ -23,6 +25,8 @@ source="https://downloads.sourceforge.net/djvu/djvulibre-$pkgver.tar.gz # - CVE-2019-15143 # - CVE-2019-15144 # - CVE-2019-15145 +# 3.5.27-r2: +# - CVE-2019-18804 build() { ./configure \ @@ -48,4 +52,5 @@ sha512sums="62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252 d9e4301fb98a35b8c2f1854eb4be53611f98b3fc9fdd357dd5502b5b189bdf61957a48b220f3ab7465bbf1df8606ce04513e10df74643a9e289c349f94721561 CVE-2019-15142.patch 3527e1c84f7c7d36f902cb3d7e9ddb6866acbdd4b47675ce3ffd164accf2e2931a4c6bbaae2ea775b4710d88ae34dd4dcd39a5846fce13bef2c82a99d608b8c1 CVE-2019-15143.patch f8f1abf328a97d69514b2626e4c6449c0c7b7e2b5518d56bba6a61a944aaf4b7fffd1371c26396353728f6a1399c6d87492af5c17e6b623dae7751b81eac11f9 CVE-2019-15144.patch -790ef1e05874635c762600c990ecbd3e29e2eb01c59e25a0f8b2a15dbadbd3673d9dbb651d9dcb53fd3e5f4cb6bded47c3eefaaef8b4ccac39bd28f8bbec2068 CVE-2019-15145.patch" +790ef1e05874635c762600c990ecbd3e29e2eb01c59e25a0f8b2a15dbadbd3673d9dbb651d9dcb53fd3e5f4cb6bded47c3eefaaef8b4ccac39bd28f8bbec2068 CVE-2019-15145.patch +e5d6cd98f208db49880c6237f7cd8ab097d02f9771936c04a5acc48d9d18876d5cf48bcc61b14f1affc501ee63e8d6337fa83af259485ef35d4faa5086f06d10 CVE-2019-18804.patch" diff --git a/user/djvulibre/CVE-2019-18804.patch b/user/djvulibre/CVE-2019-18804.patch new file mode 100644 index 000000000..7c66c3989 --- /dev/null +++ b/user/djvulibre/CVE-2019-18804.patch @@ -0,0 +1,39 @@ +From c8bec6549c10ffaa2f2fbad8bbc629efdf0dd125 Mon Sep 17 00:00:00 2001 +From: Leon Bottou <leon@bottou.org> +Date: Thu, 17 Oct 2019 22:20:31 -0400 +Subject: [PATCH] Fixed bug 309 + +--- + libdjvu/IW44EncodeCodec.cpp | 2 +- + tools/ddjvu.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp +index 00752a0..f81eaeb 100644 +--- a/libdjvu/IW44EncodeCodec.cpp ++++ b/libdjvu/IW44EncodeCodec.cpp +@@ -405,7 +405,7 @@ filter_fv(short *p, int w, int h, int rowsize, int scale) + int y = 0; + int s = scale*rowsize; + int s3 = s+s+s; +- h = ((h-1)/scale)+1; ++ h = (h>0) ? ((h-1)/scale)+1 : 0; + y += 1; + p += s; + while (y-3 < h) +diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp +index 6d0df3b..7109952 100644 +--- a/tools/ddjvu.cpp ++++ b/tools/ddjvu.cpp +@@ -279,7 +279,7 @@ render(ddjvu_page_t *page, int pageno) + prect.h = (ih * 100) / dpi; + } + /* Process aspect ratio */ +- if (flag_aspect <= 0) ++ if (flag_aspect <= 0 && iw>0 && ih>0) + { + double dw = (double)iw / prect.w; + double dh = (double)ih / prect.h; +-- +2.20.1 + diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD index bb476fe49..c7ffa7108 100644 --- a/user/dolphin/APKBUILD +++ b/user/dolphin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dolphin -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Lightweight desktop file manager" url="https://www.kde.org/applications/system/dolphin/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c9b43a3e923e6f261225ab7ebc0a35722f4aba197015e48739c7b0cc442dfa227875b55e85a28c8703abdfab7b592432d14ca3560155e59ad39a4542345646dc dolphin-19.12.2.tar.xz" +sha512sums="d4922774adea1aa5f68654f5fc0db5e2da653487ffbf8bc519d1b03f141355cedfb4d52aebf6570ab2fb40a0edac2bba42ecece983cbf31dca2ee02fa3b98fb5 dolphin-19.12.3.tar.xz" diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD index b1ddb3e43..f0d269483 100644 --- a/user/dragonplayer/APKBUILD +++ b/user/dragonplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dragonplayer -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Multimedia player with a focus on simplicity" url="https://www.kde.org/applications/multimedia/dragonplayer/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="598377048786431d4f14eb8b63c3a29c96b9cd4df016eceb4b36b25d5f4367b1f431994e579bb0d9892cd724891f8e840430a15647c71933b264fd5d132f8482 dragon-19.12.2.tar.xz" +sha512sums="29ba89a2292842e47f47dbbe313a6c8d4bfae22d6d7563336f4614f6ea561187e714baf76ac830c65bf5c5ce97077865a04418f905bd6ec902d10631e93a66b8 dragon-19.12.3.tar.xz" diff --git a/user/drkonqi/APKBUILD b/user/drkonqi/APKBUILD new file mode 100644 index 000000000..7c2089579 --- /dev/null +++ b/user/drkonqi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=drkonqi +pkgver=5.18.2 +pkgrel=0 +pkgdesc="Crash diagnostic system for KDE" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires X11 +license="GPL-2.0+ AND (LGPL-2.1-only OR LGPL-3.0-only) AND BSD-2-Clause" +depends="" +makedepends="cmake extra-cmake-modules kauth-dev kcodecs-dev kcompletion-dev + kconfigwidgets-dev kcoreaddons-dev kcrash-dev ki18n-dev kidletime-dev + kio-dev kitemviews-dev kjobwidgets-dev knotifications-dev kservice-dev + kwallet-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev + qt5-qtbase-dev qt5-qtx11extras-dev solid-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/drkonqi-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="c878a9348fe270a84321e5bc3f22063c39acde8ff1378d32c6d3f009f17374bb861cfb71559cdfe2c8046ce60c1198e7946ab181ebfa27a02c6e0aa74c9adb0b drkonqi-5.18.2.tar.xz" diff --git a/user/encfs/APKBUILD b/user/encfs/APKBUILD new file mode 100644 index 000000000..a20e1c888 --- /dev/null +++ b/user/encfs/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=encfs +pkgver=1.9.5 +pkgrel=0 +pkgdesc="Encrypted filesystem for FUSE" +url="https://vgough.github.io/encfs/" +arch="all" +license="LGPL-3.0+ AND GPL-3.0+ AND MIT AND Zlib" +depends="" +makedepends="cmake fuse-dev openssl-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://github.com/vgough/encfs/releases/download/v$pkgver/encfs-$pkgver.tar.gz + cmake.patch + length.patch + shell.patch + typos.patch + utimensat.patch + " + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + -Bbuild . + make -C build +} + +check() { + make -C build unittests + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test +} + +package() { + make DESTDIR="$pkgdir" -C build install +} + +sha512sums="036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46 encfs-1.9.5.tar.gz +4810156ba2d61aef2f5c0c4cf8528596752309aacba5930aa6becfc6160b3c897df7570408b6431d5f09d6f85cd0fc41bd9127d47bdc9da6eb2e6321a9bda2f6 cmake.patch +fa94088ad23ca9bdc2127f3025dc27fbf148ce94aad0378601cf0e0831039f654d74f2b3259d18ab448df3e3e63e96c59c73275abe0463504f91345d495f4375 length.patch +c25a8c0a65c163ce87c3275261f0dae01df8d382a31a97efdc074a746cc8e8e2564e19568ca84e49c8c0c209406257dcd161784f47ec9fc78251e2c3175a3a82 shell.patch +432199fddc361a8ace6c09a883261d07dc3aead6450584c52e98ddfaf310e5621fc9f3c3da48f012104690cc036a251919100c5d0ad17143e68ba07e826dafd9 typos.patch +2e44c9808e065424c62d81f58798c25f5d749a5f12aa46d62385e610aff563a8730100035ac044d9ea00430cd275ced33184682d1d1b55a46ef8e22d821cc635 utimensat.patch" diff --git a/user/encfs/cmake.patch b/user/encfs/cmake.patch new file mode 100644 index 000000000..4e564d996 --- /dev/null +++ b/user/encfs/cmake.patch @@ -0,0 +1,72 @@ +From 4328178788c1adcdf431952b2723770607f3cbec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rogelio=20Dom=C3=ADnguez=20Hern=C3=A1ndez?= + <rogelio.dominguez@gmail.com> +Date: Fri, 21 Feb 2020 15:48:12 -0600 +Subject: [PATCH] Remove "SYSTEM" from the include_directories() CMakeLists.txt + entries (#561) + +--- + CMakeLists.txt | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62a2ad0d..e90ce0c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -96,7 +96,7 @@ endif() + + # Check for FUSE. + find_package (FUSE REQUIRED) +-include_directories (SYSTEM ${FUSE_INCLUDE_DIR}) ++include_directories (${FUSE_INCLUDE_DIR}) + add_definitions (-D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=29) + if (CYGWIN) + # Cygwin build is intended to use WinFsp +@@ -105,7 +105,7 @@ endif() + + # Check for OpenSSL. + find_package (OpenSSL REQUIRED) +-include_directories (SYSTEM ${OPENSSL_INCLUDE_DIR}) ++include_directories (${OPENSSL_INCLUDE_DIR}) + + find_program (POD2MAN pod2man) + +@@ -187,7 +187,7 @@ include_directories (${CMAKE_CURRENT_LIST_DIR}) + if (ENABLE_NLS) + find_package (Intl) + if (Intl_FOUND) +- include_directories (SYSTEM ${Intl_INCLUDE_DIRS}) ++ include_directories (${Intl_INCLUDE_DIRS}) + endif() + + add_subdirectory(po) +@@ -236,11 +236,11 @@ if (USE_INTERNAL_TINYXML) + endif () + set(BUILD_TESTS OFF CACHE BOOL "build tests") + add_subdirectory(${TINYXML_DIR} EXCLUDE_FROM_ALL) +- include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR}) ++ include_directories(${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR}) + link_directories(${CMAKE_BINARY_DIR}/${TINYXML_DIR}) + else () + find_package (TinyXML REQUIRED) +- include_directories (SYSTEM ${TINYXML_INCLUDE_DIR}) ++ include_directories (${TINYXML_INCLUDE_DIR}) + endif () + + if (USE_INTERNAL_EASYLOGGING) +@@ -248,13 +248,13 @@ if (USE_INTERNAL_EASYLOGGING) + set(EASYLOGGING_DIR vendor/github.com/muflihun/easyloggingpp) + set(build_static_lib ON CACHE BOOL "build static libs") + add_subdirectory(${EASYLOGGING_DIR} EXCLUDE_FROM_ALL) +- include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/${EASYLOGGING_DIR}/src) ++ include_directories(${CMAKE_CURRENT_LIST_DIR}/${EASYLOGGING_DIR}/src) + link_directories(${CMAKE_BINARY_DIR}/${EASYLOGGING_DIR}) + set(EASYLOGGINGPP_LIBRARY easyloggingpp) + else () + set(EASYLOGGINGPP_USE_SHARED_LIBS ON CACHE BOOL "look for shared lib") + find_package (EASYLOGGINGPP REQUIRED) +- include_directories (SYSTEM ${EASYLOGGINGPP_INCLUDE_DIR}) ++ include_directories (${EASYLOGGINGPP_INCLUDE_DIR}) + endif () + + set(SOURCE_FILES diff --git a/user/encfs/length.patch b/user/encfs/length.patch new file mode 100644 index 000000000..be3f373c3 --- /dev/null +++ b/user/encfs/length.patch @@ -0,0 +1,22 @@ +From dafeb556d27076b0c6fa23e44e523bdd84598838 Mon Sep 17 00:00:00 2001 +From: Ben RUBSON <ben.rubson@gmail.com> +Date: Sun, 9 Dec 2018 11:28:42 +0100 +Subject: [PATCH] Correct block filename max length (#540) + +--- + encfs/encfs.pod | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/encfs/encfs.pod b/encfs/encfs.pod +index 6cb5b8f5..d3831296 100644 +--- a/encfs/encfs.pod ++++ b/encfs/encfs.pod +@@ -490,7 +490,7 @@ filenames for some reason. + + Based on an underlying filesystem supporting a maximum of 255 characters in + filenames, here is the maximum possible filename length depending on the choosen +-encoding scheme : stream (189), block (176), block32 (143). Note that we should ++encoding scheme : stream (189), block (175), block32 (143). Note that we should + rather talk about bytes, when filenames contain special (multi-bytes) characters. + + Prior to version 1.1, only stream encoding was supported. diff --git a/user/encfs/shell.patch b/user/encfs/shell.patch new file mode 100644 index 000000000..40876ca9f --- /dev/null +++ b/user/encfs/shell.patch @@ -0,0 +1,22 @@ +From 4f21701c1aaeb3e5b9822231e011ac3224026a4c Mon Sep 17 00:00:00 2001 +From: Daniel Santana <daniel@santana.tech> +Date: Sun, 9 Dec 2018 08:37:12 -0200 +Subject: [PATCH] Use /bin/sh as a fallback to SHELL in encfssh (#538) + +--- + encfs/encfssh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/encfs/encfssh b/encfs/encfssh +index fe7b502e..d9566f7d 100755 +--- a/encfs/encfssh ++++ b/encfs/encfssh +@@ -77,7 +77,7 @@ fuse_umount() { + } + + # Honor the SHELL environment variable to select a shell to run +-"$SHELL"; retval=$? ++"${SHELL:-/bin/sh}"; retval=$? + + # ensure that this shell isn't itself holding the mounted directory open + # ...but avoid terminating on failure, *or* causing a shellcheck warning for diff --git a/user/encfs/typos.patch b/user/encfs/typos.patch new file mode 100644 index 000000000..8809d8a1d --- /dev/null +++ b/user/encfs/typos.patch @@ -0,0 +1,44 @@ +From 24af76d0d9503e1bd0725f6b448c8fecb603ab56 Mon Sep 17 00:00:00 2001 +From: Vasiliy Glazov <vascom2@gmail.com> +Date: Tue, 3 Jul 2018 08:57:09 +0300 +Subject: [PATCH] Correct typo in russian translate (#528) + +--- + po/ru.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/po/ru.po b/po/ru.po +index 33ad129b..c0793cc8 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -448,7 +448,7 @@ msgstr "" + "Выберите одну из следующих букв:\n" + " введите \"x\" для режима эксперта,\n" + " введите \"p\" для режима максимальной секретности,\n" +-" любой другая буква для выбора стандартного режима.\n" ++" любая другая буква для выбора стандартного режима.\n" + "?> " + + #, c-format +From ce200c83f0d9b5309f3e8fae7283c4cad598f637 Mon Sep 17 00:00:00 2001 +From: Shohei Kusakata <shohei@kusakata.com> +Date: Thu, 18 Jul 2019 19:29:16 +0900 +Subject: [PATCH] Fix typo in japanese translation (#553) + +--- + po/ja.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/po/ja.po b/po/ja.po +index eccefb44..b089aadf 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -608,7 +608,7 @@ msgid "" + " - invalid options -- see usage message\n" + msgstr "" + "fuse が失敗しました。一般的な原因としては:\n" +-" - fuse カーネルモジュールがインストールされていない (modeprobe fuse)\n" ++" - fuse カーネルモジュールがインストールされていない (modprobe fuse)\n" + " - 無効なオプション -- 使い方を参照してください\n" + + #, c-format diff --git a/user/encfs/utimensat.patch b/user/encfs/utimensat.patch new file mode 100644 index 000000000..93c5378e1 --- /dev/null +++ b/user/encfs/utimensat.patch @@ -0,0 +1,22 @@ +From 3d060783eea3790b8d6ea9920db8a0dc6e73d184 Mon Sep 17 00:00:00 2001 +From: Russell Yanofsky <russ@yanofsky.org> +Date: Sun, 16 Sep 2018 15:41:11 -0400 +Subject: [PATCH] Fix setting nanosecond times + +utimensat function was never being called due to missing cmake define +--- + config.h.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.h.cmake b/config.h.cmake +index 8548d706..32ddf2bb 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -6,6 +6,7 @@ + #cmakedefine XATTR_LLIST + + #cmakedefine HAVE_LCHMOD ++#cmakedefine HAVE_UTIMENSAT + #cmakedefine HAVE_FDATASYNC + + #cmakedefine HAVE_DIRENT_D_TYPE diff --git a/user/erl-rebar3/APKBUILD b/user/erl-rebar3/APKBUILD index 87ae5f2a5..689c82cc7 100644 --- a/user/erl-rebar3/APKBUILD +++ b/user/erl-rebar3/APKBUILD @@ -4,7 +4,7 @@ pkgname=erl-rebar3 pkgver=3.11.1 pkgrel=0 pkgdesc="Erlang build tool" -url="http://www.rebar3.org/" +url="https://www.rebar3.org/" arch="noarch" options="!tracedeps" license="Apache-2.0" diff --git a/user/erlang/APKBUILD b/user/erlang/APKBUILD index 58fac74b8..733fcae80 100644 --- a/user/erlang/APKBUILD +++ b/user/erlang/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=erlang -pkgver=22.2.1 +pkgver=22.2.7 pkgrel=0 pkgdesc="Soft real-time system programming language" url="https://www.erlang.org/" @@ -33,7 +33,6 @@ build() { } check() { - local _header export ERL_TOP=$builddir make release_tests @@ -51,5 +50,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4c0e5b963def01e02f8550414bee9e15a79681ac19547c4707d4cf3a67924e252dde7f8f94dfeca5eb3d34730acaffd193603711531bdf7c22d47d8880c5e5f4 erlang-22.2.1.tar.gz -91c62e6a894d6f1ae371025e49c02ff25f1cc244fb18c8eae87c9e031d8216bab901b8d278df67db08f260f0d56fa18122f191405e4d58ca64934259f156b907 fix-wx-linking.patch" +sha512sums="1746acd526eda37c769b70bba1ad0f73ee1e658d05d0cbbe4063f34c11f8061932b2cde04df725537f5c5b81b537897ada2f0f9b6b18b7554b0f7596c492906b erlang-22.2.7.tar.gz +4331f4b9a8cd0787d79f26304415604118cf2f750cb2e98f3d0bb16dbf9e2b5e230b4b4b15fed4ac207a0ae83a0963adebd3f5e9423b98f0b7f733334669709d fix-wx-linking.patch" diff --git a/user/erlang/fix-wx-linking.patch b/user/erlang/fix-wx-linking.patch index e1e8d4333..234da77fb 100644 --- a/user/erlang/fix-wx-linking.patch +++ b/user/erlang/fix-wx-linking.patch @@ -1,6 +1,6 @@ --- otp-OTP-22.0.7/lib/wx/configure.in.old 2019-07-10 16:05:15.000000000 +0000 +++ otp-OTP-22.0.7/lib/wx/configure.in 2019-08-07 01:00:20.532799505 +0000 -@@ -650,7 +650,7 @@ +@@ -630,7 +630,7 @@ // it isn't in too old wxWidgets versions wxString test = wxString::FromUTF8((const char *)"foo"); wxStyledTextCtrl * foo = new wxStyledTextCtrl(); diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD index f1ca3f81f..fb710b602 100644 --- a/user/exiv2/APKBUILD +++ b/user/exiv2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=exiv2 pkgver=0.27.2 -pkgrel=1 +pkgrel=2 pkgdesc="Exif, IPTC and XMP metadata library and tools" url="https://www.exiv2.org/" arch="all" @@ -12,8 +12,11 @@ checkdepends="python3 libxml2 cmd:which" makedepends="$depends_dev bash cmake" subpackages="$pkgname-dev $pkgname-doc" source="http://www.exiv2.org/builds/exiv2-$pkgver-Source.tar.gz - https://dev.sick.bike/dist/exiv2-0.27.2-POC-file_issue_1019 - CVE-2019-17402.patch" + https://dev.sick.bike/dist/exiv2-$pkgver-POC-file_issue_1019 + https://dev.sick.bike/dist/exiv2-$pkgver-Jp2Image_readMetadata_loop.poc + CVE-2019-17402.patch + CVE-2019-20421.patch + " builddir="$srcdir/$pkgname-$pkgver-Source" # secfixes: @@ -86,6 +89,8 @@ builddir="$srcdir/$pkgname-$pkgver-Source" # - CVE-2019-13114 # 0.27.2-r1: # - CVE-2019-17402 +# 0.27.2-r2: +# - CVE-2019-20421 prepare() { default_prepare @@ -93,6 +98,10 @@ prepare() { # Remove #1019 POC after >= 0.27.2 mv "$srcdir/$pkgname-$pkgver-POC-file_issue_1019" \ test/data/POC-file_issue_1019 + + # Ditto + mv "$srcdir/$pkgname-$pkgver-Jp2Image_readMetadata_loop.poc" \ + test/data/Jp2Image_readMetadata_loop.poc } build() { @@ -112,4 +121,6 @@ package() { sha512sums="39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721 exiv2-0.27.2-Source.tar.gz cfe0b534c29c37e7b6e5a00e8ec320cb57eb17187813fe30677a097e930655f1b097ce77806e0124affbdc423b48d9910560158eed9d2d03418a824244dafba9 exiv2-0.27.2-POC-file_issue_1019 -623232624f5382c7261a8b7e66063954c37555b7812e4f2e9af8433c4d8a1f141feafbfd2c5081395208cf1c65307ce1b39e5e34f689c558dce82f78030b29dd CVE-2019-17402.patch" +d2c0f59e9e2daf00066b0ad73253bb7bb09b3319606813f16478ef5717751e4cbb93d12f5c9339dae2965dcf6a63138bdb4205b698aeab57a75f97ddf458d4f7 exiv2-0.27.2-Jp2Image_readMetadata_loop.poc +623232624f5382c7261a8b7e66063954c37555b7812e4f2e9af8433c4d8a1f141feafbfd2c5081395208cf1c65307ce1b39e5e34f689c558dce82f78030b29dd CVE-2019-17402.patch +c819f06a194b8465c66ccd91b8373cb2a359e59bab7583a8abb873c2001efe6188ac8fa4717c6382d2f2396d25e79e7b397c5ebf000d35c4a7dae547db7bc77b CVE-2019-20421.patch" diff --git a/user/exiv2/CVE-2019-20421.patch b/user/exiv2/CVE-2019-20421.patch new file mode 100644 index 000000000..bdc5449f2 --- /dev/null +++ b/user/exiv2/CVE-2019-20421.patch @@ -0,0 +1,116 @@ +From 1b917c3f7dd86336a9f6fda4456422c419dfe88c Mon Sep 17 00:00:00 2001 +From: clanmills <robin@clanmills.com> +Date: Tue, 1 Oct 2019 17:39:44 +0100 +Subject: [PATCH] Fix #1011 fix_1011_jp2_readmetadata_loop + +--- + src/jp2image.cpp | 25 +++++++++++++++---- + tests/bugfixes/github/test_CVE_2017_17725.py | 4 +-- + tests/bugfixes/github/test_issue_1011.py | 13 ++++++++++ + 4 files changed, 35 insertions(+), 7 deletions(-) + create mode 100755 test/data/Jp2Image_readMetadata_loop.poc + create mode 100644 tests/bugfixes/github/test_issue_1011.py + +diff --git a/src/jp2image.cpp b/src/jp2image.cpp +index d5cd1340a..0de088d62 100644 +--- a/src/jp2image.cpp ++++ b/src/jp2image.cpp +@@ -18,10 +18,6 @@ + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. + */ + +-/* +- File: jp2image.cpp +-*/ +- + // ***************************************************************************** + + // included header files +@@ -197,6 +193,16 @@ namespace Exiv2 + return result; + } + ++static void boxes_check(size_t b,size_t m) ++{ ++ if ( b > m ) { ++#ifdef EXIV2_DEBUG_MESSAGES ++ std::cout << "Exiv2::Jp2Image::readMetadata box maximum exceeded" << std::endl; ++#endif ++ throw Error(kerCorruptedMetadata); ++ } ++} ++ + void Jp2Image::readMetadata() + { + #ifdef EXIV2_DEBUG_MESSAGES +@@ -219,9 +225,12 @@ namespace Exiv2 + Jp2BoxHeader subBox = {0,0}; + Jp2ImageHeaderBox ihdr = {0,0,0,0,0,0,0,0}; + Jp2UuidBox uuid = {{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; ++ size_t boxes = 0 ; ++ size_t boxem = 1000 ; // boxes max + + while (io_->read((byte*)&box, sizeof(box)) == sizeof(box)) + { ++ boxes_check(boxes++,boxem ); + position = io_->tell(); + box.length = getLong((byte*)&box.length, bigEndian); + box.type = getLong((byte*)&box.type, bigEndian); +@@ -251,8 +260,12 @@ namespace Exiv2 + + while (io_->read((byte*)&subBox, sizeof(subBox)) == sizeof(subBox) && subBox.length ) + { ++ boxes_check(boxes++, boxem) ; + subBox.length = getLong((byte*)&subBox.length, bigEndian); + subBox.type = getLong((byte*)&subBox.type, bigEndian); ++ if (subBox.length > io_->size() ) { ++ throw Error(kerCorruptedMetadata); ++ } + #ifdef EXIV2_DEBUG_MESSAGES + std::cout << "Exiv2::Jp2Image::readMetadata: " + << "subBox = " << toAscii(subBox.type) << " length = " << subBox.length << std::endl; +@@ -308,7 +321,9 @@ namespace Exiv2 + } + + io_->seek(restore,BasicIo::beg); +- io_->seek(subBox.length, Exiv2::BasicIo::cur); ++ if ( io_->seek(subBox.length, Exiv2::BasicIo::cur) != 0 ) { ++ throw Error(kerCorruptedMetadata); ++ } + restore = io_->tell(); + } + break; +diff --git a/tests/bugfixes/github/test_CVE_2017_17725.py b/tests/bugfixes/github/test_CVE_2017_17725.py +index 1127b9806..670a75d8d 100644 +--- a/tests/bugfixes/github/test_CVE_2017_17725.py ++++ b/tests/bugfixes/github/test_CVE_2017_17725.py +@@ -11,7 +11,7 @@ class TestCvePoC(metaclass=system_tests.CaseMeta): + filename = "$data_path/poc_2017-12-12_issue188" + commands = ["$exiv2 " + filename] + stdout = [""] +- stderr = ["""$exiv2_overflow_exception_message """ + filename + """: +-$addition_overflow_message ++ stderr = ["""$exiv2_exception_message """ + filename + """: ++$kerCorruptedMetadata + """] + retval = [1] +diff --git a/tests/bugfixes/github/test_issue_1011.py b/tests/bugfixes/github/test_issue_1011.py +new file mode 100644 +index 000000000..415861188 +--- /dev/null ++++ b/tests/bugfixes/github/test_issue_1011.py +@@ -0,0 +1,13 @@ ++# -*- coding: utf-8 -*- ++ ++from system_tests import CaseMeta, path ++ ++class Test_issue_1011(metaclass=CaseMeta): ++ ++ filename = path("$data_path/Jp2Image_readMetadata_loop.poc") ++ commands = ["$exiv2 " + filename] ++ stdout = [""] ++ stderr = ["""$exiv2_exception_message """ + filename + """: ++$kerCorruptedMetadata ++"""] ++ retval = [1] +\ No newline at end of file diff --git a/user/extra-cmake-modules/APKBUILD b/user/extra-cmake-modules/APKBUILD index b8236536d..37a599524 100644 --- a/user/extra-cmake-modules/APKBUILD +++ b/user/extra-cmake-modules/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=extra-cmake-modules -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="CMake modules needed for KDE development" url="https://www.kde.org/" @@ -37,5 +37,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1a0e185ea4eac16d57c34f140a4709c0bcd9baaa7e0727ab5c1bfee88fe08efe23dc3634d8f73abade98ad6f2dbf529563e0778f0fbeddaa50b435e12b674229 extra-cmake-modules-5.67.0.tar.xz +sha512sums="0e3d7d9c6fd58dbf87923ec35709bbf11386d65038f698461de51bdb65a9f05c84fe9902184f97f47b133dfb88118d6306f30f6eeee912f89b9c41a3e30ffac1 extra-cmake-modules-5.68.0.tar.xz a9e5d5e7ac8372099458ed18d2a6023fa0acf46955f51509880e7a467b4bd9e5df67c44c9ad032b1d70139efb73206390eaf7cd2baf63a82131e6e2b4acdbd71 posix.patch" diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index c3537f5fe..b6de0597c 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -3,21 +3,22 @@ # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpeg -pkgver=4.2.1 +pkgver=4.2.2 pkgrel=0 pkgdesc="Record, convert, and stream audio and video" url="https://ffmpeg.org/" arch="all" -license="GPL-2.0-only" options="!check textrels" # Test suite requires proper licensing headers on all files, # which upstream does not provide. -subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" +license="GPL-2.0-only" +depends="" makedepends="alsa-lib-dev bzip2-dev freetype-dev gnutls-dev imlib2-dev ladspa-dev lame-dev libcdio-dev libcdio-paranoia-dev libmodplug-dev libtheora-dev libva-dev libvdpau-dev libvorbis-dev libwebp-dev libxfixes-dev opus-dev perl-dev pulseaudio-dev sdl2-dev speex-dev v4l-utils-dev wavpack-dev x264-dev x265-dev xvidcore-dev xz-dev yasm zlib-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch " @@ -38,7 +39,7 @@ source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz # - CVE-2017-14225 build() { - local _asm="" + _asm="" case "$CARCH" in ppc64) _asm="--cpu=G5" ;; @@ -96,5 +97,5 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="3efddc7d6bbccba9a1f55bf0e6caa8a578405a7e12058ce526766ed5eca9d45a783dbf86325ab860a8eabbe29701f8093e691f0138e0d9cc883cfe5200b3561b ffmpeg-4.2.1.tar.xz +sha512sums="381cd6732fa699eb89000621cf34256920596ed1f9de3c2194dbad35fdf2165269eb7d3a147a0eb75dc18fbb6d601382b5801750e09fc63547766842f84208e3 ffmpeg-4.2.2.tar.xz 1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD index 2fdb4f203..82d7730c7 100644 --- a/user/ffmpegthumbs/APKBUILD +++ b/user/ffmpegthumbs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpegthumbs -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE video thumbnail system using FFmpeg" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9bf1d0db50d194f31f915ec2dfbd451428755ab574f2548c09c542db644034bd8a581dff5e492316b71451fca917b7ae56422b6f9efc058b88b8ed85b4d118f6 ffmpegthumbs-19.12.2.tar.xz" +sha512sums="4364902f570dad6d6cbb814e64c31d4a39aebd3a82aeb81598f3484464f5f0ce6da1c16f8a57f3bc6075f0e91ecacf60ffbffc6b76c6582f6859c1a52af35191 ffmpegthumbs-19.12.3.tar.xz" diff --git a/user/fluidsynth/APKBUILD b/user/fluidsynth/APKBUILD index a84da6e8d..7f061b427 100644 --- a/user/fluidsynth/APKBUILD +++ b/user/fluidsynth/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fluidsynth -pkgver=2.1.0 +pkgver=2.1.1 pkgrel=0 pkgdesc="Real-time, software synthesiser based on SoundFont 2" url="http://www.fluidsynth.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d fluidsynth-2.1.0.tar.gz" +sha512sums="f8776c59aa0aa4a25fe3c38973c994e8608f8fad8a2e478db0d0232d4c787983dfdcba200c558cd810e892930b50184af4bc4a7f3c98ec5c38e147fd715e51b8 fluidsynth-2.1.1.tar.gz" diff --git a/user/frameworkintegration/APKBUILD b/user/frameworkintegration/APKBUILD index ebcde170d..8b7f57f3f 100644 --- a/user/frameworkintegration/APKBUILD +++ b/user/frameworkintegration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=frameworkintegration -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="47ec7ebc2b1067074620a5a9e39f5aa664595569fc2d4a1c591e34e9ac52502fffd51f7707a522bf4028f50064f82dfafe2c6b46faa3b0f212b766e6f2ac2186 frameworkintegration-5.67.0.tar.xz" +sha512sums="3aa3c8cd7d5c1b7d444be504fbf1d3ff3cabdd4c043d98436e82d57415c8d9f99158f90065cf3f06b007585dfd2d4a5a8ee978795f4f7285f0e50c52dc74e372 frameworkintegration-5.68.0.tar.xz" diff --git a/user/gc/APKBUILD b/user/gc/APKBUILD index 0525181ee..76d95fce0 100644 --- a/user/gc/APKBUILD +++ b/user/gc/APKBUILD @@ -3,7 +3,7 @@ pkgname=gc pkgver=8.0.4 pkgrel=0 pkgdesc="A garbage collector for C and C++" -url="http://hboehm.info/gc/" +url="https://hboehm.info/gc/" arch="all" license="MIT" depends="" diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index c5cf7bece..f0c35dca1 100644 --- a/user/glib/APKBUILD +++ b/user/glib/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glib -pkgver=2.62.4 +pkgver=2.62.5 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" @@ -75,11 +75,11 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="d54411c664281bb6770f57e58c69ac28d1eb76802cb73e9a2bca94b9d5d62441d80cf78d19d1124dadddcce385d3dff3824c019dc00ed2b10af48a69006766fa glib-2.62.4.tar.xz +sha512sums="2f99422ff8245524aabdb52f5d388ef4bde0fc075eab24499b4023f6ca143b80a74e265117b9e7a9de68a347b0c7eaa8655c836d7bbb63d54cad5c6dda630371 glib-2.62.5.tar.xz 32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch 657d3fdf7f8ac7edd5bae572d00497f2236fbe5a91a577f3cb7ceb2ccf067f2944918b2b90308fc1061f45daf3d4910067b98642383ce8761da2a1faff6e9b4f broken-gio-tests.patch 0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998 fix-spawn.patch aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84 i386-fpu-test.patch 34129be883011d266074783b7283af5c6a45055b85026b5aab47a3a0dfa1316a0a6502aaf78ab172356f67493ea7c4867b53279c25967a8cc5bee9320dbff96a musl-no-locale.patch 56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c ridiculous-strerror-nonconformance.patch -d788005bc92ed1510235b77a9a26eecd78840a3e915a64e53e1e93cd1efaaeb1b9b5edb115f41352fcbdab10006b91b4aae7af20184c904e869a0d6893080368 meson-sucks-and-i-hate-you-so-much-right-now.patch" +dc1f0232433f6fb2cb2edebc8f5e15b4dcca557191af0a0ca45ff5cc5d109362e1dde4a532b08423e74c6b716801a516ad4ea105435e1332cd1a42f8131df46b meson-sucks-and-i-hate-you-so-much-right-now.patch" diff --git a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch b/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch index ba38bdec2..1e63ac0f4 100644 --- a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch +++ b/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch @@ -1,8 +1,8 @@ --- glib-2.58.0/glib/libcharset/meson.build.old 2018-08-30 17:12:09.000000000 +0000 +++ glib-2.58.0/glib/libcharset/meson.build 2018-09-10 03:42:01.930000000 +0000 -@@ -6,4 +6,5 @@ +@@ -1,4 +1,5 @@ charset_lib = static_library('charset', 'localcharset.c', include_directories : configinc, pic : true, + install : true, - c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(charsetalias_dir) ] + glib_hidden_visibility_args) + c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(glib_charsetaliasdir) ] + glib_hidden_visibility_args) diff --git a/user/gmime/APKBUILD b/user/gmime/APKBUILD index cb1b591b9..659a0d1b1 100644 --- a/user/gmime/APKBUILD +++ b/user/gmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gmime -pkgver=3.2.5 +pkgver=3.2.6 pkgrel=0 pkgdesc="MIME utility library" url="https://developer.gnome.org/gmime/" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="37488da84f1befb37a0dff9465e9f786670dfb7248adbbc1f227dcc0e80bcd4ee7cd239abeab2b52e8ded6ea7f8aa432bcc0461b379282dacd6ee4f867aa049d gmime-3.2.5.tar.xz +sha512sums="a60d3f9f1aa8490865c22cd9539544e9c9f3ceb4037b9749cf9e5c279f97aa88fc4cd077bf2aff314ba0db2a1b7bbe76f9b1ca5a17fffcbd6315ecebc5414a3d gmime-3.2.6.tar.xz 443e768e15eb25116368739957ac31a30cd10a921c113b76af1a0baf0c690ca1346463577289d24ce8f46deb014dd014040033bc1f3d02d8a2190c70dd4c2a74 3.2.3-broken-tests.patch" diff --git a/user/gptfdisk/APKBUILD b/user/gptfdisk/APKBUILD index 21249e469..65f372d39 100644 --- a/user/gptfdisk/APKBUILD +++ b/user/gptfdisk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gptfdisk -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="Utility for manipulating GUID Partition Tables (GPT)" url="https://www.rodsbooks.com/gdisk/index.html" @@ -11,7 +11,9 @@ license="GPL-2.0-only" depends="" makedepends="icu-dev ncurses-dev popt-dev util-linux-dev" subpackages="$pkgname-doc" -source="https://www.rodsbooks.com/gdisk/gptfdisk-$pkgver.tar.gz" +source="https://sourceforge.net/projects/gptfdisk/files/gptfdisk/$pkgver/gptfdisk-$pkgver.tar.gz + ncurses.patch + " build() { make LDFLAGS="$LDFLAGS -ltinfo" @@ -24,4 +26,5 @@ package() { done } -sha512sums="2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf gptfdisk-1.0.4.tar.gz" +sha512sums="3d3a59e3488dd3d6bda5d103b9ad8b7936752210346b9787ddc936681498fba90577b6ae950c471d09a01bf6405fce32038ff1777c52db0b21e5277737fe3703 gptfdisk-1.0.5.tar.gz +052dab1640dcceceace0a147af4853ba3f1210880bdd9519b151d9c8f17b6dbc339828fa83d73314af022aa27b9e2b8eabfd81460b0a7e3d3485697323c62760 ncurses.patch" diff --git a/user/gptfdisk/ncurses.patch b/user/gptfdisk/ncurses.patch new file mode 100644 index 000000000..6d8589309 --- /dev/null +++ b/user/gptfdisk/ncurses.patch @@ -0,0 +1,14 @@ +--- gptfdisk-1.0.5/gptcurses.cc.old 2020-02-17 22:34:11.000000000 +0000 ++++ gptfdisk-1.0.5/gptcurses.cc 2020-02-26 02:16:16.836739330 +0000 +@@ -23,11 +23,7 @@ + #include <iostream> + #include <string> + #include <sstream> +-#ifdef __APPLE__ + #include <ncurses.h> +-#else +-#include <ncursesw/ncurses.h> +-#endif + #include "gptcurses.h" + #include "support.h" + diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD index 83981a303..d4973d5ff 100644 --- a/user/granatier/APKBUILD +++ b/user/granatier/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=granatier -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Clone of the classic Bomberman game" url="https://www.kde.org/applications/games/granatier/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1363b81c64ad834bb490c87d241f8e1f368da3c5caf52bd2ef77e81b3815a01bcc18ca65aa44d1287aaceec5e817db85139becc9bd3986fbf6dda0945746953f granatier-19.12.2.tar.xz" +sha512sums="efdc0c67c9b7539add2c8bcf6816b13087e5eb0712e739d97fc0947ec7667b10c9e33b02856d742e41ae73128bef28da225a0d228e39a747a4f76e74eadf5eb5 granatier-19.12.3.tar.xz" diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD index 610e5e3c6..2c0cfdbc9 100644 --- a/user/grub/APKBUILD +++ b/user/grub/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=grub pkgver=2.04 -pkgrel=2 +pkgrel=3 pkgdesc="Bootloader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" arch="all !s390x" @@ -182,6 +182,6 @@ sha512sums="9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d75378471274484 f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857f8f42601eba82c855607513eb6ce5b2af6bd6c71f046e288 fix-gcc-no-pie-specs.patch 6e001762f7f562f2fafed56118079122e7602c731c70723241276f523e0882a3930d720fd847143d379ffd85626d2d7d3fa914590c0de1f0903a293695e71c41 grub2-accept-empty-module.patch 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg -1e6ae4a3884829864dbd789d3c3a0d43a5aa5f279c3ebb25f71775686e9236bc1c6295e5064ad32b384635987ee0814df95e9ca33bc57bc8e0aeb47bec34270e default-grub +1cb675fa0af9a1fd8d1a868e3e9de3bfef7eada66c5df0cfef23eca33e93e676eed6e1f67c679690f3e581565b350a9f3ba01aa9b89de66c970ea61ca21bcd65 default-grub 8e5f1cf91da9fd956695438509bb26e45f38170ca90d99a996e859053d72c82b7e4b02cb8979f047fc53498036f47b5400bf54687c390793995a05ded4216d55 update-grub 78b7ec141a364994c7de181e47fedca820add9960c56c7adf4c14ee11d5249a0887fd788ecd5d24b9bdd102b7c40395181e2f7c3fe5ab795dd7c0057ba1115c5 quirk-01_radeon_agpmode" diff --git a/user/grub/default-grub b/user/grub/default-grub index 3fb754c7e..ca5656224 100644 --- a/user/grub/default-grub +++ b/user/grub/default-grub @@ -6,6 +6,7 @@ GRUB_DEFAULT="Adélie" GRUB_TIMEOUT=5 GRUB_DISTRIBUTOR="Adélie" GRUB_CMDLINE_LINUX_DEFAULT="ro" +GRUB_DISABLE_LINUX_PARTUUID=false # Uncomment the following line if you do *not* want /boot/grub/grub.cfg to be # automatically regenerated when easy-kernel is upgraded. diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD index 4f33fa9ce..a9a767f1a 100644 --- a/user/gwenview/APKBUILD +++ b/user/gwenview/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gwenview -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Fast and easy image viewer by KDE" url="https://www.kde.org/applications/graphics/gwenview/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="20479f0bd326584f5004e0ab9642371cee1b832d8d31cbe32659119509bf5281b17e056d36a4e0f1168d81678ed8db7b89bab827e3a6f08aa8fae28fdddd740d gwenview-19.12.2.tar.xz" +sha512sums="a93cf6a992b76e84d8e33e570aab7bff410404539a8ce4ea55ba86c4487d5d1139dea170c449ac4cfb8755be30bc4fd7903cfa890374231b88d763ae44a29ff0 gwenview-19.12.3.tar.xz" diff --git a/user/hexchat/APKBUILD b/user/hexchat/APKBUILD new file mode 100644 index 000000000..8ba05d268 --- /dev/null +++ b/user/hexchat/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +pkgname=hexchat +pkgver=2.14.3 +pkgrel=0 +pkgdesc="GTK-based IRC client" +url="https://hexchat.org" +arch="all" +options="!check" # no tests +license="GPL-2.0+ AND Custom:Expat AND LGPL-2.0+ AND LGPL-2.1+" +depends="" +makedepends="meson ninja + openssl-dev libproxy-dev libcanberra-dev dbus-glib-dev libnotify-dev + iso-codes-dev + lua5.3-dev perl-dev python3-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://dl.hexchat.net/hexchat/hexchat-$pkgver.tar.xz" +builddir="$srcdir/hexchat-$pkgver" + +build() { + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + -Dwith-lua=lua \ + . output + ninja -C output +} + +package() { + DESTDIR="$pkgdir" ninja -C output install +} + +sha512sums="c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5 hexchat-2.14.3.tar.xz" diff --git a/user/http-parser/APKBUILD b/user/http-parser/APKBUILD index 8dace78cd..af90a5f0e 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.2 +pkgver=2.9.3 pkgrel=0 pkgdesc="Library for parsing HTTP messages in C" url=" " @@ -25,4 +25,4 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install } -sha512sums="fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023 http-parser-2.9.2.tar.gz" +sha512sums="d200c52f594192ba80a8d5b59d414404843f8601dac647f29c27845db75ac1f015789031e30e91aaab5b553af1ee6af50b90f9342a444c10c1027e10fdb9a31b http-parser-2.9.3.tar.gz" diff --git a/user/hunspell/APKBUILD b/user/hunspell/APKBUILD index 79da8d619..ec63c5414 100644 --- a/user/hunspell/APKBUILD +++ b/user/hunspell/APKBUILD @@ -1,7 +1,7 @@ -# Maintainer: +# Maintainer: pkgname=hunspell pkgver=1.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="Spell checker and morphological analyzer library and program" url="https://hunspell.github.io/" arch="all" @@ -9,7 +9,12 @@ license="GPL-2.0+ AND LGPL-2.0+ AND MPL-1.1" depends="" makedepends="ncurses-dev autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="$pkgname-$pkgver.tar.gz::https://github.com/hunspell/hunspell/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/hunspell/hunspell/archive/v$pkgver.tar.gz + CVE-2019-16707.patch" + +# secfixes: +# 1.7.0-r1: +# - CVE-2019-16707 prepare() { default_prepare @@ -35,4 +40,5 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 hunspell-1.7.0.tar.gz" +sha512sums="8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 hunspell-1.7.0.tar.gz +e7674819a9da4c3d742d34338d68d137d8613f97be2d25bf20db5219d4dd626f59a63ed4757b92f34307f499f2d687014065cdea97b55c98db295a8290300d2d CVE-2019-16707.patch" diff --git a/user/hunspell/CVE-2019-16707.patch b/user/hunspell/CVE-2019-16707.patch new file mode 100644 index 000000000..649eef5b2 --- /dev/null +++ b/user/hunspell/CVE-2019-16707.patch @@ -0,0 +1,22 @@ +From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> +Date: Tue, 12 Nov 2019 20:03:15 +0000 +Subject: [PATCH] invalid read memory access #624 + +--- + src/hunspell/suggestmgr.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx +index dba084e9..c23f165a 100644 +--- a/src/hunspell/suggestmgr.cxx ++++ b/src/hunspell/suggestmgr.cxx +@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring( + int l2 = su2.size(); + // decapitalize dictionary word + if (complexprefixes) { +- if (su1[l1 - 1] == su2[l2 - 1]) ++ if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1]) + return 1; + } else { + unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l; diff --git a/user/hwids/APKBUILD b/user/hwids/APKBUILD index ef7ae3d9e..17760d3c6 100644 --- a/user/hwids/APKBUILD +++ b/user/hwids/APKBUILD @@ -1,16 +1,16 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=hwids -pkgver=20191025 +pkgver=20200204 pkgrel=0 pkgdesc="Hardware identification databases" url="https://github.com/gentoo/hwids/" arch="noarch" options="!check" # No test suite, just databases. license="BSD-3-Clause OR GPL-2.0+" -makedepends="eudev-dev" subpackages="$pkgname-net $pkgname-pci $pkgname-udev $pkgname-usb" depends="$subpackages" +makedepends="eudev-dev" subpackages="$subpackages $pkgname-doc" source="https://github.com/gentoo/hwids/archive/hwids-$pkgver.tar.gz" builddir="$srcdir/hwids-hwids-$pkgver" @@ -65,4 +65,4 @@ udev() { mv "$pkgdir"/etc "$subpkgdir"/ } -sha512sums="6f637ca8c4d6b1261c5c2eccd8d1a64ab750f4c36f3d435b50b75949c15e571d83bc61dd6a14e777b53d383d7d02c34f616cc6a62d005db3d965b33b4121deca hwids-20191025.tar.gz" +sha512sums="1d2a9baaa7ab64575a3d9b98ae4df9060cb8593ae752365296dd53b18bc5996170bbfe1c5b4b1ffc24b28e3dbaa7c321c4fa333bbf91449a6ca7b187cbe23741 hwids-20200204.tar.gz" diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD index b35be9f8f..ed6cdf89f 100644 --- a/user/juk/APKBUILD +++ b/user/juk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=juk -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE Jukebox" url="https://juk.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4db732edf5ba0d0e17118bf5722b716fe71dc681456d1456af6484baf12e0d75ec8243ffe25d91522d677c8ce9227392473d135a2f1fd1614066afee29f96b27 juk-19.12.2.tar.xz" +sha512sums="39fcfeba4e2616390ac55414bfe9030285765335973fc881b6fc83657ed868e354e0935b00acf669e6bc11e8f6f1daec6c67873d1de71eb14e7f75d1c05ffedb juk-19.12.3.tar.xz" diff --git a/user/kactivities-stats/APKBUILD b/user/kactivities-stats/APKBUILD index eb547cee6..5c8cc99c9 100644 --- a/user/kactivities-stats/APKBUILD +++ b/user/kactivities-stats/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivities-stats -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Gather statistics about KDE activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="ccd66e179efb5ecc4569ac7fb6897793b6b172cc2b6a458d8610fc1fb35fc1a817a56de8e27b290beb2f941847a0da568c9bf213029cb0dd0a4f0fa5d03c9c55 kactivities-stats-5.67.0.tar.xz" +sha512sums="ba4241d0aa0b76639d7d7231ef3cf6f38db710dc6df8d9553242c1faac40839853437710cfcfb1f246c68e7e26a4fe887eb5b058421798e885b43777b0360be9 kactivities-stats-5.68.0.tar.xz" diff --git a/user/kactivities/APKBUILD b/user/kactivities/APKBUILD index 647a24174..cbe2c27f1 100644 --- a/user/kactivities/APKBUILD +++ b/user/kactivities/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivities -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Runtime and library to organize work into separate activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="d66413643b04bf10941db0fb61e106f0153eb23afdb7cb33814d4000e64ce5973c0f2b9098fe89d95168f4058dcfa9d2f6031d319692fd3aba46b671da8a4df7 kactivities-5.67.0.tar.xz" +sha512sums="1490834305965cff0c8ddc4e38be4960a88266f10806478e41cd976f0461a83ae4b6a4e9f3566fd90d5afcf3f38a291609179bea0781b939831ce8f788acc552 kactivities-5.68.0.tar.xz" diff --git a/user/kactivitymanagerd/APKBUILD b/user/kactivitymanagerd/APKBUILD index 3f97029a8..bbcd6f519 100644 --- a/user/kactivitymanagerd/APKBUILD +++ b/user/kactivitymanagerd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kactivitymanagerd -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Service to manage KDE Plasma activities" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make -C build DESTDIR="$pkgdir" install } -sha512sums="0e4374782828841289943742c2770b7ac9978120a72ff832dc77716ae3f817345c92f89ca7673b03b5d506384d3f8335580392cbd2f74b48125911de470ab509 kactivitymanagerd-5.18.0.tar.xz" +sha512sums="3e387114cb4245357d8c7a042077b9591de1743a89efdeb0199ff354d67670d5021bca69bcb70679ea5f9f61ba95aed209370f98c48ce3c7f051b7f9dd9a55b3 kactivitymanagerd-5.18.2.tar.xz" diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD index c8b1ffa21..319d4fec1 100644 --- a/user/kalgebra/APKBUILD +++ b/user/kalgebra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalgebra -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Graph calculator and plotter" url="https://www.kde.org/applications/education/kalgebra/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ae771a71ef65456a19275fb1ba31727479f59b95d099a52fc389abb74f8ab27498d01fffead543647e179ea9322b88de97f101eea9118b92cea74754c3c9181 kalgebra-19.12.2.tar.xz" +sha512sums="9bc1957f8e851bc0d39a6e8953913d23f245f0bb1338c34e465d1cdddafd144bf80677335f1ae43530754530a2fd75c4bec8f6b3904082fee18bb235011611ab kalgebra-19.12.3.tar.xz" diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD index b1a4c4ac1..9d5e3cb16 100644 --- a/user/kalzium/APKBUILD +++ b/user/kalzium/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalzium -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Periodic table of elements (PSE) with calculators" url="https://www.kde.org/applications/education/kalzium/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e12ca2ce5ef683c66232f057827f823b2fd9b8e604053326e9ba496a319b48fbf025ac4a09c6779ed8c7320c98d87031516e9e6f73b15b17deb4b94219d69039 kalzium-19.12.2.tar.xz" +sha512sums="fb8389937c605cd681295a16a87795caa317c8362c6704406adc3b67adf1c426019b6d52cc08d71248a9c705971248ed1b93e972741db917757bc479bff1af7b kalzium-19.12.3.tar.xz" diff --git a/user/kamera/APKBUILD b/user/kamera/APKBUILD new file mode 100644 index 000000000..649746130 --- /dev/null +++ b/user/kamera/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kamera +pkgver=19.12.3 +pkgrel=0 +pkgdesc="Digital camera support for KDE" +url="https://www.KDE.org/" +arch="all" +license="GPL-2.0+ AND LGPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules libgphoto2-dev qt5-qtbase-dev kio-dev + kconfig-dev kconfigwidgets-dev kdoctools-dev ki18n-dev kxmlgui-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/release-service/$pkgver/src/kamera-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="9b7783bec9eecaa032adec76452f1a972f03bf97f919c6b354c176c7bf2fb99324e3de9d1928622cd079f4bee089d97d099f201735fa6637188b81dc45a746da kamera-19.12.3.tar.xz" diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD index e9e896ea3..d2d98aa08 100644 --- a/user/kanagram/APKBUILD +++ b/user/kanagram/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kanagram -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Letter order (anagram) game" url="https://www.kde.org/applications/education/kanagram/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f426ea393f02cc6de9dc1fab562d08e071b81a280a4ae20b89316ef38f0088b3c834bc9d514b4fc155fb3a997ec34272199d2507f7c576677c9c2a5fb5fe8166 kanagram-19.12.2.tar.xz" +sha512sums="cf48cc5ff84a033a9fecef0f2d8fc01de12e8fbed4c8055d6c0fc2bac75166d5044889eed61a32e71639413d336dd69e50878785beede40934f77706125fb6b0 kanagram-19.12.3.tar.xz" diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD index af77757e1..cc65b5056 100644 --- a/user/kapman/APKBUILD +++ b/user/kapman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kapman -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Pac-Man clone" url="https://www.kde.org/applications/games/kapman/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fa4ce1063906f9d6c0cafb15f549a62d08f19114a1c73b7fb4b573ac1696ce7dd9b7c444c0f55758fc0be38c2377c2316e4a874e0c5529374d0435ded92f376b kapman-19.12.2.tar.xz" +sha512sums="c29f5398bc930d768ba09035a57d51ea0ec53d265c7f30edeb67d887024918627b635433cce897c4b6b701400101b11ffb5b56b66e4f67c07dd6d4318c13ba34 kapman-19.12.3.tar.xz" diff --git a/user/karchive/APKBUILD b/user/karchive/APKBUILD index 7ed1e5053..6760b73cf 100644 --- a/user/karchive/APKBUILD +++ b/user/karchive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=karchive -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for manipulating archive files" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e8a7695bebc8e9ab9596e10ad0ca9393942e4d3b198929481e59ededde7651859e8944586ddd00036e37c15a8501e5b067eff31562fb2384ab1c3ff6eb27d28e karchive-5.67.0.tar.xz" +sha512sums="c0d14773c4eb27281178d5f00f789256cc44aab057bc20239237a0031750d82765a7afae7cd804b200f713a8f93cd95f5a78828641a748e9b38a6d3c84aff3cc karchive-5.68.0.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index 3c32dc5e5..d9df73288 100644 --- a/user/kate/APKBUILD +++ b/user/kate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kate -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more" url="https://kate-editor.org/" @@ -85,4 +85,4 @@ kwrite_lang() { done } -sha512sums="3c85c2e05593b67591366740d34f7c247ac6ff5f411681c100c6be64d8f5f77d4d0e3a2439c9cb1210084880578b107611d03355d3fe2400226c5755c58f1c61 kate-19.12.2.tar.xz" +sha512sums="aa6a2c44a8c5892e61ac80df676da6059e61dd93f5e2934e0547040d89379f9f3ae90f46b8e043edf463228ef5b0ab3f795b8ab3dd6c488d0ba0c55cf20bd817 kate-19.12.3.tar.xz" diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD index 5cb5bc3fc..24acd289a 100644 --- a/user/katomic/APKBUILD +++ b/user/katomic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=katomic -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Fun, educational game involving molecular geometry" url="https://games.kde.org/game.php?game=katomic" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6ade67b594ef3444c4a936e51dae93c4d0d2828f52b8704eb51c0af4dab784b9820a575bc30c99caff94c8e55e8de2326dbb8d1ff62d4ee88da48b11e3ef78fc katomic-19.12.2.tar.xz" +sha512sums="32f90755f0e85996a6949a306c8d20e610c049f18c916240750a70006d2f625dcee41b915a93e9bf2ae3ff128df1066124a8a899e980fcf834995c558e3f6411 katomic-19.12.3.tar.xz" diff --git a/user/kauth/APKBUILD b/user/kauth/APKBUILD index 6e55b1156..525a86fd4 100644 --- a/user/kauth/APKBUILD +++ b/user/kauth/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kauth -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for allowing software to gain temporary privileges" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f4ed8ffd339c5c7ce3cd974cbdee3ce4a4b766062bf3ad2845596317ea8bc27460767ca48c8a7262cc5778a130d957221612a4b0329ea735ca2b175e209669a5 kauth-5.67.0.tar.xz" +sha512sums="006ed4eb03276546f99525ede235e721ea4092da3b00735afe2f06f35c146d6a75b64e3e1b872feb6f1a986680ae6415f0d4a3dbdf4ecad07d94aaac1061d605 kauth-5.68.0.tar.xz" diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD index 60d8fc418..1dd52516e 100644 --- a/user/kblackbox/APKBUILD +++ b/user/kblackbox/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kblackbox -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Hide-and-seek logic game" url="https://www.kde.org/applications/games/kblackbox/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a0ccbabfc52bac6d503b37af95f9f2b26a092ed1f385deaf212731030da1a0ae06ce6ebcf0ee068094aa8e48dfffdaf4d6fae44e21bdfea388076621647a347c kblackbox-19.12.2.tar.xz" +sha512sums="a41aec30b0b193536526f0177a7efae247fa62e100240718e8b86befe7183ca6068b9546aa0f2d7ffc233618b8e8408612c94365ccca7388d18e97687d27fa43 kblackbox-19.12.3.tar.xz" diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD index 9ba979a32..e89b067ee 100644 --- a/user/kblocks/APKBUILD +++ b/user/kblocks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kblocks -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Falling blocks game" url="https://www.kde.org/applications/games/kblocks/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="15507cee5781c9fdb64ad822e6c2c231fd06842215f2550651ed0243f9d2f049f45ad8c3b0caf78cedf42cce56ae1b9c85bcef7871439d79ae6192b36fd2215d kblocks-19.12.2.tar.xz" +sha512sums="ae38d99354c840b7e9f6e6419be0bd238770103b46cc9eebdd73a60120ac31e9bc268977aad725eec536cc46717278ba948043b2cefa3dbe19ea382b6d7a58d6 kblocks-19.12.3.tar.xz" diff --git a/user/kbookmarks/APKBUILD b/user/kbookmarks/APKBUILD index 0f3a8690d..396ce7df1 100644 --- a/user/kbookmarks/APKBUILD +++ b/user/kbookmarks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbookmarks -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for managing XBEL-format bookmarks" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3ab71f193e3acf2bd0074d3e20e38c9cc3ee9aec207d59b06cb8f7d160b40337d5473f29afd1fec17f0af0d82abd8b31821f46991734ae8906c5fd6aa926e066 kbookmarks-5.67.0.tar.xz" +sha512sums="56712cd6312d534f33459c18b05f12141546df82a1c1a822a74ddfbde515fc4c67b7d66a6dbd0b7221808d714e2d8c0f72d18f6857ea624bb6a768b9ffffde7e kbookmarks-5.68.0.tar.xz" diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD index 5d902c18f..88d847de4 100644 --- a/user/kbounce/APKBUILD +++ b/user/kbounce/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbounce -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Puzzle/arcade game to build walls" url="https://games.kde.org/game.php?game=kbounce" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ed9c53bd4a8cd1d4201bdb4442f36a6e3629e55d818c99f89e8d45d2f1e5b6ee52f2b970dda0a16dcd1ee16eab4c22174481d4eae1d13d2ec2d1e9b954528ae7 kbounce-19.12.2.tar.xz" +sha512sums="0acae3dfcf082efdf6b79c044685abee9c8b0334a5271ca78bf91ffaafef7c2d2ebe2e7ffbfb78735247b88090a07fb20d11e94e2315b357cba9d9b500764b79 kbounce-19.12.3.tar.xz" diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD index 0d678e431..f416cc759 100644 --- a/user/kbreakout/APKBUILD +++ b/user/kbreakout/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbreakout -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Break-Out like game with a ball and paddle" url="https://games.kde.org/game.php?game=kbreakout" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6d598cbd5e415c01a4e2012dd250f2af6af4aa628ceb57a334c9ce4c440aff8d737ccdeb595af8b70ffbbbb32690d47bff51f5854e1e2dc86e3d8b8745bc0480 kbreakout-19.12.2.tar.xz" +sha512sums="983c9c034708c0af0012bdf47788b5b70c36ff1f6b24552f0c6ee8d088f805886ef89d81694750c302e6d254ed13672151f7122c6ba55f68821c62405cf28e9d kbreakout-19.12.3.tar.xz" diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD index 359a60080..927ebda72 100644 --- a/user/kbruch/APKBUILD +++ b/user/kbruch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbruch -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Practice calculating percentages and fractions" url="https://www.kde.org/applications/education/kbruch/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dee13ebfc48694bdd6ce6aa1b53c1811d61be4605ea4ed388d52f57375a6617b139ca96ac069b43be1cea7e11d96e44934f0ed5047b98adc546ae89e74a4116c kbruch-19.12.2.tar.xz" +sha512sums="b660706d6132b0b2aa9e91a09a2f132e40de76ae956308926ff83890fab1bf2e171fbd29a8b1b78979929556931b6b1e4f52cacc3fc2db4248d5f95be5af9c61 kbruch-19.12.3.tar.xz" diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD index 5a7ccb2a8..8c547e6d5 100644 --- a/user/kcachegrind/APKBUILD +++ b/user/kcachegrind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcachegrind -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Profile data visualisation tool and call graph viewer" url="https://kcachegrind.github.io/html/Home.html" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="eb18804b90fda9b35b770253c9927c0fade71cdb1379afaec40db14f82fb4a905a187406e2f07413fd5a2c31811384f030259dcd6bdef777200216f8e7537d4e kcachegrind-19.12.2.tar.xz" +sha512sums="c00474637775a100832d787ddf5d09aafa7dd40bdc58a3d9c596af0215f85011602078fd03d02e5ee3725cb65af1b8aafca390f851caac59bc79b8860f074013 kcachegrind-19.12.3.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index 835fe2fa4..da3c019b0 100644 --- a/user/kcalc/APKBUILD +++ b/user/kcalc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalc -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Calculator with many mathematical, scientific, and logic functions" url="https://utils.kde.org/projects/kcalc/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e67c1202bda13ca5682fb95412ae79159547d59c94c8f7c3894ae5182932d4e29fff4c7cc515a89c873c3e307021152b99e123d6fb4ba9b656a9bd902fa9a1a1 kcalc-19.12.2.tar.xz" +sha512sums="7323acc0e71186a2ce83ab5596a97adc122d6a95a343f5c1f7176330e93b3ee5e23108ab79186f842c7c04a91d31bee592846e44b9dad8ba2e334f244cafe2eb kcalc-19.12.3.tar.xz" diff --git a/user/kcalendarcore/APKBUILD b/user/kcalendarcore/APKBUILD index 46d0e2d99..23cf88fa2 100644 --- a/user/kcalendarcore/APKBUILD +++ b/user/kcalendarcore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalendarcore -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Library for managing a calendar of events" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6c5b10f80b3e2895719617d3de463fbe671ae7dd84640616a13d7c04e45d53792c5629862fe784c949bf04b0e6cf5c93a7bb87651afa4c22d488cfdbd3462f46 kcalendarcore-5.67.0.tar.xz" +sha512sums="256bcd4bbc0c3f2d53d05503955de505d937011fcc88006e1c52aaec9b8780e52ec18d229a4ce751df41c7ca2ddac07ba56cb5b743807a034fe7fb3f62dd7d0e kcalendarcore-5.68.0.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index 76254b3e2..4d903a763 100644 --- a/user/kcharselect/APKBUILD +++ b/user/kcharselect/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcharselect -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Tool to select special characters from all installed fonts" url="https://utils.kde.org/projects/kcharselect/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="474e1c488388ec993915c2b1e0afb5738608fcfbc322c9d6139c43e9e02bda5f659038bb133baea017bdc25365c7aaeae8dcb90bfc69352abda4551333669946 kcharselect-19.12.2.tar.xz" +sha512sums="85851910deb6c9eab2b02ce7d18fa703c78175f029469500f064e4af86d58b914287da33aeab9372db8919da7a509137849a3038e29e0d03bc125cfae9745006 kcharselect-19.12.3.tar.xz" diff --git a/user/kcmutils/APKBUILD b/user/kcmutils/APKBUILD index 4b1ab6b1d..8d3e41c5c 100644 --- a/user/kcmutils/APKBUILD +++ b/user/kcmutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcmutils -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for writing System Settings modules" url="https://api.kde.org/frameworks/kcmutils/html/index.html" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f25605b5400fc8bdd9a7153ea368a41d254a08c3abf6cae9e0454d9406af4418b622519d72a41ebc5342a88fedc0ae128198036e97ba49b1ab10de5f2e6f919c kcmutils-5.67.0.tar.xz" +sha512sums="d930874680c489465e72fd4fc7d0d920dfccccbe6e05213c654055d726bea8add2745ffe230ba2a3895dca860c4d93b0039ebe7db6397fb8c53b3c5f6edb7812 kcmutils-5.68.0.tar.xz" diff --git a/user/kcodecs/APKBUILD b/user/kcodecs/APKBUILD index c3671193f..446bcca99 100644 --- a/user/kcodecs/APKBUILD +++ b/user/kcodecs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcodecs -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for manipulating strings in differing encodings" url="https://www.kde.org/" @@ -15,7 +15,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcodecs-$pkgver.tar.xz" # secfixes: -# 5.67.0-r0: +# 5.68.0-r0: # - CVE-2013-0779 build() { @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aa5eca38cd3e155e28241c79ce1acf2e1267b539c286331fa137ef3b0e41d1f3748366736e44426c2c825eca76939abeaabe1ddf7c7158bfd3f6596f99d19ebe kcodecs-5.67.0.tar.xz" +sha512sums="1edf80355d7d986338adfaff3067b0acd80d0fca47c7c81db0c510b1d32acb6ba8dcea33bd577a8ff0da60c4b4e8812c6981948a1eda84ce1acd8a05c87cd67d kcodecs-5.68.0.tar.xz" diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD index 94b7f173d..2dc03be53 100644 --- a/user/kcolorchooser/APKBUILD +++ b/user/kcolorchooser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcolorchooser -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple application to choose a colour from the screen" url="https://www.kde.org/applications/graphics/kcolorchooser/" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cd3c4860fc576e5eab48a1ace9f0fe95d02632f3ef215a4bd851b256764f0e3fe9b395257f438bbe52801065c39f7c4ca804ac4792a63ae43cc34c9e75502449 kcolorchooser-19.12.2.tar.xz" +sha512sums="ffffd9a945be3f24813f92fb1f9ec434c045fc3225977de45a4ca6fc9b15926ae3786a573ce05e16acd254e5e3bafd078cae940737517fcf7144302a435605ca kcolorchooser-19.12.3.tar.xz" diff --git a/user/kcompletion/APKBUILD b/user/kcompletion/APKBUILD index 44a161947..d0363ad66 100644 --- a/user/kcompletion/APKBUILD +++ b/user/kcompletion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcompletion -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for implementing automatic completion of input" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="beaa0162744a20f74721ff41c643269a24937a5d51275ce01e406724a11c0b74b46b517defa6cd4ad709f3004c11ca7ef8b1e2b2a6665966b2439fd476c9c9aa kcompletion-5.67.0.tar.xz" +sha512sums="05c434549610404a8a9972fa88dd33245ec9b6e9b402a3602e2081b3ca3692127993307ceb56f8790b91d0a990a2241cf1258a54e316dedef1980b72741cb62e kcompletion-5.68.0.tar.xz" diff --git a/user/kconfig/APKBUILD b/user/kconfig/APKBUILD index 505d43bab..6e118e487 100644 --- a/user/kconfig/APKBUILD +++ b/user/kconfig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfig -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for managing software configuration" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="772fd17d86e23fa9f7516569b26cb94cb7d7dc55d10241b85addc38b62ae4294399cf1e0c4433f407e7516b76c59ec076fb9ba2b094c5d0dd7a02c6001efc726 kconfig-5.67.0.tar.xz" +sha512sums="f839b7a14a6d77060823e7892e4bbda7754ed501f374e4fbb4c10bb9061f182f7c426df55c64678d975e26e123ed3b8e0c791e762ff1077f6b058f214642a670 kconfig-5.68.0.tar.xz" diff --git a/user/kconfigwidgets/APKBUILD b/user/kconfigwidgets/APKBUILD index 338ce1088..ab6e3b9c8 100644 --- a/user/kconfigwidgets/APKBUILD +++ b/user/kconfigwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfigwidgets -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework providing widgets for software configuration" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ea48c37616c0622687824ed260afc1ed4507e582cec1862d9f6d5fc3e2c8b2e42bfd5582cfd5e69f8c42d8e714db2065b9f5341f6c036d4d852bf53d36223c92 kconfigwidgets-5.67.0.tar.xz" +sha512sums="db93c37920dd92180cc7e019f1c96d91ba5aaaa9cfd3b1d98d3e5b1b7cc828c204bb27ac83694836234eb41faef3278a0d14d3df974b3228aec631e26cb0e9e6 kconfigwidgets-5.68.0.tar.xz" diff --git a/user/kcontacts/APKBUILD b/user/kcontacts/APKBUILD index ae5c2ae4a..1fe5bd35c 100644 --- a/user/kcontacts/APKBUILD +++ b/user/kcontacts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcontacts -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Library for working with contact information" url="https://www.kde.org" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="161668100eeb3791cec5fedc18cacb0f3acaa4ea550c7ec5d879a70bbf0930b2ea5049dfa0d31238cb7a5173afc681c959a8ea0606d0d8fc36c593338b0352ba kcontacts-5.67.0.tar.xz" +sha512sums="59734f680473ba97bae3406c04f9859997ddb29233d1870865c7f147b7271b7a3dde6ed05bf4cc8ebabd7639c8492bae1f8bab38437c3947495f3bc50190341f kcontacts-5.68.0.tar.xz" diff --git a/user/kcoreaddons/APKBUILD b/user/kcoreaddons/APKBUILD index 72f1ef13d..f6c1ce99e 100644 --- a/user/kcoreaddons/APKBUILD +++ b/user/kcoreaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcoreaddons -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Core KF5 framework" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5210732001712e3f032d773fd5e7671a5df2406630c874c744c3eaddb14df577752ec3ba1e2cd7f11c5f14634d4ab168484a7d992582fbfcb9ef2984366df15f kcoreaddons-5.67.0.tar.xz +sha512sums="a76e9f05d2a1fcec509f3a02ac6554b284ece1edf96e201c4f129826d16957fa1c1bd6c1f56debb10614c5222d794b094af1fee0d133a05d17ac9c18249cd1b8 kcoreaddons-5.68.0.tar.xz d462866912d9cc9a768477d872142eb67be6b616c044436a27aa71577546efe4aa323b3dac913f9dbb52fc62dbe27d464b30ac3c4cb23c5d7c414d96138e9300 utf8.patch" diff --git a/user/kcrash/APKBUILD b/user/kcrash/APKBUILD index e47c84c6d..04bbc7458 100644 --- a/user/kcrash/APKBUILD +++ b/user/kcrash/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcrash -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for gracefully handling software errors~" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="531a204a020ede55eb9b1b873baf10118bef51ca272a2e180cd747f6cb2f55445e7fde8eface542642eaa5cee5dc5c34288c9ee62a013f9c0c413da0c8328e34 kcrash-5.67.0.tar.xz" +sha512sums="a26607886537a2d6259c624907e0e5db133f58f0a55ea47845a83e4aa07c86be7f8030a21afddddef58cdac82ca42bed0c288737aaf57d424c6bf67916782811 kcrash-5.68.0.tar.xz" diff --git a/user/kdbusaddons/APKBUILD b/user/kdbusaddons/APKBUILD index ad7cf1261..d4d6a1ede 100644 --- a/user/kdbusaddons/APKBUILD +++ b/user/kdbusaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdbusaddons -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for coping with D-Bus" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="84f46df5648a0868aa82465072993b91c0448d313c5225184adc4d3760e56ef4af72cc4b0acb84836df1025bc01c54c6813f415f9401d073101d72d9ef6f6972 kdbusaddons-5.67.0.tar.xz" +sha512sums="e9d8be0a886037ce4804cbf6a3603350d08f805fac04b5ec5a5007e8ae01300e7cef7161ea13715e87bba544bf32062cc15f77a7890c3ca5699a59b7c5f11bd7 kdbusaddons-5.68.0.tar.xz" diff --git a/user/kde-cli-tools/APKBUILD b/user/kde-cli-tools/APKBUILD index 44c4eb5a8..3688e24c9 100644 --- a/user/kde-cli-tools/APKBUILD +++ b/user/kde-cli-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kde-cli-tools -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="KDE command-like utilities" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8a7a781e76e5c548a7a60b9bcf305e272f7f35e2c9c1fc5164abddb0c2b5b7a845c3d8ec2f022f29c49d1e7382bc462a6bb25c6642885fc6575d951fc4d5da08 kde-cli-tools-5.18.0.tar.xz" +sha512sums="d87cec3a791f2fc17533bac3901a578df842d110afc0c9ce85e02e50d401a909beff4f16d144f3e79c0a7b4e308e2a4ed40359629a833ffe8b7bc179771c0f12 kde-cli-tools-5.18.2.tar.xz" diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index 271fa7770..dbeb83fc9 100644 --- a/user/kde-education/APKBUILD +++ b/user/kde-education/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-education -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Educational software from the KDE Software Collection" url="https://www.kde.org/applications/education/" diff --git a/user/kde-games/APKBUILD b/user/kde-games/APKBUILD index eb290e60a..764bea813 100644 --- a/user/kde-games/APKBUILD +++ b/user/kde-games/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-games -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="The KDE games collection" url="https://www.kde.org/applications/games/" diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD index 5bedd324f..891f92179 100644 --- a/user/kde-graphics/APKBUILD +++ b/user/kde-graphics/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-graphics -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Graphics software from the KDE Software Collection" url="https://www.kde.org/applications/graphics/" diff --git a/user/kde-gtk-config/APKBUILD b/user/kde-gtk-config/APKBUILD index cbea44c76..be224072d 100644 --- a/user/kde-gtk-config/APKBUILD +++ b/user/kde-gtk-config/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kde-gtk-config -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="KDE System Settings panel for configuring GTK+ application styles" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9c86bfa0787cb0046e3639e38ebc8fa3685f8935322f14d20185703090d6fe61558b33a918e983d95a90a41d4d15ef3f34dbba36ce296af7ea7d426063db15f1 kde-gtk-config-5.18.0.tar.xz" +sha512sums="950be06b4aee8d51c21b60a9b698426dd3444a63edff92e1dec0fc62269fcd1054cbebb602e5b26e84399959038f26a221590ebf084a6118bb6a84cde78d6083 kde-gtk-config-5.18.2.tar.xz" diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD index b1a6d4d8a..186b142e1 100644 --- a/user/kde-multimedia/APKBUILD +++ b/user/kde-multimedia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-multimedia -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Multimedia software from the KDE Software Collection" url="https://www.kde.org/applications/multimedia/" diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD index 601780f26..9f9c2802b 100644 --- a/user/kde-system/APKBUILD +++ b/user/kde-system/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-system -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="System utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/system/" diff --git a/user/kde-utilities/APKBUILD b/user/kde-utilities/APKBUILD index 95bf6bfa3..55833148a 100644 --- a/user/kde-utilities/APKBUILD +++ b/user/kde-utilities/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-utilities -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Desktop utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/utilities/" diff --git a/user/kde/APKBUILD b/user/kde/APKBUILD index 902ef67d1..2f5538124 100644 --- a/user/kde/APKBUILD +++ b/user/kde/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde pkgver=5 -pkgrel=2 +pkgrel=3 pkgdesc="The K Desktop Environment" url="https://www.kde.org/" arch="noarch" @@ -9,7 +9,7 @@ options="!check" # Metapacakge license="NCSA" subpackages="" depends="adelie-kde-theme kde-education kde-games kde-graphics kde-multimedia - kde-system kde-utilities plasma-desktop + kde-system kde-utilities plasma-desktop plasma-meta kcachegrind kget krdc ktorrent umbrello diff --git a/user/kdeclarative/APKBUILD b/user/kdeclarative/APKBUILD index 456ce373e..b31caeb3c 100644 --- a/user/kdeclarative/APKBUILD +++ b/user/kdeclarative/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdeclarative -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Frameworks for creating KDE components using QML" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0a4eb4c2975c586286fe758c96dc34a3d5aa290c29578b957237602d4ff43a4f4f9423a2e883302e39e4e25029d5ecb18d5d49b8cdebe498b56d13a58c2ae55f kdeclarative-5.67.0.tar.xz" +sha512sums="2c3253b1374e66c59436e4c88b8fd296dc60f7a19ef64fa750663afaf86f144b16323cde5af79c0a55d6f5e780085d671deac923d84410d6c31c2b88564ad363 kdeclarative-5.68.0.tar.xz" diff --git a/user/kdecoration/APKBUILD b/user/kdecoration/APKBUILD index aafc55d46..58585fbdf 100644 --- a/user/kdecoration/APKBUILD +++ b/user/kdecoration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kdecoration -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Window decoration plugin library" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b8f1c79664c4cb11cc26bb5114cb0bf41fbf31c8f71c8d55a3fb38b8eef111fb3d87493a7a8bdfaa6d299775d66e70b4b4c5801687b98087d0a6e7e30bdd6274 kdecoration-5.18.0.tar.xz" +sha512sums="b7408a3c57951d6038c1a603bfe34093a95848b7fa341352a19ead272c8e9241876138321b135c1ee6461b4bdfcc10a8606f2650cf2444733ba2038dae105462 kdecoration-5.18.2.tar.xz" diff --git a/user/kded/APKBUILD b/user/kded/APKBUILD index c2a1c4300..b22a075ac 100644 --- a/user/kded/APKBUILD +++ b/user/kded/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kded -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Central KDE workspace daemon" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a1b5bcdb22f65d6d74fadde878272448c15f3d6c2e4b95764c73f2ab58fbd65e3625495d50c5202ccdb71a13295cce1e4c05deeb9f4ef7a6054677bd2131ed62 kded-5.67.0.tar.xz" +sha512sums="f0f1073ea2e57ae6fdd615a496c213393881f29193bd0904bdef752eec3d74463ac775c20b9c90c55f03e2aed34a86988833848b78835b52115fa46d99dbe999 kded-5.68.0.tar.xz" diff --git a/user/kdegraphics-thumbnailers/APKBUILD b/user/kdegraphics-thumbnailers/APKBUILD index 82f1787ff..0cc01f082 100644 --- a/user/kdegraphics-thumbnailers/APKBUILD +++ b/user/kdegraphics-thumbnailers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdegraphics-thumbnailers -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE thumbnailing sofware" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="681544769c986b1e99ef017f15fae3aac09a2624628d252be11a25efda52c3f931df4a5fe48257e766ad51d1ec53dcb03a469a43e2c66cd4ebeab01969824244 kdegraphics-thumbnailers-19.12.2.tar.xz" +sha512sums="515703d8a22578f09a6e6105e38fc27c0546ad0e61d9c30a052e40a9068f942d586bc8f6411eed0f057f3da0791b94a49a5e378c04ff1f6af20b8c663a154470 kdegraphics-thumbnailers-19.12.3.tar.xz" diff --git a/user/kdelibs4support/APKBUILD b/user/kdelibs4support/APKBUILD index 5104859bb..57d2eb9b4 100644 --- a/user/kdelibs4support/APKBUILD +++ b/user/kdelibs4support/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdelibs4support -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Legacy support for KDE 4 software" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="68913823e8836890cb97a8d86cfdabd5d8e0f4e2484b932adfdb95a17fadd01dad0fa37058c078d089776e0744c7fac76635dcee998409d55ecc5e90b2e4f43e kdelibs4support-5.67.0.tar.xz" +sha512sums="9862e320f028e4a80f33db4532b9e865a8b8d642d434e064988fc1f72d9270e3f5883c17caca61f307b86dbf24b4a070bf27ddf12f1777d84a742749d0b8dc42 kdelibs4support-5.68.0.tar.xz" diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index 78f98a103..39c3b74f5 100644 --- a/user/kdenlive/APKBUILD +++ b/user/kdenlive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdenlive -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Libre video editor" url="https://kdenlive.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c6773d09aa9af2284ff93ee0bb163dd553b15891c0262350975902b076d5465ad664181e009023aac179dea84b837bc4c7dcd5b4b3914e9f99c624e89e962ba4 kdenlive-19.12.2.tar.xz" +sha512sums="f3e96ec336fdbecfb1c98eef8af87ce98c32ebd16f9810c9d12d1bbe7b23af3c1272396f46799b68d455a243500a3fb0532ad935bde0f25fd5e14e318c3530ad kdenlive-19.12.3.tar.xz" diff --git a/user/kdeplasma-addons/APKBUILD b/user/kdeplasma-addons/APKBUILD index 9fb56a817..87073b883 100644 --- a/user/kdeplasma-addons/APKBUILD +++ b/user/kdeplasma-addons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kdeplasma-addons -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Extra applets and toys for KDE Plasma" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make -C build DESTDIR="$pkgdir" install } -sha512sums="d6cb3daf39949e2fe2221cfce48a55ecfffb328ed46ca69da45f42b4323107bb9b908f40975f6f76cf7b1dc1a3481cf597287b46df003b3d3913df18d85f590a kdeplasma-addons-5.18.0.tar.xz" +sha512sums="ae20b08ac7624dbad78d4bc30086a115bcd8d97c59c67452902afa63d3288f896b760ca7ef54e53f06f4cd14edacf5603f33842ebd25517dad775f24389cd8b2 kdeplasma-addons-5.18.2.tar.xz" diff --git a/user/kdesignerplugin/APKBUILD b/user/kdesignerplugin/APKBUILD index abd6b72f2..755c94066 100644 --- a/user/kdesignerplugin/APKBUILD +++ b/user/kdesignerplugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdesignerplugin -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Qt Designer plugin for KDE widgets" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4b2224e07e8e043120af99f248d35483f9fdf36b353a8cfdc8fa602667555a9eb223e421619658b046314f297fd5e91e9de1453626cabd0f785bdec267c1ab6c kdesignerplugin-5.67.0.tar.xz" +sha512sums="b8d7103e223274377a109a961530ea0c5aa630134467b4baaf3c26b762319aac62f34357512e9a6c0fed9dacf61c1f71521f0a08d947cc5f2b845257a3e5faef kdesignerplugin-5.68.0.tar.xz" diff --git a/user/kdesu/APKBUILD b/user/kdesu/APKBUILD index 268dcba73..a0a2c23d2 100644 --- a/user/kdesu/APKBUILD +++ b/user/kdesu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdesu -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for elevating privileges" url="https://api.kde.org/frameworks/kdesu/html/index.html" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8ea63328e05308736368d7d011691ea942a50554e3faef1c23155bb5d449767e6d21787e45ed1bf6dddaf063016fd7730e46ec14b56796ac1139a4cc9b529ad5 kdesu-5.67.0.tar.xz" +sha512sums="cd31b83be237adb2b13896714ee07af659780b1028149e04ce797edf737d03dd0a7e1f2733c2ae28786c38e382806b558725f1f424910747df13719d35fad5f2 kdesu-5.68.0.tar.xz" diff --git a/user/kdewebkit/APKBUILD b/user/kdewebkit/APKBUILD index 04a06554c..b980489f7 100644 --- a/user/kdewebkit/APKBUILD +++ b/user/kdewebkit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdewebkit -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="KDE integration with WebKit" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2292adbbf21d549dab9e23f10b81ab8c07fd50f71c11ab10e9e68f65fb71fa7ee50b1bca6b71dc034155dcf5cef458a9494766b76c3dbb73ede69be12de1ae32 kdewebkit-5.67.0.tar.xz" +sha512sums="be885bc7234551adf38faadd03f863fec60588f46bb710558702570bb1a40dff44ea35155c2cf30624c2f9f7ae13dfe57cdc2f088538c35e11157189ba803594 kdewebkit-5.68.0.tar.xz" diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD index 0038f2dc2..214475d1b 100644 --- a/user/kdf/APKBUILD +++ b/user/kdf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdf -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="View disk usage information" url="https://utils.kde.org/projects/kdf/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4700d172c3bd818ffcef3aab4383362b00051f6376fc6acc065242ea13bac437c3e7a78c941238985499d586cd7b0d36f8802edd60ac4e46d466600689f5d6fb kdf-19.12.2.tar.xz" +sha512sums="46639acdaca1f29d215bde691a2844ae24234fe747081a5d6cca1c81a0c09f862b1f6eb066e1d301a8b57345b82096a4c9c7a771a2a29e7bbf21dd1b62d2582a kdf-19.12.3.tar.xz" diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD index 2152484f0..fe347e5db 100644 --- a/user/kdiamond/APKBUILD +++ b/user/kdiamond/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdiamond -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Three-in-a-row game" url="https://games.kde.org/game.php?game=kdiamond" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="561245b56e66a9824bd75e7c7cab5b758b10a0c59da68dcaa053d7d7d0f0addd47352cd8ed31fb55ed272d2ccb476d228bab2bb391dac594db9a4a2147a1be37 kdiamond-19.12.2.tar.xz" +sha512sums="7ed8b8dacdd5e134bd0b6c292d54423680f5613da9fd934690703bb735b5c531bfd9ded79fb43903094b80c0a266dcebc0848148e12f957afcec3cc327104268 kdiamond-19.12.3.tar.xz" diff --git a/user/kdnssd/APKBUILD b/user/kdnssd/APKBUILD index da699be0a..49398a2b0 100644 --- a/user/kdnssd/APKBUILD +++ b/user/kdnssd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdnssd -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for discovering network services using Zeroconf" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6a88b32808b2d2c5e772cbe0474b48d005e826b6bc241d1f645744c70f83402d225d237b4a620832ff84d5b420833006d50ffa791aaeb969eb080028c5c3fcaa kdnssd-5.67.0.tar.xz" +sha512sums="ada02627e705fabfa50ccbd7221969d123f0b9bdf51edb390c78a6cfaef545f1237fed91dad868d17800b85d677597df9e4d7906156a0816cb54f744ded89857 kdnssd-5.68.0.tar.xz" diff --git a/user/kdoctools/APKBUILD b/user/kdoctools/APKBUILD index c5ee4409a..ec2771be6 100644 --- a/user/kdoctools/APKBUILD +++ b/user/kdoctools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdoctools -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Tools to generate user-readable documentation from DocBook XML" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bf499b5119ccd76b5beaebcf25e527e0a5852aa2c0b37217a28f128c9fd80c5a5b906f97c59b85475c0b1e18c76728cf067938490e7e9ebe7b7d8bbc71923f9c kdoctools-5.67.0.tar.xz" +sha512sums="5f39e0193bf8cbad90a579394730e72fce741673ef7a600198b5d05fac0bd25bb785c8edd68ed9d852a4b1b4be856db4fd9d37ec5719a7943177cc19a6ccd34b kdoctools-5.68.0.tar.xz" diff --git a/user/kemoticons/APKBUILD b/user/kemoticons/APKBUILD index 37aa07e85..89f47bb2c 100644 --- a/user/kemoticons/APKBUILD +++ b/user/kemoticons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kemoticons -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Emoticons to express emotions in KDE" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="629e136c12850799cb9a8d5ac7bf7486d0c319ee458b1c1430f12d9acf5b374955b29c27eab44f51741fb1b47ef12f58550427ffa17f85135f5d64f59477d2de kemoticons-5.67.0.tar.xz" +sha512sums="44ef3ec99997ae99d90bd0c4318930db0ca2805f812ad8fd18166b801424d940a40a499266bfa20f6f9169cdd4608a42a206069e72af015956e16d95b9b5e731 kemoticons-5.68.0.tar.xz" diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD index 0a7503aed..5c5e7374c 100644 --- a/user/kfilemetadata/APKBUILD +++ b/user/kfilemetadata/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfilemetadata -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="File metadata extraction framework" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f15836611b86b93a055b62d4c7f08e35ee7d5d6fe07a7330dce5c251beea72e972c7ad3d4aec251f86d67704aeefed6037b3546a528f6c0653ac6185e86b604b kfilemetadata-5.67.0.tar.xz +sha512sums="a8e10b45b6c2790f1f0e41ea8f0a474d6a6b4e6c6bc73d53d26887b24b06f7c95c1fc3a81fc9096759c8506e64fd30f6b7f822ea6dc238ea787b812ba685f8bf kfilemetadata-5.68.0.tar.xz 17aad7d1e223c5668d7b61b125843d89d7f2598e94173d451e731f96d6322d93ab7b967a9f04dd83020e77cd2f84471c46d81b595b2ea484d2b423af6d1c332b test-mimetype.patch" diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index 2b9498813..e2da48d02 100644 --- a/user/kfind/APKBUILD +++ b/user/kfind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfind -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Standalone search utility for KDE" url="https://www.kde.org/applications/utilities/kfind/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9f70eafa8e913196df3e04809ce1814fd61be012e73492e2fae2271fd8902321b725c1a60d05ede7229c5b9ac5e737a1fe800986cbdd5e7d6205aec8269c8a49 kfind-19.12.2.tar.xz" +sha512sums="a3e0572d12c0ffb4ca60774e91237f82ae2d424558ac91636a83075d1a1c11c2ff8848f1093360a4c3149b3c4d8233dff9bd5ac0914547af873aa9f1bba8dff5 kfind-19.12.3.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index 16862e460..0c30fd2cc 100644 --- a/user/kfloppy/APKBUILD +++ b/user/kfloppy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfloppy -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Utility for formatting floppy diskettes" url="https://utils.kde.org/projects/kfloppy/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="242dcb496fb0425a3eb1fd5e2f6c59411e00a0be8a6caddba1fad38a6650cc5411c8694fb75b692317e9cfbe49841d370337922a4904c8341e4766a2c347ce8f kfloppy-19.12.2.tar.xz" +sha512sums="26a3664af62ac5b39bb527c4b1c3b16ea34f68b5e8a28368747dc563bdcfac850aba488c5362616f93e5a60555540aadb2607fe5570341c0eb14f3844cb0aeba kfloppy-19.12.3.tar.xz" diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD index bcc638e19..12c8a62f9 100644 --- a/user/kfourinline/APKBUILD +++ b/user/kfourinline/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfourinline -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Two player board game based on Connect Four" url="https://games.kde.org/game.php?game=kfourinline" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="995d6f95df5bd624bb6146a441cefb16a70872ab621c0aa2d3aaf56265859d531fa38cdec579650aced13f037499392b1a966d84c148e3db75632507741c8709 kfourinline-19.12.2.tar.xz" +sha512sums="8738836d6f0a850f3fa563f1f6571757ec8b8001b31ac122ced617a4b64a311fa710cb449655bf3ae3fc170ce1c53c0126d023c089a03c94b8b8ef1a6e9097df kfourinline-19.12.3.tar.xz" diff --git a/user/kgamma5/APKBUILD b/user/kgamma5/APKBUILD index f2f15e201..33b326b0a 100644 --- a/user/kgamma5/APKBUILD +++ b/user/kgamma5/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kgamma5 -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Control monitor gamma from KDE 5" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="95c7b4e2af25b9daa260744cb6ddf73c20811c23cb1240ae683b54a306fc28a937507be55452b2d55b06f8662fe821ee4214263fbb7e8c06cd56b44584dce084 kgamma5-5.18.0.tar.xz" +sha512sums="2a5a470f55a0d68c6083725ce157039c9965c0262ceb0b34a67269eca696110191d4c5dce11be16944e86eb03df7b11d2162953b40b682ea55d5fef29091eab2 kgamma5-5.18.2.tar.xz" diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD index 13ee509cc..a536493d7 100644 --- a/user/kgeography/APKBUILD +++ b/user/kgeography/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgeography -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Geography learning tool and trainer" url="https://www.kde.org/applications/education/kgeography/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="14bb57a581df72ad320bddad39d4c65282f850b48dcba6cac5fcbb6c6dcd142bde05ad90cb1d5074388b79a4cb9224052b1ea1f57a4a9eec5f39fe68a383ca08 kgeography-19.12.2.tar.xz" +sha512sums="fcd99351c80750c79b50ec78bfb0864f5f3fb08d9ec94af5d2fb6907a537c02bae9ff2c70437eb58f22c4a873ecdce4ac7e1ab0d55a8140d2671d6ed89b743d3 kgeography-19.12.3.tar.xz" diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD index 4d05748c0..033ab8603 100644 --- a/user/kget/APKBUILD +++ b/user/kget/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kget -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Versatile download manager" url="https://www.kde.org/applications/internet/kget/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ebb848755e2d0dbc862e59c4b2f64225a2f25b99ff06a144c7883c13692d8fc663e8633be35a87b2868e9c0b382420bc040f102641f2e945bdf84c781af4a75b kget-19.12.2.tar.xz" +sha512sums="67adf59577ab08895d8107b9ae828db34174efe5546d53bcec48cfa273cf4443ae2e2dfc1c189781a48305fdbd0aa1e2d2aedbacd242a6e14d0ac1ad9b3aa887 kget-19.12.3.tar.xz" diff --git a/user/kglobalaccel/APKBUILD b/user/kglobalaccel/APKBUILD index fb8649b0b..03f2be72a 100644 --- a/user/kglobalaccel/APKBUILD +++ b/user/kglobalaccel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kglobalaccel -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for implementing global shortcuts/accelerators" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="440447fe394801c2bc33a9dced707464c2f8c21f328d5955f81a1236caf489feb82da128d16210aee0220b557d19cadf0c36d58c471a212bdb2fc6f54918637f kglobalaccel-5.67.0.tar.xz" +sha512sums="66929e86dd09acca739e71a88dff5818bf6602417fe257b6f195f2a194f1bb030ca44e25b37d9383f4bc4960da95ddcaa7330f3c2cfceb1772be50d80763796e kglobalaccel-5.68.0.tar.xz" diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD index 33e3f853c..e10b5e835 100644 --- a/user/kgoldrunner/APKBUILD +++ b/user/kgoldrunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgoldrunner -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around" url="https://games.kde.org/game.php?game=kgoldrunner" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fca33bc0373a3994f7130bec67ccf2ff2b309844cec07e2249c000cf2e0979694da386182861193dc0b2028801b72cc50d2d82b74c14f8a13807ea1e982d4625 kgoldrunner-19.12.2.tar.xz" +sha512sums="af90c483e94a335080d4091264213df33c5bfe5b4abbf95336dfb5c0885037caed8fd844371c1b1bcba41a8cc5de88ee8bef9feeb91a22a087c56e44e85abbd3 kgoldrunner-19.12.3.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index d785031ed..c815bf81a 100644 --- a/user/kgpg/APKBUILD +++ b/user/kgpg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgpg -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple interface for GnuPG, a powerful encryption utility" url="https://utils.kde.org/projects/kgpg/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8a1593196c031359d44d4d445aa84a46046dd7abf093bc4d24fa08ab21309a159c4f760a1d22e8362eecbfac6f250dee623a534a084e557b5b677d3f52d59a7c kgpg-19.12.2.tar.xz" +sha512sums="465d0b57ed96be41b226bfdc484c5472c0866f293eb0c57816ac3536aef20d81cf320b2244f1d20110d8b86e1014ff578be730dac84331896b41ae9dc7960109 kgpg-19.12.3.tar.xz" diff --git a/user/kguiaddons/APKBUILD b/user/kguiaddons/APKBUILD index a1d50eda9..9b0559805 100644 --- a/user/kguiaddons/APKBUILD +++ b/user/kguiaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kguiaddons -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for creating high-level user interfaces" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4c4c580d6f1af072efc744bd217d25d366b000918c1aec0bd5bde985b00a5f50e560407e53044b098056e7a1a1b77dc1710d15d768196b99b688d38ff1000566 kguiaddons-5.67.0.tar.xz" +sha512sums="9547c8717f5ea32a46165ddfc5cd9b3d02b0f318a0efd580ed22d6183d7fa3b43b8068e43cefc25aa811a3a7e1f692e33a517055204c8171b6ca569d43683f00 kguiaddons-5.68.0.tar.xz" diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD index f4482f367..2db471d89 100644 --- a/user/khangman/APKBUILD +++ b/user/khangman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khangman -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Hangman word game" url="https://www.kde.org/applications/education/khangman/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9c884cadd9cd0a7393c3be98ab8dc44d85690fcf65041ebbe81c0d87dc1e5aa11f965ee283da260400a1122adb6e1740366a5235d0c38276a8222790c4d10d3c khangman-19.12.2.tar.xz" +sha512sums="d653bc8c48d84a46634ed4c3fb711a80ace9b5e3b12c8ba05cc6d76e71978b98f85f28f1d4454b1960b1edf589dcebf1788c22451383a85a395c2f7e1cd0b526 khangman-19.12.3.tar.xz" diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD index 1eb3c23bd..a332d276c 100644 --- a/user/khelpcenter/APKBUILD +++ b/user/khelpcenter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khelpcenter -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Graphical documentation viewer" url="https://www.kde.org/applications/system/khelpcenter/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7733dce8b32933abd72d863454fbd5d7055601c9669435dbf76e416530fb1588d8e37c96c3e85de86ab3e4fc2da5b7d26c672bf5ff67d95eff1ae55e1a7c4e85 khelpcenter-19.12.2.tar.xz" +sha512sums="d8aef5f562a23a65f807218f5c7746afdd4f97e74de127bfd81037b5bba9d1024337082954752b33fd478896f462e565796ec567f32ebf0d006e2c73de3880c6 khelpcenter-19.12.3.tar.xz" diff --git a/user/kholidays/APKBUILD b/user/kholidays/APKBUILD index c120c75a6..f3af735bc 100644 --- a/user/kholidays/APKBUILD +++ b/user/kholidays/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kholidays -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="List of national holidays for many countries" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9330ae2f0fcb79b7b93549835d9a9401d23842b67e2b548a50bff888d298122654e71d5a0f6aefc2dd2a198bc34088aadfe0fcfb5b6743937cc761aae8895f4d kholidays-5.67.0.tar.xz" +sha512sums="ad4ab73880862104cc7aa1fff2dd91c5b9fe36f8f8ee0fb1f217a0e159ca4184984767ba5bebbb3ef0bd6a1fd6cbff09a019fe3c26826ab4df5cfabcb80ce9a3 kholidays-5.68.0.tar.xz" diff --git a/user/khotkeys/APKBUILD b/user/khotkeys/APKBUILD index 5dd918a9b..0eacef73e 100644 --- a/user/khotkeys/APKBUILD +++ b/user/khotkeys/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=khotkeys -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Hot key mapping for KDE Plasma 5" url="https://www.KDE.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bbdc13144533470d9ecb8a5adfcfef9cb03dcff6a7c54d317d8d28458b6f9c5e30dc65bfbc5d6e3efa845919a3d252e0723ba24e86053879d4de131275e44a22 khotkeys-5.18.0.tar.xz" +sha512sums="5acf66cf3bc7fb3c9ea5bda5e7af9af04883d7e00b82d66357bbc7651d279e9a7f280d94cce7da8427df9377c8161332676333f3ae8d38ef11f0ccf25b2cbb80 khotkeys-5.18.2.tar.xz" diff --git a/user/khtml/APKBUILD b/user/khtml/APKBUILD index f146c3df6..747a25921 100644 --- a/user/khtml/APKBUILD +++ b/user/khtml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khtml -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="The KDE HTML library, ancestor of WebKit" url="https://konqueror.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c49dd43e345e3599ed6c3e076895732a30b553ef0db6da0512b6577ebca842529e497964bf71e64d962c9b7456c0ecdb8716792ad163aada1d5444d00d080145 khtml-5.67.0.tar.xz" +sha512sums="a306f5da7bf03f77111af4f3e4d4a2b21e483861e7e5d4265941e914f788e58079fce11ab2667bb802d512d7c84fa70653a94a16cdb14221ce1aebbe300ce2ee khtml-5.68.0.tar.xz" diff --git a/user/ki18n/APKBUILD b/user/ki18n/APKBUILD index ae30c3fe4..e2cd6c3b9 100644 --- a/user/ki18n/APKBUILD +++ b/user/ki18n/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ki18n -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for creating multi-lingual software" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="509db8423cb5cc20b927e8f5ee789cd08758a2a2746c7c2275e8b0c2c15c237e847bceb50070256452b28fb4d673f2b84863f65a45a042fbf28bd9b47d0913c1 ki18n-5.67.0.tar.xz" +sha512sums="2256e06a40761b7f948cd83caf527e8533035afd2ecda266535b67dab9030571154a6eab75744db94da4c13c27bcc67d1d2dcdfb3b9de92e75abcf3f517e52e7 ki18n-5.68.0.tar.xz" diff --git a/user/kiconthemes/APKBUILD b/user/kiconthemes/APKBUILD index 920f7c031..126088b51 100644 --- a/user/kiconthemes/APKBUILD +++ b/user/kiconthemes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiconthemes -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for icon theming" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c54971e1a070d406639033d98c50f46287e1a266ebc859059252a14b267fc86dbb57d45cdadc246f73b31db47ad5b365b2f5b46ccd14d5e3280512f0f334b821 kiconthemes-5.67.0.tar.xz" +sha512sums="9088164a379a49bdf86fb8558ad1c95555c18985012c9c03e95d6e043b983e871afa594d40cc0c6f13b9261a2a19b2a0355f4a6a75d85e49a1675ef5be34724b kiconthemes-5.68.0.tar.xz" diff --git a/user/kidletime/APKBUILD b/user/kidletime/APKBUILD index 44139c26f..f7769d45d 100644 --- a/user/kidletime/APKBUILD +++ b/user/kidletime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kidletime -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for determining a user's idle time" url="https://api.kde.org/frameworks/kidletime/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="46c8f2c2b7b36395f1bdd93a1e9a24a720309c889e31318659ca450af538dc1a5f37f51e56549441ec715c4d94dfffd2b5d49671dd997361dc356bb640f5a4e6 kidletime-5.67.0.tar.xz" +sha512sums="c803de25cf6f26b2d320ec7e35ba598f134e75575dd8f1c06b41461975c99a6b46e7d60bb34b09ed2d799837cf7682bc3d09ba720b2b7dbb1b1bee668fdb1b01 kidletime-5.68.0.tar.xz" diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD index e8a0ab5b5..707245af9 100644 --- a/user/kig/APKBUILD +++ b/user/kig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kig -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Interactive geometry learning and exploration tool" url="https://www.kde.org/applications/education/kig/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3f091e85d61b5889183097201161ca9378c1085d947a2819e43dc937e8c9c433ba8fba10d8fea1ff1c20af93bd05f9fc8718a130f8d7e17fcd1ab97726cdb117 kig-19.12.2.tar.xz" +sha512sums="554b70c1ec7e62b52bdfb736cf17d685df68ffee00ebd4253e838f753e274c275a5df774f37240b2cb4778bfdc16b28c37f087772e61c82409397e92982e4109 kig-19.12.3.tar.xz" diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD index 6cf92b525..b458397ef 100644 --- a/user/kigo/APKBUILD +++ b/user/kigo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kigo -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Go or Igo game for KDE" url="https://www.kde.org/applications/games/kigo/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b93ce452bf790f79446ca68529dea538f8fa8680287668da22bd4234eec156e553cea68b23c932fd8019cfd2c92616707018993ca92875085adb686a452aef35 kigo-19.12.2.tar.xz" +sha512sums="ebb8b7fd3da4b47c1a26642b894e57d174a0046fce7123cd222d1a527a2158cf1cca42a7e54ab029a11d2419f0c8cb69f3f8343fa07454593d293f7d84d252ce kigo-19.12.3.tar.xz" diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD index 300066b2c..706c3efe2 100644 --- a/user/killbots/APKBUILD +++ b/user/killbots/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=killbots -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple game of evading killer robots" url="https://www.kde.org/applications/games/killbots/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="987c9c4cd8fcb412b9e217a89c5b8d30294c707bebb877d77cf72b6c500a31e0e929f33318effd97d9ad4284d85c2ab31647a31c0cf175ed201d9d5c44086988 killbots-19.12.2.tar.xz" +sha512sums="7e5554f03f91210ceb25429bd6f4917100bcf9246db563058c31f10a2ed2cd5b095898320f742db021b2f8d3ee211a9271364544fbad1cdc3de9f39fd2827514 killbots-19.12.3.tar.xz" diff --git a/user/kinfocenter/APKBUILD b/user/kinfocenter/APKBUILD index ff1912a29..c0d3c7dcd 100644 --- a/user/kinfocenter/APKBUILD +++ b/user/kinfocenter/APKBUILD @@ -1,10 +1,10 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kinfocenter -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Information about the running computer" -url="https://www.kde.org/applications/system/kinfocenter/" +url="https://userbase.kde.org/KInfoCenter" arch="all" license="GPL-2.0-only" depends="" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e07955c8cc181abda437d7ad2febe3c85cf2e3f0109065cdedd7092cf397557dd842398f0b4e46d97c16457a53e8822ba0a2469cce03e0ef37612accd8caeae0 kinfocenter-5.18.0.tar.xz" +sha512sums="de8786eba290778af51eed8335a7026f06fac809a913b340321739b0e815e37c19b91b544c86054aedf835d6316d8b897547e9bdd3fa823a5d1e9c5e2439067e kinfocenter-5.18.2.tar.xz" diff --git a/user/kinit/APKBUILD b/user/kinit/APKBUILD index 1306f500e..b80261ce0 100644 --- a/user/kinit/APKBUILD +++ b/user/kinit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kinit -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="KDE initialisation routines" url="https://www.kde.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d021eaa19b413955e9eedc4f9c756399bdda2f32f95b70534bdf67adeeb873552f072786b342487e7f7861182c2f5274c1755687a5196cb2c069e58f40b6b63f kinit-5.67.0.tar.xz" +sha512sums="66d39c7bb330e7237ba4334938451ba5d1faad3f38e1c577036061cd75e2770c858c897317543222b208f8a694e29c30eb142483f4617e30954a34813e941530 kinit-5.68.0.tar.xz" diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index f286c205f..8fdc83304 100644 --- a/user/kio-extras/APKBUILD +++ b/user/kio-extras/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio-extras -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4586ef6f26c1f6e4491c9afc653052a18eb39f80d616b9ca6059c91e2a1bbc093dfd1055bba8680a542dafd42ae6e0de3d65bc64df34215aa7507e3be66d904d kio-extras-19.12.2.tar.xz +sha512sums="289d4336e563ee38be20f40c146172111ebeb3893edd15c76ad42435b8b1b0967864d8764519cd5c0aaa2580c56b76283076a3598917876b5e22acdf75ba9da7 kio-extras-19.12.3.tar.xz dbc58b5d8a7783d5697a24fe6232f0aa3d6222cf15eeb8ce94f0ea99c81dce067ab1ef20261f77107cc9f75ecae506458a828a5ad3437b589ca00b93ad52b1e2 D17205-nfs-tirpc.patch" diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD index 0ad1002c5..8f56f536e 100644 --- a/user/kio/APKBUILD +++ b/user/kio/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for data and file management" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="baf1e6abc6ae1ffa4010245a79cb676787217d365fb033f620a9da293565ec267186afaac08791104cead3ce5c87d3a76ec89b796355361b326b16f044691d72 kio-5.67.0.tar.xz +sha512sums="f962631383719a7265a9b300881c812d00eda566198c1f68ad134a21407717245b49fd383901440a13d403245a0b9b3bab98432ec31c22e3dbe78b09240840e7 kio-5.68.0.tar.xz a21e700948317e460f273276aee36359b5bba8a69da1e43714169002ca4bf4538f1cc3663e823be30a0fa838d61103769afb7445caa6e8ceba29830f8532b6db strcpy-ppc.patch" diff --git a/user/kirigami2/APKBUILD b/user/kirigami2/APKBUILD index a05be888b..4c0ec71dc 100644 --- a/user/kirigami2/APKBUILD +++ b/user/kirigami2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kirigami2 -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for rapidly designing usable interfaces" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="8c80539e8c4eaa82f035af12108f3bbb4e837e6acdd744d29538364f936ab4fdc8248004979a01fc44c8e737a544b5de726140f70d91f4e659d8e6bc4f571d39 kirigami2-5.67.0.tar.xz" +sha512sums="f9f84893dec3298066e7dd3f283a118a488403d23895992875b9229d26d3b3ad14ff14bdd7a5afc79591d96ac431556ea15fcb65dffe23c42a3144f1fbe88f21 kirigami2-5.68.0.tar.xz" diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD index 8f2cbda06..8c1a5bbc1 100644 --- a/user/kiriki/APKBUILD +++ b/user/kiriki/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiriki -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Yahtzee-like dice game for one or more players" url="https://games.kde.org/game.php?game=kiriki" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="14dee57e2be53e0da0b1ed51f06fc750c5aa462f5d24c7ce96eaded8b3ed2fc7dab98a40b5ab56b3bd8a214139fbc0e4891d4cdeece5ce49b09169e533cb0d11 kiriki-19.12.2.tar.xz" +sha512sums="1f225e0761b4e57141731ba7ae093fcc74f0c435fcf7f812c713652fd47115f93e89a3b6275509a8d90de3abf8755c9c3078b7f4510724420921c207a84f0ece kiriki-19.12.3.tar.xz" diff --git a/user/kitemmodels/APKBUILD b/user/kitemmodels/APKBUILD index 60cd4b4f5..b329016d1 100644 --- a/user/kitemmodels/APKBUILD +++ b/user/kitemmodels/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kitemmodels -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for sorting and searching objects" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ea83034e6e3550d2d8533439c6f6a3158ab233e3549a841b7da07dbe77f24dec0de284f6a4e50e62d402e254e40e68ba0b7eb54258307692be8e7fc5f51107aa kitemmodels-5.67.0.tar.xz" +sha512sums="dcdb8ad9783f84b8838d7c87516f4813b0a257eca4af83cbb2225d4d5f5d17eb21b25ce35afb7a4e5dc1471f56ffd8e2c5598d797cf21eb4baf613e5b132c421 kitemmodels-5.68.0.tar.xz" diff --git a/user/kitemviews/APKBUILD b/user/kitemviews/APKBUILD index d9fd6bf53..1c340843c 100644 --- a/user/kitemviews/APKBUILD +++ b/user/kitemviews/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kitemviews -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for displaying collections of items" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5b24be12829833393a58fe513d58356031ad73233db0792e278dc0440b467b7aebced4bd67e2ca41cf0ecdae53b24f5ad289be769fd371fc172c84b982ac3603 kitemviews-5.67.0.tar.xz" +sha512sums="59d744473ddb697e89adc54cd74c4b5688b7244b0ddb17bb26cb6bc762faf8b39018b4d4498c89a9c8df05e241d75bffe00d01c02bb0d70a8f9b1f64b7d9c313 kitemviews-5.68.0.tar.xz" diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD index e4da58cbe..ed9df5a20 100644 --- a/user/kiten/APKBUILD +++ b/user/kiten/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiten -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Japanese reference and study tool" url="https://www.kde.org/applications/education/kiten/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f12e75f378fee504ce7e2ac17f52fc9564b23fd0961e29985236134ec61c16671078ce1136448fdc18a0f6858ccd9690085020de6a991571f8c28822c41ef11c kiten-19.12.2.tar.xz" +sha512sums="74481a65c0823d2da598544fef6b5a8b7c5788adaf8804af29a0d4092767e67ff788a0a294f910ea63bc1ee7ceedb3ccf25fe8e929cc453e5ee85307fe851526 kiten-19.12.3.tar.xz" diff --git a/user/kjobwidgets/APKBUILD b/user/kjobwidgets/APKBUILD index 610aa96e5..f1d68af28 100644 --- a/user/kjobwidgets/APKBUILD +++ b/user/kjobwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjobwidgets -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework providing widgets that show job progress" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1284ffa8960773060d73b12d43f7c4271c76f68138185064105e4a5f62976a4dacc13953e797660d035426a7c95bd5a3c08c4372643216ed2cc91271bcb5873c kjobwidgets-5.67.0.tar.xz" +sha512sums="e1db735d465b3df1081bdde0eeefecbe6c86d20e520ef18842375f7c583abdfd8ee9017688de2ec193b220712f4c9742b379492612b55bc3495aea3996fed015 kjobwidgets-5.68.0.tar.xz" diff --git a/user/kjs/APKBUILD b/user/kjs/APKBUILD index 0b6de9ae9..ff7755686 100644 --- a/user/kjs/APKBUILD +++ b/user/kjs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjs -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Independent, free JavaScript engine" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8680860094fdfb1ea8946dddd3f37ec7abdef0cec9d5969a02b3c1fe9a8348264efcdad1ee8700d76832893bf484a7623ba19976787960cdaa57155086795fe2 kjs-5.67.0.tar.xz" +sha512sums="0daf43ef5fb1c50114e3df6cdff19d162fb8d53b13188a201250c3e7fe1e1b72691389ae73ffaa5b2880343492f5f7efdd3f85245673edf2d6cf9b12b34e27f4 kjs-5.68.0.tar.xz" diff --git a/user/kjsembed/APKBUILD b/user/kjsembed/APKBUILD index 66bdbbb24..2e3c29afd 100644 --- a/user/kjsembed/APKBUILD +++ b/user/kjsembed/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjsembed -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="JavaScript bindings for QObject" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1c1f5b35c8deb14452399ccfb476d69c2cbfdfa1fea4e04ff99a6c6fa9b9264af811ce8e9115209655303fd7853d95fb7825bfe486378f20cc9ade45acc74ad5 kjsembed-5.67.0.tar.xz" +sha512sums="2fcab72f43bf66f69f8b5a2463ca50baaacf239d84f9d99ba75f8e9661b30303cb8e2601d53280b54743436481a32d9294b97d3b4a9eaceb401274d0169bf1c0 kjsembed-5.68.0.tar.xz" diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD index 89f2602c9..76e54d98d 100644 --- a/user/kjumpingcube/APKBUILD +++ b/user/kjumpingcube/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjumpingcube -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Dice-driven tactical game" url="https://games.kde.org/game.php?game=kjumpingcube" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5fe3fb95d8d3ae39d67e4fce4100c06050c28820c265cb111b9b48bed4e549965a659ed7e8bc8383d976c820001efe6abf131cbfcac5528d25e6d645b17b8948 kjumpingcube-19.12.2.tar.xz" +sha512sums="e2ca3330a6775393f7512b17ae3072b6586109450ae07689bcb4db00bc90c77e0d2c53406cfef766aabacae04a2c3d3fc989b382e8b45cf0daf22fd8a3a8f5ca kjumpingcube-19.12.3.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index 7154a670c..ecfead943 100644 --- a/user/kleopatra/APKBUILD +++ b/user/kleopatra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kleopatra -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9c22c6aac485e1ab1a24326d33758f12480c474e9eca57c6651fc85f88a477ce66a8b33e7adbad42561672d93357e7c947596573594a458d01829116e762b658 kleopatra-19.12.2.tar.xz" +sha512sums="e217a7a05d4ab22ba520c02a3a09abbcf3711de1ad2f42c79f3d375580fafbc3aa33a3cab05a5b6c201fb11c0b0b92a655a9566043dd0c400acbe3ead913f85a kleopatra-19.12.3.tar.xz" diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD index dac262b0b..eb1357a8c 100644 --- a/user/klettres/APKBUILD +++ b/user/klettres/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klettres -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Learn alphabets for multiple languages" url="https://www.kde.org/applications/education/klettres/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f7070b1ff08567fc1a43adbb4c2741714572e62ad87903be3494255ed0d15f1c7c60d56fd62fb1b9b1b64d880f71a87be7d1a56ddd7311e0f0cf249c29b30868 klettres-19.12.2.tar.xz" +sha512sums="1b26f5d4e3424e3870f8165736d21abcbf22cddd6d122cff8c0fa4fade58d1345052bfb4bd14bc8215bcd62fa490b92945f0c25b147fdd7facbabcb33e7cf8f3 klettres-19.12.3.tar.xz" diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD index f4fe55c6f..70c9f3b30 100644 --- a/user/klickety/APKBUILD +++ b/user/klickety/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klickety -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Fun, simple colour matching game" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cb52896a52df710f9404064cd7beb29e15ed158e0954a1bf10b9b3bdd7742d20165e373a94d223aeba9738e5e94735b32a1ffc953119ab55daab47d6c73ed5c3 klickety-19.12.2.tar.xz" +sha512sums="d1b4f59e3fd4ebaaf5f36fc4f3e4f7385fdc126df9fb3e1cb38104ed886a447995fed3e286c3e706318affcbb3572f41ea118d5b7a08afab6c571b6fa04110b0 klickety-19.12.3.tar.xz" diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD index fa2c4dd9c..1f0f4c0ff 100644 --- a/user/klines/APKBUILD +++ b/user/klines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klines -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple yet addictive single-player game" url="https://games.kde.org/game.php?game=klines" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="37e44613fb9d97f19e350ecc7ccf4c1c460ec0e1d5186da2561fe6a3294461e8dd235b06d54c237478d1991818a68133414d3d93180930a15dcc233256f41e53 klines-19.12.2.tar.xz" +sha512sums="2e272cbdffa530cefffa74726a46cc937b5d09307b69e98477a07d1eb61889d5b280a72a0ef129fb192733b284f86fe1e86f7128f15ca2f79f320633b4f7bcbf klines-19.12.3.tar.xz" diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index 624393efe..f2637de08 100644 --- a/user/kmag/APKBUILD +++ b/user/kmag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmag -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9c8161e63b064d6c52b64a3e770c40c7acd45c357ff886ce7934d0b725b7f6e9d19ab9950a773871522be460f3f8bbde09ca67fca57ff7e1568f9874d7e933ed kmag-19.12.2.tar.xz" +sha512sums="6f3dc983be2efe249e77b30429d4fb01f7b9c28552c56db27c1906de0312f1071658b9bc5fa9c5b5de35df54d7d50e9f1f540eec13cb40255b1ea9441db5afe3 kmag-19.12.3.tar.xz" diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD index 6a1ffdcb0..33970e576 100644 --- a/user/kmahjongg/APKBUILD +++ b/user/kmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmahjongg -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Mah Jongg desktop game" url="https://games.kde.org/game.php?game=kmahjongg" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b51d8e9d83dd94a9f3f121fd1251afb1cde09f4698544fa610c514f0ee3b2e3d8c7c0757f3150f324a7182c7a9fcfa98038806e5312adb744beac2a78199e060 kmahjongg-19.12.2.tar.xz" +sha512sums="5f62a61b221ff6059a95c781a04364e60023bcf3a450648b9cb831f29d545973d171422d9f26c2ea6a6765bbdbdeb78ce9f60f412c7d1e2564d91d285bfb77c5 kmahjongg-19.12.3.tar.xz" diff --git a/user/kmediaplayer/APKBUILD b/user/kmediaplayer/APKBUILD index 9173ffd70..4d5566cf1 100644 --- a/user/kmediaplayer/APKBUILD +++ b/user/kmediaplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmediaplayer -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Media player framework for KDE 5" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b5ce946004df9f006f4ac20e7e483765f0b78360f4d6aae9585ba707464dca275ff21a44d159e9834d160ccd832823796ae8f5ad6daf55881371a1d6669e648e kmediaplayer-5.67.0.tar.xz" +sha512sums="ca3cb02ed23492495d2c5e2f8e75d542daae61542fa9dcc3f632b421be82cf4373d01afcba47512c029f03bb0418c09625da56b7090d84e5d3d763cf650652a6 kmediaplayer-5.68.0.tar.xz" diff --git a/user/kmenuedit/APKBUILD b/user/kmenuedit/APKBUILD index 286263607..2e66d85df 100644 --- a/user/kmenuedit/APKBUILD +++ b/user/kmenuedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kmenuedit -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Menu editor for Plasma 5" url="https://www.KDE.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a6c54fa362c3386c37452c48f72ee0ded5f01d9692148457877e844dc09c85e0be4f9208713841fd665caee8c8e2bfc18fecd7ecebe6854d96293f9a0dedfcfa kmenuedit-5.18.0.tar.xz" +sha512sums="2b38ff3ae5a05125d08e27a6591d424035fede907c2cb21b95b4c9f5aa24174367ff00b123d015448d2871a82c95c8bef5d40cf488b779cfb7b2fb4d03aa03a0 kmenuedit-5.18.2.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index 2a47600ee..bd4858607 100644 --- a/user/kmime/APKBUILD +++ b/user/kmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmime -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5df4b5e81de9b4b7026e41faca5efaba3c484ddf18ac4016e67ea9464ae7bc3e2307a184396c9411abacacdf91f4493b1509e45fd322625d935a6f0788f5896d kmime-19.12.2.tar.xz" +sha512sums="ff150d983432cf8fff336f5dc24e02b798a26d51f0fb86ded1a04899bde529c1fde11f46202961b88f357aa311819fc876de5500f0d4cc29b43e28d048c15cb5 kmime-19.12.3.tar.xz" diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD index d42858e64..34c37429d 100644 --- a/user/kmines/APKBUILD +++ b/user/kmines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmines -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Classic Minesweeper game" url="https://games.kde.org/game.php?game=kmines" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5a99d2ec4ec0c365248cb6dfdedc1f7c0e83f5c530c12937a7bad7dcff840751d0bfc59cf638e99365ef86a3ce49e122cad47e5b560bec37c1dd339202bcf589 kmines-19.12.2.tar.xz" +sha512sums="a0ab3ea04071887d6778caa846ecdd6bfbd16b54d1da8e4629bfe446261a7adfe0366255f8ff96364722db50b5a7fffd838537e6e4947bee7ab38c60bb39871b kmines-19.12.3.tar.xz" diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD index ca85881b2..664764ae1 100644 --- a/user/kmix/APKBUILD +++ b/user/kmix/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmix -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE sound mixer" url="https://www.kde.org/applications/multimedia/kmix/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="948e4881b56a8fc0b707940607f67c401b2644189acfe653b8ac35a8d035eff4a79b8c0890248785062a7696aa785b347cab37ae6882b64f993f242adabd8bf7 kmix-19.12.2.tar.xz" +sha512sums="bcf2cfabfd6832bab153c7c05ca3811dc6109629af524820f5ca0ffdc779d6dbbe1ddd4457ad289987bd97bcdebf59d55cd47d94e9af75c1cea89d62b233b5e2 kmix-19.12.3.tar.xz" diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index d9e3cb737..b483246a6 100644 --- a/user/kmousetool/APKBUILD +++ b/user/kmousetool/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmousetool -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Tool to assist with clicking the mouse button" url="https://userbase.kde.org/KMouseTool" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e8788132cfb51034ff0a06bf14c1bb5b4dee3dce6e185996db59874cd57ee7910d99ad03edc7d3c9f8ccb5bbcc5b776c86eea4f538a0bb34b3491c756ecad788 kmousetool-19.12.2.tar.xz" +sha512sums="bf453675ffa67c8be5e8d5da1ed99b4b803f7b34da483055442468b1fa55ebc0a5910813c2bb1654653807c637f43fd313a769448de85d5e16d3be7d066a9f00 kmousetool-19.12.3.tar.xz" diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD index cd8b8585e..71ed030d8 100644 --- a/user/kmplot/APKBUILD +++ b/user/kmplot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmplot -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Mathematical function plotter" url="https://www.kde.org/applications/education/kmplot/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="178ad4683ffbe82775d2cb53cd925d54912e650d2e5ccfec0d2af3a69eff07d195cd81b50ad75db994939bafe92e565597d285abfe875a7859016421b24cc4f6 kmplot-19.12.2.tar.xz" +sha512sums="33a72a15d2b6045bd95d75dd70d44b75b2e045b55dacf787dbc4427e9ee26918b2dcce2a45ef98a9ff1d4ae2c1faf6fd69bcd21b18d3fac302687ac1872c9d95 kmplot-19.12.3.tar.xz" diff --git a/user/knavalbattle/APKBUILD b/user/knavalbattle/APKBUILD index a9b752ddd..ca553dc8a 100644 --- a/user/knavalbattle/APKBUILD +++ b/user/knavalbattle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knavalbattle -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Ship sinking game from KDE" url="https://www.kde.org/applications/games/knavalbattle/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e42ad3a38459aab2b8427d1951363e71c6264c80552f31227f0d1e24b1be2f5095daa0fa047595546534cf133a641cb6d8b5498bdb7d3d38f7e4aac7f6df9ad2 knavalbattle-19.12.2.tar.xz" +sha512sums="01475c680c012324767f69c95582b14f913cd5f61d4e1bd4d05099949031ec396c5bc5904cc1d690ade4bf982f3d0c246c2859dfaefc6a6d93e7bda263703100 knavalbattle-19.12.3.tar.xz" diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD index c356d43cc..e40238805 100644 --- a/user/knetwalk/APKBUILD +++ b/user/knetwalk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knetwalk -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Build up a computer network by placing the wires correctly" url="https://www.kde.org/applications/games/knetwalk/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="09fc29d832709caf230017ecf1751c0bb5b671bfb4983de77e3cffd9696e3f9e2b30e1bb1aa7d24a5fba4c97b2e4c77dc9b5bf78705855668579a9adc07f6dc1 knetwalk-19.12.2.tar.xz" +sha512sums="7b7d74d18f32d613ea32fb4bdd36d3b9c8523a6d93d88fff9ec34ea3eeef4bccd17922e177eee25720a0886b93cf1ffbab3a663a6a9c217181b180766504040e knetwalk-19.12.3.tar.xz" diff --git a/user/knewstuff/APKBUILD b/user/knewstuff/APKBUILD index e4131f9ec..ec88617c9 100644 --- a/user/knewstuff/APKBUILD +++ b/user/knewstuff/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knewstuff -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for discovering and downloading plugins, themes, and more" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fc9a791f6b8330a8e674d8fc3c6f46d96a43266689552bdd7f0bee53b2ad157ccfc75fab07ba3215e2598127f0c3a6c77a2db96aad338d5c3e6bc2b47e2b2bf6 knewstuff-5.67.0.tar.xz" +sha512sums="37e4aabd22eddb1ad216bc07d275006215008845af7979ee5aed9123b7fc2b8742cd07259294876b03c04706a417f1f648f26ef6355f8937d8d9b927e9ce6e5d knewstuff-5.68.0.tar.xz" diff --git a/user/knotifications/APKBUILD b/user/knotifications/APKBUILD index 5ae43dcd4..5952a53f6 100644 --- a/user/knotifications/APKBUILD +++ b/user/knotifications/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knotifications -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for sending notifications to users" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3ee74f84d8157142e943b348d12601ada8c5741026098abddd1433379753352b7f775d2382f02f7b1d8c8ef3387a3a23a3eecc80826718b5ff07946d5925e300 knotifications-5.67.0.tar.xz" +sha512sums="301b300a6da4631d49c1e0004938872091c857bfbf312ab85aaa8f0ce3ce28425cbcdfa380a7ed46211d6e95776ea91cf9fd2a5521add05d5956de5e97f3958e knotifications-5.68.0.tar.xz" diff --git a/user/knotifyconfig/APKBUILD b/user/knotifyconfig/APKBUILD index 3dd3b4711..88bb47763 100644 --- a/user/knotifyconfig/APKBUILD +++ b/user/knotifyconfig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knotifyconfig -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for configuring notifications" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a53651cf08153d023da880297a4a5b99a10cc3cfee5418ecdce224d9ec2cb6de841de24dc7914bc4a1855f41441d3a51be1c52b1f27e7a72ba5b425c3b85a3cd knotifyconfig-5.67.0.tar.xz" +sha512sums="de9269b4654fec05b7b87aaf91c35158b9fcc7a9afb18d42f7810c493dfdbe6ff82ed6fa044d369186b8fb087d524d6a5597365c3f967e95d93be54a03b13568 knotifyconfig-5.68.0.tar.xz" diff --git a/user/kolf/APKBUILD b/user/kolf/APKBUILD index a654180af..44e8fee1b 100644 --- a/user/kolf/APKBUILD +++ b/user/kolf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolf -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="2D miniature golf game from KDE" url="https://www.kde.org/applications/games/kolf/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4a3fe1d6a3f67cae4ba614e7c9b44a2922fc51afa8b9e7b37a17b8dc9eae9937cb8faf0a4b22c89ab5a6e4c183e4887711cc6e7cfa9d3a58bab82e67191b17dd kolf-19.12.2.tar.xz" +sha512sums="447f8b8966bb8549802fbb5129f5178e182b12b546731c2cb7abf95a8777eb1ba7148cb155fe2428d5df3a47134b3dc695fb9b8bd60af5fba0dcdaeb483031ee kolf-19.12.3.tar.xz" diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD index 2bcede50a..9585e0db6 100644 --- a/user/kollision/APKBUILD +++ b/user/kollision/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kollision -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple ball dodging game" url="https://games.kde.org/game.php?game=kollision" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fb8fe5a8135d39ad2a25344880dbf207404dbbc1d706ba1216984e11bed8cd4f1c47b3ba3bfabca119dad7e7c57432484d1c1ba4da4e13ce4960f53316730f86 kollision-19.12.2.tar.xz" +sha512sums="ee37178bdae73db5f0b854dc892100306d9e53afaff8b631555ee50dfd198dee948bac68ad3839c4372055ac1cbf4a6c7610b62fdf511aa9ad5ded47bfdc8141 kollision-19.12.3.tar.xz" diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD index 4900852e1..0b1c2f4b6 100644 --- a/user/kolourpaint/APKBUILD +++ b/user/kolourpaint/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolourpaint -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple painting program for KDE" url="http://kolourpaint.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="22006e9f360e7bd004f8387e5b6b989882fdcd93d688efce6a501502f68a34e63e8c87e1179ada70b02ece10536f64ccab2863f5548a46d74400c5fa0410f430 kolourpaint-19.12.2.tar.xz" +sha512sums="8697ada6f407426bb48e8f62dcc9337630631a0aed17d5efd3390dfedd7039c3c7a9f7c88e46dfe2475fea5f25f73387a4dd40b624c8811fdb019e1e5f6e85bf kolourpaint-19.12.3.tar.xz" diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD index bcd06d02d..d91dd1e03 100644 --- a/user/konquest/APKBUILD +++ b/user/konquest/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=konquest -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Galactic strategy game" url="https://games.kde.org/game.php?game=konquest" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="27e6320237d1cf54904206d791ffd28c587d0ace66c8ab6acb8e8a786fd00f342eb7e3d6aa8ad29ac3530f615e3e41a0492aba99f90a5dd449ccbcae88503c75 konquest-19.12.2.tar.xz" +sha512sums="0be29664cc43f647caf0c4dea5f92e1f38bf708bb67923b8ff916a0e0aacb1e8896cb2c38279f803b368ff09ab253ec67e785964ccb23d32fac9bc4af5af4dd7 konquest-19.12.3.tar.xz" diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD index 30b275c7a..5b700fe16 100644 --- a/user/konsole/APKBUILD +++ b/user/konsole/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=konsole -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Terminal emulator for Qt/KDE" url="https://konsole.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="90d0bcf53a6721fb9bc7391be961cd6ed83fdb4c6ad1517fcaf1685e0aa2c9d4a3a7755c8036b6e54f35fa087dc13d4effb076c8218e7be5c9e13da63e12b9f9 konsole-19.12.2.tar.xz" +sha512sums="980a7eab4efb219acdda8873318980ba14cf7d3fc4f78ac171f8ed1e11400b3028150140aac192820771a0ac8e596fc0f6497c4a44d74bbd1c421f72a39da289 konsole-19.12.3.tar.xz" diff --git a/user/kpackage/APKBUILD b/user/kpackage/APKBUILD index f9c870ae8..29ad6f8da 100644 --- a/user/kpackage/APKBUILD +++ b/user/kpackage/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpackage -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Frameworks for managing KDE data packages" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ab8b1793115002e68dacb7334dca6c793975842d34d1c6ff3026e219569589510dcb0a89e5e46e5a5ffceedc80a5f53d3c0ffaa6736e68f650fca534eb363c25 kpackage-5.67.0.tar.xz" +sha512sums="b77c8656c34a40962eed49e67a8368dcb43a842ad4009505778fefc90be96de2baed382c693eaf3ebf499b6f9e6117584cea839993e14ba94290a2c4f67f70ef kpackage-5.68.0.tar.xz" diff --git a/user/kparts/APKBUILD b/user/kparts/APKBUILD index 552d39924..37a314abc 100644 --- a/user/kparts/APKBUILD +++ b/user/kparts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kparts -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for user interface components" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fd53960ecb88123a4ca43810d7b9e9ec4629d9f860b0d3c5413e05b675e44df63f433dcda6eb1876314c9970267f698096cc24e8313a7bf5caae671c2bbe6440 kparts-5.67.0.tar.xz" +sha512sums="7fa0575ab194e8921b22f54f80f3aa85aa0ec608364d920e0202295f142ee7919fce0f79e1de840be5cc3fa6a2dc99e47e6cb94d95df5c7f151b76dcb713d20b kparts-5.68.0.tar.xz" diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD index 21106ec3a..7205b2642 100644 --- a/user/kpat/APKBUILD +++ b/user/kpat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpat -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Collection of card games for KDE" url="https://games.kde.org/game.php?game=kpat" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="31d23cebd37f9531551b44b3ae69fc4487d2925b9c444956227685ba77371ac74dc958f54aa015a82f98521dde6c5cbf75193977d3f5492f8f0bc7f9354b6a3b kpat-19.12.2.tar.xz" +sha512sums="c19651e717b7c99ccf533c72876ee9d848cfed04680b2e580f0e61028045bc1aecdf8d449d5f40a5e4f0d2de29207cb6d1344874126fa831462805c64b6b24c7 kpat-19.12.3.tar.xz" diff --git a/user/kpeople/APKBUILD b/user/kpeople/APKBUILD index 3d23d3531..5ac60fc11 100644 --- a/user/kpeople/APKBUILD +++ b/user/kpeople/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpeople -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Provides access to all contacts and groups them by physical person" url="https://api.kde.org/frameworks/kpeople/html/index.html" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b9bad73466ba99bf7afbef2b4cd2b1719acaada6942275d4e62efa75d5cb90a30ef7514e98fe4477736417f17686d2f278945c47dafaa638b45ccbca25b98b4d kpeople-5.67.0.tar.xz +sha512sums="9f249fa3cc21a378824d13050919554dec6058277e9c737730bedbc2651d1191833dd7f5ecbfb74158c78808504a300861b5463e23058fef522e1ae3f21aa8e1 kpeople-5.68.0.tar.xz 77df2aefcdfb8e5b9c2fef7a6bfd79066819b0c6958b9e2f8fe94860155aaae9c284a110a15a189cd5b423dc7aa017b952196370f60a4fb382ed7eb77f15abd9 dont-crash-test.patch" diff --git a/user/kphotoalbum/APKBUILD b/user/kphotoalbum/APKBUILD index 7968c5e45..efb9b4586 100644 --- a/user/kphotoalbum/APKBUILD +++ b/user/kphotoalbum/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kphotoalbum -pkgver=5.5 -pkgrel=1 +pkgver=5.6.1 +pkgrel=0 pkgdesc="Versatile photo album software by KDE" url="https://www.kphotoalbum.org/" arch="all" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0 kphotoalbum-5.5.tar.xz" +sha512sums="fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7 kphotoalbum-5.6.1.tar.xz" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index 9d658155d..40a274b58 100644 --- a/user/kpimtextedit/APKBUILD +++ b/user/kpimtextedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpimtextedit -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Text editor for Personal Information Managers (PIMs)" url="https://pim.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a7a0e5312c86d117a3a1c2a2f9992f69a19419bded915a809abf3a9b365ed780bf4dfd94d17662a5f0d59d7163acd6ad032b71e0cceb9800a61764008eb9ea8d kpimtextedit-19.12.2.tar.xz" +sha512sums="116d54e99f89e064acd6a699155b395327a4e64b8e63087f83cad8e652cbc8f7fa6a892f607f21bc7d6a998e5e7ba8e472a95ddfc490534602198930bac30a6a kpimtextedit-19.12.3.tar.xz" diff --git a/user/kplotting/APKBUILD b/user/kplotting/APKBUILD index fe3c4b867..1661cf6f1 100644 --- a/user/kplotting/APKBUILD +++ b/user/kplotting/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kplotting -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for data plotting functions" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df6a0389bb95c11c80449fbff2e99b16d8c002ded12b571a908c9b0c7993e4ba47c4ca8de10a444e051dcf26c0d85738ec8f4acd966495e912f70462aec7ac15 kplotting-5.67.0.tar.xz" +sha512sums="f4b5158afc2eb4d38278618a475dbc26482682cc77d7ae0e3bb799b25a43f156946791156f73a1fd030b7602fb691364e491bef4686d36bc4f955ac2b8033e1b kplotting-5.68.0.tar.xz" diff --git a/user/kpmcore/APKBUILD b/user/kpmcore/APKBUILD index 654bf76a1..ea16d434f 100644 --- a/user/kpmcore/APKBUILD +++ b/user/kpmcore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpmcore -pkgver=4.0.1 +pkgver=4.1.0 pkgrel=0 pkgdesc="Core routines for KDE Partition Manager" url="https://www.kde.org/applications/system/partitionmanager" @@ -12,11 +12,7 @@ depends_dev="libatasmart-dev parted-dev qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules kcoreaddons-dev ki18n-dev kwidgetsaddons-dev util-linux-dev kauth-dev qca-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/kpmcore/$pkgver/src/kpmcore-$pkgver.tar.xz - fat32.patch - nullptr-segfault.patch - test.patch - " +source="https://download.kde.org/stable/kpmcore/$pkgver/src/kpmcore-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,7 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="982ad77246f59ade74edba15effca6490ac9ac7bb6db7f6194bcdbfddfa735c9bc1b58020affccd945fcdfc96fce3488167f492d6a13dcd6d19c5692505303ac kpmcore-4.0.1.tar.xz -904897b7e9292a33c131af9c65d3aa4eaca8cb84a437b83ac76bd8ee7347b49c7c098254ca03f72ab17a8c4f224b31e950978f3bc2c76953d60e38835faab9d7 fat32.patch -cfcce896034c636bdea7ef36548e8116cfd7c0d92e76c4034f6b87b93efc943bb7a475325b2ac178dfb753178cff615603b2aca42a245a3bfda80ffa9c444ea4 nullptr-segfault.patch -2b51fc26188f88fe5d6942ece062d19810ba35471f47005838fa812e8ecc78d25240a08e9e5d824f37da1284dd991323542d295519a6bdc89138c48d256e331b test.patch" +sha512sums="c45b31a41c62a68aee991be0f7954f4bd2136660578cc60f7fa6f05e56716458421e16cd314b3b9a14b56fdc9377db511c1645e5c41f0446d86a8ac5bb66c273 kpmcore-4.1.0.tar.xz" diff --git a/user/kpmcore/fat32.patch b/user/kpmcore/fat32.patch deleted file mode 100644 index 1f308d5c7..000000000 --- a/user/kpmcore/fat32.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 59c9ba2f8d644357e759e6584b4cddad545d4feb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu> -Date: Tue, 15 Oct 2019 21:19:33 +0100 -Subject: Set MBR partition type of FAT32 partitions to 0x0c. - -BUG: 412959 ---- - src/plugins/sfdisk/sfdiskpartitiontable.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/sfdisk/sfdiskpartitiontable.cpp b/src/plugins/sfdisk/sfdiskpartitiontable.cpp -index bf0ae6b..552c973 100644 ---- a/src/plugins/sfdisk/sfdiskpartitiontable.cpp -+++ b/src/plugins/sfdisk/sfdiskpartitiontable.cpp -@@ -178,7 +178,7 @@ static struct { - { FileSystem::Type::LinuxSwap, { QLatin1String("0657FD6D-A4AB-43C4-84E5-0933C84B4F4F"), QLatin1String("82") } }, - { FileSystem::Type::Fat12, { QLatin1String("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"), QLatin1String("6") } }, - { FileSystem::Type::Fat16, { QLatin1String("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"), QLatin1String("6") } }, -- { FileSystem::Type::Fat32, { QLatin1String("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"), QLatin1String("7") } }, -+ { FileSystem::Type::Fat32, { QLatin1String("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"), QLatin1String("c") } }, - { FileSystem::Type::Nilfs2, { QLatin1String("0FC63DAF-8483-4772-8E79-3D69D8477DE4"), QLatin1String("83") } }, - { FileSystem::Type::Ntfs, { QLatin1String("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"), QLatin1String("7") } }, - { FileSystem::Type::Exfat, { QLatin1String("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"), QLatin1String("7") } }, --- -cgit v1.1 - diff --git a/user/kpmcore/nullptr-segfault.patch b/user/kpmcore/nullptr-segfault.patch deleted file mode 100644 index 3caeecbdf..000000000 --- a/user/kpmcore/nullptr-segfault.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c02d59aa6d314678cef9683f96b28e2a1abd82b7 Mon Sep 17 00:00:00 2001 -From: Hartmut Goebel <h.goebel@crazy-compilers.com> -Date: Thu, 7 Nov 2019 22:16:36 +0000 -Subject: Stop helper only if formerly started. - -Differential Revision: https://phabricator.kde.org/D25161 -BUG: 413851 ---- - src/util/externalcommand.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp -index 30b98a2..6f45127 100644 ---- a/src/util/externalcommand.cpp -+++ b/src/util/externalcommand.cpp -@@ -433,6 +433,8 @@ bool ExternalCommand::startHelper() - - void ExternalCommand::stopHelper() - { -+ if (!helperStarted) -+ return; - auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"), - QStringLiteral("/Helper"), QDBusConnection::systemBus()); - QByteArray request; -@@ -441,6 +443,7 @@ void ExternalCommand::stopHelper() - QByteArray hash = QCryptographicHash::hash(request, QCryptographicHash::Sha512); - interface->exit(privateKey->signMessage(hash, QCA::EMSA3_Raw), nonce); - -+ helperStarted = false; - delete privateKey; - delete init; - } --- -cgit v1.1 - diff --git a/user/kpmcore/test.patch b/user/kpmcore/test.patch deleted file mode 100644 index 35b83452a..000000000 --- a/user/kpmcore/test.patch +++ /dev/null @@ -1,140 +0,0 @@ -From c9a08a593bac8b8610a647db118fea6f2958156d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu> -Date: Thu, 7 Nov 2019 22:12:00 +0000 -Subject: Remove broken smart unit test. - -BUG: 413853 ---- - test/CMakeLists.txt | 9 ----- - test/testsmart.cpp | 102 ---------------------------------------------------- - 2 files changed, 111 deletions(-) - delete mode 100644 test/testsmart.cpp - -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 67f63a2..6a300d3 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -53,12 +53,3 @@ find_package (Threads) - # Execute external commands as root - kpm_test(testexternalcommand testexternalcommand.cpp) - add_test(NAME testexternalcommand COMMAND testexternalcommand ${BACKEND}) -- --# Including SMART files reference --set(SMARTPARSER ${CMAKE_SOURCE_DIR}/src/core/smartdiskinformation.cpp -- ${CMAKE_SOURCE_DIR}/src/core/smartattributeparseddata.cpp -- ${CMAKE_SOURCE_DIR}/src/core/smartparser.cpp) -- --# Test SMART support --kpm_test(testsmart testsmart.cpp ${SMARTPARSER}) --add_test(NAME testsmart COMMAND testsmart ${BACKEND}) -diff --git a/test/testsmart.cpp b/test/testsmart.cpp -deleted file mode 100644 -index 2236af7..0000000 ---- a/test/testsmart.cpp -+++ /dev/null -@@ -1,102 +0,0 @@ --#include "helpers.h" -- --#include "util/externalcommand.h" --#include "backend/corebackend.h" --#include "backend/corebackendmanager.h" --#include "core/smartstatus.h" --#include "core/smartparser.h" -- --#include <QCoreApplication> --#include <QDebug> -- --static QString getDefaultDevicePath(); --static bool testSmartStatus(); --static bool testSmartParser(); -- --int main(int argc, char **argv) --{ -- QCoreApplication app(argc, argv); -- -- KPMCoreInitializer i; -- -- if (argc == 2) -- i = KPMCoreInitializer(argv[1]); -- -- if (!i.isValid()) -- return 1; -- -- CoreBackend *backend = CoreBackendManager::self()->backend(); -- -- if (!backend) -- { -- qWarning() << "Couldn't get backend."; -- return 1; -- } -- -- if (!testSmartStatus() || !testSmartParser()) -- return 1; -- -- return app.exec(); --} -- --static QString getDefaultDevicePath() --{ -- // Getting default home partition using 'df -P /home | awk 'END{print $1}'' command -- ExternalCommand command(QStringLiteral("df"), { QStringLiteral("-P"), QStringLiteral("/home"), QStringLiteral("|"), -- QStringLiteral("awk"), QStringLiteral("\'END{print $1}\'") }); -- -- if (command.run() && command.exitCode() == 0) { -- QString output = command.output(); -- return output; -- } -- -- return QString(); --} -- --static bool testSmartStatus() --{ -- QString devicePath = getDefaultDevicePath(); -- -- SmartStatus smart(devicePath); -- -- if (smart.devicePath() != devicePath) -- return false; -- -- if (!smart.status()) -- return false; -- -- if (smart.modelName() == QString()) -- return false; -- -- if (smart.firmware() == QString()) -- return false; -- -- if (smart.serial() == QString()) -- return false; -- -- if (smart.selfTestStatus() != SmartStatus::SelfTestStatus::Success) -- return false; -- -- if (!smart.isValid()) -- return false; -- -- return true; --} -- --static bool testSmartParser() --{ -- QString devicePath = getDefaultDevicePath(); -- -- SmartParser parser(devicePath); -- -- if (!parser.init()) -- return false; -- -- if (parser.devicePath() != devicePath) -- return false; -- -- if (!parser.diskInformation()) -- return false; -- -- return true; --} --- -cgit v1.1 - diff --git a/user/kpty/APKBUILD b/user/kpty/APKBUILD index ae979902f..e71c433e1 100644 --- a/user/kpty/APKBUILD +++ b/user/kpty/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpty -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for implementing terminal emulation" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9637a0b1130a1f8310a20447c84efe836c081dac4f07b0ba5b19d188444b30048543a428d90e63765ce7ccb1c9fbbb937b400d594098049a2708a438586c35c0 kpty-5.67.0.tar.xz" +sha512sums="9ea1452994e66d92a99595f4cbf53f94abe3af4d35f7adb57deb1a2ae7ab6d95524a7e8bd82af90ca7ade39644f6af9002ebbfee751a0395a705e38b1e8b4e23 kpty-5.68.0.tar.xz" diff --git a/user/kquickcharts/APKBUILD b/user/kquickcharts/APKBUILD new file mode 100644 index 000000000..7adaa073f --- /dev/null +++ b/user/kquickcharts/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kquickcharts +pkgver=5.68.0 +pkgrel=0 +pkgdesc="A QtQuick plugin providing high-performance charts" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires X11 +license="LGPL-2.1+" +depends="" +depends_dev="qt5-qtbase-dev" +makedepends="$depends_dev qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev cmake + extra-cmake-modules" +subpackages="$pkgname-dev" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kquickcharts-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="90d50f5aa211d97656e3b8c1dcc0c069675e432ebaf0c33b0fa956e69319d670feaaedd38d24e587f3188b8cf8816d1d0fbdb33010447b3c4c1175ab9062f5c7 kquickcharts-5.68.0.tar.xz" diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD index 0b71f12d7..603f52565 100644 --- a/user/krdc/APKBUILD +++ b/user/krdc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krdc -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="View and control remote desktops (RDP and VNC)" url="https://www.kde.org/applications/internet/krdc/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a64d89e436c5f75c4489d6fec0838b1f72fe1e60cbd5986056ce1c632d4c4ea2af22f36b3452152607f9d9793fe91cfc7b9baa4e2d1fe9da12b0ab4911dae8c7 krdc-19.12.2.tar.xz" +sha512sums="f752180980eebc9aaee92180d3bbc9e4db723ef0ed637b3ec66a5944e30eba3c224972d4e8f543ee1c32a4e62a0d90d37c4f82f575e94a3ac8d9dbe5feb63474 krdc-19.12.3.tar.xz" diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD index 34e04ac44..b2e8a65a9 100644 --- a/user/kreversi/APKBUILD +++ b/user/kreversi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kreversi -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Reversi game" url="https://games.kde.org/game.php?game=kreversi" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="84890c26a7b50f9825641af159f02d87e041ffe57fd5ebc0daa55bff7801366bcbdd6ee21a584ff1d177dd1a19c46bcb25a177391e77335b845778957b7737d4 kreversi-19.12.2.tar.xz" +sha512sums="244edb7cc223f8882b4f2ce77318f91de79d360ccace318fc3f441fde30aad2438e672693f449fcf7a27da72736d50aef26889ac13823a3b9c5517b015c5cda0 kreversi-19.12.3.tar.xz" diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD index cc2191b07..1c606cb71 100644 --- a/user/krfb/APKBUILD +++ b/user/krfb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krfb -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Share your screen with others for remote watching or assistance" url="https://www.kde.org/applications/system/krfb/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6730eb847f331211077859d8ce19f3cf04ec724b5a882759fc57cffa9d70624c0548660a94af2cb560fc88e02c0116e258150355d935ab01fd1cc03942904381 krfb-19.12.2.tar.xz" +sha512sums="d4cd5957034a42164756e226c8596816bcb19aca72f3b4b1af6967c4ab9881aaeed50c396630dd434dd9234fc3f8ddfd0783926f5e7f72a7de101a0c98ad4f36 krfb-19.12.3.tar.xz" diff --git a/user/kross/APKBUILD b/user/kross/APKBUILD index 4668ba3bd..f9aa5ceca 100644 --- a/user/kross/APKBUILD +++ b/user/kross/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kross -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for scripting KDE applications" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ca856f5e5c5540f42477548b74339413efe7c6316a49e1cadd6db00dafb50149d694c95422ce6c0302546e87732d8486cba71339e37e02bddab11db0af2ff540 kross-5.67.0.tar.xz" +sha512sums="3e610248a2f6328b805d59fe8007bba02bd7af02edc93756626f5b3449a494207ed73c27ff504b85aa2d03c70f1a78b8a60289f39cdd6afdfe53c5386e429f23 kross-5.68.0.tar.xz" diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD index 5eb23c593..b87df305b 100644 --- a/user/kruler/APKBUILD +++ b/user/kruler/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kruler -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Screen ruler" url="https://www.kde.org/applications/graphics/kruler/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df7f7cb8ef7917b28132ef7a873cd55db20c20925782087dbd48ad25516674c3478b3a908dfef43e47212cd2487abdc4a2b450a2ee74b98e5e685dbb0722a08a kruler-19.12.2.tar.xz" +sha512sums="34f9cd2c9076594f8984428eac971ceed91798011f6aeb7ec2ba8c8fbec1829a29da8e603a5a66a0e41e423bc81d181c549c43d2529aa23cb421f0267b5d80c0 kruler-19.12.3.tar.xz" diff --git a/user/krunner/APKBUILD b/user/krunner/APKBUILD index 7fb8074f0..9d291a1f2 100644 --- a/user/krunner/APKBUILD +++ b/user/krunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krunner -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Parallel query system" url="https://api.kde.org/frameworks/krunner/html/index.html" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a43cd902a26d7a0af5b9e5114f96fbeaa2f24918ae64ba0ab899c299ad4c0ff95ca98c19380a61ecdd414c5a3c7ad5fc9924337180a67d9fcc92748b798f7234 krunner-5.67.0.tar.xz" +sha512sums="0f3c7bb4afbd1b30405d9ab5265804b62e2928249d4334bbbcd1094cf28c8d9c587995182008f0c8fb4eab8a7a0ace5a18b9aa518139481b786cd54e5f081b47 krunner-5.68.0.tar.xz" diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD index 426c90601..0f5d0c768 100644 --- a/user/kscreenlocker/APKBUILD +++ b/user/kscreenlocker/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kscreenlocker -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Secure X11 screen locker" url="https://www.kde.org/" @@ -47,6 +47,6 @@ package() { install -m644 "$srcdir"/kde-np.pam "$pkgdir"/etc/pam.d/kde-np } -sha512sums="3d9878ff0749175636f34d1bd694d3a2992e67a3e65556f3fe9773f20080c30e1cbff46619960b9357cd8c515082760bcb4b5c03fbc985006f4771b509cae634 kscreenlocker-5.18.0.tar.xz +sha512sums="904c6438c8afea186896ffd508fc30020f12456eb3631dd97596096b00a51928654382091c7aca5e0db927c18173ea5b6d60877591b1f4e5eb23a5617cb4f9d4 kscreenlocker-5.18.2.tar.xz 56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3 kde.pam 565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd kde-np.pam" diff --git a/user/kservice/APKBUILD b/user/kservice/APKBUILD index f644d11ab..d8a092326 100644 --- a/user/kservice/APKBUILD +++ b/user/kservice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kservice -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for implementing plugins and services" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="d6f700f1e8a9b178e5141e4336ef395da06fbf859cdc303d54e36a84189c0d9ee6413f394e69e169fc65850dc2b7b9849b72207c2b2177c430fdd8aa4616e395 kservice-5.67.0.tar.xz" +sha512sums="3581b7ec51317a0b2b63fac7e0491e89da8ba03cd90ba0ef745fc84792af4cd247c80eeec0396069a26f8bc73b971f8444e80ac7749d05b379c29138df6725ec kservice-5.68.0.tar.xz" diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD index 887049564..9015a6e74 100644 --- a/user/kshisen/APKBUILD +++ b/user/kshisen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kshisen -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Mixture of Solitaire and Mah Jongg" url="https://games.kde.org/game.php?game=kshisen" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dec426a6f7988e0b55d7029f408aa2e87064530bd90f211b0fa40b75887e13b07b9c3af8447223e43456a66269a6f8eef17535d2a7f9b2b8b442a0d5adf334b1 kshisen-19.12.2.tar.xz" +sha512sums="32e842b7c9de58ac8d9715c1f947295a73d88b940727990a8c5d7981b807171849eb95d68a623ec6c1819525cd0271777f283a40672a97b80278d4a6074557eb kshisen-19.12.3.tar.xz" diff --git a/user/ksirk/APKBUILD b/user/ksirk/APKBUILD index 06d6625dc..0319102ea 100644 --- a/user/ksirk/APKBUILD +++ b/user/ksirk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksirk -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Strategy game from KDE" url="https://www.kde.org/applications/games/ksirk/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a675e58c177a3c38317c6122c5297f7f1f0f431e27cc8b9a68f56f5c6a7544248c2dd2fbc2f1e246442e113b2f4742a129aa0e278c259404bf23c5e4be7519e8 ksirk-19.12.2.tar.xz" +sha512sums="105442d9c3229cda57d4bafa5f77b5fbf639d6488eabfe405ee82ce0365781efc17526a3dc903a1c730617474c61f037fd81059b72227575920769fba7bff8bb ksirk-19.12.3.tar.xz" diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD index 23c396d57..c8340b11f 100644 --- a/user/ksnakeduel/APKBUILD +++ b/user/ksnakeduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksnakeduel -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Tron-like game" url="https://www.kde.org/applications/games/ksnakeduel/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6e5603ce8a10b7c64c947a617b5c6dc4ad71d04a1a4073193af39aabb992fa7a9ceeccd717062b97c951f7f3f8338537d6c9f6919d9a6ed1d7b1752292b72df0 ksnakeduel-19.12.2.tar.xz" +sha512sums="d3923b4614a9134595aeca0d831f473b39ea94651bd2a997b3cafc98feda141991dec273becc1dfaa9cf8651fc2a7bd13fea31b84529ca0d4966a6dd84d30da6 ksnakeduel-19.12.3.tar.xz" diff --git a/user/kspaceduel/APKBUILD b/user/kspaceduel/APKBUILD index d6f2ad078..5405515bb 100644 --- a/user/kspaceduel/APKBUILD +++ b/user/kspaceduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kspaceduel -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Space arcade game from KDE" url="https://www.kde.org/applications/games/kspaceduel/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="64fce84fc6ed21510d3ff311d7f8f607fa97ecd613cc312685a56a18de27bf1f8a2a923b8bf54491843d04fee18aa9d376ac648887b19aac09ad62e24aebabc0 kspaceduel-19.12.2.tar.xz" +sha512sums="a7965b55fd521bb5aba8c9aa9dfaa1e86c3d88fddbd76176dd4fcb52db1e76fd1bf4c44aa255a46568c812729efb76e4becc532b48761adcec91f834cb610ca1 kspaceduel-19.12.3.tar.xz" diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD index 5dff6873f..847a5a2ab 100644 --- a/user/ksquares/APKBUILD +++ b/user/ksquares/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksquares -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Fun and exciting game of Dots and Boxes" url="https://games.kde.org/game.php?game=ksquares" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e314470ef6ad1ba06b958bc7a496b962a23c42eaa9084a4f93a690a90ffc45d87679e96cdea62c10cf030cc69070fba7c7ed179509f60e7645ad055c435a8b12 ksquares-19.12.2.tar.xz" +sha512sums="c0b4fd109f2873da18a9ae5df837eb0574419ae8cac0e885bcc5c3ac577a0bd2dc57105147aab46e58fab7ee66dd19e68ea1d1686f06fb8dc69d6e4e1afd6760 ksquares-19.12.3.tar.xz" diff --git a/user/ksshaskpass/APKBUILD b/user/ksshaskpass/APKBUILD index ab49297a1..e1e349f2b 100644 --- a/user/ksshaskpass/APKBUILD +++ b/user/ksshaskpass/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=ksshaskpass -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Plasma integration for SSH agents" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b16c56845576c1d0c19deabd2a826d631eebef9307e93aded4f8b3f8bbeb02992a3d5e29278f1c2eeecf40c59c5e31612f2bf5125e7b5b65d04db3fb1d1abb94 ksshaskpass-5.18.0.tar.xz" +sha512sums="6cf83ddee7273a4dcae9e6a73c204edfe4318c20277c9526af4faf49c28c7dc27d041836e11cd4cf93b5eb15175ad4f88451ff506c209ddd98986e06713975b8 ksshaskpass-5.18.2.tar.xz" diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD index d631f8629..3792a7b3b 100644 --- a/user/kstars/APKBUILD +++ b/user/kstars/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kstars -pkgver=3.3.6 +pkgver=3.4.1 pkgrel=0 pkgdesc="Desktop planetarium" url="https://www.kde.org/applications/education/kstars/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="07371c343456d60b3d5e7dd2fb13983926db811dc0ffedb56364c1a02783db501189328c7476762ac0535f43d372ace81d39f90cd0c170ce36385f8e5a185bf3 kstars-3.3.6.tar.xz" +sha512sums="f6380ad578d1fd39bf1cb115fb47dd519fe7ba3067e55ec9296d01559cba529f0f6a3aba363c2c107f3c0648db0d733d34de8c7b196c748f409b8d006ebe26af kstars-3.4.1.tar.xz" diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD index 02298d247..e6b2ab920 100644 --- a/user/ksudoku/APKBUILD +++ b/user/ksudoku/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksudoku -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Desktop Sudoku (symbol placement / logic) game" url="https://games.kde.org/game.php?game=ksudoku" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a505e6315e4687c16afe223f6343ec658d3e6672261777c5d607ba964bf1b56ea4740ed739fcca6a29efccbfc3e0b56b3036074ae4af0706bfb2cc236733bbc6 ksudoku-19.12.2.tar.xz" +sha512sums="0f9bd802525ce6a3215f92c142322143532d37a82dff8f4502eb848280ee74e712fe540ad40f477e99854a23fecde777dd5de7f6b5185a277b21908703b88f64 ksudoku-19.12.3.tar.xz" diff --git a/user/ksysguard/APKBUILD b/user/ksysguard/APKBUILD index 2aa6b55a9..7ae8ab039 100644 --- a/user/ksysguard/APKBUILD +++ b/user/ksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=ksysguard -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="KDE system monitor utility" url="https://www.kde.org/" @@ -40,5 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="445a17452183ba7fe1daa79bc9a5448d30ae65488cfa935b68f91cde8f2dc94d69a0e3cdd262928572ee782f3cdd10c5f2ce8285a21e8509504ccfb0febe5168 ksysguard-5.18.0.tar.xz +sha512sums="2d1f02fa4ca05b130ebf2bf3ec82ab5d8966451ae078f0c5c5d8807f17d8d2067b3dc028da6f92d69aad89a7818849cb9a8d0b3e0cfa519957592b6e63415595 ksysguard-5.18.2.tar.xz 75e07b80c647bc6fdfb092ad3855813ef6bfe91b0ad03562dacfe4e680cfdee201364a2e452db162822045684635c1791ab2392c47d8e5c560c9e617a970cf39 ksysguard-5.6.5-rindex-header.patch" diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD index 68ba1bf12..e6616b810 100644 --- a/user/ksystemlog/APKBUILD +++ b/user/ksystemlog/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksystemlog -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Friendly, powerful system log viewer tool" url="https://www.kde.org/applications/system/ksystemlog/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bae6cee05b3149607a6fc9ae4ff84667bcd41d8559c693f8d916bc1e3fb64066e5a82221007991353153d681236f5dbefcb2e2c69dc8e97d2372197d1401ef6e ksystemlog-19.12.2.tar.xz" +sha512sums="88b12d12210b628d6470b1a73f28f0f01946158c3bb35be6bda14cfe5d3b75990149d2bf7f2077d030f5bc34df0dfea1192161c27128927d62d11d2bde8de530 ksystemlog-19.12.3.tar.xz" diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD index 0ac8aaf60..9e99e9e6a 100644 --- a/user/kteatime/APKBUILD +++ b/user/kteatime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kteatime -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Steep responsibly" url="https://www.kde.org/applications/games/kteatime/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="020031b1fc2d7e374f3132ab45672a45e88d918697289143a63adbe8b88d7597700a3dae8390a04247c68085d1bde8c3056e84ee44ecbfb36e95fea283eedc81 kteatime-19.12.2.tar.xz" +sha512sums="e35cacc4c4fa2c1a37915134687a43225701933f15683916ae094a0cc5fa033da6dc3f34e6116490c0d6d1532755dc7ee16046e8e2e0b853529cb4626a89df77 kteatime-19.12.3.tar.xz" diff --git a/user/ktexteditor/APKBUILD b/user/ktexteditor/APKBUILD index a1beca8e7..c1f2a264c 100644 --- a/user/ktexteditor/APKBUILD +++ b/user/ktexteditor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktexteditor -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Reusable, programmable text editor widget" url="https://www.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8a485d0e9c78b090285c1ed447cef859dd717097ecaad4a002f08933e3536664cdec2eac21a9968195da08369398b84ce77db49e5762b1900b219902b13a28b0 ktexteditor-5.67.0.tar.xz" +sha512sums="88cf4826cd0d0811a1f1d9193fb505e1fd6221192b22b14cca1d491f923dbad1816b9c29d540ff733c2f165c3ac456ac3b425c318a45b9aefd506a2b36e6fb43 ktexteditor-5.68.0.tar.xz" diff --git a/user/ktextwidgets/APKBUILD b/user/ktextwidgets/APKBUILD index 8fb1cbf32..a9d90c430 100644 --- a/user/ktextwidgets/APKBUILD +++ b/user/ktextwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktextwidgets -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework providing widgets for text manipulation" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9c36e81bc6f94c291fd036173a661454a60d47879607c1d0eaafaff177d6e99ea134a0117918e5e3b3f2951268f7151edeba649ace2272959404efb843e2884a ktextwidgets-5.67.0.tar.xz" +sha512sums="75bcf0f0f3ff55770768a95eb3376cf97f6f56cf97dd0223d5615c29bbdf98692db4a1179c802a848a88aeb65a3f1ba2cad0599cf983351cdcf2be555c32bbef ktextwidgets-5.68.0.tar.xz" diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index 68972da7e..30d577ba8 100644 --- a/user/ktimer/APKBUILD +++ b/user/ktimer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktimer -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Tool to execute programs after some time" url="https://www.kde.org/applications/utilities/ktimer/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8f63c47827b5dd84e5d09002b306530e81622c032d172b37bb6954327eecd8dd9243609e9e34615c961d09aeba87651dc143424b18c0c93c6e4465ccf7019679 ktimer-19.12.2.tar.xz" +sha512sums="da075774292f911cdfbc28d3ce76b53cf6e9c3a91ff42c8b18334e8c680a87d08e3f22faf9b646342a7318c7096ed14de740e9e3558a71aed6ca7449b6d11358 ktimer-19.12.3.tar.xz" diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD index dc1a05579..f54a8937b 100644 --- a/user/ktouch/APKBUILD +++ b/user/ktouch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktouch -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Touch typing tutor" url="https://www.kde.org/applications/education/ktouch/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="20d78b0cbce6652c5e4c9e74958cf3fcd0bf56b7a9b1dba508141160b482ceb9e749aeb05917d92e223a0c507227f1bcade3c6844057bc516e6dfdca613f2144 ktouch-19.12.2.tar.xz" +sha512sums="1a3dc798e5e5c8d63419fbc2d9a70e3f872f00527575dd04cd5a8770fce0412a5445cd57c8716b9a6d613a360895f1f1e269acd963fcb3ccc99161b4efb412c6 ktouch-19.12.3.tar.xz" diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD index 2421cba09..abf428ce8 100644 --- a/user/ktuberling/APKBUILD +++ b/user/ktuberling/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktuberling -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Simple constructor game" url="https://games.kde.org/game.php?game=ktuberling" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d716154f4915e475c6c43b0d8f47788a849a3376b7aef85c83b538b97b439be6ce56889a644a3b266af539fae010f6bc405fa473596c91116503e155e471f0a7 ktuberling-19.12.2.tar.xz" +sha512sums="35d9038db7ca568d4666c126421f20eb24ff5a84c790892d1bf772f14a346cebb4761979772f5a62be4e3777698f0c866d3057dd23a24f7acf6d4a14063e818f ktuberling-19.12.3.tar.xz" diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD index 75343d64a..8720725d7 100644 --- a/user/kturtle/APKBUILD +++ b/user/kturtle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kturtle -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Educational programming environment" url="https://www.kde.org/applications/education/kturtle/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5c82f095806c9c234db746c9db2a865dcbc58667ab0c0488e498ccccbd8f5a662f0984424b32dd527ffa747a7e5b1589a040354cceffda1509eaca3996fdbb79 kturtle-19.12.2.tar.xz" +sha512sums="dbf30fab10d9b49b03941309013f29f1481bf4ac8db1f9d5ad10fbaddd6ec6cf3adfd5a59c35163b47cdc3fd0526050434e2f44a05e903ae3b42968bd358151a kturtle-19.12.3.tar.xz" diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD index 40884f68e..f8630b026 100644 --- a/user/kubrick/APKBUILD +++ b/user/kubrick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kubrick -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="3D cube puzzle solving game" url="https://www.kde.org/applications/games/kubrick/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e005491e7193eabb7e811695fec5f02bc83f55517a355cc8f921f737edb3330f2506da369311802c316d3bbd0b1dc90791238f077e717b9977ed0ee8c689d532 kubrick-19.12.2.tar.xz" +sha512sums="ce6c6163f8dbc36900b02126636219c0e1c0cd150deace706b7d622786e72ee2b77e8f1764e490d3a809c293f8fa81a13783153b79fa84293a69f1e85e94a3a9 kubrick-19.12.3.tar.xz" diff --git a/user/kunitconversion/APKBUILD b/user/kunitconversion/APKBUILD index 204562008..5994321cd 100644 --- a/user/kunitconversion/APKBUILD +++ b/user/kunitconversion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kunitconversion -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Convert between metric and imperial" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="04e6c5a96588980c16f1aa5fe88f009c1416f6ad65d333da28f8bd88e6a8541ff61071a1eff95ac66e0b8f835130645f406ed3bf5ab6938ce876b51ec67e73ac kunitconversion-5.67.0.tar.xz" +sha512sums="38e26fc71d9080e876db1f458d0f76d4a102cb40d506c721e4f1fd53dcf7a5fe1de963b3c2aeb16e51c903208c976d6455b34787670032e33c88f30a9e5a15b9 kunitconversion-5.68.0.tar.xz" diff --git a/user/kuserfeedback/APKBUILD b/user/kuserfeedback/APKBUILD index ce5f10b6b..7c0ba2a55 100644 --- a/user/kuserfeedback/APKBUILD +++ b/user/kuserfeedback/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kuserfeedback -pkgver=0.9.90 +pkgver=1.0.0 pkgrel=0 pkgdesc="User feedback agent for KDE" url="https://www.kde.org/" @@ -12,7 +12,7 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev qt5-qttools-dev bison flex" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/unstable/kuserfeedback/kuserfeedback-$pkgver.tar.xz" +source="https://download.kde.org/stable/kuserfeedback/kuserfeedback-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a4f5ee35d54479d0ed8c8e142c6d600a95f6a5e0179398953ef9e9b439b5f286ca90306577797478d53b07da258070710a442b227d6f70e4f2f372dd13b60aae kuserfeedback-0.9.90.tar.xz" +sha512sums="d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7 kuserfeedback-1.0.0.tar.xz" diff --git a/user/kwallet/APKBUILD b/user/kwallet/APKBUILD index 5074403fd..3c1b192f7 100644 --- a/user/kwallet/APKBUILD +++ b/user/kwallet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwallet -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Secure storage system for passwords built atop Qt" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d71f29c476a7eaef05cfcd345e2569352dc5da11000bff7200dadea026d2a8f725cd777806dee99eb88944050566b630ef7904c250dddba0f68102fc320cf889 kwallet-5.67.0.tar.xz +sha512sums="a0a410a9040cb8f157ff01cfbc976f49dac90d0fda0b4dbc8e760cb0549073ed9be5d442bde03b4f6bf27aa16a397671a1a0285c179aea3760bbf441e22cf004 kwallet-5.68.0.tar.xz edca12963a5db9db05b3b4d581c1b970569f3b96dc672422e561c189c9024b69710732281f054514ce3d596688a5b0ba512766f4fd768eea8e00a18dcfd59179 kwallet-5.22.0-blowfish-endianness.patch" diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index a5a939c3c..ddee7952f 100644 --- a/user/kwalletmanager/APKBUILD +++ b/user/kwalletmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwalletmanager -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Manage KDE wallets" url="https://www.kde.org/applications/system/kwalletmanager5" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="059b60106660a2841f8367e952dab9efbbef684b817a54e21944e8b2cd77984826033270c4ff7de5857d1c2af2c954b6dcbd160f0d8fffef884837e32abad4a5 kwalletmanager-19.12.2.tar.xz" +sha512sums="32cf7765c68a7cd4c44e4ce081ddd02de238fafc3644c1c45c7cdca4fd7a658f34bd7473e5bcad42ca6944069a805a1b9499ce949b3c42533ad71ed566678b4e kwalletmanager-19.12.3.tar.xz" diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD index 844d6bbdb..89664524c 100644 --- a/user/kwave/APKBUILD +++ b/user/kwave/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwave -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Sound editor built for KDE" url="http://kwave.sourceforge.net/" @@ -44,6 +44,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="908aaf1ca599fe1f2d4ea9a20a662d3beb2a9e9452c328761c00288f7e6cfc69ef566620b97d048029a2aadf90bf3f59e8debfef1ae3287f1bd720d19f42cb37 kwave-19.12.2.tar.xz +sha512sums="33c045e85aebc4e7ef599a801ebeaf413ce4335fafce109a542cd8af5f83f3748d603698aab48586824cb12a573c6325d7ee20e78d6492a990e7a6650c67e9ba kwave-19.12.3.tar.xz 63afd083727fd28436c2a8071429ba95fe4342c11669a4e27afc30b8a088b981f284fcff13861d5ef01a6f97152b25eec1fbeb303c9bdd76707e44ff5978dab8 es-doc-fix.patch 43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch" diff --git a/user/kwayland/APKBUILD b/user/kwayland/APKBUILD index b67be6e06..d8df26b71 100644 --- a/user/kwayland/APKBUILD +++ b/user/kwayland/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwayland -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Qt wrapper libraries for Wayland" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4f8c4aa2b9faba02b4198cec3c787bfb7e8da6133123146d9c8bac3f20dc9ceb4cc136260dc3af7408e52561156ebf09c67ea62f2551b11a1991e24a72ae0121 kwayland-5.67.0.tar.xz" +sha512sums="384628349c53a92925aa072941821ff153208415ff08fd9d32523a3e0b362d4fbf6539ebc0b3790112a570c70782989daa4cf1bf0ece26621cc8cc2d499654c8 kwayland-5.68.0.tar.xz" diff --git a/user/kwidgetsaddons/APKBUILD b/user/kwidgetsaddons/APKBUILD index 468928970..a1ce477e6 100644 --- a/user/kwidgetsaddons/APKBUILD +++ b/user/kwidgetsaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwidgetsaddons -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework containing ready-made widgets for common tasks" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b327e1a1b7ec8c164c874395d1ec4788074cb48fe1e1064b839fdcf93442e5e777470769109dc28211923297841aad8cb9efe27e01fe37cffe247033001dd2d0 kwidgetsaddons-5.67.0.tar.xz" +sha512sums="64556563d0d45cbffa68b4eecc3c7c31d3597a598a63e713ac29377cf544354c25232cda78973bc15999d3e0b305810b480556a06fba45e811b8b0fe7c97cf23 kwidgetsaddons-5.68.0.tar.xz" diff --git a/user/kwin/APKBUILD b/user/kwin/APKBUILD index 6c818b2a6..2487fe332 100644 --- a/user/kwin/APKBUILD +++ b/user/kwin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kwin -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Modern, stylish window manager (requires OpenGL)" url="https://www.kde.org/" @@ -50,4 +50,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8c64a0023493268c56d38044ae0d289633271a7eb4410b814741de79d4b7c37fe2fd11a63f50f3de1fac8c9cd8181ca59a2c1bfbd6a9298b10094f9c635de9dc kwin-5.18.0.tar.xz" +sha512sums="dab807fd97d501b6dd90cb881a571a9c60be0fc6a7159460d7b025416d10fbfbe152d3cb13c067cd0ac035590e28ed5e72d971b8fd4e10cf2d3883309230b129 kwin-5.18.2.tar.xz" diff --git a/user/kwindowsystem/APKBUILD b/user/kwindowsystem/APKBUILD index 7a6ea3d69..80a107032 100644 --- a/user/kwindowsystem/APKBUILD +++ b/user/kwindowsystem/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwindowsystem -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for introspecting the running X11 window manager" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="09aab6459c9b90effa8a2524c7415966992fdab986dd2313b3b8a72084f0e511da8b2c490ccc12836cc4c8555fe4c32f8c94d37b39db1d5736af7dd2f6b661bc kwindowsystem-5.67.0.tar.xz" +sha512sums="1c7abbdcd3d4b32c4e04eecabafe319f6b7d40d8634e769db4ec3871cfb68030ed6d402ea78ab5de1c873ec710aedff2a80fce6a56135ee57dd81c69c32a03f9 kwindowsystem-5.68.0.tar.xz" diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD index 79b97b193..0d096c2ea 100644 --- a/user/kwordquiz/APKBUILD +++ b/user/kwordquiz/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwordquiz -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Flash card trainer for KDE" url="https://www.kde.org/applications/education/kwordquiz/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="624e2c79aea2075cc9243c4cba9362bc9906b8f0ac14bd05a48976ae0238733a1d29a241669e535d59b37622fe2672686a940bc6bf97143fee025df2181a1e8a kwordquiz-19.12.2.tar.xz" +sha512sums="cfdf267585a6bfc5de06da3a0de6372cb2beec7c6abe7482551f28356b464d4b67f092998a251991b4678131b47a6278745c409f0c4203c457fed8a38081baf6 kwordquiz-19.12.3.tar.xz" diff --git a/user/kxmlgui/APKBUILD b/user/kxmlgui/APKBUILD index a064a34a3..55c6b6ac2 100644 --- a/user/kxmlgui/APKBUILD +++ b/user/kxmlgui/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kxmlgui -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for creating user interfaces using XML" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="57e860ae9cb6c82d691b7f463992147f440f5f89cad14ba770a6e16f6d50347a2575a2fa5a0e09decb7e135ad50720f8762d412072d2d2fe868280e07d861e2e kxmlgui-5.67.0.tar.xz" +sha512sums="de98fab8c9a878b24081ec0676fef35da39f44391689ce7087c367d8e54c3122f13214cac8fda3fa9bf59c1515a1328bc704b550bf0c0cc1ca11dc898a01d430 kxmlgui-5.68.0.tar.xz" diff --git a/user/kxmlrpcclient/APKBUILD b/user/kxmlrpcclient/APKBUILD index 2ace4f9f5..0586cc70d 100644 --- a/user/kxmlrpcclient/APKBUILD +++ b/user/kxmlrpcclient/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kxmlrpcclient -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Qt library for writing XML-RPC clients" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4c6d2a8f4bc165202bd97921ad98de35e25f977db9ffae31301d24f817a0baeb5516491482ddff12a1cf4df837cca8d363423979cb68734e036bef32e0467ffc kxmlrpcclient-5.67.0.tar.xz" +sha512sums="89350795c4c3601fca751fc80cf4c331bd4e692d85f672c50bdd1871cfb72809004d4ec0bc0826020c42a21c38d18962481477ac3f95ecbf219f4b88aa586aad kxmlrpcclient-5.68.0.tar.xz" diff --git a/user/libexif/APKBUILD b/user/libexif/APKBUILD index de51ae7b0..06e1e832a 100644 --- a/user/libexif/APKBUILD +++ b/user/libexif/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libexif pkgver=0.6.21 -pkgrel=3 +pkgrel=4 pkgdesc="Library to parse EXIF metadata" url="https://sourceforge.net/projects/libexif" arch="all" @@ -10,14 +10,19 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends="" makedepends="" source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + CVE-2016-6328.patch CVE-2017-7544.patch CVE-2018-20030.patch + CVE-2019-9278.patch " # secfixes: # 0.6.21-r3: # - CVE-2017-7544 # - CVE-2018-20030 +# 0.6.21-r4: +# - CVE-2016-6328 +# - CVE-2019-9278 prepare() { default_prepare @@ -41,5 +46,7 @@ package() { } sha512sums="4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35 libexif-0.6.21.tar.bz2 +c0d4c74207993efc373615ef2c797d720162a2ee6fd7ad026edf2ced4198d9b1165b88790c2af3194f6bb7c2de88d4672c041c2cff8a82c8914700633332b8c5 CVE-2016-6328.patch d529c6c5bd26dc21c0946702574184e1f61c2bfd4fb95b41e314f486a0dd55571963ff2cad566d2fb0804de3c0799bcd956c15a3dc10a520ce207728edad4e2d CVE-2017-7544.patch -0d6123bd275ace338ad9cebb31a2e714de0141b91860f07394b281686a5393566c3f4159679d4ba689ae7ea69ae2e412b158c3deb451c40c210b5817f6888bbc CVE-2018-20030.patch" +0d6123bd275ace338ad9cebb31a2e714de0141b91860f07394b281686a5393566c3f4159679d4ba689ae7ea69ae2e412b158c3deb451c40c210b5817f6888bbc CVE-2018-20030.patch +c30c03fefea94d175b94c9f0c4d60cbb3aa0ad78b0d29008975fbbb15c17f2907a16fd50970e5fa18d533d0ce291a5ee9b62934210cb40b0f463693460607738 CVE-2019-9278.patch" diff --git a/user/libexif/CVE-2016-6328.patch b/user/libexif/CVE-2016-6328.patch new file mode 100644 index 000000000..0568f27d2 --- /dev/null +++ b/user/libexif/CVE-2016-6328.patch @@ -0,0 +1,60 @@ +From 41bd04234b104312f54d25822f68738ba8d7133d Mon Sep 17 00:00:00 2001 +From: Marcus Meissner <marcus@jet.franken.de> +Date: Tue, 25 Jul 2017 23:44:44 +0200 +Subject: [PATCH] fixes some (not all) buffer overreads during decoding pentax + makernote entries. + +This should fix: +https://sourceforge.net/p/libexif/bugs/125/ CVE-2016-6328 +--- + libexif/pentax/mnote-pentax-entry.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c +index d03d159..ea0429a 100644 +--- a/libexif/pentax/mnote-pentax-entry.c ++++ b/libexif/pentax/mnote-pentax-entry.c +@@ -425,24 +425,34 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, + case EXIF_FORMAT_SHORT: + { + const unsigned char *data = entry->data; +- size_t k, len = strlen(val); ++ size_t k, len = strlen(val), sizeleft; ++ ++ sizeleft = entry->size; + for(k=0; k<entry->components; k++) { ++ if (sizeleft < 2) ++ break; + vs = exif_get_short (data, entry->order); + snprintf (val+len, maxlen-len, "%i ", vs); + len = strlen(val); + data += 2; ++ sizeleft -= 2; + } + } + break; + case EXIF_FORMAT_LONG: + { + const unsigned char *data = entry->data; +- size_t k, len = strlen(val); ++ size_t k, len = strlen(val), sizeleft; ++ ++ sizeleft = entry->size; + for(k=0; k<entry->components; k++) { ++ if (sizeleft < 4) ++ break; + vl = exif_get_long (data, entry->order); + snprintf (val+len, maxlen-len, "%li", (long int) vl); + len = strlen(val); + data += 4; ++ sizeleft -= 4; + } + } + break; +@@ -455,5 +465,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, + break; + } + +- return (val); ++ return val; + } diff --git a/user/libexif/CVE-2019-9278.patch b/user/libexif/CVE-2019-9278.patch new file mode 100644 index 000000000..bd15e8d13 --- /dev/null +++ b/user/libexif/CVE-2019-9278.patch @@ -0,0 +1,85 @@ +From 75aa73267fdb1e0ebfbc00369e7312bac43d0566 Mon Sep 17 00:00:00 2001 +From: Marcus Meissner <meissner@suse.de> +Date: Sat, 18 Jan 2020 09:29:42 +0100 +Subject: [PATCH] fix CVE-2019-9278 + +avoid the use of unsafe integer overflow checking constructs (unsigned integer operations cannot overflow, so "u1 + u2 > u1" can be optimized away) + +check for the actual sizes, which should also handle the overflows +document other places google patched, but do not seem relevant due to other restrictions + +fixes https://github.com/libexif/libexif/issues/26 +--- + libexif/exif-data.c | 28 ++++++++++++++++++---------- + 1 file changed, 18 insertions(+), 10 deletions(-) + +diff --git a/libexif/exif-data.c b/libexif/exif-data.c +index a6f9c94..6332cd1 100644 +--- a/libexif/exif-data.c ++++ b/libexif/exif-data.c +@@ -192,9 +192,15 @@ exif_data_load_data_entry (ExifData *data, ExifEntry *entry, + doff = offset + 8; + + /* Sanity checks */ +- if ((doff + s < doff) || (doff + s < s) || (doff + s > size)) { ++ if (doff >= size) { + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", +- "Tag data past end of buffer (%u > %u)", doff+s, size); ++ "Tag starts past end of buffer (%u > %u)", doff, size); ++ return 0; ++ } ++ ++ if (s > size - doff) { ++ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", ++ "Tag data goes past end of buffer (%u > %u)", doff+s, size); + return 0; + } + +@@ -315,13 +321,14 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, + unsigned int ds, ExifLong o, ExifLong s) + { + /* Sanity checks */ +- if ((o + s < o) || (o + s < s) || (o + s > ds) || (o > ds)) { +- exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", +- "Bogus thumbnail offset (%u) or size (%u).", +- o, s); ++ if (o >= ds) { ++ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o); ++ return; ++ } ++ if (s > ds - o) { ++ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o); + return; + } +- + if (data->data) + exif_mem_free (data->priv->mem, data->data); + if (!(data->data = exif_data_alloc (data, s))) { +@@ -947,7 +954,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", + "IFD 0 at %i.", (int) offset); + +- /* Sanity check the offset, being careful about overflow */ ++ /* ds is restricted to 16 bit above, so offset is restricted too, and offset+8 should not overflow. */ + if (offset > ds || offset + 6 + 2 > ds) + return; + +@@ -956,6 +963,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, + + /* IFD 1 offset */ + n = exif_get_short (d + 6 + offset, data->priv->order); ++ /* offset < 2<<16, n is 16 bit at most, so this op will not overflow */ + if (offset + 6 + 2 + 12 * n + 4 > ds) + return; + +@@ -964,8 +972,8 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", + "IFD 1 at %i.", (int) offset); + +- /* Sanity check. */ +- if (offset > ds || offset + 6 > ds) { ++ /* Sanity check. ds is ensured to be above 6 above, offset is 16bit */ ++ if (offset > ds - 6) { + exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, + "ExifData", "Bogus offset of IFD1."); + } else { diff --git a/user/libgd/APKBUILD b/user/libgd/APKBUILD index 27de81126..2a537dfca 100644 --- a/user/libgd/APKBUILD +++ b/user/libgd/APKBUILD @@ -2,20 +2,22 @@ # Maintainer: pkgname=libgd pkgver=2.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="Library for dynamic image creation" url="http://libgd.github.io/" arch="all" options="!check" # Upstream bug 201 regression. license="MIT" depends="" -makedepends="bash fontconfig-dev freetype-dev libjpeg-turbo-dev libpng-dev - libwebp-dev zlib-dev" +makedepends="autoconf automake bash fontconfig-dev freetype-dev + libjpeg-turbo-dev libpng-dev libtool libwebp-dev tiff-dev zlib-dev + " subpackages="$pkgname-dev" replaces="gd" source="https://github.com/$pkgname/$pkgname/releases/download/gd-$pkgver/$pkgname-$pkgver.tar.xz CVE-2016-7568.patch CVE-2018-5711.patch + CVE-2018-14553.patch CVE-2018-1000222.patch CVE-2019-6977.patch CVE-2019-6978.patch @@ -27,6 +29,13 @@ source="https://github.com/$pkgname/$pkgname/releases/download/gd-$pkgver/$pkgna # - CVE-2018-1000222 # - CVE-2019-6977 # - CVE-2019-6978 +# 2.2.5-r2: +# - CVE-2018-14553 + +prepare() { + default_prepare + autoreconf -vif +} build() { ./configure \ @@ -58,6 +67,7 @@ dev() { sha512sums="e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b libgd-2.2.5.tar.xz 8310d11a2398e8617c9defc4500b9ce3897ac1026002ffa36000f1d1f8df19336005e8c1f6587533f1d787a4a54d7a3a28ad25bddbc966a018aedf4d8704a716 CVE-2016-7568.patch d6577566814cbe2d93b141a4216b32acdeb2989dc1712eb137565081b913151bbb4c69911c96b2bb7c90695078a85152d368aad183de494d1283fde25021751b CVE-2018-5711.patch +353491fab6c6e0916dca910c9d14f0e0efab6d9d88c48f6f3f2f69e60312489039b25d26980e7c5c2c04ed9e56003b99eae77bd412fbbed1d8eb47d561f7af74 CVE-2018-14553.patch d12462f1b159d50b9032435e9767a5d76e1797a88be950ed33dda7aa17005b7cb60560d04b9520e46d8111e1669d42ce28cb2c508f9c8825d545ac0335d2a10b CVE-2018-1000222.patch df84e469515f684d79ebad163e137401627310a984ac1ae6a4d31b739b3dc6d9144f101e9bfc3211af1d7cdbaa827721d21a9fe528e69b9b60a943ec8a7ab74b CVE-2019-6977.patch 3bf31941365a878bef899afa14a89e4ad0fbfb3280d34b2118c8484698e15eff600751ae3ce146a4f006e6c21730cb18899bae3538f6cc2651025274b40cf1ca CVE-2019-6978.patch" diff --git a/user/libgd/CVE-2018-14553.patch b/user/libgd/CVE-2018-14553.patch new file mode 100644 index 000000000..7510101d1 --- /dev/null +++ b/user/libgd/CVE-2018-14553.patch @@ -0,0 +1,99 @@ +From a93eac0e843148dc2d631c3ba80af17e9c8c860f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?F=C3=A1bio=20Cabral=20Pacheco?= <fcabralpacheco@gmail.com> +Date: Fri, 20 Dec 2019 12:03:33 -0300 +Subject: [PATCH] Fix potential NULL pointer dereference in gdImageClone() + +--- + src/gd.c | 9 +-------- + tests/gdimageclone/CMakeLists.txt | 1 + + tests/gdimageclone/Makemodule.am | 3 ++- + tests/gdimageclone/style.c | 30 ++++++++++++++++++++++++++++++ + 5 files changed, 35 insertions(+), 9 deletions(-) + create mode 100644 tests/gdimageclone/style.c + +diff --git a/src/gd.c b/src/gd.c +index 592a0286..d564d1f9 100644 +--- a/src/gd.c ++++ b/src/gd.c +@@ -2865,14 +2865,6 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) { + } + } + +- if (src->styleLength > 0) { +- dst->styleLength = src->styleLength; +- dst->stylePos = src->stylePos; +- for (i = 0; i < src->styleLength; i++) { +- dst->style[i] = src->style[i]; +- } +- } +- + dst->interlace = src->interlace; + + dst->alphaBlendingFlag = src->alphaBlendingFlag; +@@ -2907,6 +2899,7 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) { + + if (src->style) { + gdImageSetStyle(dst, src->style, src->styleLength); ++ dst->stylePos = src->stylePos; + } + + for (i = 0; i < gdMaxColors; i++) { +diff --git a/tests/gdimageclone/CMakeLists.txt b/tests/gdimageclone/CMakeLists.txt +index e6ccc318..662f4e96 100644 +--- a/tests/gdimageclone/CMakeLists.txt ++++ b/tests/gdimageclone/CMakeLists.txt +@@ -1,5 +1,6 @@ + LIST(APPEND TESTS_FILES + bug00300 ++ style + ) + + ADD_GD_TESTS() +diff --git a/tests/gdimageclone/Makemodule.am b/tests/gdimageclone/Makemodule.am +index 4b1b54c0..51abf5c1 100644 +--- a/tests/gdimageclone/Makemodule.am ++++ b/tests/gdimageclone/Makemodule.am +@@ -1,5 +1,6 @@ + libgd_test_programs += \ +- gdimageclone/bug00300 ++ gdimageclone/bug00300 \ ++ gdimageclone/style + + EXTRA_DIST += \ + gdimageclone/CMakeLists.txt +diff --git a/tests/gdimageclone/style.c b/tests/gdimageclone/style.c +new file mode 100644 +index 00000000..c2b246ed +--- /dev/null ++++ b/tests/gdimageclone/style.c +@@ -0,0 +1,30 @@ ++/** ++ * Cloning an image should exactly reproduce all style related data ++ */ ++ ++ ++#include <string.h> ++#include "gd.h" ++#include "gdtest.h" ++ ++ ++int main() ++{ ++ gdImagePtr im, clone; ++ int style[] = {0, 0, 0}; ++ ++ im = gdImageCreate(8, 8); ++ gdImageSetStyle(im, style, sizeof(style)/sizeof(style[0])); ++ ++ clone = gdImageClone(im); ++ gdTestAssert(clone != NULL); ++ ++ gdTestAssert(clone->styleLength == im->styleLength); ++ gdTestAssert(clone->stylePos == im->stylePos); ++ gdTestAssert(!memcmp(clone->style, im->style, sizeof(style)/sizeof(style[0]))); ++ ++ gdImageDestroy(clone); ++ gdImageDestroy(im); ++ ++ return gdNumFailures(); ++} diff --git a/user/libgee/APKBUILD b/user/libgee/APKBUILD index b1b90d7f1..3e4653b2d 100644 --- a/user/libgee/APKBUILD +++ b/user/libgee/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgee -pkgver=0.20.2 +pkgver=0.20.3 pkgrel=0 pkgdesc="GObject collection library" url="https://wiki.gnome.org/Projects/Libgee" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4ea312f73046fee5d0ad1d5d1942c9f4aecbec22509ce7f00b51352039b9643d65d2f37d4c0de550f0165ff7f6058cf88ecb55d7c5963706a1b63d5ec14c7d7d libgee-0.20.2.tar.xz" +sha512sums="c7dd32bc02ea9f0f70e7593bc5625139802a52674e5aa07fe6fc815a78517f25590419b2da00e194bf7bf5f1505a138ba133d6dba67c44f9cdcb38389825adf7 libgee-0.20.3.tar.xz" diff --git a/user/libidn2/APKBUILD b/user/libidn2/APKBUILD index c5355c814..b52ec8ad9 100644 --- a/user/libidn2/APKBUILD +++ b/user/libidn2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=libidn2 -pkgver=2.2.0 +pkgver=2.3.0 pkgrel=0 pkgdesc="Free implementation of IDNA2008, Punycode, and TR46" url="https://gitlab.com/libidn/libidn2" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ccf56056a378d49a28ff67a2a23cd3d32ce51f86a78f84839b98dad709a1d0d03ac8d7c1496f0e4d3536bca00e3d09d34d76a37317b2ce87e3aa66bdf4e877b8 libidn2-2.2.0.tar.gz" +sha512sums="a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187 libidn2-2.3.0.tar.gz" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 584fbf44a..21aeed83d 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -1,21 +1,20 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput -pkgver=1.15.0 +pkgver=1.15.2 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" +depends="" +checkdepends="check-dev valgrind" 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" replaces="$pkgname-libs" -source="https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz - time64.patch - " +source="https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" build() { meson --prefix=/usr \ @@ -33,5 +32,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="5dab48e1b4c9c0deb5b01ebc3ccb4cc28d614be25d87daaf42f51fbd2d955266f3fdba73029bc0094caa55060dad8967751b72d8f45f19a40b542f0c9118c1b6 libinput-1.15.0.tar.xz -e4c898359c8264651b0d0a795c05ccfebcd24e44c7b2dbad8a2bce2c0da6138288e0be93bd68e4b61cc0fb56e9a46ad5c4b670f3f88e493b8a7993020f1d2c61 time64.patch" +sha512sums="f6b50dbdf6ee6b65f88e020c4292c94c3178125d58629f27c2e52f92b658ccd67e0c5604fbf0b303621ff0386637ce1e291daaa991761d4145e8bcda4dd128a2 libinput-1.15.2.tar.xz" diff --git a/user/libinput/time64.patch b/user/libinput/time64.patch deleted file mode 100644 index 47833b6ee..000000000 --- a/user/libinput/time64.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 2e15e1f56d673626d518760c1b7997543bb01fea Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Sun, 19 Jan 2020 16:01:57 -0600 -Subject: [PATCH] evdev-fallback: Use input_event_init for fallback - -Old-style field initialisation ignores the 64-bit time_t change in -Linux UAPI, which causes the structure to be incompletely initialised -on 32-bit systems with the 64-bit time_t kernel headers. - -This patch uses the input_event_init helper from the original 64-bit -time_t enablement patch. - -Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> -Fixes: 5dc1a7ebd ("Adjust for 64bit time_t for 32bit architectures") -See-Also: libinput/libinput!346 ---- - src/evdev-fallback.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/evdev-fallback.c b/src/evdev-fallback.c -index 651f0111..99c87c87 100644 ---- a/src/evdev-fallback.c -+++ b/src/evdev-fallback.c -@@ -29,6 +29,7 @@ - #include <mtdev-plumbing.h> - - #include "evdev-fallback.h" -+#include "util-input-event.h" - - static void - fallback_keyboard_notify_key(struct fallback_dispatch *dispatch, -@@ -701,10 +702,10 @@ fallback_lid_keyboard_event(uint64_t time, - if (dispatch->lid.reliability == RELIABILITY_WRITE_OPEN) { - int fd = libevdev_get_fd(dispatch->device->evdev); - int rc; -- struct input_event ev[2] = { -- {{ 0, 0 }, EV_SW, SW_LID, 0 }, -- {{ 0, 0 }, EV_SYN, SYN_REPORT, 0 }, -- }; -+ struct input_event ev[2]; -+ -+ ev[0] = input_event_init(0, EV_SW, SW_LID, 0); -+ ev[1] = input_event_init(0, EV_SYN, SYN_REPORT, 0); - - rc = write(fd, ev, sizeof(ev)); - --- -2.24.1 - diff --git a/user/libjpeg-turbo/APKBUILD b/user/libjpeg-turbo/APKBUILD index d9a551b1b..ad4a4076a 100644 --- a/user/libjpeg-turbo/APKBUILD +++ b/user/libjpeg-turbo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libjpeg-turbo -pkgver=2.0.3 +pkgver=2.0.4 pkgrel=0 pkgdesc="Accelerated JPEG compression and decompression library" url="https://libjpeg-turbo.org/" @@ -32,7 +32,7 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -DENABLE_STATIC=OFF \ -DWITH_JPEG8=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -51,4 +51,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36 libjpeg-turbo-2.0.3.tar.gz" +sha512sums="708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 libjpeg-turbo-2.0.4.tar.gz" diff --git a/user/libkdcraw/APKBUILD b/user/libkdcraw/APKBUILD index 72b15a15d..982cb008a 100644 --- a/user/libkdcraw/APKBUILD +++ b/user/libkdcraw/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdcraw -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="RAW image file format support for KDE" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e1a214ef95040760537346bf26560f02d3cfb1904f539d9ad9122175972c577115e5bd5f4a6723ce7f0cac758bb2d922acbe9f00af9b25b23741f278067335f6 libkdcraw-19.12.2.tar.xz" +sha512sums="9a2df5e98adedb6ca79804530b0560d606c7c79aa7e4d432c97c06acd0643ea0a138bc2f30fd586ae3a7db42aaa56bf2b05f3512614a167dae42628cad87720d libkdcraw-19.12.3.tar.xz" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index 16fb3c7ec..1d1243c7a 100644 --- a/user/libkdegames/APKBUILD +++ b/user/libkdegames/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdegames -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Library for common routines shared between KDE games" url="https://www.kde.org/applications/games/" @@ -60,4 +60,4 @@ carddecks() { mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/ } -sha512sums="9efed7f707424e7991125259453221b16a752d6c05eec3eb45628e19a4bbabf8c510c5cbb5dea028d5bd7361620c7b0d6d421ba51b18e30711e60ebbab38678d libkdegames-19.12.2.tar.xz" +sha512sums="4ef533dd126e5fe43c96749cc08ff7faee761d9f00876be5639416b02c52b7304c37dbbf31aa1cd42c737d7f2b2dcfd5d3b800c54b267e4c59ce1e08d033dd3b libkdegames-19.12.3.tar.xz" diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD index a61eb15c7..2dde5afba 100644 --- a/user/libkeduvocdocument/APKBUILD +++ b/user/libkeduvocdocument/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkeduvocdocument -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Library for manipulating KVTML files" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="108f7203d618076b47ce606b238aa237e5a0e58241981f98a0b76348fffd963670df8f4fa7d577ecc2cada4123e136e5ac09b9c8d0a3b7a0af0b4f86cef3f8d5 libkeduvocdocument-19.12.2.tar.xz" +sha512sums="f8cc3a90767710f7a93f7549257831998c6faec274e3a66ef1a40fbf9efe1234a09147c85a7f37be1cf18fa38453682a4be1b72c8631ba949ed69329b2c6d063 libkeduvocdocument-19.12.3.tar.xz" diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD index 922c1f5b4..094839e20 100644 --- a/user/libkexiv2/APKBUILD +++ b/user/libkexiv2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkexiv2 -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE integration with Exiv2 EXIF data library" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c76a3858e14f83473b34fb1e2130b5424acee5cabd066adb66e5b0673aa8356c0a3ba73b401019ba1db4f819bb2df1c54d3fa1494b307ced3f7e5844edba93d8 libkexiv2-19.12.2.tar.xz" +sha512sums="243dad5ebab2384567e3ff09d7bf49525abfc126169fcf0d20bdf42fe88b3df9c9f40f7d36c1db3c69d37be54fc633a4a44eb1a75bc5c2fe3e6cc339f5ea8644 libkexiv2-19.12.3.tar.xz" diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD index 65b15169b..67b24bc4f 100644 --- a/user/libkipi/APKBUILD +++ b/user/libkipi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkipi -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE Image Plugin Interface library" url="https://www.digikam.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a893e188e92ee61cc4048266dedc71b93caefc395fcd447110f6bcd3ebe42a74e22a18cc0b3b96307359e6ad13a61faea8f75274f951be6601942d3472ca4320 libkipi-19.12.2.tar.xz" +sha512sums="09e624aef5fc3de085820d8803dd5a579d2b3f5c72f8b4fba0633c9725ccfe6ff0ed552ee16dfea233c20c8b85e477272734c6c1fb4cc1e6037c725be956bac9 libkipi-19.12.3.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index 24175ecf8..594c36564 100644 --- a/user/libkleo/APKBUILD +++ b/user/libkleo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkleo -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c687995cdbacef349c096bf6c3246a762c22c74ba00674b3b2622d35ecee5c3f342e242d512a4d5ded238115b395e1951e365d711954f451b61aff93b5c6b302 libkleo-19.12.2.tar.xz" +sha512sums="88dfb85673dda645c4ca9c40527907e0bdcff83be353643826c8f5e4ab113a7e93c69bca95939879fd9ec352cef4ae07795a063bd1bd927b6d915b5a566fe45e libkleo-19.12.3.tar.xz" diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD index f0b1c553b..b8645ac60 100644 --- a/user/libkmahjongg/APKBUILD +++ b/user/libkmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkmahjongg -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Library with Mah Jongg logic" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3e03bd0a1b1bea13bf2fec4ea6c256f355b8562f7cdf5fdf3fd3eddd8cd69f1bbb0cbf3a45bc951b3ed3eb8bdbee81c8e8a316834e0f6fd7a75af72954f396a5 libkmahjongg-19.12.2.tar.xz" +sha512sums="90491bda908453aca3f5a438fbcfbbb8efbbfb5a5a625b2df84fd26b20ba2a8dfd0ee47400727b3087f435bb7d91e85cb847db708521942b931355d3b49dcc09 libkmahjongg-19.12.3.tar.xz" diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD index 55b378ab5..0430b4e9b 100644 --- a/user/libksane/APKBUILD +++ b/user/libksane/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libksane -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="KDE scanning library" url="https://www.kde.org" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a073cb214cfa84e93091db86c1791647840f7f2d8794e2bc28ab6bac69d1b6d354a4bef85efe557653c54dd40cb15603fb9404799085de544cbe66114de71c33 libksane-19.12.2.tar.xz" +sha512sums="83c397edcce693e0f9d82a36c16aff771d33015a78af308c00d0c815ee878c9decf558217dcc57c062aaf7bdb15fdcbf610fc3eb9a71e4710ec3208ac3696121 libksane-19.12.3.tar.xz" diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD index 263c3a9d0..0e4679641 100644 --- a/user/libkscreen/APKBUILD +++ b/user/libkscreen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=libkscreen -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="KDE Plasma screen management software" url="https://www.kde.org/" @@ -53,4 +53,4 @@ wayland() { "$subpkgdir"/usr/lib/qt5/plugins/kf5/kscreen/ } -sha512sums="9766d0ed8a03361983fa127bb6b88f252d407bf65fd2845208f9507180bc68f7f3e6efac473a475b519b10618f477aa55811abd07c41059310aabb4c78c00c9f libkscreen-5.18.0.tar.xz" +sha512sums="fba933c4b26a32f19a6352738e3704f8a35ad24b268bed6fca173c2c4abe0b899845ce1750ce6473b3b9185239332980384a8bb708081484162ee30ff4b3e29a libkscreen-5.18.2.tar.xz" diff --git a/user/libksysguard/APKBUILD b/user/libksysguard/APKBUILD index f639d08bb..b79e945db 100644 --- a/user/libksysguard/APKBUILD +++ b/user/libksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=libksysguard -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="KDE system monitor library" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="90dd36c7e85a66ea18f63f2c2db2601c4016a345faeb49524111de070f92dfc7334e2c5d377623c38ad3f94a351319dfa66a4b7296c40994c64b45d19f16d78d libksysguard-5.18.0.tar.xz" +sha512sums="75de2526ffeaabf623163f6fd1f592a8eb3edb0f25b70a1f7c8715d83a01158079addc5ea3cf81baa4650049370a0efefcbece1b3f80edfe511c6942d08ad2a6 libksysguard-5.18.2.tar.xz" diff --git a/user/libkworkspace/APKBUILD b/user/libkworkspace/APKBUILD index 9ce8218e4..487c573a7 100644 --- a/user/libkworkspace/APKBUILD +++ b/user/libkworkspace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=libkworkspace -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="KDE Plasma 5 workspace library" url="https://www.kde.org/plasma-desktop" @@ -45,7 +45,7 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="afce0ef26b1ce5e8bbc56c8ac4eac1ae097126966c0e9b77ffe74278f270a3ae9fc2bd116be939e13b3134ad9967cb80501ed1194f115710529ac98f408e903a plasma-workspace-5.18.0.tar.xz +sha512sums="0fa91451e28b70d7602de79686afb57143eecd86e3856ed9c773bc4f5394610e5a5cf2f13fd03398b7a01624b45ab86d7e12da016980cb91ab23adac41a6793e plasma-workspace-5.18.2.tar.xz 3f72f33219999bc39c52c143c047df37eb34b4149bf479ec9aee64ce14c78946635cf20cf120858f10a676a2b7c00cef0b95aa696e8e71b7412d936fbdd7e755 header-generation.patch 1c7a23a4bb13030b992b8bde125548f104dbc6db489b60a6c40d91e2b793b208f35f88cca9ad90a9cc116d92b902d5c536b0e643805799b07286fbc82a0dafe8 session.patch -4f5f4976366b038badf8712b0a61da94ccb3e4a838146f9e1c36ff9710b2aa4b47234010e07ccee4826567e5bd77c2d85c9133ace2c5caed55598572a0c55b59 standalone.patch" +b9dc109c4a2dafddceba194cfa268ef3b34b21826d715d680447c0d3932d16daa16a7cf12c6456f48d6c654beeb7fcb02f30512bd74b80264e9af26871164e4c standalone.patch" diff --git a/user/libkworkspace/standalone.patch b/user/libkworkspace/standalone.patch index a9b327a40..23ccb2de2 100644 --- a/user/libkworkspace/standalone.patch +++ b/user/libkworkspace/standalone.patch @@ -15,7 +15,7 @@ index 3c4c47870..53bc780b5 100644 +project(libkworkspace) + +if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) -+ set(PROJECT_VERSION "5.18.0") ++ set(PROJECT_VERSION "5.18.2") + set(PROJECT_VERSION_MAJOR 5) + + cmake_minimum_required(VERSION 3.0) diff --git a/user/libmtp/APKBUILD b/user/libmtp/APKBUILD index e6187c747..1baa0e7b4 100644 --- a/user/libmtp/APKBUILD +++ b/user/libmtp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libmtp -pkgver=1.1.16 +pkgver=1.1.17 pkgrel=0 pkgdesc="Library for accessing MTP (Media Transfer Protocol) devices" url="http://libmtp.sourceforge.net/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0540271930c1c932c5d06dcdd30142d407a4fadd022b195e8339d614fa3ec9b050605bf013b28ac6451f4dfcddf7add949c928acb1382802ab5fd6311c1628a0 libmtp-1.1.16.tar.gz" +sha512sums="f2648e259529bd3dfe74a7049a79c4b0042bcaf63cc1fec8b232b66312d62e9620280e4f725312c9ef8207f1f1ceac19f460a0a8772a3cc6c7f0b00ead01add2 libmtp-1.1.17.tar.gz" diff --git a/user/libqmi/APKBUILD b/user/libqmi/APKBUILD index 1fd9944e8..f662aa30d 100644 --- a/user/libqmi/APKBUILD +++ b/user/libqmi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libqmi -pkgver=1.24.2 +pkgver=1.24.4 pkgrel=0 pkgdesc="Library for interfacing with Qualcomm modems" url="https://www.freedesktop.org/wiki/Software/libqmi/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ad47cad5804f9af2fc66c79bcda9fcbf87c0b68bff54a0f0d46f190413d4de99167ce2f2c42986f354e17dacaecd5e42743701a2ee3fa98b2ba65bc2185a663e libqmi-1.24.2.tar.xz" +sha512sums="7850c2754763d3d0addfa6760ed11ba895dd78421a6b3453224b50bd97d09109ccacf16c322d81c8e512321e45fd8e611015796c86a94f30acf8611eb37e8a1a libqmi-1.24.4.tar.xz" diff --git a/user/librsvg/APKBUILD b/user/librsvg/APKBUILD index eddc645dc..3fa19b15b 100644 --- a/user/librsvg/APKBUILD +++ b/user/librsvg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=librsvg -pkgver=2.40.20 -pkgrel=1 +pkgver=2.40.21 +pkgrel=0 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" url="https://wiki.gnome.org/action/show/Projects/LibRsvg" arch="all" @@ -14,6 +14,10 @@ makedepends="$depends_dev bzip2-dev cairo-dev glib-dev gobject-introspection-dev" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" +# secfixes: +# 2.40.21-r0: +# - CVE-2019-20446 + build() { ./configure \ --build=$CBUILD \ @@ -33,4 +37,4 @@ package() { rm -rf "$pkgdir"/usr/lib/mozilla } -sha512sums="cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f librsvg-2.40.20.tar.xz" +sha512sums="db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280 librsvg-2.40.21.tar.xz" diff --git a/user/libsecret/APKBUILD b/user/libsecret/APKBUILD index bb7f81e1f..828b3ed74 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.19.1 +pkgver=0.20.1 pkgrel=0 pkgdesc="Library for storing and retrieving passphrases" url="https://wiki.gnome.org/Projects/Libsecret" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="134f98f09a1cc7c61b9011b2fb35900d9beccfc06d978f1ffab8b5286dc6caa176832e55e3bed498c6f3526f6f34998307f67cf7accc4c79e9abf1c17cc9c7c2 libsecret-0.19.1.tar.xz" +sha512sums="d8fca5f4da63427f594e1cb38c91330a98ab706aa945f8e735337f3fd342895bc96ceb36390ba01a4c0b9c5d503c4b544753c3243c444579f46f7b2e7836d1ac libsecret-0.20.1.tar.xz" diff --git a/user/libtasn1/APKBUILD b/user/libtasn1/APKBUILD index 0e5478f55..8412236d7 100644 --- a/user/libtasn1/APKBUILD +++ b/user/libtasn1/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libtasn1 -pkgver=4.15.0 +pkgver=4.16.0 pkgrel=0 pkgdesc="Highly portable ASN.1 library" url="https://www.gnu.org/software/libtasn1/" @@ -46,4 +46,4 @@ tools() { mv -i "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="a8095aebf57a0b482027d06e0ee6978946f267b57bf2db3c891c4656ca35250cc1f72e2e90f4cc0ddbdf6cd2b1783881a62d495a57ad4a98684f8d037307552d libtasn1-4.15.0.tar.gz" +sha512sums="b356249535d5d592f9b59de39d21e26dd0f3f00ea47c9cef292cdd878042ea41ecbb7c8d2f02ac5839f5210092fe92a25acd343260ddf644887b031b167c2e71 libtasn1-4.16.0.tar.gz" diff --git a/user/libva/APKBUILD b/user/libva/APKBUILD index 617fc79bf..d42e22efa 100644 --- a/user/libva/APKBUILD +++ b/user/libva/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libva -pkgver=2.5.0 +pkgver=2.6.1 pkgrel=0 pkgdesc="Video Acceleration (VA) API for Linux" url="https://github.com/intel/libva" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ffaeb9cf8ed1f93073c1cb3e58f5b3d3612e81622d02f8e428c089f625d4370b496b7681ac2fc2823c48670c9fd3da50893b1db51de768cf0f5d866e2ee78106 libva-2.5.0.tar.bz2" +sha512sums="b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d libva-2.6.1.tar.bz2" diff --git a/user/libxcb/APKBUILD b/user/libxcb/APKBUILD index ddeb95531..cac678bff 100644 --- a/user/libxcb/APKBUILD +++ b/user/libxcb/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxcb -pkgver=1.13.1 -pkgrel=1 +pkgver=1.14 +pkgrel=0 pkgdesc="X11 C language Binding" url="https://xcb.freedesktop.org/" arch="all" @@ -10,9 +10,8 @@ depends="" depends_dev="libxau-dev xcb-proto" checkdepends="check-dev" subpackages="$pkgname-dev $pkgname-doc" -makedepends="$depends_dev libxslt python3 libpthread-stubs libxdmcp-dev" -source="https://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2 - 0001-tests-Support-Check-0.13.0-API.patch" +makedepends="$depends_dev libxslt python3 libxdmcp-dev" +source="https://www.X.org/releases/individual/lib/libxcb-$pkgver.tar.xz" build() { ./configure \ @@ -34,5 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23 libxcb-1.13.1.tar.bz2 -c5731fc76566f9f27d6d6f762971e07d2c27ed34a4881b8fa03c332f2d6a163954efb658682043e181170b93d3c979fa2c2374d3b25c80eead5747dea684037a 0001-tests-Support-Check-0.13.0-API.patch" +sha512sums="b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6 libxcb-1.14.tar.xz" diff --git a/user/libxkbcommon/APKBUILD b/user/libxkbcommon/APKBUILD index 6825a2701..15791113f 100644 --- a/user/libxkbcommon/APKBUILD +++ b/user/libxkbcommon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxkbcommon -pkgver=0.9.1 +pkgver=0.10.0 pkgrel=0 pkgdesc="Keyboard handling library" url="https://www.xkbcommon.org/" @@ -30,4 +30,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="8d4551a06e7dd4936633f544409401dc33f8f1900adb5daa6403615c71f321d17212db739f89a5b3e393d729b3f33167691404849a25d5526b403fd9ec3e8878 libxkbcommon-0.9.1.tar.xz" +sha512sums="58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79 libxkbcommon-0.10.0.tar.xz" diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD index 30f8f9aef..b501a5f18 100644 --- a/user/lighttpd/APKBUILD +++ b/user/lighttpd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lighttpd -pkgver=1.4.54 -pkgrel=2 +pkgver=1.4.55 +pkgrel=0 pkgdesc="A secure, fast, compliant and very flexible web-server" url="http://www.lighttpd.net/" pkgusers="lighttpd" @@ -97,7 +97,7 @@ mod_webdav() { _mv_mod mod_webdav } -sha512sums="aa180a2751711a77b9da91a6a285c967d2c183ccbabe3e9064aea74e44629c3b0227ac98c7d720c8d4d223ce4b31e8b221b05b928adc917b199ab1015fcdba37 lighttpd-1.4.54.tar.xz +sha512sums="023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439 lighttpd-1.4.55.tar.xz f2f3c5c7731550237fd75a8de66275f427eaf897cffff7ac7ef44178328ad8fad6c4ec6654759bfc665cbaf7991ddcdf0aaa916831c8b6aa440192d57b242038 lighttpd.initd 9d2ab5deb7353ebf290e90936b511941df440859c78589d0bcf130ef69a5e9c79e4d318548b6b118df002083c46f7476230a28954b7a10a9dbd05040e02b1291 lighttpd.confd 0536b4f21d2e8659f7831b45998c13d9f6051ae7ecde13be01f372f837d255bfc4e211de48a7686cc743d53aa9c08ab3f10ec19788896dcf8356b90053ca7a16 lighttpd.logrotate diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD index 006f7df00..8e6681499 100644 --- a/user/lskat/APKBUILD +++ b/user/lskat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lskat -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Lieutenant Skat, an interactive two-player card game" url="https://games.kde.org/game.php?game=lskat" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ecc2f9f3ea61f8efc884c775f393a85c895980a6b1b69c1dc90b64e2569c81b6fbaebec091132756dcf40d4d6fdb343c84a0e6690489bc92d4526851e1b6719c lskat-19.12.2.tar.xz" +sha512sums="84aebdbdbc3e7a85799cd4495c12c7f746a2745a353eeef48eca69242557762619fdd117fcf6581811e51700b5cde3b5c3b0cd1fbedceae529c2e925f0cc5fed lskat-19.12.3.tar.xz" diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index 2c53d7061..214373d24 100644 --- a/user/marble/APKBUILD +++ b/user/marble/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=marble -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Free, open-source map and virtual globe" url="https://marble.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4e8483ae11f929fdbc052b46557e976789b05619ec36847173b80d9c1bfdb90b82ee0c9ee75edae77ccd7f9cd1feb75da5e42fb97078829b5b40cbfbed446d0d marble-19.12.2.tar.xz" +sha512sums="e6b693b15be53f590bbfbd97648113bad696339544350640699e890bc4f891c4a06215ee09f21cf4968dc8d2cb104c06f43380470145397fc5abc7daa0e02639 marble-19.12.3.tar.xz" diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD index 786a4e1a6..815a44faa 100644 --- a/user/mariadb/APKBUILD +++ b/user/mariadb/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mariadb -pkgver=10.4.11 +pkgver=10.4.12 pkgrel=0 pkgdesc="Open source database server" url="https://mariadb.org/" @@ -32,6 +32,10 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad mariadb-server.limits " +# secfixes: +# 10.4.12-r0: +# - CVE-2020-7221 + build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" @@ -261,7 +265,7 @@ doc() { default_doc } -sha512sums="2a1a8d90e326530b41a8a7d6889325cefcba5914451a48c6a20d5d5cd68004835e76e6ecac628554167a014f9c0b1487c15f37151afd771ea0166a4c40afd7d2 mariadb-10.4.11.tar.gz +sha512sums="518dae18c04a1f7fcc6fd4d2dfbfbfbdf5e83e72ca41e66e1074328df8d92ab41b458e6a9973771419ac09a7348f264f158916cd198c335085d6e823e707bbc6 mariadb-10.4.12.tar.gz 03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0 crc32-power.patch 15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3 gcc_builtins_ppc.h 0cb265173923cb85517a1144cfa904dafe059c1f859e13b4415442cabbb414db5904f2dcee0e865914b0f9c181d1d61d220834cb187b14f8538a0d2552025a9d ppchax.patch diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index b6d37ceab..7af2e17cd 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mesa -pkgver=19.3.3 +pkgver=19.3.4 _llvmver=8 -pkgrel=1 +pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="https://www.mesa3d.org" arch="all" @@ -21,10 +21,12 @@ subpackages="$pkgname-dev $pkgname-dri # requires glslang: $pkgname-vulkan-overlay source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz amdgpu-pthread-header.patch + big-endian-flipping.patch intel-vulkan.patch musl-fixes.patch musl-fix-includes.patch no-tls.patch + time64.patch " _dri_driverdir=/usr/lib/xorg/modules/dri @@ -151,9 +153,11 @@ dri() { mv "$pkgdir"/usr/share/vulkan/icd.d "$subpkgdir"/usr/share/vulkan/ } -sha512sums="1f792fbde71132afd4a43d6abe6a3d640f375e83641c6144c82312774434c9588ffba65a3ba38394947bd753656aa85213b6cd9f745cec0040c0559eb41f0dc9 mesa-19.3.3.tar.xz +sha512sums="2bbb3dc8f1d839f11fe12cc959393cd69607fa6714b2166b80299e0559d2d3b0ac38ed4e15ac3e5f472264eb24536d1901d350f7409f3a7e00d6f4ccbb2312fb mesa-19.3.4.tar.xz 245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch +3417e5c6d7ec564178e1d72431042b0a6ba659321f13a3dda81eda5fa0f2c8bc7c6972cb8266aea84ab05976ffb161659e9988c50ecc418e8bc1e1ce8f93a65f big-endian-flipping.patch ba954ea9aa49e5cdfec08f310f41abf09e01a2a889a09b6c32a154b750d3ebb2bfb5a9b7d244c06d26442688aeeb7f212f5f3c98c6db69f878098a49d476ff70 intel-vulkan.patch 9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch -56e829b0570cf5215c191330a5162356b77eeb555eb8127e30da57bdff9d369c1bb3de3bd7ee36233d6d610c0cec81773879da05cc0b391e06ff4d7507bef8a8 no-tls.patch" +56e829b0570cf5215c191330a5162356b77eeb555eb8127e30da57bdff9d369c1bb3de3bd7ee36233d6d610c0cec81773879da05cc0b391e06ff4d7507bef8a8 no-tls.patch +0aad2fdc56ea8825533746ee4c2c803734f871e04da13ddd461b2de36716ba52e345e745a6861ffae62efacf6b64f629187ddda3c01e3d880ce20c0ac551dccb time64.patch" diff --git a/user/mesa/big-endian-flipping.patch b/user/mesa/big-endian-flipping.patch new file mode 100644 index 000000000..154a83108 --- /dev/null +++ b/user/mesa/big-endian-flipping.patch @@ -0,0 +1,37 @@ +From f1e0d76264491a8d8f99a0041b1a36cf9752fd28 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Thu, 27 Feb 2020 04:24:52 -0600 +Subject: [PATCH] mesa: Support flipping three-channel formats + +Test system: POWER9 ppc64 (BE) system with a Radeon R5 230. + +Before this commit, starting Xorg caused this message: +Assertion failed: !"Invalid array format" (../src/mesa/main/formats.c: _mesa_array_format_flip_channels: 421) + +After this commit, Xorg starts successfully. +--- + src/mesa/main/formats.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c +index 370859d37ca..2e7d5d7f05e 100644 +--- a/src/mesa/main/formats.c ++++ b/src/mesa/main/formats.c +@@ -419,6 +419,14 @@ _mesa_array_format_flip_channels(mesa_array_format format) + return format; + } + ++ if (num_channels == 3) { ++ static const uint8_t flip[6] = { 2, 1, 0, 3, 4, 5 }; ++ _mesa_array_format_set_swizzle(&format, ++ flip[swizzle[0]], flip[swizzle[1]], ++ flip[swizzle[2]], flip[swizzle[3]]); ++ return format; ++ } ++ + if (num_channels == 4) { + static const uint8_t flip[6] = { 3, 2, 1, 0, 4, 5 }; + _mesa_array_format_set_swizzle(&format, +-- +2.25.1 + diff --git a/user/mesa/time64.patch b/user/mesa/time64.patch new file mode 100644 index 000000000..7e7894a9d --- /dev/null +++ b/user/mesa/time64.patch @@ -0,0 +1,34 @@ +--- mesa-19.3.1/src/gallium/drivers/vc4/vc4_bufmgr.c.old 2019-12-18 18:36:00.000000000 +0000 ++++ mesa-19.3.1/src/gallium/drivers/vc4/vc4_bufmgr.c 2020-01-20 19:26:36.470000000 +0000 +@@ -107,8 +107,8 @@ + + struct timespec time; + clock_gettime(CLOCK_MONOTONIC, &time); +- fprintf(stderr, " now: %ld\n", +- time.tv_sec); ++ fprintf(stderr, " now: %"PRId64"\n", ++ (int64_t)time.tv_sec); + } + } + +--- mesa-19.3.1/src/gallium/drivers/v3d/v3d_bufmgr.c.old 2019-12-18 18:36:00.000000000 +0000 ++++ mesa-19.3.1/src/gallium/drivers/v3d/v3d_bufmgr.c 2020-01-20 19:28:02.600000000 +0000 +@@ -23,6 +23,7 @@ + + #include <errno.h> + #include <err.h> ++#include <inttypes.h> + #include <sys/mman.h> + #include <fcntl.h> + #include <xf86drm.h> +@@ -80,8 +81,8 @@ + + struct timespec time; + clock_gettime(CLOCK_MONOTONIC, &time); +- fprintf(stderr, " now: %ld\n", +- time.tv_sec); ++ fprintf(stderr, " now: %"PRId64"\n", ++ (int64_t)time.tv_sec); + } + } + diff --git a/user/metalog/APKBUILD b/user/metalog/APKBUILD new file mode 100644 index 000000000..3998a3a2d --- /dev/null +++ b/user/metalog/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: +# Maintainer: +pkgname=metalog +pkgver=20200113 +pkgrel=0 +pkgdesc="A highly configurable replacement for syslogd/klogd" +url="https://github.com/hvisage/metalog" +arch="all" +license="GPL-2.0-only" +depends="pcre" +makedepends="autoconf autoconf-archive-dev automake pcre-dev" +subpackages="$pkgname-doc $pkgname-openrc" +source="https://github.com/hvisage/$pkgname/archive/$pkgname-$pkgver.tar.gz + metalog-0.9-metalog-conf.patch + + metalog.confd + metalog.initd-r1 + " +builddir="$srcdir/$pkgname-$pkgname-$pkgver/" + +build() { + autoreconf -fi + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install + install -D -m755 "$srcdir"/metalog.initd-r1 \ + "$pkgdir"/etc/init.d/metalog + install -D -m644 "$srcdir"/metalog.confd \ + "$pkgdir"/etc/conf.d/metalog +} + +sha512sums="d399d86f988c69c9f74553cd682a5fe04886bca458e6f8bb3132fe1fb9f522510a428cfde8af0857c5ba22531b276b04fa05183e0006c2d28ef0f0aead488f93 metalog-20200113.tar.gz +0c95e8461e89d9469452d2ef66fa52f469b61578b12a6c72adb73e48807f998f8fb58cf0b3f1bc5caa38296fd59c8f8d1fc209beec81790387816d1c497a07df metalog-0.9-metalog-conf.patch +4fea6b7f48e55d5f69a9c9a69f54623bb9d515e2fd2eda6829f8b769eec85e3de448eb42feb6bf65645400480169b3d70d56dff090103cfc95a3810515c42b2e metalog.confd +09d8ac585418c6a3dfccc9d0f1a050b5862924712d78dc44fce3cb497bb362afe0a556240b14cf957fcdf64d0d06f5b6a8df4372c69129b43dc3520ecd310344 metalog.initd-r1" diff --git a/user/metalog/metalog-0.9-metalog-conf.patch b/user/metalog/metalog-0.9-metalog-conf.patch new file mode 100644 index 000000000..efb794de5 --- /dev/null +++ b/user/metalog/metalog-0.9-metalog-conf.patch @@ -0,0 +1,11 @@ +--- a/metalog.conf ++++ b/metalog.conf +@@ -21,6 +21,8 @@ + # merely write $@ to some device (your console for messages): + # echo "$@" > /dev/tty10 + # ++# Hint: you can control the consolelog.sh behavior in /etc/conf.d/metalog ++# + #console logging : + # + # facility = "*" diff --git a/user/metalog/metalog.confd b/user/metalog/metalog.confd new file mode 100644 index 000000000..ec7e64eda --- /dev/null +++ b/user/metalog/metalog.confd @@ -0,0 +1,18 @@ +# /etc/conf.d/metalog + +# Some useful options: +# -a Log with buffering +# -s Log without buffering +# See `metalog --help` for more + +METALOG_OPTS="" + + +# Options used by /usr/sbin/consolelog.sh + +# Space delimited list of devices to write "console" messages to +#CONSOLE="/dev/console /dev/tty10" +CONSOLE="/dev/tty10" + +# Format of logging (make sure you use single quotes) +FORMAT='$1 [$2] $3' diff --git a/user/metalog/metalog.initd-r1 b/user/metalog/metalog.initd-r1 new file mode 100644 index 000000000..bb947bdad --- /dev/null +++ b/user/metalog/metalog.initd-r1 @@ -0,0 +1,28 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +pidfile="${PIDFILE:-/run/metalog.pid}" +command="/usr/sbin/metalog" +command_args="--pidfile=${pidfile} --daemonize ${METALOG_OPTS}" + +extra_started_commands="buffer unbuffer" + +depend() { + need localmount + use clock hostname + after bootmisc + provide logger +} + +buffer() { + ebegin "Enabling log buffering" + start-stop-daemon --exec "${command}" --signal USR2 --pidfile "${pidfile}" + eend ${?} +} + +unbuffer() { + ebegin "Disabling log buffering" + start-stop-daemon --exec "${command}" --signal USR1 --pidfile "${pidfile}" + eend ${?} +} diff --git a/user/milou/APKBUILD b/user/milou/APKBUILD index 7aabe888d..1aed6cff3 100644 --- a/user/milou/APKBUILD +++ b/user/milou/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=milou -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Search and launch plasmoid" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="46733d5b4adb76fc1c1914c393b309804515ff67feab138824cfca2aa825337c812b7b2c5e54fe2fc8725bd9b4d2eb18c7b0fba503baa9bdec25d08093560268 milou-5.18.0.tar.xz" +sha512sums="5f5cdf1ff5d18413cc747d3c06b542678bc44af6dcc3670d2805c4902b18997ce8af81f26d94dbe59a49b8c2b882ef25556ae54276e89d85a14f023cae5ddb9a milou-5.18.2.tar.xz" diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD index 70ff32635..2cc6eb4d7 100644 --- a/user/minuet/APKBUILD +++ b/user/minuet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=minuet -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Music education software" url="https://minuet.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8c9f39fcaaca1ea54f5ababa40890a834bf99d7920ca5d46e38e4ad2d4d527e88351378c7b2ddb5909abc25b990b234c0e1ef29ce6699b67790b54924a50cd7a minuet-19.12.2.tar.xz" +sha512sums="545e4ef25965d8d614644b4d897382edd65a92f835b6f4a461c1dec819388608e05dbe1000f26b37430e91fd4d3949d3ff39ed92cc8f8a36d77391e01c0d0fb0 minuet-19.12.3.tar.xz" diff --git a/user/modemmanager-qt/APKBUILD b/user/modemmanager-qt/APKBUILD new file mode 100644 index 000000000..0b84de2ea --- /dev/null +++ b/user/modemmanager-qt/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=modemmanager-qt +pkgver=5.68.0 +pkgrel=0 +pkgdesc="Qt framework for ModemManager" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires MM running. +license="LGPL-2.1-only OR LGPL-3.0-only" +depends="" +depends_dev="modemmanager-dev" +makedepends="$depends_dev cmake doxygen extra-cmake-modules qt5-qtbase-dev + qt5-qttools-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/modemmanager-qt-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_QCH:BOOL=ON \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="6314130e61e11d2a916e55630df4173ecf60a2c58bbca9b05b865505b916f783deec32fd3cd310bfe6a1171c9723ce84d4428f94c29aaa0aa033901909a4e19b modemmanager-qt-5.68.0.tar.xz" diff --git a/user/modemmanager/APKBUILD b/user/modemmanager/APKBUILD index ee6aa8974..62cf584ce 100644 --- a/user/modemmanager/APKBUILD +++ b/user/modemmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=modemmanager -pkgver=1.12.2 +pkgver=1.12.6 pkgrel=0 pkgdesc="Software to control mobile broadband modems" url="https://www.freedesktop.org/wiki/Software/ModemManager/" @@ -43,6 +43,6 @@ package() { "$srcdir"/01-org.freedesktop.ModemManager.rules } -sha512sums="d0a80bcd3cc9ee92af438cf155c49fa645d2e554e600aa50e5c0319a40a3be5378ca7ce3cf070a4ce7f2fec1c53e6be5d14ae8c53ff4e589e4e2a1ebcad7dea8 ModemManager-1.12.2.tar.xz +sha512sums="63c2f874c8ac62ddddf02735cc3dc0dec0c3ea62be39eb7f69cfb899ae04f6d14cfe59d63cd2fa4a5150afa15560d4a6db7a3fdb7c4467f228cd1b4b30fbd1ec ModemManager-1.12.6.tar.xz 78e1c2ef604fb8b204618b9ecdc741ed7087fcc46ee563dbaaf6c9c0185165be58abfc3bf8ba89129fce7570c172cd1ac1e191e6d1200e3029c14a585ff40b83 no-translit.patch 31ded548acc8ccfcca5cd54384819b73ad9ac83556b754fa03a1a9c08aed7f913c7f066000abef0e52310721ef8c00ca8f48f1f762faaa5792420f62b5201881 01-org.freedesktop.ModemManager.rules" diff --git a/user/nano/APKBUILD b/user/nano/APKBUILD index 84ceb64f2..9ff07764a 100644 --- a/user/nano/APKBUILD +++ b/user/nano/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=nano -pkgver=4.7 +pkgver=4.8 pkgrel=0 pkgdesc="Enhanced clone of the Pico text editor" url="https://www.nano-editor.org" @@ -40,4 +40,4 @@ package() { rm -rf "$pkgdir"/usr/lib/charset.alias } -sha512sums="53fc587554ca639f27cfdd81adc8108e38adddae4fda9d73c3ebff57e546feaa45be7a2851da43bcdafd442e4834a42cc1f9eec1a99051a32410a712142f48c3 nano-4.7.tar.xz" +sha512sums="9799d93f322ac12d95784b6ecc7f7f9037f0a395be0cafe238b9e0ae2d8d93181a8a114a11ccccb20bcf07375ddaf842f49f7d23372f0d330ce67a66d0318ae8 nano-4.8.tar.xz" diff --git a/user/ncompress/APKBUILD b/user/ncompress/APKBUILD index 2ed725ebf..1e283dd2a 100644 --- a/user/ncompress/APKBUILD +++ b/user/ncompress/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ncompress -pkgver=4.2.4.5 +pkgver=4.2.4.6 pkgrel=0 pkgdesc="Fast, simple LZW compressor" url="https://github.com/vapier/ncompress" @@ -12,7 +12,8 @@ depends="" makedepends="" subpackages="$pkgname-doc" source="https://downloads.sourceforge.net/ncompress/ncompress-$pkgver.tar.gz - fix-9bit-compress.patch" + fix-9bit-compress.patch + " build() { make @@ -23,5 +24,5 @@ package() { install -D -m644 "$builddir"/compress.1 "$pkgdir"/usr/share/man/man1/compress.1 } -sha512sums="487e8d5ca743c3aba19cf69f7ec62bdc0784e43af5737f06d6d4257f2f33899eb3d293ed049f57b3164e344a0fddc077bc73437564977bad8de45816354c8bf3 ncompress-4.2.4.5.tar.gz +sha512sums="03dd9670c48548d6f7a028dd307758ce7ac61997297c1075d65457ac849e8f2d710bc38fa9eb42e4b2cac163c1b93b7cf7eb197e90cbd689a1274df3de2a3ed8 ncompress-4.2.4.6.tar.gz b2e897679234f391fa3cf4d5b55a3894424cca632a3b16303b0085e908808bc72b66e6a9df3e56e1a26eac79340c0901f7e6ef2378cc61b710e93194d345c2ea fix-9bit-compress.patch" diff --git a/user/networkmanager-qt/APKBUILD b/user/networkmanager-qt/APKBUILD new file mode 100644 index 000000000..22d4d65d0 --- /dev/null +++ b/user/networkmanager-qt/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=networkmanager-qt +pkgver=5.68.0 +pkgrel=0 +pkgdesc="Qt framework for NetworkManager" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires the system to have NM running. +license="LGPL-2.1-only OR LGPL-3.0-only" +depends="" +depends_dev="networkmanager-dev" +makedepends="$depends_dev cmake doxygen extra-cmake-modules qt5-qtbase-dev + qt5-qttools-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/networkmanager-qt-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_QCH:BOOL=ON \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="e9b81c9720db55c4d403df06b6d56e7003adb08a437b9869a7e18fd1d3621fd24e73c254f957d41ee428b4449eb5484a06add15486a79bb901c2234d2db36f8f networkmanager-qt-5.68.0.tar.xz" diff --git a/user/networkmanager/APKBUILD b/user/networkmanager/APKBUILD index 17e6eadab..19ba6c868 100644 --- a/user/networkmanager/APKBUILD +++ b/user/networkmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=networkmanager -pkgver=1.22.0 +pkgver=1.22.8 pkgrel=0 pkgdesc="Network management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" @@ -90,7 +90,7 @@ openrc() { "$subpkgdir"/etc/NetworkManager/dispatcher.d/ } -sha512sums="f6a2f621b42f7788646c81cc61d17261aa6df6351e6acfbc70d3d1b034416476f1c14b2444565d6abac2ee1b9aa2680fdb513b523fe6cad1bc37102d4bee41d0 NetworkManager-1.22.0.tar.xz +sha512sums="3533f6d0cfb2723078aece287101feda0d4f65a1f0160ae17dd77142ca5e126a0f27f5904c2e2c4dcdf9433dacc3990e1bf366f14e67b94fa1cd3006dd6b3a4c NetworkManager-1.22.8.tar.xz ecd9cb920a125e0e3c4b8c96048ca3ac24490fdd453f0525ecaccf688687692e7a5feaf87eeaf97a2dfb405b2e0db8743114510e30f00f7ae119dc9b9551e7d7 editline.patch b0b85294c19510893ba30cf3d0e1984430c451273d4eb545760de52c69866a5ed0385f9c14a9bc180da01daad7d1c0da221101e7a826bc5be53c2724c9990d95 errno.patch 7b3cfbea8b80f832862d79fce9f89f604b457744324a8ae6b428cf3cb42ec2536d3c5784303d140d50c5a2cd8caf91d04f5096ef420a57a761e412bf2256bd5a musl.patch diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD index c762afc58..2d42c60ff 100644 --- a/user/nfs-utils/APKBUILD +++ b/user/nfs-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nfs-utils -pkgver=2.4.2 +pkgver=2.4.3 pkgrel=0 pkgdesc="NFS file sharing client and server" url="http://nfs.sourceforge.net/" @@ -13,12 +13,8 @@ makedepends="keyutils-dev krb5-dev libevent-dev libtirpc-dev lvm2-dev rpcsvc-proto sqlite-dev util-linux-dev" subpackages="$pkgname-doc $pkgname-openrc" source="https://downloads.sourceforge.net/nfs/nfs-utils-$pkgver.tar.xz - nfs-utils-1.1.4-mtab-sym.patch - nfsdcld.patch posixish.patch - ssize_t.patch time64.patch - undef-def.patch exports nfs.confd nfs.initd nfsclient.confd nfsclient.initd nfsmount.confd @@ -61,13 +57,9 @@ package() { done } -sha512sums="60cd74294d0a68f481a962a0ece6ac6385b933d1f2b0e733ef098d6ce4d4177da81128884f9b1ae8299b5067dec717dfe9fee573d01629c1fffa226a3ba20c84 nfs-utils-2.4.2.tar.xz -afa0b913a21880f91580a2953cbd9057310367d406d2fff9d9985ec24f20288191600d81bf58daf6e3de376866b02662e573e59478e859f455d94f225d884465 nfs-utils-1.1.4-mtab-sym.patch -2f4c519cce81b2a29ffe2b7554cb5e524fde32db1338442f9ecbdf5d468552d1ad406918b3710340239bba741f5316742ee209fd5b76c5ccd10e466d7beaefa1 nfsdcld.patch -10501b1956e81b3a3db0829fcfb6f25d734d33be1cbc9169ff45594d8db355a337f61f41ec59e51484e5c5bcb77b2f969527edd477528621f8866ae412ddf03f posixish.patch -7cb1de79c2a420ff5121e19e5fdcbc97d367451ec59bc2fc39c2d60dde8d7136b227fc88e16996ede8365ed512004269d4b47ee19c62c8f8e0266430b0b85f06 ssize_t.patch -128fb10ca703a4e0d3dbd5f94d233e10cf917df7a565b8d3112f195d24697b96d71663459f7e7c2a4290ebe327762bfdc65e22a507a68a645dca1c3f13b08319 time64.patch -1fbe6f017ddde9a2edc5b8a8a2958c8c4f8ccc8764e15b8817da3cc315a5529519782c34df6154d76e146c83ee9f911fa8590aefd6902c0de1f6e6d9855b9b04 undef-def.patch +sha512sums="9b8065d9d3958e45021898e24574d1e6d59353f94c2f760df18a793a734d79d0047df95e2f9cdebfda58e3f68f52b2ef723df2261c10bbeb5b16fe1413c1b8d7 nfs-utils-2.4.3.tar.xz +8ed36d22094eaca1a7b83fd5e840e774ee172ca81bf15215cf04127e45fc32ac75c3e0f3d8914370ac09c93d08a0fe8aa6d8f3eb7a8318db1e9ab7b2a05dee06 posixish.patch +e85afa3ba90eeb48d3a571543ab1361a27b9c4148799548a6b0cd304cff3231235c09753268a1601bf793b1589eb320d7196d00e86ef5eb33aee466fa260dafd time64.patch fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220 exports bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535 nfs.confd f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018 nfs.initd diff --git a/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch deleted file mode 100644 index 0a7d70bc4..000000000 --- a/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch +++ /dev/null @@ -1,39 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.4/utils/mount/fstab.c -+++ nfs-utils-1.1.4/utils/mount/fstab.c -@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { - return var_mtab_does_not_exist; - } - --static int -+int - mtab_is_a_symlink(void) { - get_mtab_info(); - return var_mtab_is_a_symlink; ---- nfs-utils-1.1.4/utils/mount/fstab.h -+++ nfs-utils-1.1.4/utils/mount/fstab.h -@@ -7,6 +7,7 @@ - #define _PATH_FSTAB "/etc/fstab" - #endif - -+int mtab_is_a_symlink(void); - int mtab_is_writable(void); - int mtab_does_not_exist(void); - void reset_mtab_info(void); ---- nfs-utils-1.1.4/utils/mount/mount.c -+++ nfs-utils-1.1.4/utils/mount/mount.c -@@ -204,6 +204,13 @@ create_mtab (void) { - int flags; - mntFILE *mfp; - -+ /* Avoid writing if the mtab is a symlink to /proc/mounts, since -+ that would create a file /proc/mounts in case the proc filesystem -+ is not mounted, and the fchmod below would also fail. */ -+ if (mtab_is_a_symlink()) { -+ return EX_SUCCESS; -+ } -+ - lock_mtab(); - - mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/user/nfs-utils/nfsdcld.patch b/user/nfs-utils/nfsdcld.patch deleted file mode 100644 index f5532e1d6..000000000 --- a/user/nfs-utils/nfsdcld.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs-utils-2.4.1/utils/nfsdcld/nfsdcld.c.old 2019-06-10 14:34:37.000000000 +0000 -+++ nfs-utils-2.4.1/utils/nfsdcld/nfsdcld.c 2019-06-20 00:28:42.926915402 +0000 -@@ -737,7 +737,7 @@ - int - main(int argc, char **argv) - { -- char arg; -+ int arg; - int rc = 0; - bool foreground = false; - char *progname; diff --git a/user/nfs-utils/posixish.patch b/user/nfs-utils/posixish.patch index d973bf9c7..d8802047d 100644 --- a/user/nfs-utils/posixish.patch +++ b/user/nfs-utils/posixish.patch @@ -1,6 +1,6 @@ --- nfs-utils-2.3.3/configure.old 2018-09-06 18:10:07.000000000 +0000 +++ nfs-utils-2.3.3/configure 2019-01-10 16:01:32.110000000 +0000 -@@ -20594,9 +20594,9 @@ +@@ -20596,9 +20596,9 @@ fi fi @@ -13,7 +13,7 @@ $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -20610,27 +20610,27 @@ +@@ -20612,27 +20612,27 @@ #ifdef __cplusplus extern "C" #endif diff --git a/user/nfs-utils/ssize_t.patch b/user/nfs-utils/ssize_t.patch deleted file mode 100644 index 16313890a..000000000 --- a/user/nfs-utils/ssize_t.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c.old 2020-01-24 03:35:27.856939255 +0000 -+++ nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c 2020-01-24 04:34:24.349432698 +0000 -@@ -378,7 +378,7 @@ - bsize = cld_message_size(cmsg); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - - /* reopen pipe, just to be sure */ -@@ -409,7 +409,7 @@ - xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) { -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - ret = cld_pipe_open(clnt); - if (ret) { -@@ -459,7 +459,7 @@ - xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) { -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - ret = cld_pipe_open(clnt); - if (ret) { -@@ -498,7 +498,7 @@ - cmsg->cm_status); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) { -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - ret = cld_pipe_open(clnt); - if (ret) { -@@ -548,7 +548,7 @@ - cmsg->cm_status); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) { -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - ret = cld_pipe_open(clnt); - if (ret) { -@@ -607,7 +607,7 @@ - xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) { -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - ret = cld_pipe_open(clnt); - if (ret) { -@@ -667,7 +667,7 @@ - xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) { -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - ret = cld_pipe_open(clnt); - if (ret) { ---- nfs-utils-2.4.2/tools/locktest/testlk.c.old 2019-11-13 17:09:41.000000000 +0000 -+++ nfs-utils-2.4.2/tools/locktest/testlk.c 2020-01-24 04:42:06.118844841 +0000 -@@ -5,6 +5,7 @@ - #include <stdlib.h> - #include <stdio.h> - #include <unistd.h> -+#include <inttypes.h> - #ifdef linux - #include <getopt.h> - #endif -@@ -81,7 +82,7 @@ - if (fl.l_type == F_UNLCK) { - printf("%s: no conflicting lock\n", fname); - } else { -- printf("%s: conflicting lock by %d on (%ld;%ld)\n", -+ printf("%s: conflicting lock by %d on (%"PRId64";%"PRId64")\n", - fname, fl.l_pid, fl.l_start, fl.l_len); - } - return 0; diff --git a/user/nfs-utils/time64.patch b/user/nfs-utils/time64.patch index 024402554..b28ee2f44 100644 --- a/user/nfs-utils/time64.patch +++ b/user/nfs-utils/time64.patch @@ -54,35 +54,6 @@ time(NULL) + cache_entry_expiration); addfield(&bp, &bsiz, buf1); /* Note we're ignoring the status field in this case; we'll ---- nfs-utils-2.4.2/utils/nfsdcld/sqlite.c.old 2019-11-13 17:09:41.000000000 +0000 -+++ nfs-utils-2.4.2/utils/nfsdcld/sqlite.c 2020-01-24 04:35:02.235281405 +0000 -@@ -512,7 +512,7 @@ - current_epoch = tcur; - recovery_epoch = trec; - ret = 0; -- xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu", -+ xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64, - __func__, current_epoch, recovery_epoch); - out: - sqlite3_finalize(stmt); -@@ -1223,7 +1223,7 @@ - - current_epoch = tcur; - recovery_epoch = trec; -- xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu", -+ xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64, - __func__, current_epoch, recovery_epoch); - - out: -@@ -1282,7 +1282,7 @@ - } - - recovery_epoch = 0; -- xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu", -+ xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64, - __func__, current_epoch, recovery_epoch); - - out: --- nfs-utils-2.4.2/utils/nfsdcltrack/nfsdcltrack.c.old 2019-11-13 17:09:41.000000000 +0000 +++ nfs-utils-2.4.2/utils/nfsdcltrack/nfsdcltrack.c 2020-01-24 04:40:06.871901242 +0000 @@ -38,6 +38,7 @@ diff --git a/user/nfs-utils/undef-def.patch b/user/nfs-utils/undef-def.patch deleted file mode 100644 index 8c1899ab5..000000000 --- a/user/nfs-utils/undef-def.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs-utils-2.3.3/utils/mountd/cache.c.old 2018-09-06 18:09:08.000000000 +0000 -+++ nfs-utils-2.3.3/utils/mountd/cache.c 2019-01-10 16:26:22.750000000 +0000 -@@ -446,7 +446,7 @@ - if (count_slashes(p) != count_slashes(parent)) - return 0; - --#if HAVE_NAME_TO_HANDLE_AT -+#ifdef HAVE_NAME_TO_HANDLE_AT - struct { - struct file_handle fh; - unsigned char handle[128]; diff --git a/user/node/APKBUILD b/user/node/APKBUILD index be64aaa46..d60a359af 100644 --- a/user/node/APKBUILD +++ b/user/node/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=node -pkgver=10.18.0 +pkgver=10.19.0 pkgrel=0 pkgdesc="JavaScript runtime" url="https://nodejs.org/" @@ -71,7 +71,7 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8fc9062e150af6f054f1ebebbdf67151b16f14bcca9cbb35338a4c7fcd7fa1c3f05c4a7ace12d4153180cec0007a195cbc94942c4d04c3895384dc18951d2c1c node-v10.18.0.tar.xz +sha512sums="512efc58415ed789938c434af131d76bdd51772cac9f7e380afaa79d83cc9c433a979068fc7272adba6ba6551d195267978e1fc819236926b0d1fd6cf91c5eee node-v10.19.0.tar.xz 27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6 Python-2.7.15.tar.xz 8f64922d586bce9d82c83042a989739cc55ecc5e015778cdfbda21c257aa50527ddb18740985bcb2068e4a749b71eb8a135d9a8152b374d361589df7f33c9b60 libatomic.patch 6d37794c7c78ef92ebb845852af780e22dc8c14653b63a8609c21ab6860877b9dffc5cf856a8516b7978ec704f312c0627075c6440ace55d039f95bdc4c85add ppc32.patch diff --git a/user/okteta/APKBUILD b/user/okteta/APKBUILD index c96d22022..d7fc84030 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.26.2 +pkgver=0.26.3 pkgrel=0 pkgdesc="Graphical hex/binary editor" url="https://www.kde.org/applications/utilities/okteta/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9d79cfecf80a7bfd4eb42ac8ee93d83140064601c16be0bed38481f7f0ea8ed2fa0aedfd16be3547f2bbd65ab483281e0ecdc0e59799040d67ecf1b4cda39246 okteta-0.26.2.tar.xz" +sha512sums="345e6ebb339a046e66e0d5b056ee487d881afa21d1ed29db2fb213200e431ba6936b1bf75a49733c14c96bdbee2482ed860257b0666b19f701c5ad0fd57e58c6 okteta-0.26.3.tar.xz" diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD index 7db813e9d..f77196bae 100644 --- a/user/okular/APKBUILD +++ b/user/okular/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okular -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Universal document reader developed by KDE" url="https://okular.kde.org/" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="acd9640c120d73a0b84054941a76d8eaa7434fc9a6d82e77edf5bd4827ab17334f4e4bedc521133d922afa7cd9ba9e08057534ac08281fd23f9bed7fff28f304 okular-19.12.2.tar.xz +sha512sums="ccc3c357fefe04691bba7bc803321789c3a1fdad4cfc610e9c425b2373efd94340fa2ceb2e357569ad14f1c0c69ef0db8079d9bc082a6d5708ccbfb3b65d8b3d okular-19.12.3.tar.xz de32eabda7ee84c4d894b02c56c7d66d8e2332688c726ad95e1b61c1e730035081ff7721275c7b7a9884aabc268ee0115d9ab8e5f52ae8838e1c09c471c81932 es-doc-fix.patch" diff --git a/user/openjpeg/APKBUILD b/user/openjpeg/APKBUILD index 680e1c8c2..54f9811ea 100644 --- a/user/openjpeg/APKBUILD +++ b/user/openjpeg/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openjpeg pkgver=2.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="Open-source implementation of JPEG 2000 image codec" url="http://www.openjpeg.org/" arch="all" @@ -13,9 +13,15 @@ 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 - CVE-2019-12973.patch" + CVE-2019-12973.patch + CVE-2020-6851.patch + CVE-2020-8112.patch + " # secfixes: +# 2.3.1-r3: +# - CVE-2020-6851 +# - CVE-2020-8112 # 2.3.1-r2: # - CVE-2019-12973 # 2.3.0-r0: @@ -52,4 +58,6 @@ tools() { } sha512sums="339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03 openjpeg-2.3.1.tar.gz -472deba1d521553f9c7af805ba3d0c4fc31564fd36e37c598646f468b7d05bf5f81d2320fd6fadf8c0e3344ebce7bc0d04cece55a1b3cec2ef693a6e65bd2516 CVE-2019-12973.patch" +472deba1d521553f9c7af805ba3d0c4fc31564fd36e37c598646f468b7d05bf5f81d2320fd6fadf8c0e3344ebce7bc0d04cece55a1b3cec2ef693a6e65bd2516 CVE-2019-12973.patch +c8ffc926d91392b38250fd4e00fff5f93fbf5e17487d0e4a0184c9bd191aa2233c5c5dcf097dd62824714097bba2d8cc865bed31193d1a072aa954f216011297 CVE-2020-6851.patch +9659e04087e0d80bf53555e9807aae59205adef2d49d7a49e05bf250c484a2e92132d471ec6076e57ca69b5ce98fd81462a6a8c01205ca7096781eec06e401cc CVE-2020-8112.patch" diff --git a/user/openjpeg/CVE-2020-6851.patch b/user/openjpeg/CVE-2020-6851.patch new file mode 100644 index 000000000..9a70291f5 --- /dev/null +++ b/user/openjpeg/CVE-2020-6851.patch @@ -0,0 +1,29 @@ +From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Sat, 11 Jan 2020 01:51:19 +0100 +Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose + coordinates are beyond INT_MAX (fixes #1228) + +--- + src/lib/openjp2/j2k.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c +index 14f6ff41a..922550eb1 100644 +--- a/src/lib/openjp2/j2k.c ++++ b/src/lib/openjp2/j2k.c +@@ -9221,6 +9221,14 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image, + l_img_comp = p_image->comps; + for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) { + OPJ_INT32 l_h, l_w; ++ if (p_image->x0 > (OPJ_UINT32)INT_MAX || ++ p_image->y0 > (OPJ_UINT32)INT_MAX || ++ p_image->x1 > (OPJ_UINT32)INT_MAX || ++ p_image->y1 > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(p_manager, EVT_ERROR, ++ "Image coordinates above INT_MAX are not supported\n"); ++ return OPJ_FALSE; ++ } + + l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0, + (OPJ_INT32)l_img_comp->dx); diff --git a/user/openjpeg/CVE-2020-8112.patch b/user/openjpeg/CVE-2020-8112.patch new file mode 100644 index 000000000..95cb8095f --- /dev/null +++ b/user/openjpeg/CVE-2020-8112.patch @@ -0,0 +1,43 @@ +From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Thu, 30 Jan 2020 00:59:57 +0100 +Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow + +That could lead to later assertion failures. + +Fixes #1231 / CVE-2020-8112 +--- + src/lib/openjp2/tcd.c | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c +index deecc4dff..aa419030a 100644 +--- a/src/lib/openjp2/tcd.c ++++ b/src/lib/openjp2/tcd.c +@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, + /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */ + l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx; + l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy; +- l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx; +- l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy; ++ { ++ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1, ++ (OPJ_INT32)l_pdx)) << l_pdx; ++ if (tmp > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); ++ return OPJ_FALSE; ++ } ++ l_br_prc_x_end = (OPJ_INT32)tmp; ++ } ++ { ++ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1, ++ (OPJ_INT32)l_pdy)) << l_pdy; ++ if (tmp > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); ++ return OPJ_FALSE; ++ } ++ l_br_prc_y_end = (OPJ_INT32)tmp; ++ } + /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/ + + l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)(( diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD index ffff4c1a7..30f2059ff 100644 --- a/user/openldap/APKBUILD +++ b/user/openldap/APKBUILD @@ -11,7 +11,7 @@ # - CVE-2017-9287 # pkgname=openldap -pkgver=2.4.48 +pkgver=2.4.49 pkgrel=0 pkgdesc="LDAP Server" url="https://www.openldap.org/" @@ -198,7 +198,7 @@ _submv() { done } -sha512sums="cf694a415be0bd55cc7f606099da2ed461748efd276561944cd29d7f5a8252a9be799d8778fac2d4fa9f382731eb4ca48c6b85630cb58a3b8249843561ae8feb openldap-2.4.48.tgz +sha512sums="99d1943d126b06e62865e31e5825fcff2cb15415f7f85ae4962fa0e7425bc3b58db5b9639150d7b09e3642c80257724c745e47c25ab4fcb1bba0ba771011dd49 openldap-2.4.49.tgz 5d34d49eabe7cb66cf8284cc3bd9730fa23df4932df68549e242d250ee50d40c434ae074ebc720d5fbcd9d16587c9333c5598d30a5f1177caa61461ab7771f38 openldap-2.4-ppolicy.patch 44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357 openldap-2.4.11-libldap_r.patch 8c4244d316a05870dd1147b2ab7ddbcfd7626b5dce2f5a0e72f066dc635c2edb4f1ea3be88c6fec2d5ab016001be16bedef70f2ce0695c3cd96f69e1614ff177 fix-manpages.patch diff --git a/user/os-prober/APKBUILD b/user/os-prober/APKBUILD index fb228faf2..016f92168 100644 --- a/user/os-prober/APKBUILD +++ b/user/os-prober/APKBUILD @@ -35,8 +35,9 @@ package() { install -Dm755 $file "$pkgdir/usr/lib/$probes" done if [ -e "$probes/${PROBE_ARCH}" ]; then - install -Dm755 $probes/${PROBE_ARCH}/* \ - "$pkgdir/usr/lib/$probes" + mkdir -p "$pkgdir/usr/lib/$probes/${PROBE_ARCH}" + cp -a $probes/${PROBE_ARCH}/* \ + "$pkgdir/usr/lib/$probes/${PROBE_ARCH}" fi done mkdir -p "$pkgdir"/usr/lib/os-prober "$pkgdir"/usr/bin diff --git a/user/oxygen-icons5/APKBUILD b/user/oxygen-icons5/APKBUILD index 71e7e5bf6..397e87ce7 100644 --- a/user/oxygen-icons5/APKBUILD +++ b/user/oxygen-icons5/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=oxygen-icons5 -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="The KDE Oxygen icon set" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d77da5e218e1abaf78069c3bd339c953e64b9f536d234f7d1a179b28476958170db8a660e2c7f0a04e65ca4ea99704d36b6232d698d6c15f78d4a388a568cc65 oxygen-icons5-5.67.0.tar.xz" +sha512sums="d7ba6906823b0e4c6a724b98b587808d8136e29a7f3bdf6fdb8309cbb9bfd43bc903a79cf5629c5f5cbf15510de3526332728f538d8ff624c52c021488b4ca6c oxygen-icons5-5.68.0.tar.xz" diff --git a/user/oxygen/APKBUILD b/user/oxygen/APKBUILD index 3f132c2cb..e85c84980 100644 --- a/user/oxygen/APKBUILD +++ b/user/oxygen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=oxygen -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="'Oxygen' theme for KDE" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="26aa01ce0ff7cd45e6564720821951487c0720bd8c7b0d193344ed3d1e36c4d74a72388b7267b691e428cb51687309677e5fd532159c74760b5a6e39710eca8e oxygen-5.18.0.tar.xz" +sha512sums="02c840d4e7130da9468c01818d9999f2ac8f8ffba0bac27805614ab8ad5133aa76a9153ff0b63553822a0367341dcfd900498366d98fca1ac60e1730e8e4166e oxygen-5.18.2.tar.xz" diff --git a/user/palapeli/APKBUILD b/user/palapeli/APKBUILD index f42db982b..793560380 100644 --- a/user/palapeli/APKBUILD +++ b/user/palapeli/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=palapeli -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Jigsaw puzzle game by KDE" url="https://www.kde.org/applications/games/palapeli/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cba96383d458fe31f4cd453bdfa43fe38ee63f69391cad12879d74027eaec8da1cc0791ed4ffb352a15cb0207529b4915e3dc65bb7bb5691b29846c7bb65c47e palapeli-19.12.2.tar.xz" +sha512sums="4ffda823a8046f36ae2e43e556c9c780e565c98c395cf54e4ff175acce8fa96b5ffa0fc0bab06f6fa8cd533ffaa1714c5a536f4d7ce0ef898cfd638c2e655676 palapeli-19.12.3.tar.xz" diff --git a/user/papirus-icons/APKBUILD b/user/papirus-icons/APKBUILD index 849057fe8..6dff3c80d 100644 --- a/user/papirus-icons/APKBUILD +++ b/user/papirus-icons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=papirus-icons -pkgver=20191101 +pkgver=20200201 pkgrel=0 pkgdesc="Material, flat style icon theme" url="https://store.kde.org/p/1166289/" @@ -39,4 +39,4 @@ epapirus() { mv "$pkgdir"/usr/share/icons/ePapirus "$subpkgdir"/usr/share/icons/ } -sha512sums="abbf3c6b248abd6945e7397ea53fe92e645d74918f6fa6f54e3701e560d75e94ac75c2e9d01d5bed7c989af8e14ea9dff4dba018956aaff43291d45fc7ab9e4d papirus-icons-20191101.tar.gz" +sha512sums="07ed45eb409ed12f57657f058f9a5a03dec77679ed598dc8645536a614ecc5424c60be57f10de20ca72204d2a21152fdd62adadf2637bbfa1266d588c787d7e9 papirus-icons-20200201.tar.gz" diff --git a/user/partitionmanager/APKBUILD b/user/partitionmanager/APKBUILD index 830611586..d37784b29 100644 --- a/user/partitionmanager/APKBUILD +++ b/user/partitionmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=partitionmanager -pkgver=4.0.0 +pkgver=4.1.0 pkgrel=0 pkgdesc="Qt-based partition manager" url="https://www.kde.org/applications/system/partitionmanager" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dbdae666b29996a7ef463159cd96469cf5081ca9027d1d59556e21556e2488485c0d4bee1e9005a446a47b13e3c1e4b71014f58c7bfa830adfd7c39364f4581a partitionmanager-4.0.0.tar.xz" +sha512sums="63f77c68f0468e6b17da33bf52824e2858b43f33cb46f8ff7069386d56a154c86f5f3ec20113c472d567a790ba0d8593c2ecb44d9c0d4e1614dcdc570b072761 partitionmanager-4.1.0.tar.xz" diff --git a/user/plasma-browser-integration/APKBUILD b/user/plasma-browser-integration/APKBUILD new file mode 100644 index 000000000..6c898c7d1 --- /dev/null +++ b/user/plasma-browser-integration/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-browser-integration +pkgver=5.18.2 +pkgrel=0 +pkgdesc="Integrate Web browsers into the KDE Plasma desktop" +url="https://www.kde.org/" +arch="all" +license="GPL-3.0+" +depends="" +makedepends="cmake extra-cmake-modules kactivities-dev kconfig-dev kcrash-dev kdbusaddons-dev kfilemetadata-dev ki18n-dev kio-dev knotifications-dev krunner-dev purpose-dev qt5-qtbase-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-browser-integration-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install + rm -r "$pkgdir"/etc +} + +sha512sums="76fc14ccea545f480ffc617bc373a7384dc95b709ac4d880b0249306c6b18e7280267703cb62a0b69e30bc46125e9322b2ce66b5ebc79b2e6a028765134a1e5f plasma-browser-integration-5.18.2.tar.xz" diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD index e00e704a4..d74a4a885 100644 --- a/user/plasma-desktop/APKBUILD +++ b/user/plasma-desktop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-desktop -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Modern, functional, integrated libre desktop environment" url="https://www.kde.org/plasma-desktop" @@ -10,11 +10,11 @@ options="!check" # Test suite fails due to keyboard layouts license="GPL-2.0 LGPL-2.1" # theme/visual dependencies depends="breeze breeze-icons kirigami2 oxygen qt5-qtquickcontrols2 - ttf-liberation" + qqc2-desktop-style ttf-liberation" # shell/QML dependencies depends="$depends kde-cli-tools kded kwin qt5-qtgraphicaleffects setxkbmap" # Good Ideas™ to have -depends="$depends consolekit2 kdeclarative" +depends="$depends consolekit2 kdeclarative polkit-kde-agent-1" makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev qt5-qtsvg-dev kdelibs4support-dev xf86-input-synaptics-dev kauth-dev plasma-framework-dev kdoctools-dev ki18n-dev libkworkspace-dev @@ -25,7 +25,8 @@ makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev libxkbcommon-dev pulseaudio-dev libcanberra-dev libxkbfile-dev xorg-server-dev kwin-dev kscreenlocker-dev baloo-dev xcb-util-image-dev xf86-input-libinput-dev breeze-dev xkeyboard-config extra-cmake-modules - kirigami2-dev libksysguard-dev qt5-qtquickcontrols2-dev" + kirigami2-dev libksysguard-dev qt5-qtquickcontrols2-dev + qqc2-desktop-style-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz" @@ -53,4 +54,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="863516751f4f37193ad5a96713fa9c7eb8d346e3bbe33dc43dcb83fa18955456dc875ddc3e2db990e7f3a017e394a69790e3dc21e13e8fc0c5d6841591c8fb4e plasma-desktop-5.18.0.tar.xz" +sha512sums="3f850eb9ab6f7a7ee86b11d024a0e9c5552fbfb24a17502bca141bd01e52a99a509e64669abd708ec7a2617fcbb5c65eaa401084388a812785573ed1c5f9c097 plasma-desktop-5.18.2.tar.xz" diff --git a/user/plasma-framework/APKBUILD b/user/plasma-framework/APKBUILD index d24175796..fb047de4e 100644 --- a/user/plasma-framework/APKBUILD +++ b/user/plasma-framework/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-framework -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Frameworks for the KDE Plasma 5 desktop environment" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3708262501b39698a84656b1ec0ea461011369301c7e1f1e5858fdc5b3e06f4fd3a5d7511dba1f91e08e89b2331fcc3204561efd1e06440f97e6b4a32cbd8f92 plasma-framework-5.67.0.tar.xz" +sha512sums="e4e0ef5fff99518061f79f7eb03fe8048fa8c5d863e8092f05f98dfa0fec8cb1f097d042ffb417434a1b0bd424c0997c4a2c38068bcae30e39324d001ea3ffd0 plasma-framework-5.68.0.tar.xz" diff --git a/user/plasma-integration/APKBUILD b/user/plasma-integration/APKBUILD index c52a6adb2..c7c199e5d 100644 --- a/user/plasma-integration/APKBUILD +++ b/user/plasma-integration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-integration -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Qt platform theme plugin for Plasma" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c6ba798d6525c7d8cfd46874a1ffd7c6147e600f64a49b410b124945f7a46de0003166b049981897fb20f8776a66d14b9cf7fc1e4729497dc6285421d5161850 plasma-integration-5.18.0.tar.xz" +sha512sums="d605bba7e1ac1786bbdceecd38a571cf8f9d71f95b31a9beb66100af85d0d607304ee00d7df135e7f76c295e4832ccd197e666dd2ea3c3842307fb649ff53559 plasma-integration-5.18.2.tar.xz" diff --git a/user/plasma-meta/APKBUILD b/user/plasma-meta/APKBUILD new file mode 100644 index 000000000..929b30f9b --- /dev/null +++ b/user/plasma-meta/APKBUILD @@ -0,0 +1,20 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-meta +pkgver=5.18.2 +pkgrel=0 +pkgdesc="Metapackage for optional KDE Plasma dependencies" +url="https://www.adelielinux.org/" +arch="noarch" +options="!check" # No tests, it's a metapackage. +license="Public-Domain" +depends="bluedevil breeze-grub drkonqi plasma-browser-integration plasma-pa + plasma-thunderbolt plasma-vault" +makedepends="" +subpackages="" +source="" + +package() { + mkdir -p "$pkgdir" +} + diff --git a/user/plasma-nm/APKBUILD b/user/plasma-nm/APKBUILD new file mode 100644 index 000000000..62133f18f --- /dev/null +++ b/user/plasma-nm/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-nm +pkgver=5.18.2 +pkgrel=0 +pkgdesc="NetworkManager integration for KDE Plasma desktop" +url="https://www.kde.org/" +arch="all" +license="(LGPL-2.1-only OR LGPL-3.0-only) AND GPL-2.0-only AND GPL-2.0+ AND LGPL-2.0+" +depends="prison-quick" +makedepends="cmake extra-cmake-modules kauth-dev kcodecs-dev kcompletion-dev + kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kdeclarative-dev + ki18n-dev kiconthemes-dev kio-dev kitemviews-dev kjobwidgets-dev + knotifications-dev kpackage-dev kservice-dev kwallet-dev + kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev modemmanager-qt-dev + networkmanager-dev networkmanager-qt-dev plasma-framework-dev + prison-dev qca-dev qt5-qtbase-dev qt5-qtdeclarative-dev solid-dev" +subpackages="$pkgname-lang" +# We don't want to pull NM into plasma-meta, so we do this as a workaround. +install_if="plasma-desktop networkmanager" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-nm-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="efb126d690ba1460d6c58cc96fb0f5a533b3846bdd11898ee96be23a311a1bee651f1b9df5ea2a1d24248a12baa80a1d0765d3a5a3d4672b4bfa8fad268432a5 plasma-nm-5.18.2.tar.xz" diff --git a/user/plasma-pa/APKBUILD b/user/plasma-pa/APKBUILD new file mode 100644 index 000000000..40816cbe2 --- /dev/null +++ b/user/plasma-pa/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-pa +pkgver=5.18.2 +pkgrel=0 +pkgdesc="PulseAudio integration for KDE Plasma desktop" +url="https://www.kde.org/" +arch="all" +license="LGPL-2.1-only OR LGPL-3.0-only" +depends="kirigami2 libcanberra-pulse sound-theme-freedesktop" +makedepends="cmake extra-cmake-modules glib-dev kcoreaddons-dev kdeclarative-dev + kdoctools-dev kglobalaccel-dev ki18n-dev knotifications-dev + libcanberra-dev plasma-framework-dev pulseaudio-dev qt5-qtbase-dev + qt5-qtdeclarative-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-pa-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="51604dc9310d0ea9314bb04ac54852ae756d2f2c7eb0a3f37abaf707a52afff24fedf3c676e412c198df4cc13716fe539e76cfd9ec2536d7040d595277b94282 plasma-pa-5.18.2.tar.xz" diff --git a/user/plasma-thunderbolt/APKBUILD b/user/plasma-thunderbolt/APKBUILD new file mode 100644 index 000000000..ebe1e8cca --- /dev/null +++ b/user/plasma-thunderbolt/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-thunderbolt +pkgver=5.18.2 +pkgrel=0 +pkgdesc="Thunderbolt device integration for KDE Plasma desktop" +url="https://www.kde.org/" +arch="all" +options="!check" # Requires running D-Bus. +license="GPL-2.0-only" +depends="bolt" +makedepends="cmake extra-cmake-modules kcmutils-dev kcoreaddons-dev + knotifications-dev qt5-qtbase-dev qt5-qtdeclarative-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-thunderbolt-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="e42cdbc6ce4da2a7e38ed3cbeb4f1dec6c6e9a1c9dc160d256b5701b1bf3f4e298f9e6d19c6c5cdf48155f3f792961f2f20e5971e80b80e3670ba5bba86af05e plasma-thunderbolt-5.18.2.tar.xz" diff --git a/user/plasma-vault/APKBUILD b/user/plasma-vault/APKBUILD new file mode 100644 index 000000000..56af52654 --- /dev/null +++ b/user/plasma-vault/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-vault +pkgver=5.18.2 +pkgrel=0 +pkgdesc="Secure storage plugin for KDE Plasma desktop" +url="https://www.kde.org/" +arch="all" +license="GPL-2.0-only AND (LGPL-2.1-only OR LGPL-3.0-only)" +depends="encfs" +makedepends="cmake extra-cmake-modules kactivities-dev kconfig-dev + kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev ki18n-dev kio-dev + kwidgetsaddons-dev libksysguard-dev plasma-framework-dev + qt5-qtbase-dev qt5-qtdeclarative-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-vault-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + -Bbuild + make -C build +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test +} + +package() { + make DESTDIR="$pkgdir" -C build install +} + +sha512sums="5abeb6adb721b0933217dc0a2cc6fcd07e682b48c17b983d0f7d50c2ea206b06f4fb05dcb58f20009f7f1bf95ce104722cc70f83a09dd752fdb6331c3babdda7 plasma-vault-5.18.2.tar.xz" diff --git a/user/plasma-workspace-wallpapers/APKBUILD b/user/plasma-workspace-wallpapers/APKBUILD index c38da7d88..f8bcad63e 100644 --- a/user/plasma-workspace-wallpapers/APKBUILD +++ b/user/plasma-workspace-wallpapers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-workspace-wallpapers -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Default wallpapers from KDE" url="https://www.KDE.org/" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7433b27b583b640fe4a3f78c2abd24592e2cb9c62fdf80110fdc366c97e64dab3f4fb288e9cf617b5aada92b6bd6bc7662774e4614eb70c95ebeffbaeecdd380 plasma-workspace-wallpapers-5.18.0.tar.xz" +sha512sums="7901c54a414602a1a0a4bde50b851afb86c505bbd8600dce2fa0979628b180d7adba6f26dd53797082dfc108a87a427e4e55ca7d146f9a9697db5c9a57274a95 plasma-workspace-wallpapers-5.18.2.tar.xz" diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD index 07a28a91b..da67d4b2d 100644 --- a/user/plasma-workspace/APKBUILD +++ b/user/plasma-workspace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-workspace -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="KDE Plasma 5 workspace" url="https://www.kde.org/plasma-desktop" @@ -13,7 +13,7 @@ depends="kinit qdbus qtpaths xmessage xprop xset xsetroot" # font installation stuff depends="$depends mkfontdir" # QML deps -depends="$depends qt5-qtgraphicaleffects qt5-qtquickcontrols solid" +depends="$depends kquickcharts qt5-qtgraphicaleffects qt5-qtquickcontrols solid" # other runtime deps / plugins depends="$depends libdbusmenu-qt kcmutils kde-cli-tools kded kdesu kio-extras ksysguard kwin milou plasma-integration pulseaudio-utils iso-codes xrdb" @@ -59,5 +59,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="afce0ef26b1ce5e8bbc56c8ac4eac1ae097126966c0e9b77ffe74278f270a3ae9fc2bd116be939e13b3134ad9967cb80501ed1194f115710529ac98f408e903a plasma-workspace-5.18.0.tar.xz +sha512sums="0fa91451e28b70d7602de79686afb57143eecd86e3856ed9c773bc4f5394610e5a5cf2f13fd03398b7a01624b45ab86d7e12da016980cb91ab23adac41a6793e plasma-workspace-5.18.2.tar.xz f58b88928fd68518bc0524db35388cb0f0dbc2a55d85fc47e92ce7fcbaf9b155482736e282bd84104ceecc625406845840128c8d0fcd2a4d5a854673964cd94f libkworkspace.patch" diff --git a/user/polkit-kde-agent-1/APKBUILD b/user/polkit-kde-agent-1/APKBUILD new file mode 100644 index 000000000..529ea4116 --- /dev/null +++ b/user/polkit-kde-agent-1/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=polkit-kde-agent-1 +pkgver=5.18.2 +pkgrel=0 +pkgdesc="PolKit agent for KDE" +url="https://www.kde.org/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules kcoreaddons-dev kcrash-dev + kdbusaddons-dev ki18n-dev kiconthemes-dev kwidgetsaddons-dev + kwindowsystem-dev polkit-qt-1-dev qt5-qtbase-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/polkit-kde-agent-1-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="a34515c1173bc439b0659df891ac35830dfc05916b4c3c622045cbaef2ce93f91be000eac31c8c0f669e7064628d09a999251237bdd5c381f74dd34e06a722fe polkit-kde-agent-1-5.18.2.tar.xz" diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD index 11c7f70da..bc65648cb 100644 --- a/user/postfix/APKBUILD +++ b/user/postfix/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=postfix -pkgver=3.4.8 +pkgver=3.4.9 pkgrel=0 pkgdesc="Mail server (MTA) that is Sendmail outside and Qmail inside" url="http://www.postfix.org/" @@ -92,6 +92,6 @@ sqlite() { _database "sqlite" "SQLite 3" } -sha512sums="782fe83e4b40c7aadfb4c55850db4c7163dd0f647f4ef133e59f7b47c993b2b4fa6c43ebbc45131caa54d968259f9c8568f47e81bfccda02ab142be52aa95d45 postfix-3.4.8.tar.gz +sha512sums="9038850d79bf19460d55dede2dd97e6f4bd8255363b4004704e5f0493bf9b1c0729f5bb11663ba6f6ed34177205609f72401b0f55d1d9dbce5398b4603a0a991 postfix-3.4.9.tar.gz 63ea7fe461fca1306088e9984acfab6ab3e919dafa2b606d43fbca472969e6ec232800071f939f5a4482c01c6d7b53a86de9e7e893ab94f4cb135d16ff5763cc honour-config-directory.patch 2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592 postfix.initd" diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD index 975cd7e7f..8f7f21355 100644 --- a/user/postgresql/APKBUILD +++ b/user/postgresql/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=postgresql -pkgver=10.10 +pkgver=10.12 pkgrel=0 pkgdesc="Featureful object-relational database system (RDBMS)" url="https://www.postgresql.org/" @@ -22,7 +22,6 @@ subpackages="$pkgname-contrib $pkgname-dev $pkgname-doc libpq $pkgname-libs $pkgname-plpython3 $pkgname-plpython3-contrib:plpython3_contrib" install="$pkgname.pre-upgrade" source="https://ftp.postgresql.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2 - initdb.patch perl-rpath.patch conf-unix_socket_directories.patch disable-broken-tests.patch @@ -250,8 +249,7 @@ _submv() { done } -sha512sums="60cafe4b27a194949aff482dcce4fa096a9916f37205868437a32afb8964df71934b619a0b891fe85eb7c7f9b11775cffbbedca589e78feb6c4184eb224b48bc postgresql-10.10.tar.bz2 -1f8e7dc58f5b0a12427cf2fd904ffa898a34f23f3332c8382b94e0d991c007289e7913a69e04498f3d93fc5701855796c207b4b1cc4a0b366f586050124d7fcc initdb.patch +sha512sums="6accc66cbbae811509095c33e8a8d17ddd11d9e307267312e3d09df90469db4700a5806166d66f25d77769d3ef88653c98dfc7d05dd053f10434b03e0a9e33b7 postgresql-10.12.tar.bz2 5f9d8bb4957194069d01af8ab3abc6d4d83a7e7f8bd7ebe1caae5361d621a3e58f91b14b952958138a794e0a80bc154fbb7e3e78d211e2a95b9b7901335de854 perl-rpath.patch 8439a6fdfdea0a4867daeb8bc23d6c825f30c00d91d4c39f48653f5ee77341f23282ce03a77aad94b5369700f11d2cb28d5aee360e59138352a9ab331a9f9d0f conf-unix_socket_directories.patch 1966b2a3971f56fbecd8daa45965236d487683e13300e5c000e595bbadbbe9d0e1301fbbfa034f452abe8a4e4a427781f772370b9ff392bb03fc11ee43c9dee7 disable-broken-tests.patch diff --git a/user/postgresql/initdb.patch b/user/postgresql/initdb.patch deleted file mode 100644 index 59a872a49..000000000 --- a/user/postgresql/initdb.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c ---- a/src/bin/initdb/initdb.c -+++ b/src/bin/initdb/initdb.c -@@ -3259,9 +3259,7 @@ - /* translator: This is a placeholder in a shell command. */ - appendPQExpBuffer(start_db_cmd, " -l %s start", _("logfile")); - -- printf(_("\nSuccess. You can now start the database server using:\n\n" -- " %s\n\n"), -- start_db_cmd->data); -+ printf(_("\nSuccess.\n\n")); - - destroyPQExpBuffer(start_db_cmd); - diff --git a/user/powerdevil/APKBUILD b/user/powerdevil/APKBUILD index c6afbd606..9f63547a1 100644 --- a/user/powerdevil/APKBUILD +++ b/user/powerdevil/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=powerdevil -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="KDE Plasma power management utilities" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="be42b1b5171e87697c9dba3d5b4aa16c074d61272c97a40d4515dd80cc4e3640e4b0bd03d44a2369adb38a6e47b9e6a6e9e879ff574a88502f8c38d41cd3c586 powerdevil-5.18.0.tar.xz" +sha512sums="2c3059566e649e00eee1e34e20dfd08d8070e5d8c2afceded0bbd8e534d3b1128fb28f9ddacbd5318cc56b19328d49991a928f122ab31b440171a7f4566864f1 powerdevil-5.18.2.tar.xz" diff --git a/user/ppp/02_all_make-vars.patch b/user/ppp/02_all_make-vars.patch deleted file mode 100644 index 7937d666e..000000000 --- a/user/ppp/02_all_make-vars.patch +++ /dev/null @@ -1,185 +0,0 @@ ---- ppp-2.4.5/chat/Makefile.linux -+++ ppp-2.4.5/chat/Makefile.linux -@@ -10,7 +10,6 @@ - CDEF4= -DFNDELAY=O_NDELAY # Old name value - CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) - --COPTS= -O2 -g -pipe - CFLAGS= $(COPTS) $(CDEFS) - - INSTALL= install -@@ -18,7 +17,7 @@ - all: chat - - chat: chat.o -- $(CC) -o chat chat.o -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ - - chat.o: chat.c - $(CC) -c $(CFLAGS) -o chat.o chat.c ---- ppp-2.4.5/pppd/Makefile.linux -+++ ppp-2.4.5/pppd/Makefile.linux -@@ -32,7 +32,7 @@ - - # CC = gcc - # --COPTS = -O2 -pipe -Wall -g -+COPTS+= -Wall - LIBS = - - # Uncomment the next 2 lines to include support for Microsoft's ---- ppp-2.4.5/pppd/plugins/Makefile.linux -+++ ppp-2.4.5/pppd/plugins/Makefile.linux -@@ -1,7 +1,11 @@ - #CC = gcc --COPTS = -O2 -g - CFLAGS = $(COPTS) -I.. -I../../include -fPIC --LDFLAGS = -shared -+LDFLAGS_PROG := $(LDFLAGS) -+export LDFLAGS LDFLAGS_PROG -+LDFLAGS += -shared -+# need the following option, otherwise linking plugins might fail with undef errors (Gentoo bug 210837) -+LDFLAGS += -Wl,--allow-shlib-undefined -+LIBS = - INSTALL = install - - DESTDIR = $(INSTROOT)@DESTDIR@ -@@ -23,7 +27,7 @@ - for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done - - %.so: %.c -- $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) - - VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h) - ---- ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux -+++ ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux -@@ -1,7 +1,5 @@ - #CC = gcc --COPTS = -O2 -g - CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC --LDFLAGS = -shared - INSTALL = install - - #*********************************************************************** -@@ -33,7 +31,7 @@ - all: $(PLUGIN) - - $(PLUGIN): $(PLUGIN_OBJS) -- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) ---- ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux -+++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux -@@ -1,7 +1,5 @@ - #CC = gcc --COPTS = -O2 -g - CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC --LDFLAGS = -shared - INSTALL = install - - #*********************************************************************** -@@ -16,7 +14,7 @@ - all: $(PLUGINS) - - %.so: %.o -- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) ---- ppp-2.4.5/pppd/plugins/radius/Makefile.linux -+++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux -@@ -12,7 +12,7 @@ - INSTALL = install - - PLUGIN=radius.so radattr.so radrealms.so --CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON -+CFLAGS=$(COPTS) -I. -I../.. -I../../../include -fPIC -DRC_LOG_FACILITY=LOG_DAEMON - - # Uncomment the next line to include support for Microsoft's - # MS-CHAP authentication protocol. -@@ -43,13 +43,13 @@ - $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) - - radius.so: radius.o libradiusclient.a -- $(CC) -o radius.so -shared radius.o libradiusclient.a -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ - - radattr.so: radattr.o -- $(CC) -o radattr.so -shared radattr.o -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ - - radrealms.so: radrealms.o -- $(CC) -o radrealms.so -shared radrealms.o -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ - - CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \ - clientid.o sendserver.o lock.o util.o md5.o ---- ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux -+++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux -@@ -25,12 +25,11 @@ - # Version is set ONLY IN THE MAKEFILE! Don't delete this! - RP_VERSION=3.8p - --COPTS=-O2 -g - CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' - all: rp-pppoe.so pppoe-discovery - - pppoe-discovery: pppoe-discovery.o debug.o -- $(CC) -o pppoe-discovery pppoe-discovery.o debug.o -+ $(CC) $(LDFLAGS_PROG) $(CFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o - - pppoe-discovery.o: pppoe-discovery.c - $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c -@@ -39,7 +38,7 @@ - $(CC) $(CFLAGS) -c -o debug.o debug.c - - rp-pppoe.so: plugin.o discovery.o if.o common.o -- $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o -+ $(CC) $(LDFLAGS) $(CFLAGS) -o rp-pppoe.so plugin.o discovery.o if.o common.o - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) ---- ppp-2.4.5/pppdump/Makefile.linux -+++ ppp-2.4.5/pppdump/Makefile.linux -@@ -2,7 +2,7 @@ - BINDIR = $(DESTDIR)/sbin - MANDIR = $(DESTDIR)/share/man/man8 - --CFLAGS= -O -I../include/net -+CFLAGS=$(COPTS) -I../include/net - OBJS = pppdump.o bsd-comp.o deflate.o zlib.o - - INSTALL= install -@@ -10,7 +10,7 @@ - all: pppdump - - pppdump: $(OBJS) -- $(CC) -o pppdump $(OBJS) -+ $(CC) $(LDFLAGS) -o pppdump $(OBJS) - - clean: - rm -f pppdump $(OBJS) *~ ---- ppp-2.4.5/pppstats/Makefile.linux -+++ ppp-2.4.5/pppstats/Makefile.linux -@@ -10,7 +10,6 @@ - PPPSTATOBJS = pppstats.o - - #CC = gcc --COPTS = -O - COMPILE_FLAGS = -I../include - LIBS = - -@@ -26,7 +25,7 @@ - $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) - - pppstats: $(PPPSTATSRCS) -- $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o pppstats pppstats.c $(LIBS) - - clean: - rm -f pppstats *~ #* core diff --git a/user/ppp/04_all_mpls.patch b/user/ppp/04_all_mpls.patch index 54b79f7bd..dd316974e 100644 --- a/user/ppp/04_all_mpls.patch +++ b/user/ppp/04_all_mpls.patch @@ -1,6 +1,6 @@ --- ppp-2.4.5/pppd/main.c +++ ppp-2.4.5/pppd/main.c -@@ -96,6 +96,9 @@ +@@ -95,6 +95,9 @@ #include "fsm.h" #include "lcp.h" #include "ipcp.h" diff --git a/user/ppp/10_all_defaultgateway.patch b/user/ppp/10_all_defaultgateway.patch deleted file mode 100644 index 1b7ae6396..000000000 --- a/user/ppp/10_all_defaultgateway.patch +++ /dev/null @@ -1,90 +0,0 @@ -This patch reverses revision 1.114 of the pppd/sys-linux.c file. -The default gateway is needed by the openswan's %defaultroute. - ---- ppp-2.4.7/pppd/sys-linux.c -+++ ppp-2.4.7/pppd/sys-linux.c -@@ -206,7 +206,7 @@ - - static int if_is_up; /* Interface has been marked up */ - static int if6_is_up; /* Interface has been marked up for IPv6, to help differentiate */ --static int have_default_route; /* Gateway for default route added */ -+static u_int32_t default_route_gateway; /* Gateway for default route added */ - static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ - static char proxy_arp_dev[16]; /* Device for proxy arp entry */ - static u_int32_t our_old_addr; /* for detecting address changes */ -@@ -346,8 +346,8 @@ - /* - * Delete any routes through the device. - */ -- if (have_default_route) -- cifdefaultroute(0, 0, 0); -+ if (default_route_gateway != 0) -+ cifdefaultroute(0, 0, default_route_gateway); - - if (has_proxy_arp) - cifproxyarp(0, proxy_arp_addr); -@@ -1621,17 +1621,17 @@ - struct rtentry rt; - - if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) { -- if (rt.rt_flags & RTF_GATEWAY) -- error("not replacing existing default route via %I", -- SIN_ADDR(rt.rt_gateway)); -- else -- error("not replacing existing default route through %s", -- rt.rt_dev); -+ u_int32_t old_gateway = SIN_ADDR(rt.rt_gateway); -+ -+ if (old_gateway != gateway) -+ error("not replacing existing default route to %s [%I]", -+ rt.rt_dev, old_gateway); - return 0; - } - -- memset (&rt, 0, sizeof (rt)); -- SET_SA_FAMILY (rt.rt_dst, AF_INET); -+ memset (&rt, '\0', sizeof (rt)); -+ SET_SA_FAMILY (rt.rt_dst, AF_INET); -+ SET_SA_FAMILY (rt.rt_gateway, AF_INET); - - rt.rt_dev = ifname; - -@@ -1640,14 +1640,16 @@ - SIN_ADDR(rt.rt_genmask) = 0L; - } - -- rt.rt_flags = RTF_UP; -+ SIN_ADDR(rt.rt_gateway) = gateway; -+ -+ rt.rt_flags = RTF_UP | RTF_GATEWAY; - if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { - if ( ! ok_error ( errno )) - error("default route ioctl(SIOCADDRT): %m"); - return 0; - } - -- have_default_route = 1; -+ default_route_gateway = gateway; - return 1; - } - -@@ -1660,7 +1662,7 @@ - { - struct rtentry rt; - -- have_default_route = 0; -+ default_route_gateway = 0; - - memset (&rt, '\0', sizeof (rt)); - SET_SA_FAMILY (rt.rt_dst, AF_INET); -@@ -1673,7 +1675,9 @@ - SIN_ADDR(rt.rt_genmask) = 0L; - } - -- rt.rt_flags = RTF_UP; -+ SIN_ADDR(rt.rt_gateway) = gateway; -+ -+ rt.rt_flags = RTF_UP | RTF_GATEWAY; - if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { - if (still_ppp()) { - if ( ! ok_error ( errno )) diff --git a/user/ppp/18_all_defaultmetric.patch b/user/ppp/18_all_defaultmetric.patch deleted file mode 100644 index fba787005..000000000 --- a/user/ppp/18_all_defaultmetric.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- ppp-2.4.5/pppd/options.c -+++ ppp-2.4.5/pppd/options.c -@@ -94,6 +94,7 @@ - int kdebugflag = 0; /* Tell kernel to print debug messages */ - int default_device = 1; /* Using /dev/tty or equivalent */ - char devnam[MAXPATHLEN]; /* Device name */ -+int defaultmetric = 0; /* Metric of the default route */ - bool nodetach = 0; /* Don't detach from controlling tty */ - bool updetach = 0; /* Detach once link is up */ - int maxconnect = 0; /* Maximum connect time */ -@@ -289,6 +290,10 @@ - "Number of seconds to wait for child processes at exit", - OPT_PRIO }, - -+ { "defaultmetric", o_int, &defaultmetric, -+ "The metric of the default route", -+ OPT_LIMITS, 0, 32766 }, -+ - #ifdef HAVE_MULTILINK - { "multilink", o_bool, &multilink, - "Enable multilink operation", OPT_PRIO | 1 }, ---- ppp-2.4.5/pppd/pppd.8 -+++ ppp-2.4.5/pppd/pppd.8 -@@ -121,6 +121,9 @@ - This entry is removed when the PPP connection is broken. This option - is privileged if the \fInodefaultroute\fR option has been specified. - .TP -+.B defaultmetric \fIn -+The metric of the default route configured by pppd; default is 0. -+.TP - .B disconnect \fIscript - Execute the command specified by \fIscript\fR, by passing it to a - shell, after ---- ppp-2.4.5/pppd/pppd.h -+++ ppp-2.4.5/pppd/pppd.h -@@ -276,6 +276,7 @@ - extern int kdebugflag; /* Tell kernel to print debug messages */ - extern int default_device; /* Using /dev/tty or equivalent */ - extern char devnam[MAXPATHLEN]; /* Device name */ -+extern int defaultmetric; /* Metric of the default route */ - extern int crtscts; /* Use hardware flow control */ - extern bool modem; /* Use modem control lines */ - extern int inspeed; /* Input/Output speed requested */ ---- ppp-2.4.5/pppd/sys-linux.c -+++ ppp-2.4.5/pppd/sys-linux.c -@@ -1465,7 +1465,7 @@ - FILE *route_fd = (FILE *) 0; - static char route_buffer[512]; - static int route_dev_col, route_dest_col, route_gw_col; --static int route_flags_col, route_mask_col; -+static int route_flags_col, route_mask_col, route_metric_col; - static int route_num_cols; - - static int open_route_table (void); -@@ -1508,6 +1508,7 @@ - route_dest_col = 1; - route_gw_col = 2; - route_flags_col = 3; -+ route_metric_col = 6; - route_mask_col = 7; - route_num_cols = 8; - -@@ -1527,6 +1528,8 @@ - route_gw_col = col; - else if (strcasecmp(q, "flags") == 0) - route_flags_col = col; -+ else if (strcasecmp(q, "metric") == 0) -+ route_metric_col = col; - else if (strcasecmp(q, "mask") == 0) - route_mask_col = col; - else -@@ -1569,6 +1572,7 @@ - - rt->rt_flags = (short) strtoul(cols[route_flags_col], NULL, 16); - rt->rt_dev = cols[route_dev_col]; -+ rt->rt_metric = (short) strtoul(cols[route_metric_col], NULL, 16); - - return 1; - } -@@ -1591,6 +1595,8 @@ - - if (kernel_version > KVERSION(2,1,0) && SIN_ADDR(rt->rt_genmask) != 0) - continue; -+ if (rt->rt_metric != defaultmetric) /* consider only routes with the same metric */ -+ continue; - if (SIN_ADDR(rt->rt_dst) == 0L) { - result = 1; - break; -@@ -1661,6 +1667,7 @@ - SIN_ADDR(rt.rt_gateway) = gateway; - - rt.rt_flags = RTF_UP | RTF_GATEWAY; -+ rt.rt_metric = defaultmetric + 1; /* +1 for binary compatibility */ - if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { - if ( ! ok_error ( errno )) - error("default route ioctl(SIOCADDRT): %m"); -@@ -1696,6 +1703,7 @@ - SIN_ADDR(rt.rt_gateway) = gateway; - - rt.rt_flags = RTF_UP | RTF_GATEWAY; -+ rt.rt_metric = defaultmetric + 1; /* +1 for binary compatibility */ - if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { - if (still_ppp()) { - if ( ! ok_error ( errno )) diff --git a/user/ppp/21_all_custom_iface_names.patch b/user/ppp/21_all_custom_iface_names.patch deleted file mode 100644 index 5d3f7b94b..000000000 --- a/user/ppp/21_all_custom_iface_names.patch +++ /dev/null @@ -1,144 +0,0 @@ -pppd: Support arbitrary interface names - -This patch implements a new string option "ifname" which allows to specify -fully custom PPP interface names on Linux. It does so by renaming the -allocated pppX device immediately after it has been created to the requested -interface name. - -Originally written by Suse. Used by openwrt, debian, ubuntu. - -Reference: - -https://dev.openwrt.org/browser/trunk/package/network/services/ppp/patches/320-custom_iface_names.patch - -diff -purN ppp-2.4.7.orig/pppd/main.c ppp-2.4.7/pppd/main.c ---- ppp-2.4.7.orig/pppd/main.c 2016-08-25 15:52:52.032202044 +0200 -+++ ppp-2.4.7/pppd/main.c 2016-08-25 16:22:25.740299940 +0200 -@@ -729,8 +729,11 @@ void - set_ifunit(iskey) - int iskey; - { -- info("Using interface %s%d", PPP_DRV_NAME, ifunit); -- slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit); -+ if (use_ifname[0] == 0) -+ slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit); -+ else -+ slprintf(ifname, sizeof(ifname), "%s", use_ifname); -+ info("Using interface %s", ifname); - script_setenv("IFNAME", ifname, iskey); - if (iskey) { - create_pidfile(getpid()); /* write pid to file */ -diff -purN ppp-2.4.7.orig/pppd/options.c ppp-2.4.7/pppd/options.c ---- ppp-2.4.7.orig/pppd/options.c 2016-08-25 15:52:52.191194523 +0200 -+++ ppp-2.4.7/pppd/options.c 2016-08-25 16:04:23.335501924 +0200 -@@ -115,6 +115,7 @@ int log_to_fd = 1; /* send log messages - bool log_default = 1; /* log_to_fd is default (stdout) */ - int maxfail = 10; /* max # of unsuccessful connection attempts */ - char linkname[MAXPATHLEN]; /* logical name for link */ -+char use_ifname[IFNAMSIZ]; /* physical name for PPP link */ - bool tune_kernel; /* may alter kernel settings */ - int connect_delay = 1000; /* wait this many ms after connect script */ - int req_unit = -1; /* requested interface unit */ -@@ -274,6 +275,9 @@ option_t general_options[] = { - { "linkname", o_string, linkname, - "Set logical name for link", - OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, MAXPATHLEN }, -+ { "ifname", o_string, use_ifname, -+ "Set physical name for PPP interface", -+ OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, IFNAMSIZ }, - - { "maxfail", o_int, &maxfail, - "Maximum number of unsuccessful connection attempts to allow", -diff -purN ppp-2.4.7.orig/pppd/pppd.h ppp-2.4.7/pppd/pppd.h ---- ppp-2.4.7.orig/pppd/pppd.h 2016-08-25 15:52:52.829164346 +0200 -+++ ppp-2.4.7/pppd/pppd.h 2016-08-25 16:07:12.024522417 +0200 -@@ -71,6 +71,10 @@ - #include "eui64.h" - #endif - -+#ifndef IFNAMSIZ -+#define IFNAMSIZ 16 -+#endif -+ - /* - * Limits. - */ -@@ -319,6 +323,7 @@ extern char *record_file; /* File to rec - extern bool sync_serial; /* Device is synchronous serial device */ - extern int maxfail; /* Max # of unsuccessful connection attempts */ - extern char linkname[MAXPATHLEN]; /* logical name for link */ -+extern char use_ifname[IFNAMSIZ]; /* physical name for PPP interface */ - extern bool tune_kernel; /* May alter kernel settings as necessary */ - extern int connect_delay; /* Time to delay after connect script */ - extern int max_data_rate; /* max bytes/sec through charshunt */ -diff -purN ppp-2.4.7.orig/pppd/sys-linux.c ppp-2.4.7/pppd/sys-linux.c ---- ppp-2.4.7.orig/pppd/sys-linux.c 2016-08-25 15:52:52.268190881 +0200 -+++ ppp-2.4.7/pppd/sys-linux.c 2016-08-25 16:12:13.905242396 +0200 -@@ -172,6 +172,10 @@ struct in6_ifreq { - /* We can get an EIO error on an ioctl if the modem has hung up */ - #define ok_error(num) ((num)==EIO) - -+#if !defined(PPP_DRV_NAME) -+#define PPP_DRV_NAME "ppp" -+#endif /* !defined(PPP_DRV_NAME) */ -+ - static int tty_disc = N_TTY; /* The TTY discipline */ - static int ppp_disc = N_PPP; /* The PPP discpline */ - static int initfdflags = -1; /* Initial file descriptor flags for fd */ -@@ -644,7 +648,8 @@ void generic_disestablish_ppp(int dev_fd - */ - static int make_ppp_unit() - { -- int x, flags; -+ struct ifreq ifr; -+ int x, flags, s; - - if (ppp_dev_fd >= 0) { - dbglog("in make_ppp_unit, already had /dev/ppp open?"); -@@ -667,6 +672,30 @@ static int make_ppp_unit() - } - if (x < 0) - error("Couldn't create new ppp unit: %m"); -+ -+ if (use_ifname[0] != 0) { -+ s = socket(PF_INET, SOCK_DGRAM, 0); -+ if (s < 0) -+ s = socket(PF_PACKET, SOCK_DGRAM, 0); -+ if (s < 0) -+ s = socket(PF_INET6, SOCK_DGRAM, 0); -+ if (s < 0) -+ s = socket(PF_UNIX, SOCK_DGRAM, 0); -+ if (s >= 0) { -+ slprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s%d", PPP_DRV_NAME, ifunit); -+ slprintf(ifr.ifr_newname, sizeof(ifr.ifr_newname), "%s", use_ifname); -+ x = ioctl(s, SIOCSIFNAME, &ifr); -+ close(s); -+ } else { -+ x = s; -+ } -+ if (x < 0) { -+ error("Couldn't rename %s to %s", ifr.ifr_name, ifr.ifr_newname); -+ close(ppp_dev_fd); -+ ppp_dev_fd = -1; -+ } -+ } -+ - return x; - } - -diff -purN ppp-2.4.7.orig/pppstats/pppstats.c ppp-2.4.7/pppstats/pppstats.c ---- ppp-2.4.7.orig/pppstats/pppstats.c 2014-08-09 14:31:39.000000000 +0200 -+++ ppp-2.4.7/pppstats/pppstats.c 2016-08-25 16:13:52.623572634 +0200 -@@ -506,10 +506,12 @@ main(argc, argv) - if (argc > 0) - interface = argv[0]; - -+#if 0 - if (sscanf(interface, PPP_DRV_NAME "%d", &unit) != 1) { - fprintf(stderr, "%s: invalid interface '%s' specified\n", - progname, interface); - } -+#endif - - #ifndef STREAMS - { diff --git a/user/ppp/30_all_Makefile.patch b/user/ppp/30_all_Makefile.patch deleted file mode 100644 index 165fc7b22..000000000 --- a/user/ppp/30_all_Makefile.patch +++ /dev/null @@ -1,37 +0,0 @@ -Ensure that the build process aborts if there is an error in one of -the plugin subdirectories. - -2010-09-01 Martin von Gagern - -References: -http://bugs.gentoo.org/334727 - -Index: ppp-2.4.5/pppd/plugins/Makefile.linux -=================================================================== ---- ppp-2.4.5/pppd/plugins/Makefile.linux -+++ ppp-2.4.5/pppd/plugins/Makefile.linux -@@ -20,7 +20,7 @@ include .depend - endif - - all: $(PLUGINS) -- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done -+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all || exit $?; done - - %.so: %.c - $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ -@@ -30,12 +30,12 @@ VERSION = $(shell awk -F '"' '/VERSION/ - install: $(PLUGINS) - $(INSTALL) -d $(LIBDIR) - $(INSTALL) $? $(LIBDIR) -- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install; done -+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install || exit $?; done - - clean: - rm -f *.o *.so *.a -- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean; done -+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean || exit $?; done - - depend: - $(CPP) -M $(CFLAGS) *.c >.depend -- for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend; done -+ for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend || exit $?; done diff --git a/user/ppp/32_all_pado-timeout.patch b/user/ppp/32_all_pado-timeout.patch index 72f1adbb1..e17658456 100644 --- a/user/ppp/32_all_pado-timeout.patch +++ b/user/ppp/32_all_pado-timeout.patch @@ -218,37 +218,3 @@ /* Is it PADS? */ if (packet.code == CODE_PADS) { /* Parse for goodies */ ---- ppp-2.4.6/pppd/plugins/rp-pppoe/pppoe-discovery.c -+++ ppp-2.4.6/pppd/plugins/rp-pppoe/pppoe-discovery.c -@@ -14,6 +14,7 @@ - #include <unistd.h> - #include <errno.h> - #include <string.h> -+#include <time.h> - - #include "pppoe.h" - -@@ -513,6 +514,8 @@ - struct timeval tv; - PPPoEPacket packet; - int len; -+ time_t start, now; -+ int time_remain; - - struct PacketCriteria pc; - pc.conn = conn; -@@ -522,9 +525,13 @@ - pc.seenServiceName = 0; - conn->error = 0; - -+ time(&start); - do { -+ time(&now); -+ time_remain = timeout - (int)difftime(now, start); -+ if (time_remain <= 0) return; /* Timed out */ - if (BPF_BUFFER_IS_EMPTY) { -- tv.tv_sec = timeout; -+ tv.tv_sec = time_remain; - tv.tv_usec = 0; - - FD_ZERO(&readable); diff --git a/user/ppp/50_all_linux-headers.patch b/user/ppp/50_all_linux-headers.patch deleted file mode 100644 index cd2adbead..000000000 --- a/user/ppp/50_all_linux-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -the linux headers have started adding shims to not define types or structs -when C lib headers are active, but in order to work, the C lib headers have -to be included before the linux headers. - -move the netinet/in.h include up above the linux/ includes. - -Mike Frysinger <vapier@gentoo.org> - ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -47,6 +47,8 @@ - #include <sys/socket.h> - #endif - -+#include <netinet/in.h> -+ - /* Ugly header files on some Linux boxes... */ - #if defined(HAVE_LINUX_IF_H) - #include <linux/if.h> -@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t; - #include <linux/if_ether.h> - #endif - --#include <netinet/in.h> -- - #ifdef HAVE_NETINET_IF_ETHER_H - #include <sys/types.h> - diff --git a/user/ppp/51_all_glibc-2.28.patch b/user/ppp/51_all_glibc-2.28.patch deleted file mode 100644 index cbb5857a7..000000000 --- a/user/ppp/51_all_glibc-2.28.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 3c7b86229f7bd2600d74db14b1fe5b3896be3875 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com> -Date: Fri, 6 Apr 2018 14:27:18 +0200 -Subject: [PATCH] pppd: Use openssl for the DES instead of the libcrypt / glibc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It seems the latest glibc (in Fedora glibc-2.27.9000-12.fc29) dropped -libcrypt. The libxcrypt standalone package can be used instead, but -it dropped the old setkey/encrypt API which ppp uses for DES. There -is support for using openssl in pppcrypt.c, but it contains typos -preventing it from compiling and seems to be written for an ancient -openssl version. - -This updates the code to use current openssl. - -[paulus@ozlabs.org - wrote the commit description, fixed comment in - Makefile.linux.] - -Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com> -Signed-off-by: Paul Mackerras <paulus@ozlabs.org> ---- - pppd/Makefile.linux | 7 ++++--- - pppd/pppcrypt.c | 18 +++++++++--------- - 2 files changed, 13 insertions(+), 12 deletions(-) - -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 36d2b036..8d5ce99d 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -35,10 +35,10 @@ endif - COPTS = -O2 -pipe -Wall -g - LIBS = - --# Uncomment the next 2 lines to include support for Microsoft's -+# Uncomment the next line to include support for Microsoft's - # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. - CHAPMS=y --USE_CRYPT=y -+#USE_CRYPT=y - # Don't use MSLANMAN unless you really know what you're doing. - #MSLANMAN=y - # Uncomment the next line to include support for MPPE. CHAPMS (above) must -@@ -137,7 +137,8 @@ endif - - ifdef NEEDDES - ifndef USE_CRYPT --LIBS += -ldes $(LIBS) -+CFLAGS += -I/usr/include/openssl -+LIBS += -lcrypto - else - CFLAGS += -DUSE_CRYPT=1 - endif -diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c -index 8b85b132..6b35375e 100644 ---- a/pppd/pppcrypt.c -+++ b/pppd/pppcrypt.c -@@ -64,7 +64,7 @@ u_char *des_key; /* OUT 64 bit DES key with parity bits added */ - des_key[7] = Get7Bits(key, 49); - - #ifndef USE_CRYPT -- des_set_odd_parity((des_cblock *)des_key); -+ DES_set_odd_parity((DES_cblock *)des_key); - #endif - } - -@@ -158,25 +158,25 @@ u_char *clear; /* OUT 8 octets */ - } - - #else /* USE_CRYPT */ --static des_key_schedule key_schedule; -+static DES_key_schedule key_schedule; - - bool - DesSetkey(key) - u_char *key; - { -- des_cblock des_key; -+ DES_cblock des_key; - MakeKey(key, des_key); -- des_set_key(&des_key, key_schedule); -+ DES_set_key(&des_key, &key_schedule); - return (1); - } - - bool --DesEncrypt(clear, key, cipher) -+DesEncrypt(clear, cipher) - u_char *clear; /* IN 8 octets */ - u_char *cipher; /* OUT 8 octets */ - { -- des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher, -- key_schedule, 1); -+ DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher, -+ &key_schedule, 1); - return (1); - } - -@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear) - u_char *cipher; /* IN 8 octets */ - u_char *clear; /* OUT 8 octets */ - { -- des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear, -- key_schedule, 0); -+ DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear, -+ &key_schedule, 0); - return (1); - } - diff --git a/user/ppp/APKBUILD b/user/ppp/APKBUILD index c99d82171..82545b0f7 100644 --- a/user/ppp/APKBUILD +++ b/user/ppp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ppp -pkgver=2.4.7 +pkgver=2.4.8 pkgrel=0 pkgdesc="Point-to-Point Protocol (PPP) implementation for serial networking" url="https://ppp.samba.org/" @@ -11,32 +11,26 @@ license="BSD-4-Clause AND GPL-2.0-only AND GPL-2.0+ AND zlib AND LGPL-2.0+" depends="" makedepends="bsd-compat-headers linux-pam-dev libpcap-dev openssl-dev utmps-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" -source="https://download.samba.org/pub/ppp/ppp-$pkgver.tar.gz +source="https://github.com/paulusmack/ppp/archive/ppp-$pkgver.tar.gz http://distfiles.gentoo.org/distfiles/ppp-dhcpc.tgz - 02_all_make-vars.patch 03_all_use_internal_logwtmp.patch 04_all_mpls.patch 06_all_killaddr-smarter.patch 08_all_wait-children.patch - 10_all_defaultgateway.patch 12_all_linkpidfile.patch 16_all_auth-fail.patch - 18_all_defaultmetric.patch 19_all_radius_pid_overflow.patch 20_all_dev-ppp.patch - 21_all_custom_iface_names.patch 24_all_passwordfd-read-early.patch 26_all_pppd-usepeerwins.patch 28_all_connect-errors.patch - 30_all_Makefile.patch 32_all_pado-timeout.patch 34_all_lcp-echo-adaptive.patch - 50_all_linux-headers.patch - 51_all_glibc-2.28.patch 80_all_eaptls-mppe-1.101a.patch 85_all_dhcp-make-vars.patch 86_all_dhcp-sys_error_to_strerror.patch adelie.patch + CVE-2020-8597.patch dhcp.patch install-path.patch musl-fix-headers.patch @@ -46,6 +40,11 @@ source="https://download.samba.org/pub/ppp/ppp-$pkgver.tar.gz ppp.pamd pppd.initd " +builddir="$srcdir"/ppp-ppp-$pkgver + +# secfixes: +# 2.4.8-r0: +# - CVE-2020-8597 prepare() { mv "$srcdir"/dhcp "$builddir"/pppd/plugins @@ -91,35 +90,29 @@ package() { install -Dm 0755 "$srcdir"/pppd.initd "$pkgdir"/etc/init.d/pppd } -sha512sums="e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2 ppp-2.4.7.tar.gz +sha512sums="a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478 ppp-2.4.8.tar.gz aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 ppp-dhcpc.tgz -8444d7edfe902a83f6cce96d29b9b7fb45ac68bdbe44494797d2a98470b80017489d36feb50cf945cbe72486bac69f45b23790e15cfbd33e07913a857ee80ab7 02_all_make-vars.patch 4c4a5cc6fd8ce3203c41ff07fc0ce5f0468985c779fe05030898d36c404d2086ce7a49336ac58e6502fc2fd14c4de9006028fe19c500d2cac890a16a55c723e8 03_all_use_internal_logwtmp.patch -1d63795949da00a19712aef39a54f338183b6917b246083e04a0b9ee43d346af5adeeb9357cb165587722790fa19b13375d55008646a4e9e2acdf8724bf3c7cc 04_all_mpls.patch +df263b6a8395be1f3aa0a87aca8fe7bcda1395208df8df73de98decdb59a70a67242a4f7a7227db2c4b470fc1b44d771967d8c91c16cfaffaa3eb41110dc3b28 04_all_mpls.patch b49086401c1b395ee6caba0418272b2d1b2ab9dcf6f1fc7e7f1280e94fcf17c8fdb884a19f4ef911bd7849a9cceb4cc07fc75438726340cd8c17265d4c2bd4d8 06_all_killaddr-smarter.patch 807707ee9795ef4300b92bacdeba6b9e7332b6ce5a355de3ce77ddcc6dafce069f024131fd3ef282e38be3499e4230ad50fdda2b96e00891f5df1696234b775b 08_all_wait-children.patch -c084237458ceb8704541f6e8424855788dbc2883559c4bf1ff35060e277c2b2ddfadcdb6dedc0bf42a5e83e98cfe7241fae8f6dc59d1ed963ed50356c9fd83ed 10_all_defaultgateway.patch 122b9e3dbc3a9accacb31c653b3c0d368e8cdf3d954a6c93d04ac26ca8f3cb5bfcf8a01881d1cf08e855a1d2d0bd86e7fadba22bb5ada1a86f78e6b9820e6687 12_all_linkpidfile.patch 3a23ef3619b2840eb3f1f7e14bd4765526b09acdfa8ab4d659ad8525a6f96d0cfb7c9fef042cde99ba1de8cf5caa74faa32e2a988453b4b17a70d5cc9a4bcf41 16_all_auth-fail.patch -24b2cf579844bb9e1c0360227a5d35c3510471c0de6f16031d5e192d0ae7b1913aba93c2d99ea5fd3724deb6754f9831c1adb30671a31617268c77c65fc8beaf 18_all_defaultmetric.patch 9fdb3346ef13b250f91f1af55c0efa0f836a60abe9e62fceed30df4e431a3bccdd33b083c2662c45e2091085438ba2221cdc4ae51fc1b05a666d77f74d461214 19_all_radius_pid_overflow.patch 82c80701095a2d9707afbf5fc29bdf2fc3f92252b7de5de1d639f8607096a9d34ce90ffd0a2f770512b590a27dec56f2b03e5e9f4c9e56e1f362a2387d9fb568 20_all_dev-ppp.patch -314e0939b546af5229db34888284a06e07d7b4c94190bf95d4382d3ff39935f18ecc6172f62309e4f63a00fdfceca73d908da8d82c95fd0b926b1832968ee3cc 21_all_custom_iface_names.patch 2508cf1285a086c917ba5deffc96c1c29a511f1c1a0ef94c811b2bf139aed0218f34d7c1f1004890e105c47dffc5834a049dbe7686611d0fc8b8607ccdc86105 24_all_passwordfd-read-early.patch 3eb55fb681e7fecf4e09b53683f509d2db3779599dd60fb89f88cd644c92d779f4720114546ba458262e8239581061e4a450143338c4725ada18b7ca314e12b0 26_all_pppd-usepeerwins.patch 2e0bd81124bcd7c1234089f11e0b607b19047d279dc436ced3a4b8d793bcee4fcececd948b6a0755a02f68542c5c5e30b6f8541f90b998c09da8d50362827520 28_all_connect-errors.patch -e495a489ee98258a3a4549127faca2c41feff27dff296065c2e41bfc696ced2ad1062ea0aa5bf3cc2425c85b4494ebbcbaaabacd8a3ea8ce8fab28acea028336 30_all_Makefile.patch -77c0585b46f4fc090a67198d800d67dab2ce75eadcf2153c6e800e274b53ced6b512fd6eb4767c632f765bacd6c332f8d2a68233abb3781d6c62321d6bbb6052 32_all_pado-timeout.patch +32c77c938cd607e44bd358cbc3f0eaf99178084d936bf8e6b8aeb20e881ac9d734008cfb93ff3b1fd2783dae0c46e963c3ee1d1b128712b4ba342db069e26636 32_all_pado-timeout.patch 0bd928f45708f10835250fd6a6162f6e148dca172c810511c1f4b1fe56602c4869e7f622e95a3f4a41e5502ddefd0cf6054cd57211bc83426d5da5b5f10dac26 34_all_lcp-echo-adaptive.patch -cda8e347eef7f26589cf1a12243f4d77de34d5736e3cb04fda9063adc0d931ef7ec7dbb2f142f1dfabc6d3ee04a252d2dd67d2c99ad9c01f2bd343bec88abe97 50_all_linux-headers.patch -fc012971a062456fa4e253f5b4a5e2ce56ae1852293d0245ecfd165ba162fa76ec2c28e1035dd89de3e9d43941d528e2d95a40552eb8037a5ba084c1717c20d1 51_all_glibc-2.28.patch 977b247e87557c4c57a871470c40670457e285ca59357dabab854ab16cc5578526ddf880410aa2efc7078e16d32d7afea4b69928af14ac4449523f6a591284f1 80_all_eaptls-mppe-1.101a.patch 2d294bfe455648949cedb47a12a07913f0395aadbe2566c1e90d70fc37baa8635a667ab45195a697567f8d52de88771c499adffee82cde2e9e318ed858b6007b 85_all_dhcp-make-vars.patch 44d5528c057d0abf2b45ba04943a52b6b94209434a06aa565f8a74acdd660efd86fe13280d540383168eaedad9f627673410bb8468860b64adb3145030e12889 86_all_dhcp-sys_error_to_strerror.patch -2ba9ba8856e569c204a0e058a3e7a4a74f331118cb33bbca445a87b54bb0e4f0da2a968df5f394633911603359284831a80a4d9c793d795eef8477d00bab63f1 adelie.patch -6d38f9779945bce2277f2d52d66dd79d2696f02c44186e1750d236f2d77d692746a8e8c164d925d5bb32dbfd02a723cabb59304f05954e0b5f7adada208ee220 dhcp.patch +350ed598c9690aa2f357ead34eb17a67dc5e34a5bd7529809288c5e0151728882158f32734041f2005413ac701db84d76501edabdcc6c64750dfce2927e2aa2a adelie.patch +e5638fd6e7b573552a7354fad3c91a8bde86760fb17d510e7e925ee8c1f60f7d39efe95134cb0a1c46b1e9fb14c987f224b4adbb1f3c75633b2bea0eccaff7c6 CVE-2020-8597.patch +6d22e4b601dd3eabd55751408b03c4036815ca64184f9c9f07f2368d2f5a6a9081ce7a88e5c7d5ee60708c430c9cf55070e105ce00adb1325b60cddada4bf562 dhcp.patch fb4ae2c2ba4ecdd1c85f6e5f730fd9659cf1fbc7a8a004b09042adafee7e4af6238df8deb3dbd3dc9c69407d9ebc4c82e1792a43b4aaf8ac18ebe18268b50597 install-path.patch -2f071ea9db15e4abf1bed6cce8130dc81b710a31bfef5fa8f9370c353f845dbc47674b1551b8e040478e5156add6f98d480530206125e8bb308f0f4288d1eec6 musl-fix-headers.patch +ba240d483ada6865bf52497ce00cb9ae8d750e8f650e501d0d068b132d364ae4d09ac2e290b903e246aa35d33cf984aa29a6be41906df355b1c1e2b7637dc8b0 musl-fix-headers.patch 723ff3dd0aee13f9878559aa433b314af6043523a2bafd5957258809a645942f7d34b5bd659869a1528cf7b1a462ad7cc2dbf18e7986220f5f685f2c1ea1d36b utmpx.patch 58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041 ppp.mod e30a397392d467ac3c78f6533f3adff5de7d38f0372d8d6f7b186db4ec69ddf12463d467d8a86eb5867effeb7dd6bd16942a98fb3a3ab59ff754a123e16d0938 ppp.pamd diff --git a/user/ppp/CVE-2020-8597.patch b/user/ppp/CVE-2020-8597.patch new file mode 100644 index 000000000..5d7c51bca --- /dev/null +++ b/user/ppp/CVE-2020-8597.patch @@ -0,0 +1,37 @@ +From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001 +From: Paul Mackerras <paulus@ozlabs.org> +Date: Mon, 3 Feb 2020 15:53:28 +1100 +Subject: [PATCH] pppd: Fix bounds check in EAP code + +Given that we have just checked vallen < len, it can never be the case +that vallen >= len + sizeof(rhostname). This fixes the check so we +actually avoid overflowing the rhostname array. + +Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> +Signed-off-by: Paul Mackerras <paulus@ozlabs.org> +--- + pppd/eap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pppd/eap.c b/pppd/eap.c +index 94407f56..1b93db01 100644 +--- a/pppd/eap.c ++++ b/pppd/eap.c +@@ -1420,7 +1420,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +@@ -1846,7 +1846,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; diff --git a/user/ppp/adelie.patch b/user/ppp/adelie.patch index 06bb6edf9..a89dd4063 100644 --- a/user/ppp/adelie.patch +++ b/user/ppp/adelie.patch @@ -1,14 +1,5 @@ --- ppp-2.4.7/pppd/Makefile.linux.old 2019-05-09 20:32:30.959257140 +0000 +++ ppp-2.4.7/pppd/Makefile.linux 2019-05-09 20:34:48.964184093 +0000 -@@ -32,7 +32,7 @@ - - # CC = gcc - # --COPTS+= -Wall -+COPTS+= -Wall -D_GNU_SOURCE - LIBS = - - # Uncomment the next line to include support for Microsoft's @@ -61,14 +61,14 @@ USE_TDB=y diff --git a/user/ppp/dhcp.patch b/user/ppp/dhcp.patch index 611882326..8ef76d2a0 100644 --- a/user/ppp/dhcp.patch +++ b/user/ppp/dhcp.patch @@ -322,3 +322,14 @@ diff -Naur ppp-2.4.7/pppd/plugins/dhcp.old/socket.h ppp-2.4.7/pppd/plugins/dhcp/ all: $(PLUGIN) +--- ppp-ppp-2.4.8/pppd/plugins/dhcp/Makefile.linux.old 2020-02-26 04:02:43.528569753 +0000 ++++ ppp-ppp-2.4.8/pppd/plugins/dhcp/Makefile.linux 2020-02-26 04:03:07.425957036 +0000 +@@ -14,7 +14,7 @@ + $(INSTALL) -s -c -m 755 dhcpc.so $(LIBDIR) + + dhcpc.so: dhcpc.o clientpacket.o packet.o socket.o options.o +- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ ++ $(CC) $(LDFLAGS) -shared $(CFLAGS) -o $@ $^ + + + clean: diff --git a/user/ppp/musl-fix-headers.patch b/user/ppp/musl-fix-headers.patch index d24f62896..5b26fc29c 100644 --- a/user/ppp/musl-fix-headers.patch +++ b/user/ppp/musl-fix-headers.patch @@ -28,14 +28,13 @@ diff --git a/pppd/magic.h b/pppd/magic.h index c81213b..305aece 100644 --- a/pppd/magic.h +++ b/pppd/magic.h -@@ -42,6 +42,8 @@ - * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $ +@@ -43,5 +43,7 @@ */ +#include <sys/cdefs.h> + - void magic_init __P((void)); /* Initialize the magic number generator */ - u_int32_t magic __P((void)); /* Returns the next magic number */ + void magic_init (void); /* Initialize the magic number generator */ + u_int32_t magic (void); /* Returns the next magic number */ diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c index 91e9a57..9c0fac3 100644 @@ -88,50 +87,13 @@ index 3d3bf4e..b5f82d3 100644 /* Initialize frame types to RFC 2516 values. Some broken peers apparently use different frame types... sigh... */ -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index 9ab2eee..4d68147 100644 ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -86,18 +86,6 @@ typedef unsigned long UINT32_t; - - #include <netinet/in.h> - --#ifdef HAVE_NETINET_IF_ETHER_H --#include <sys/types.h> -- --#ifdef HAVE_SYS_SOCKET_H --#include <sys/socket.h> --#endif --#ifndef HAVE_SYS_DLPI_H --#include <netinet/if_ether.h> --#endif --#endif -- -- - - /* Ethernet frame types according to RFC 2516 */ - #define ETH_PPPOE_DISCOVERY 0x8863 -diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c -index 6d71530..86d224e 100644 ---- a/pppd/sys-linux.c -+++ b/pppd/sys-linux.c -@@ -102,19 +102,11 @@ - #define MAX_ADDR_LEN 7 - #endif - --#if __GLIBC__ >= 2 - #include <asm/types.h> /* glibc 2 conflicts with linux/types.h */ - #include <net/if.h> - #include <net/if_arp.h> - #include <net/route.h> - #include <netinet/if_ether.h> --#else --#include <linux/types.h> --#include <linux/if.h> --#include <linux/if_arp.h> --#include <linux/route.h> --#include <linux/if_ether.h> --#endif +--- ppp-ppp-2.4.8/pppd/plugins/rp-pppoe/pppoe.h.old 2019-12-31 01:31:26.000000000 +0000 ++++ ppp-ppp-2.4.8/pppd/plugins/rp-pppoe/pppoe.h 2020-02-26 04:01:48.414595401 +0000 +@@ -46,6 +46,7 @@ + /* This has to be included before Linux 4.8's linux/in.h + * gets dragged in. */ #include <netinet/in.h> - #include <arpa/inet.h> ++#include <netinet/if_ether.h> + /* Ugly header files on some Linux boxes... */ + #if defined(HAVE_LINUX_IF_H) diff --git a/user/prison/APKBUILD b/user/prison/APKBUILD index 23acb699a..2fa79cc16 100644 --- a/user/prison/APKBUILD +++ b/user/prison/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=prison -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Qt Barcode library for programatically creating QR codes" url="https://www.kde.org/" @@ -44,4 +44,4 @@ quick() { mv "$pkgdir"/usr/lib/qt5/qml "$subpkgdir"/usr/lib/qt5/ } -sha512sums="cbb1c5fbab33fb7a53a43f159451f77fdb04c1fded62330743bfc7303fd036154450115d9f09593f6c39f226cc94332e9a050568f3e2520dcd6cd41a8ea4c4f9 prison-5.67.0.tar.xz" +sha512sums="dc3606bf25ec07f3702b9c5cb51fbb29c410d864349ca65fc5f86d26619be24ce42a14e969a2db4a11b8f1f57dca8705a0bd163e5bea468fe5edfa06a409f1c3 prison-5.68.0.tar.xz" diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD index 028164bd8..c94b096e0 100644 --- a/user/protobuf/APKBUILD +++ b/user/protobuf/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=protobuf _gemname=google-protobuf -pkgver=3.11.2 +pkgver=3.11.3 _tstver=1.8.1 pkgrel=0 pkgdesc="Library for extensible, efficient structure packing" @@ -111,5 +111,5 @@ vim() { "$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim } -sha512sums="8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f protobuf-3.11.2.tar.gz +sha512sums="beac21d495bfd8e9b40120d1db9fd82251958f954533fc6f76cd0b9c28f92533ac35368a4c298ebb1d8e09047b670ed3bd948bb7da6eb5cca7fdc0c1c44aa39b protobuf-3.11.3.tar.gz e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 googletest-1.8.1.tar.gz" diff --git a/user/purpose/APKBUILD b/user/purpose/APKBUILD new file mode 100644 index 000000000..dbad62201 --- /dev/null +++ b/user/purpose/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=purpose +pkgver=5.68.0 +pkgrel=0 +pkgdesc="KDE context menu framework" +url="https://www.kde.org/" +arch="all" +license="GPL-2.0+ AND LGPL-2.0+ AND LGPL-2.1+" +depends="kdeclarative" +makedepends="cmake extra-cmake-modules kconfig-dev kcoreaddons-dev ki18n-dev + kio-dev kirigami2-dev knotifications-dev qt5-qtbase-dev + qt5-qtdeclarative-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/purpose-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + # menutest requires X11 + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E menutest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="a8103026b5b7bef1dd4fd28912eaefbace466c39967a474a7b8abf1e074be58c5b3d68527c132fa79adf2785a059ae8a09537735b6a51b53aa553113b6d48aad purpose-5.68.0.tar.xz" diff --git a/user/py3-cffi/APKBUILD b/user/py3-cffi/APKBUILD index 65feb86cc..56681055b 100644 --- a/user/py3-cffi/APKBUILD +++ b/user/py3-cffi/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-cffi _pkgname=cffi _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.13.2 +pkgver=1.14.0 pkgrel=0 pkgdesc="Interface for Python to call in to C code" url="https://cffi.readthedocs.io/" @@ -29,4 +29,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="2c57d9c06c39e95498a54408dc39940427190f3c03e1b8f1a3584140db08a5775dd12e6e67b03093429c130af579d01519b0fc868b99ba7a530068ed22d38522 py3-cffi-1.13.2.tar.gz" +sha512sums="4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253 py3-cffi-1.14.0.tar.gz" diff --git a/user/py3-lxml/APKBUILD b/user/py3-lxml/APKBUILD index e06030e11..9237e12b9 100644 --- a/user/py3-lxml/APKBUILD +++ b/user/py3-lxml/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-lxml _pkgname=lxml _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=4.4.2 +pkgver=4.5.0 pkgrel=0 pkgdesc="Python LXML Library" url="https://lxml.de/" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="7a3dcbdb6de703ff939cd7e75c4c73f71b3c8b212796303c1a1ab74dc06153968661d69ab379a2c4b8b75e7643a53e09473988e21758643e9ee52819cd1042aa lxml-4.4.2.tar.gz" +sha512sums="7cb957b2ab9931c32984ad0808f51e650e82e2d9b14df3fd8df2dd8f2c5c261d26ebf2c672b723e89b00b867a0a8dbb9130023e48a5f302fd02d5409e1c8cd6c lxml-4.5.0.tar.gz" diff --git a/user/py3-mako/APKBUILD b/user/py3-mako/APKBUILD index 00dcf775d..af088ee11 100644 --- a/user/py3-mako/APKBUILD +++ b/user/py3-mako/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-mako _pkgname=Mako _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=0 pkgdesc="Fast templating language for Python" url="http://www.makotemplates.org/" @@ -30,4 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="acb0f53a22ae152c359c38391f508eca706efcc52916a6e87f2702517dd48b5ffd26eef0f2f9172046f1abd0aea1f47328354ff622938886aa00f950a261e8d4 Mako-1.1.0.tar.gz" +sha512sums="ff707ab3360148fe6e80bea7cd80d043514f08caebc502247c28c63a83e33d1be7513019605fc1adb77c32fc550e9bc16015c512bafde1a6f846aab0775d4ce7 Mako-1.1.1.tar.gz" diff --git a/user/py3-psutil/APKBUILD b/user/py3-psutil/APKBUILD index 98b23873e..3b58a225f 100644 --- a/user/py3-psutil/APKBUILD +++ b/user/py3-psutil/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-psutil _pkgname=${pkgname#py3-} -pkgver=5.6.7 +pkgver=5.7.0 pkgrel=0 pkgdesc="Process and system utilities" url="https://pypi.org/project/psutil/" @@ -26,5 +26,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="74eb488b91764941e38214f07bca00e3c837167ad543bfd9ae3b83d665e2be1bb5341eca4aff9282ad50d321568a679e1ffa2ee72ad7b4965cda92b7c80b2503 psutil-5.6.7.tar.gz +sha512sums="8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981 psutil-5.7.0.tar.gz 5b0eea07856afeb0eff3268dc78bd3daf3491022e8a08c422db3eaad1b5e0da71429fe9e2e4b23f3eabf9669e7e4fb5a187c96aedbfe994692bb3e5a98fe2fc2 utmpx.patch" diff --git a/user/py3-pygments/APKBUILD b/user/py3-pygments/APKBUILD index 388951161..9bfe39936 100644 --- a/user/py3-pygments/APKBUILD +++ b/user/py3-pygments/APKBUILD @@ -9,7 +9,7 @@ _p="${_pkgname%"$_p"}" pkgver=2.5.2 pkgrel=0 pkgdesc="A syntax highlighting package written in Python" -url="http://pygments.org/" +url="https://pygments.org/" arch="noarch" options="!check" # needs nose, flake8 license="BSD-2-Clause" diff --git a/user/py3-transitions/APKBUILD b/user/py3-transitions/APKBUILD index b877992d3..d59df486f 100644 --- a/user/py3-transitions/APKBUILD +++ b/user/py3-transitions/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-transitions _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.7.1 +pkgver=0.7.2 pkgrel=0 pkgdesc="Python state machine library" url="https://pypi.org/project/transitions/" @@ -30,4 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="4802e6a914270a183f66e70cf648c5f09c25b63e9233fdeb65b231ad24847d023182c6a45eaa1d47780d1f5d7f6f23695a6e578d4eaae55bf7a7ff121561e06b transitions-0.7.1.tar.gz" +sha512sums="c33eaec3e338b6febd924d803b85436df3ec3ab728315290fe81c73fb328aedcdb15e8f19f0e3d9d3a7d62750671686ae65bad560c48cfd113481dfe702a4204 transitions-0.7.2.tar.gz" diff --git a/user/qqc2-desktop-style/APKBUILD b/user/qqc2-desktop-style/APKBUILD new file mode 100644 index 000000000..a9468cd1f --- /dev/null +++ b/user/qqc2-desktop-style/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qqc2-desktop-style +pkgver=5.67.1 +pkgrel=0 +pkgdesc="QtQuickControls 2 style that uses QWidget's QStyle for painting" +url="https://www.kde.org/" +arch="all" +license="GPL-2.0-only AND LGPL-3.0-only" +depends="" +makedepends="cmake extra-cmake-modules kconfig-dev kconfigwidgets-dev + kiconthemes-dev kirigami2-dev qt5-qtbase-dev qt5-qtdeclarative-dev + qt5-qtquickcontrols2-dev qt5-qtx11extras-dev" +subpackages="$pkgname-dev" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/qqc2-desktop-style-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + -Bbuild . + make -C build +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test +} + +package() { + make DESTDIR="$pkgdir" -C build install +} + +sha512sums="c2a88c81e2f4f1c586c7b512624cb631a1e8b84aea1caa69647aa939b34f44c66a1369bfbcbfa32d152f674e852399877c88abcb038eefd99a7480929b085f66 qqc2-desktop-style-5.67.1.tar.xz" diff --git a/user/qt5-qtimageformats/APKBUILD b/user/qt5-qtimageformats/APKBUILD new file mode 100644 index 000000000..92ab99eb8 --- /dev/null +++ b/user/qt5-qtimageformats/APKBUILD @@ -0,0 +1,30 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qt5-qtimageformats +_pkgname=qtimageformats-everywhere-src +pkgver=5.12.6 +pkgrel=0 +pkgdesc="Image handling plugin for Qt" +url="https://www.qt.io/" +arch="all" +license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" +depends="" +makedepends="jasper-dev libwebp-dev qt5-qtbase-dev tiff-dev" +source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" + +_qt5_prefix=/usr/lib/qt5 +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + qmake + make +} + +check() { + make check +} + +package() { + make install INSTALL_ROOT="$pkgdir" +} + +sha512sums="0f8c481f647d6047b66564247b604a741f16c2758e96245abd0ef190ba50c937b6c713c7a466b911dd8e074174a7b30e6ad1ed0cd7ed915c4cda9dc4dccd8ab9 qtimageformats-everywhere-src-5.12.6.tar.xz" diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index e95a88c26..4d17de4ea 100644 --- a/user/rocs/APKBUILD +++ b/user/rocs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rocs -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Graph theory IDE" url="https://www.kde.org/applications/education/rocs/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d42bc5c8d53143579152112f50a85f234e5e43ad34699384a5801b0863b02ec34c26cfa158410a4f2cac108cd3e0dde155ed0f799586dbf9beed02e5a323bd71 rocs-19.12.2.tar.xz +sha512sums="1b4839197e5b40460a517221da4328c9283e4618eadf0dbeb20b7d5019a97f8fbac26dbf7c6a1b9b481bc4da8436ea6e632e38c1d6b33b1cb235055c76855984 rocs-19.12.3.tar.xz 0ed6660f78096d0f6b53e563f7c632dd1616beda4032a3a6556aef20dc1c79f6a31b93a377b005a1d3acaecd9da7b20ae8c0b3e7e36d97ef65837b207d3e94b3 webkit.patch" diff --git a/user/rpcsvc-proto/APKBUILD b/user/rpcsvc-proto/APKBUILD index 2ae70b29c..1f875bafc 100644 --- a/user/rpcsvc-proto/APKBUILD +++ b/user/rpcsvc-proto/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rpcsvc-proto -pkgver=1.4 +pkgver=1.4.1 pkgrel=0 pkgdesc="RPC service protocol definitions and compiler" url=" " @@ -10,7 +10,7 @@ license="BSD-3-Clause" depends="" makedepends="" subpackages="$pkgname-doc" -source="https://github.com/thkukuk/rpcsvc-proto/releases/download/v$pkgver/rpcsvc-proto-$pkgver.tar.gz" +source="https://github.com/thkukuk/rpcsvc-proto/releases/download/v$pkgver/rpcsvc-proto-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d1ad662e8036f17cd013b7becbf811caa62ef444f1c48ba6864c3c3cb28c5d69366b0c18b21692d1ad3f8445f33805e6bffe12c00d07e30324f8b930eae418d4 rpcsvc-proto-1.4.tar.gz" +sha512sums="02d08c2e53dd02923a470be4243fa8458ebe73c74dcb755b36c001bfb128747359c5b7c2ba76ea7b12cd4eaa6916edc60849e8ec4b43d2c462751038ba0205fc rpcsvc-proto-1.4.1.tar.xz" diff --git a/user/ruby-rake-compiler/APKBUILD b/user/ruby-rake-compiler/APKBUILD index be2ed80b0..828a9b1ac 100644 --- a/user/ruby-rake-compiler/APKBUILD +++ b/user/ruby-rake-compiler/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rake-compiler _gemname=${pkgname#ruby-} -pkgver=1.0.9 +pkgver=1.1.0 pkgrel=0 pkgdesc="Provide a standard and simplified way to build and package Ruby extensions" url="https://github.com/rake-compiler/rake-compiler" @@ -39,5 +39,5 @@ package() { rm -r cache build_info doc } -sha512sums="8a5ccbc4bbe6a546634f939c1cbe42b35d952173bbe914e7a22eb78f3f2e85b48e207ff36b70432fe469a2d07d62b8e59c9827352181122fde76ba89bbc2aca0 ruby-rake-compiler-1.0.9.tar.gz +sha512sums="77338776506df66c2e99e9b1b82dc4d54cc4e7c8fdb1f8b7b6d7507b9f9cb0718839e5139e9c0cb6295259e819dc8a011101e2427cdd387b568b639889321d60 ruby-rake-compiler-1.1.0.tar.gz 21feda7887b7fe0978f906d407ecd44d7f25e334e7ee8ff27f73e71d494bd10af4174d7373652b29b1a8eaf95f53f2c8581879088f343e7f045fc265eecf7eac gemfile-remove-unwanted-files.patch" diff --git a/user/ruby-rspec-core/APKBUILD b/user/ruby-rspec-core/APKBUILD index 6168bb2ba..9a7ad8d68 100644 --- a/user/ruby-rspec-core/APKBUILD +++ b/user/ruby-rspec-core/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-core _gemname=${pkgname#ruby-} -pkgver=3.9.0 +pkgver=3.9.1 pkgrel=0 pkgdesc="RSpec runner and formatters" url="https://relishapp.com/rspec/rspec-core" @@ -37,5 +37,5 @@ package() { "$gemdir"/doc } -sha512sums="c4e1136ea671d51f00c6de3067a479b15785fcb0f580fbdc57a9d35f852f10ec4b86e842a534536cc520175510de559f4d03dbc3fbd34fb22df411e89d06d662 ruby-rspec-core-3.9.0.tar.gz +sha512sums="2da714ebf35e78be789758857efbebc69548df7a11fff8bcd74a854b61485ef726cf0cec781e27a97d20f4eac0010aad50656b6074248c94b1833d4cb267189a ruby-rspec-core-3.9.1.tar.gz e0cbcfddcc4c73d9b9673907e3b1a785b399c0b3b213761e9dbca9fadc55d50a88389eaf561f5603bd674eb94ce9f2ecf829d884eaa77df8ef1b565c0c7f25f2 gemspec.patch" diff --git a/user/ruby-rspec-mocks/APKBUILD b/user/ruby-rspec-mocks/APKBUILD index d2b3fab97..aff6a8008 100644 --- a/user/ruby-rspec-mocks/APKBUILD +++ b/user/ruby-rspec-mocks/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-mocks _gemname=${pkgname#ruby-} -pkgver=3.9.0 +pkgver=3.9.1 pkgrel=0 pkgdesc="RSpec's 'test double' framework, with support for stubbing and mocking" url="https://relishapp.com/rspec/rspec-mocks/" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="bb6bb5d5dc272e0e0726d23069e0087f780f57614840208816867c570173f1980a43c2cc955c68b2ceca58828951229361305551a4b6bf3530880db843a49bf9 ruby-rspec-mocks-3.9.0.tar.gz +sha512sums="f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f ruby-rspec-mocks-3.9.1.tar.gz 6fd7ab08b20a93f806a8d3c42da5da0a99162793079ecb1695341a04dff2a7cefdb12592d1798fb844dfbdf8ead6ad0b8729e461d3cd5af46d853b182d15228d gemspec.patch" diff --git a/user/ruby-rspec-support/APKBUILD b/user/ruby-rspec-support/APKBUILD index 2e4f838e2..a5d1536f9 100644 --- a/user/ruby-rspec-support/APKBUILD +++ b/user/ruby-rspec-support/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-support _gemname=${pkgname#ruby-} -pkgver=3.9.0 +pkgver=3.9.2 pkgrel=0 pkgdesc="Support utilities for RSpec gems" url="https://rubygems.org/gems/rspec-support" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="10e8fa4af59097891219f00e2ced5940e7a5bc67d946fbd348683d2246a4a491e62f7bac6bb757e14d82bb0ba970fe5633609ca4ab2c97c4900719b8004cf4b5 ruby-rspec-support-3.9.0.tar.gz +sha512sums="436a3400a354012b06f471a339386667ed4854814b780f9c21d71182b001b3b4ab45ade578b56e4f2dec81325de5d88baa783f7e56b27bb215cfdc58448b10f1 ruby-rspec-support-3.9.2.tar.gz e9d611ea1789e835f742aa92f1e668840139e2621898edf158dc53e111db4119a324da65d2d28f5c6e737c82f261f4adb3beb8c244ee01d2f618778ed62d3731 gemspec.patch" diff --git a/user/sane/APKBUILD b/user/sane/APKBUILD index 73b025de2..6a3e19a8c 100644 --- a/user/sane/APKBUILD +++ b/user/sane/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sane _pkgname=sane-backends -pkgver=1.0.28 +pkgver=1.0.29 pkgrel=0 pkgdesc="Scanner access library" url="http://www.sane-project.org/" @@ -37,8 +37,9 @@ done subpackages="$pkgname-doc $pkgname-dev $subpackages $pkgname-utils saned saned-openrc:openrc:noarch $pkgname-udev::noarch $_pkgname::noarch $pkgname-lang" -source="https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/sane-backends-1.0.28.tar.gz +source="https://gitlab.com/sane-project/backends/uploads/54f858b20a364fc35d820df935a86478/sane-backends-1.0.29.tar.gz saned.initd + endian.patch include.patch network.patch pidfile.patch @@ -137,8 +138,9 @@ _backend() { fi } -sha512sums="84607739cea28c31f9a2f21df583c3d9f3ad1e7e87ad54fb8af8103450b22d2de6cf1670563eaa8310750491f840b377a2ca42c5eaee45aaec500a0a6792b3af sane-backends-1.0.28.tar.gz +sha512sums="9ee431b0c048119719e15905f8743c7a0fd8bc6fcee81d75df8459a989cab7e39bf045518976713a7e1d94c816dd1a1e0fa190612d815c0ddb6a51d2abf3fd54 sane-backends-1.0.29.tar.gz 0a06eaa28b345202f2bdf8361e06f843bb7a010b7d8f80132f742672c94249c43f64031cefa161e415e2e2ab3a53b23070fb63854283f9e040f5ff79394ac7d1 saned.initd +c7523b2684726cf35c0b251fe2e1863120284ff6ea3f93b53feb5dfa020c1e383910ecdd1a0c77a2289912ac4fd355cb3c743ea3706dab1bcf0a3412e1d0fbcc endian.patch 1779ff8beb1ba5f9238c25d819a7f0045f7e257c19b511315feb85650e445ca86450a9e1d7ff8650499d3dae808589a6c2e358d5f3f39a3f40ce4999179b86d6 include.patch 9cb595841f59b5105ecc85e4c0ad8781c52caa2354fb823c920ec467e88afbe47f2b3f4a7a3980bef5dbf22983c5786f051a9d10aea97b4bf7c4a05378592029 network.patch 8f0a1529a5793bc78422419b674963b543527c932476c9ea2d92ea0ad0a286691da306020824c1aaa0b35929f571480d21d7fc464a9f652e15664854c75a4cea pidfile.patch diff --git a/user/sane/endian.patch b/user/sane/endian.patch new file mode 100644 index 000000000..f55f01ecc --- /dev/null +++ b/user/sane/endian.patch @@ -0,0 +1,26 @@ +From e1934720c687ed8c6125c75ac658f55b4e1513ce Mon Sep 17 00:00:00 2001 +From: Luiz Angelo Daros de Luca <luizluca@gmail.com> +Date: Sun, 2 Feb 2020 21:19:15 -0300 +Subject: [PATCH] genesys: fix bigendian build + +Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com> +--- + backend/genesys/low.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/backend/genesys/low.cpp b/backend/genesys/low.cpp +index 1e1b632bf..cbb43b045 100644 +--- a/backend/genesys/low.cpp ++++ b/backend/genesys/low.cpp +@@ -546,7 +546,7 @@ Image read_unshuffled_image_from_scanner(Genesys_Device* dev, const ScanSession& + } + + #ifdef WORDS_BIGENDIAN +- if (depth == 16) { ++ if (session.params.depth == 16) { + dev->pipeline.push_node<ImagePipelineNodeSwap16BitEndian>(); + } + #endif +-- +2.24.1 + diff --git a/user/screen/APKBUILD b/user/screen/APKBUILD index 85164bbcc..295e51c7f 100644 --- a/user/screen/APKBUILD +++ b/user/screen/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=screen -pkgver=4.7.0 +pkgver=4.8.0 pkgrel=0 pkgdesc="A window manager that multiplexes a physical terminal" url="http://ftp.gnu.org/gnu/screen/" @@ -40,5 +40,5 @@ package() { install -Dm644 etc/screenrc "$pkgdir"/etc/skel/.screenrc } -sha512sums="44c7a33e2ed772ce91998cdc07556ef7b972e5b100335e14702b273a234e437fe6415de459e7b6d34c6086282a432778629047424ef9159ac6fcf26d22b45745 screen-4.7.0.tar.gz +sha512sums="770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c screen-4.8.0.tar.gz 82aca3e16c8cd7a3029d3b589ff2dd3471708d6287979ebb5cfdaedbd1f3012c0cd660b131e0cbe142b99786e49ef8b24c63159523d870e95ccf71ec94b82634 utmpx.patch" diff --git a/user/scummvm/APKBUILD b/user/scummvm/APKBUILD index e9b6b2074..d6e001f70 100644 --- a/user/scummvm/APKBUILD +++ b/user/scummvm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Tambra Wilcox <Tambra@J30AD.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=scummvm -pkgver=2.1.0 +pkgver=2.1.1 pkgrel=0 pkgdesc="Allows running classic point-and-click adventure games" url="https://www.scummvm.org/" @@ -28,5 +28,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5f91a65cdde62e6f996ae8a983d212f3d04edcf1ce3ab0e5273f1dfce155724912f386025959f5b2cc6ba566432845d929503f80f0cee513c774d5e04dafde1f scummvm-2.1.0.tar.bz2 +sha512sums="c27de3cf226ca6b11b1b431d40ab416c4e10e93244ab96535ead4f704c74267d816545448ae3618be2762ae148b0008952c26784fa4937ac0f3697b2d77f98d9 scummvm-2.1.1.tar.bz2 20b20a68263c691efb7db83aa8132ec980f2732af728300a641d30c4035d4aa8fcf6efdcebb8c5b924e68fafb50e39ed1825cd64d1f81145259493e858bd50f4 fluidsynth.patch" diff --git a/user/sddm-kcm/APKBUILD b/user/sddm-kcm/APKBUILD index 815eb3f88..e1515db7e 100644 --- a/user/sddm-kcm/APKBUILD +++ b/user/sddm-kcm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=sddm-kcm -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="KDE configuration applet for SDDM" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d32987a07e809c063915d044ebec88324766829458792ff2ba9dd25a036c4e409a310639d22630b7e987efe97ee823a3239d102b362fe958bdb5df02f0eb2343 sddm-kcm-5.18.0.tar.xz" +sha512sums="0d08f06ec50ae48453e8e4fecb80fced6d237d89ca85a7d9776b312c1e224e631e2e8407db34d9c98593f2e99f1520a0861e17de776f3228ec3f63268db78fe0 sddm-kcm-5.18.2.tar.xz" diff --git a/user/smartmontools/APKBUILD b/user/smartmontools/APKBUILD index d8ce1221e..e035c815d 100644 --- a/user/smartmontools/APKBUILD +++ b/user/smartmontools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=smartmontools -pkgver=7.0 +pkgver=7.1 pkgrel=0 pkgdesc="Control and monitor S.M.A.R.T. enabled hard drives" url="https://www.smartmontools.org/" @@ -35,6 +35,6 @@ package() { install -Dm644 "$srcdir"/smartd.confd "$pkgdir"/etc/conf.d/smartd } -sha512sums="96e18a201182579f699d541539ce393e7bc2191e027cfdf7f87455a63da3a14451574f8fe391232047ac941ace453a017193d0a4987a4edb8f7ed9d5007f0512 smartmontools-7.0.tar.gz +sha512sums="440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295 smartmontools-7.1.tar.gz 61cae548fc9f3a9fbea20d684502d3816e7b0b60fcf533ae4e1ab850725c208eb6ba5012ae154a46f0b7bb7285a9e63cbdecafed8db7fd63fda0ba59081260cc smartd.initd ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437 smartd.confd" diff --git a/user/solid/APKBUILD b/user/solid/APKBUILD index adfa7e6fd..994c3bb6f 100644 --- a/user/solid/APKBUILD +++ b/user/solid/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=solid -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Platform-independent hardware discovery and access" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fd5e96b397c6de719c0bcea1c44be069d4cce97d1bdd65b20416cd7dc83646bba83915e565b584cf5131d040809b1e3937084552503ccc7d2db0e2e638b453b1 solid-5.67.0.tar.xz" +sha512sums="df0a7520b698c28324c1881585d551aac885f43edb6e2dda4e95dc3a9fbb6d7609807a64042acf02bae72c55d6081205033228a1e250ada06b61ede5c3f544b7 solid-5.68.0.tar.xz" diff --git a/user/sonnet/APKBUILD b/user/sonnet/APKBUILD index b1f6605c4..74ac2fd11 100644 --- a/user/sonnet/APKBUILD +++ b/user/sonnet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sonnet -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for implementing portable spell check functionality" url="https://www.kde.org/" @@ -47,4 +47,4 @@ aspell() { "$subpkgdir"/usr/lib/qt5/plugins/kf5/sonnet/sonnet_aspell.so } -sha512sums="b31d4cf8dd13553a1e8caeeefbc8aa3bcdbb08fe84139784922fd7475c9dcc3e86e55f90d34e744e743b0c9f78127455752996f519d7279d9505d946dbd4b878 sonnet-5.67.0.tar.xz" +sha512sums="add681532d2cfe371662306376da07bd337446f67d2b375a878bf53355e08407d24e1e63155f313e31b737a70014a052c19a1d120bbc67aeffd6be525f0aada3 sonnet-5.68.0.tar.xz" diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index 56d640717..00793ced6 100644 --- a/user/spectacle/APKBUILD +++ b/user/spectacle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spectacle -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="94934df994800baefa8da5f0841b57e2130e60a7622663916f7d216b0d12b725dd3c5c47cdddea3adddfa311281778eb66d2364fab5c39d20c29057c290ab72e spectacle-19.12.2.tar.xz +sha512sums="6bc10c376a63d6558c478e5844c5bc1c099d58c04593d5dc9bf2d0b17543fce62c202d8c3b9c2ade144566e205d9621546b777c134d1159529e7a3bc7b9d6766 spectacle-19.12.3.tar.xz 36665d1b7d8b7c8004e457179f03fff1eed3865ee3e558f44f19022b80e39bbb2659de3e7b9affe654d5dbc5077890b38b6b4351f3a43324733749fbd36880ac no-wayland.patch" diff --git a/user/step/APKBUILD b/user/step/APKBUILD index b2013661e..08fb2ce0e 100644 --- a/user/step/APKBUILD +++ b/user/step/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=step -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Interactive physics simulation" url="https://www.kde.org/applications/education/step/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="81378ea5850369c3cb6c72d8830cfef2669cbdbba4753cbdad9410ad0667a7711685d0042fe9acc47895ff441ad70dba460767c4b6f027e539b3c9a0a8c1c707 step-19.12.2.tar.xz" +sha512sums="af8c67a0e6678461a2536a7abdc7b27d1ed4d172bf838414c29c47ff4ed42db5e32a2c6394bfa704d3bd2de04c4186fe608da16aa6e13414de26555cbf4cd7a1 step-19.12.3.tar.xz" diff --git a/user/syntax-highlighting/APKBUILD b/user/syntax-highlighting/APKBUILD index e0ee05b23..5716c32c0 100644 --- a/user/syntax-highlighting/APKBUILD +++ b/user/syntax-highlighting/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=syntax-highlighting -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="Framework for rendering programming code with formatting" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a14cabfe29da936668dff441334dada4a12b98d6bed9cca991bcb8f80529b681fe8c49d5ee14081ab8410b5d82bc411d9b03baa340c8f5fef245dab8767913a7 syntax-highlighting-5.67.0.tar.xz" +sha512sums="ffb4b1e57bd912ed76c93b8ea074af3fd8343cd094a584647bef42870366cd089c6ba2070670a57e4997ba6ac122775af5066d5bae4891f3533e4b7bfecf1fee syntax-highlighting-5.68.0.tar.xz" diff --git a/user/systemsettings/APKBUILD b/user/systemsettings/APKBUILD index 1eead85bd..cd8a63c40 100644 --- a/user/systemsettings/APKBUILD +++ b/user/systemsettings/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=systemsettings -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="KDE system settings configuration utility" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9447a0140ed3fd8eafca2a6d44e378247ed8a78a2f92f80a6467073d45bc7feac43e039d73493a568760f38d42d5c7bd67b5805ac5b2732a7a2b4348ac0f331f systemsettings-5.18.0.tar.xz" +sha512sums="627d88fb0dbec4faf9637353e04ed897f0c15518964fc4b902f7825d525f258f52e171b285eb7fcea7c9fa0eb6d36444eb7bb9bf78517281fa6933f8b01c3c0b systemsettings-5.18.2.tar.xz" diff --git a/user/telegram/APKBUILD b/user/telegram/APKBUILD index 1f36cb942..994ed5559 100644 --- a/user/telegram/APKBUILD +++ b/user/telegram/APKBUILD @@ -1,20 +1,20 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=telegram -pkgver=1.9.6 +pkgver=1.9.19 pkgrel=0 pkgdesc="Telegram messaging app" url="https://telegram.org/" arch="all" options="!check" # No test suite. license="GPL-3.0-only WITH OpenSSL-exception" -depends="" -makedepends="cmake enchant-dev ffmpeg-dev lz4-dev minizip-dev openal-soft-dev openssl-dev opus-dev pulseaudio-dev python3 qt5-qtbase-dev range-v3 xxhash-dev xz-dev zlib-dev" +depends="qt5-qtimageformats" +makedepends="cmake enchant-dev ffmpeg-dev hunspell-dev libdbusmenu-qt-dev + lz4-dev minizip-dev openal-soft-dev openssl-dev opus-dev pulseaudio-dev + python3 qt5-qtbase-dev range-v3 xxhash-dev xz-dev zlib-dev" subpackages="" -source="https://github.com/telegramdesktop/tdesktop/releases/download/v1.9.6/tdesktop-$pkgver-full.tar.gz +source="https://github.com/telegramdesktop/tdesktop/releases/download/v$pkgver/tdesktop-$pkgver-full.tar.gz endian.patch - headers.patch - ppc.patch " builddir="$srcdir/tdesktop-$pkgver-full" @@ -35,7 +35,10 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \ -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \ + -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF \ + -DDESKTOP_APP_USE_PACKAGED_GSL=OFF \ -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \ + -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF \ -DTDESKTOP_API_ID="${TELEGRAM_API_ID}" \ -DTDESKTOP_API_HASH="${TELEGRAM_API_HASH}" \ -DTDESKTOP_DISABLE_GTK_INTEGRATION=ON \ @@ -48,16 +51,13 @@ build() { } package() { - install -D -m755 "$builddir"/bin/Telegram "$pkgdir"/usr/bin/telegram-desktop + install -D -m755 "$builddir"/bin/telegram-desktop "$pkgdir"/usr/bin/telegram-desktop install -D -m644 "$builddir"/lib/xdg/telegramdesktop.desktop "$pkgdir"/usr/share/applications/telegramdesktop.desktop - install -D -m644 "$builddir"/lib/xdg/tg.protocol "$pkgdir"/usr/share/kservices5/tg.protocol for _icon in 16 32 48 64 128 256 512; do install -D -m644 "$builddir"/Telegram/Resources/art/icon$_icon.png \ "$pkgdir"/usr/share/icons/hicolor/${_icon}x${_icon}/apps/telegram.png done } -sha512sums="12446b8c467226b7ebfb96d3e8cdc77fbaeb9de6065e43e2de727564735f3047f2810d20bb12649eaffb41c09d2295a7918d041058ab1f96ba3dcdcf019d857e tdesktop-1.9.6-full.tar.gz -f39b541c915830adf359d864e197f773822f9925817664a596b595ef31b0c2d0d7f073284c45fb1236b61565e2d7959e030783b7a8350399513ff13f9c27aa2a endian.patch -9b9a9b623edcce37339e52e3e306a7106b6289749fca1b2dc7450c299da1a6f8d3f3f12b4973ecfbf3797f75ba88cf7f644adee896b053a683df4e4754d5d057 headers.patch -685142055710f5a499d1f7c72a57c9c979dedce91c078204a6880080473db989e690d1bd1cce916e0a2cebb285741570665b4940ca7a5a36eecdd54eb39e8003 ppc.patch" +sha512sums="29070c6e1d813943d5062dc1703f383a18323b5698fbc4e6f2c89b33366da9da5d1ec84dc29950288e7e7d112024de2924244ec9c800d59d4b210e6288c7291d tdesktop-1.9.19-full.tar.gz +c478bd59187493d60172d805ca19e9e09fa2c81b87d5dbbd5f3cd9aae0f207b463d127e06f2053f7b7b6ac00b3191d59e36ec6c5453a1da4d6535d1caad27242 endian.patch" diff --git a/user/telegram/endian.patch b/user/telegram/endian.patch index 81cfd8859..40a3b4478 100644 --- a/user/telegram/endian.patch +++ b/user/telegram/endian.patch @@ -11,7 +11,7 @@ diff --git Telegram/SourceFiles/config.h Telegram/SourceFiles/config.h index fb7b54e4d..6a873fbd7 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h -@@ -177,7 +177,7 @@ constexpr auto ApiHash = "344583e45741c457fe1862106095a5eb"; +@@ -162,7 +162,7 @@ constexpr auto ApiHash = "344583e45741c457fe1862106095a5eb"; #endif // TDESKTOP_API_ID && TDESKTOP_API_HASH #if Q_BYTE_ORDER == Q_BIG_ENDIAN diff --git a/user/telegram/headers.patch b/user/telegram/headers.patch deleted file mode 100644 index dece8ec21..000000000 --- a/user/telegram/headers.patch +++ /dev/null @@ -1,12 +0,0 @@ -Should send this one upstream; it would work with glibc as well. - ---- tdesktop-1.9.6-full/Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp.old 2020-01-21 12:16:27.000000000 +0000 -+++ tdesktop-1.9.6-full/Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp 2020-01-22 17:44:42.185530350 +0000 -@@ -6,6 +6,7 @@ - - #include "AudioPulse.h" - #include <dlfcn.h> -+#include <libgen.h> - #include "../../logging.h" - - #define DECLARE_DL_FUNCTION(name) typeof(name)* AudioPulse::_import_##name=NULL diff --git a/user/telegram/ppc.patch b/user/telegram/ppc.patch deleted file mode 100644 index 0a09150eb..000000000 --- a/user/telegram/ppc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From af5f8d19f0fdded987beee4568f02cc8dcbd20f4 Mon Sep 17 00:00:00 2001 -From: John Zimmermann <johnz@posteo.net> -Date: Thu, 2 Jan 2020 12:58:45 +0100 -Subject: [PATCH] PowerPC support - ---- - base/build_config.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git Telegram/lib_base/base/build_config.h Telegram/lib_base/base/build_config.h -index a02c9b0..b3f4860 100644 ---- a/Telegram/lib_base/base/build_config.h -+++ b/Telegram/lib_base/base/build_config.h -@@ -46,9 +46,9 @@ - #define ARCH_CPU_X86_FAMILY 1 - #define ARCH_CPU_X86 1 - #define ARCH_CPU_32_BITS 1 --#elif defined(__aarch64__) -+#elif defined(__aarch64__) || defined(__powerpc64__) - #define ARCH_CPU_64_BITS 1 --#elif defined(_M_ARM) || defined(__arm__) -+#elif defined(_M_ARM) || defined(__arm__) || defined(__powerpc__) - #define ARCH_CPU_32_BITS 1 - #else - #error Please add support for your architecture in base/build_config.h --- -2.24.1 - diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD index bfca90ccc..65f658c29 100644 --- a/user/tellico/APKBUILD +++ b/user/tellico/APKBUILD @@ -4,7 +4,7 @@ pkgname=tellico pkgver=3.2.3 pkgrel=0 pkgdesc="Collection manager" -url="http://tellico-project.org/" +url="https://tellico-project.org/" arch="all" license="GPL-2.0-only OR GPL-3.0-only" depends="" diff --git a/user/threadweaver/APKBUILD b/user/threadweaver/APKBUILD index 19b55ac22..cd127de65 100644 --- a/user/threadweaver/APKBUILD +++ b/user/threadweaver/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=threadweaver -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=0 pkgdesc="High-level threading framework" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0fc05c6a1656608952b83286768ab9d5a8ec6be526756a95b08874f775521f7a65faaaad18b55d34e8e24eb54fb252f6c467782e0d2a861b710d9b7467e64f0d threadweaver-5.67.0.tar.xz" +sha512sums="d1473867df5d5143e69f076899159016f489df40b898be79f41e4ea35f4e1b95feab5f145dbabf17af50516a6301db0c8dc9813b9f48f2cb26149c8c09b158a8 threadweaver-5.68.0.tar.xz" diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD index 72656527c..5cb1c2099 100644 --- a/user/thunderbird/APKBUILD +++ b/user/thunderbird/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=thunderbird -pkgver=68.4.1 +pkgver=68.5.0 pkgrel=0 pkgdesc="Email client from Mozilla" url="https://www.thunderbird.net/" @@ -38,6 +38,9 @@ source="https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thun mozilla-build-arm.patch rust-config.patch shut-up-warning.patch + skia-sucks1.patch + skia-sucks2.patch + skia-sucks3.patch stackwalk-x86-ppc.patch webrtc-broken.patch @@ -145,7 +148,7 @@ package() { ${pkgdir}/usr/share/applications/thunderbird.desktop } -sha512sums="16cccbc2313472e6312e842a28079782238cb22e72b324bebaffefa4a2fe68fec9f2173f2c83f1caccc5522ab9145884b2e2a58e97e236f7aefa4c61764e08b7 thunderbird-68.4.1.source.tar.xz +sha512sums="bb58a398f24d89eac5b1816f9d16edadbe65cdac6542e1f6798424c7ea18eb2d4ca46bb03f54c8c365e67d1dec44d3dfb36fbe4f85afe9ad80fbcc1f2984084b thunderbird-68.5.0.source.tar.xz 16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0 Python-2.7.16.tar.xz 5519234df2934ac2f3d76c8cad7e4f0fe15cf83ea4beb32c6489d8b7839b3ebea88bdb342e0d2a9c1c7c95e9455d234b0a5aa0e73446fd8027b520f080a2bb5b mozconfig ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch @@ -155,6 +158,9 @@ c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2 e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch 45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8 rust-config.patch 39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch +e751ffab263f03d4c74feebc617e3af115b1b53cf54fe16c3acc585eec67773f37aa8de4c19599fa6478179b01439025112ef2b759aa9923c9900e7081cb65a9 skia-sucks1.patch +9152bd3e6dc446337e6a2ed602279c620aedecc796ba28e777854c4f41fcf3067f9ebd086a4b63a6b76c2e69ec599ac6435b8eeda4f7488b1c45f69113facba4 skia-sucks2.patch +7a1fa27e060b2f025eaebbd39fb5c62960b62450241437e6d057d58cef9faf1cd1a85efe3b6a37b865d686ff18e90605ebea3089b26243f2d14876c2107106a6 skia-sucks3.patch 452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448 stackwalk-x86-ppc.patch be68f1387aa6677875a67106e2d6a9db470c934c943056d3b53391a63034235108e41945c53957db427d9cdc59f0aa2f9e6f2f8cd862e090e512a3ab9cbcc9a8 webrtc-broken.patch 95a2b1deb4f6c90750fdd2bfe8ca0a7879a5b267965091705a6beb0a0a4b1ccad75d11df7b9885543ca4232ff704e975c6946f4c11804cb71c471e06f9576001 thunderbird.desktop" diff --git a/user/thunderbird/skia-sucks1.patch b/user/thunderbird/skia-sucks1.patch new file mode 100644 index 000000000..a02c3b775 --- /dev/null +++ b/user/thunderbird/skia-sucks1.patch @@ -0,0 +1,84 @@ +# HG changeset patch +# Parent 548d0a2f3a22bfac32ec0c3921c6c969c8bf32a9 + +diff -r 548d0a2f3a22 gfx/2d/ConvolutionFilter.cpp +--- a/gfx/2d/ConvolutionFilter.cpp Mon Jul 22 16:57:54 2019 +0200 ++++ b/gfx/2d/ConvolutionFilter.cpp Thu Jul 25 14:27:59 2019 +0200 +@@ -35,9 +35,38 @@ + return true; + } + ++static void ByteSwapArray(uint8_t *u8Array, int32_t size) { ++ uint32_t *array = reinterpret_cast<uint32_t*>(u8Array); ++ for (int pxl = 0; pxl < size; ++pxl) { ++ // Use an endian swap to move the bytes, i.e. BGRA -> ARGB. ++ uint32_t rgba = array[pxl]; ++ array[pxl] = NativeEndian::swapToLittleEndian(rgba); ++ } ++} ++ + void ConvolutionFilter::ConvolveHorizontally(const uint8_t* aSrc, uint8_t* aDst, + bool aHasAlpha) { ++#ifdef MOZ_BIG_ENDIAN ++ int outputSize = mFilter->numValues(); ++ ++ // Input size isn't handed in, so we have to calculate it quickly ++ int inputSize = 0; ++ for (int xx = 0; xx < outputSize; ++xx) { ++ // Get the filter that determines the current output pixel. ++ int filterOffset, filterLength; ++ mFilter->FilterForValue(xx, &filterOffset, &filterLength); ++ inputSize = std::max(inputSize, filterOffset + filterLength); ++ } ++ ++ ByteSwapArray((uint8_t*)aSrc, inputSize); ++#endif ++ + SkOpts::convolve_horizontally(aSrc, *mFilter, aDst, aHasAlpha); ++ ++#ifdef MOZ_BIG_ENDIAN ++ ByteSwapArray((uint8_t*)aSrc, inputSize); ++ ByteSwapArray(aDst, outputSize); ++#endif + } + + void ConvolutionFilter::ConvolveVertically(uint8_t* const* aSrc, uint8_t* aDst, +@@ -49,8 +78,26 @@ + int32_t filterLength; + auto filterValues = + mFilter->FilterForValue(aRowIndex, &filterOffset, &filterLength); ++ ++#ifdef MOZ_BIG_ENDIAN ++ for (int filterY = 0; filterY < filterLength; filterY++) { ++ // Skia only knows LE, so we have to swizzle the input ++ ByteSwapArray(aSrc[filterY], aRowSize); ++ } ++#endif ++ + SkOpts::convolve_vertically(filterValues, filterLength, aSrc, aRowSize, aDst, + aHasAlpha); ++ ++#ifdef MOZ_BIG_ENDIAN ++ // After skia is finished, we swizzle back to BE, in case ++ // the input is used again somewhere else ++ for (int filterY = 0; filterY < filterLength; filterY++) { ++ ByteSwapArray(aSrc[filterY], aRowSize); ++ } ++ // The destination array as well ++ ByteSwapArray(aDst, aRowSize); ++#endif + } + + /* ConvolutionFilter::ComputeResizeFactor is derived from Skia's +diff -r 548d0a2f3a22 gfx/skia/skia/include/core/SkPreConfig.h +--- a/gfx/skia/skia/include/core/SkPreConfig.h Mon Jul 22 16:57:54 2019 +0200 ++++ b/gfx/skia/skia/include/core/SkPreConfig.h Thu Jul 25 14:27:59 2019 +0200 +@@ -73,7 +73,7 @@ + defined(__ppc__) || defined(__hppa) || \ + defined(__PPC__) || defined(__PPC64__) || \ + defined(_MIPSEB) || defined(__ARMEB__) || \ +- defined(__s390__) || \ ++ defined(__s390__) || defined(__s390x__) || \ + (defined(__sh__) && defined(__BIG_ENDIAN__)) || \ + (defined(__ia64) && defined(__BIG_ENDIAN__)) + #define SK_CPU_BENDIAN diff --git a/user/thunderbird/skia-sucks2.patch b/user/thunderbird/skia-sucks2.patch new file mode 100644 index 000000000..1a498f871 --- /dev/null +++ b/user/thunderbird/skia-sucks2.patch @@ -0,0 +1,44 @@ +# HG changeset patch +# Parent aecb4600e5da17443b224c79eee178c1d8e155e3 +For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the +right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white). + +diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h +--- a/gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200 ++++ b/gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200 +@@ -238,7 +238,18 @@ + AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; } + AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; } + ++ // On Big endian the commented out variant doesn't work, ++ // and honestly, I have no idea why it exists in the first place. ++ // The reason its broken is, I think, that it defaults to the double-variant of ToBits() ++ // which gets a 64-bit integer, and FromBits returns 32-bit, ++ // cutting off the wrong half again. ++ // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles). ++ // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system) ++#ifdef SK_CPU_BENDIAN ++ AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; } ++#else + AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); } ++#endif + AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); } + AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); } + +diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h +--- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200 ++++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200 +@@ -203,7 +203,13 @@ + // ~~~> + // a = 1*aa + d(1-1*aa) = aa + d(1-aa) + // c = 0*aa + d(1-1*aa) = d(1-aa) ++ ++ // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0 ++#ifdef SK_CPU_BENDIAN ++ return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0)) ++#else + return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255)) ++#endif + + d.approxMulDiv255(aa.inv()); + }; + while (h --> 0) { diff --git a/user/thunderbird/skia-sucks3.patch b/user/thunderbird/skia-sucks3.patch new file mode 100644 index 000000000..9d2ffc410 --- /dev/null +++ b/user/thunderbird/skia-sucks3.patch @@ -0,0 +1,30 @@ +# HG changeset patch +# Parent 46ea866ca3acb8bb5e1709ceb799b9c94f591dec +Problem description: Tab-titles that are too long to fit into a tab get faded out. + On big endian this is broken and instead of fading out, the + tab gets white and the font transparent, leading to an unreadable + tab-title +Solution: This is not a real solution, but a hack. The real solution would have been + to byte-swap the correct buffer, but I could not find it. + So the next best thing is to deactivate the fading-effect. Now all tab-titles + are readable, albeit not as pretty to look at as they could be. +Side-effects: I have not yet found an unwanted side-effect. + +diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp +--- a/gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200 ++++ b/gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100 +@@ -1861,6 +1861,14 @@ + SkCanvas::kPreserveLCDText_SaveLayerFlag | + (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0)); + ++#if MOZ_BIG_ENDIAN ++ // Pushing a layer where an aMask is defined produces wrong output. ++ // We _should_ endian swap the data, but I couldn't find a workable way to do so ++ // Therefore I deactivate those layers in the meantime. ++ // The result is: Tab-titles that are longer than the available space should be faded out. ++ // The fading doesn't work, so we deactivate the fading-effect here. ++ if (!aMask) ++#endif + mCanvas->saveLayer(saveRec); + + SetPermitSubpixelAA(aOpaque); diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD index 8b96a271e..ae1798e8e 100644 --- a/user/umbrello/APKBUILD +++ b/user/umbrello/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=umbrello -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Software modelling tool and code generator" url="https://umbrello.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="85f3fda1d1f075aaf747265e377fd064e26ffb813fb92ec9157dfebfc5e3ba0e27f28ad1a879083db14f49908d6af688c747b24572705778538adab74d25fde3 umbrello-19.12.2.tar.xz +sha512sums="f5edf5021bf5568053bd9f79dfc1f5ca586fa27c2b8e6660100d09f06bfd6c69867f7bbe16010a11703f30b02383edd965d0e2834e62b650504d00b76e8e269a umbrello-19.12.3.tar.xz fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch" diff --git a/user/user-manager/APKBUILD b/user/user-manager/APKBUILD index 16ef5db92..05f41f09e 100644 --- a/user/user-manager/APKBUILD +++ b/user/user-manager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=user-manager -pkgver=5.18.0 +pkgver=5.18.2 pkgrel=0 pkgdesc="Manage user accounts from KDE" url="https://www.KDE.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6feb9b2ed25ca2ade7d97d0110cae376af4d3550d98bc79cf1905058d1f5ad8a237ced00456ad1a9355433aeab5ee4f854a5bff2a2b636bb03dbce264b4d102c user-manager-5.18.0.tar.xz" +sha512sums="86d90ea0607cff32146c123468547e92d4c3bba8c5c088c232de944a07091768f27017d182d8791b5d7d69c8af359d7093fd54bedb536346d11168eafdbe4925 user-manager-5.18.2.tar.xz" diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index ddf80a03a..dfa1a3277 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -2,7 +2,7 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=weechat -pkgver=2.7 +pkgver=2.7.1 pkgrel=0 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://www.weechat.org" @@ -22,9 +22,11 @@ source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz" # secfixes: # 1.7.1-r0: -# - CVE-2017-8073 +# - CVE-2017-8073 # 1.9.1-r0: -# - CVE-2017-14727 +# - CVE-2017-14727 +# 2.7.1-r0: +# - CVE-2020-8955 build() { cmake \ @@ -59,4 +61,4 @@ _plugin() { mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir } -sha512sums="7a9205b6a3b7e338b14708e1b9aad4f2099506c46b1e86faf4fa94a105bc20b056a53ce3d003ae31ea1cdbab711ddd9dca7258a7d03f0f7af3703ebdbdfeb3d9 weechat-2.7.tar.gz" +sha512sums="2d2f555a4c48dbfa60a97845657e041fcd37bdde01974b4a49ff2d0ef6b92f16147f84b0e60772e9f54ba3e05ae1772012d3551a5fbb8bdf8332a08ef63a352d weechat-2.7.1.tar.gz" diff --git a/user/xcb-proto/APKBUILD b/user/xcb-proto/APKBUILD index 2973e9e52..b9af25d42 100644 --- a/user/xcb-proto/APKBUILD +++ b/user/xcb-proto/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcb-proto -pkgver=1.13 +pkgver=1.14 pkgrel=0 pkgdesc="XCB protocol descriptions" url="https://xcb.freedesktop.org/" @@ -8,7 +8,7 @@ arch="noarch" license="X11" depends="" makedepends="python3" -source="https://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2" +source="https://www.X.org/releases/individual/proto/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -26,4 +26,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7 xcb-proto-1.13.tar.bz2" +sha512sums="de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690 xcb-proto-1.14.tar.xz" diff --git a/user/xf86-video-ati/APKBUILD b/user/xf86-video-ati/APKBUILD index 4bce3a851..15029c507 100644 --- a/user/xf86-video-ati/APKBUILD +++ b/user/xf86-video-ati/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-ati pkgver=19.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="ATI video driver for X11" url="https://www.X.Org/" arch="all" options="!check" # No test suite. license="MIT" -depends="mesa-dri-ati" +depends="mesa-dri" makedepends="eudev-dev libdrm-dev libxi-dev mesa-dev pixman-dev util-macros xorg-server-dev" subpackages="$pkgname-doc" diff --git a/user/xf86-video-intel/APKBUILD b/user/xf86-video-intel/APKBUILD index 7ffb832b9..a7eb064bb 100644 --- a/user/xf86-video-intel/APKBUILD +++ b/user/xf86-video-intel/APKBUILD @@ -2,23 +2,22 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=xf86-video-intel verbase=2.99.917 -pkgver=${verbase}_git20180803 +pkgver=${verbase}_git20200224 pkgrel=0 pkgdesc="Legacy X.Org driver for Intel graphics cards" url="https://xorg.freedesktop.org" arch="pmmx x86_64" options="!check" # No test suite. license="MIT" -depends="mesa-dri-intel" +depends="mesa-dri" makedepends="xorg-server-dev libxi-dev libdrm-dev mesa-dev libxvmc-dev xcb-util-dev eudev-dev util-macros autoconf automake libtool xorgproto + libxv-dev " subpackages="$pkgname-doc" -source="https://dev.sick.bike/$pkgname-$pkgver.tar.gz - pmmx.patch - " +source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.gz" giturl="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git" -reporev="3d395062ce73f85e8340218df01c2ebf4bc25023" +reporev="f66d39544bb8339130c96d282a80f87ca1606caf" prepare() { default_prepare @@ -43,5 +42,4 @@ package() { rm "$pkgdir"/usr/libexec/xf86-video-intel-backlight-helper } -sha512sums="a96e627ed1b3fb6b66f02caaafb0f94967df9a2409158aacc9d8958538ef47bd84176ce71a4785f21944beb764450b1560c6dc59eef435f75959e27704be41f1 xf86-video-intel-2.99.917_git20180803.tar.gz -13694f8829ec59773f764817467052d5d4b93b5de16d8cdacc08ced48608b46008414be1f5f118e5f327c401541477c3418f510ada9cfb290a11ac2e5590b0f3 pmmx.patch" +sha512sums="cb853076238cbde61faeb7dd1a07c5edc5325361dc3109acd9c142c1bf66566ee8c19f8e709bde34456e4198353ac72d337bc6a43dbcc80a4546762541be6eb9 xf86-video-intel-2.99.917_git20200224.tar.gz" diff --git a/user/xf86-video-intel/pmmx.patch b/user/xf86-video-intel/pmmx.patch deleted file mode 100644 index 7edddfb96..000000000 --- a/user/xf86-video-intel/pmmx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/sna/compiler.h b/src/sna/compiler.h -index 0f3775ec..c4056913 100644 ---- a/src/sna/compiler.h -+++ b/src/sna/compiler.h -@@ -32,7 +32,7 @@ - #define likely(expr) (__builtin_expect (!!(expr), 1)) - #define unlikely(expr) (__builtin_expect (!!(expr), 0)) - #define noinline __attribute__((noinline)) --#define force_inline inline __attribute__((always_inline)) -+#define force_inline inline - #define fastcall __attribute__((regparm(3))) - #define must_check __attribute__((warn_unused_result)) - #define constant __attribute__((const)) diff --git a/user/xf86-video-nouveau/APKBUILD b/user/xf86-video-nouveau/APKBUILD index 40c9b8f82..2f812fc77 100644 --- a/user/xf86-video-nouveau/APKBUILD +++ b/user/xf86-video-nouveau/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-nouveau pkgver=1.0.16 -pkgrel=0 +pkgrel=1 pkgdesc="Libre Nvidia video driver for X11" url="https://nouveau.freedesktop.org/" arch="all" license="MIT" -depends="mesa-dri-nouveau" +depends="mesa-dri" 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" diff --git a/user/xkbcomp/APKBUILD b/user/xkbcomp/APKBUILD index fbe2ccb9f..f1d2a0356 100644 --- a/user/xkbcomp/APKBUILD +++ b/user/xkbcomp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xkbcomp -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=0 pkgdesc="Keyboard layout compiler for X11" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b00d1eb08c19be86044418c8ea3bfc3c3973406c481878270138a70ed9dab348acb8e4d0af8678879598ffbd7df1c640a63d0abad3d7481758be99af8dd7734e xkbcomp-1.4.2.tar.bz2" +sha512sums="827713c0413aecdcad2b61edb7b8c7c7a002e18505b9041f570e2f680907193cb5ff8a5b424695e21110b2d06c145cbf0e397e52347421ee946f06e2a51f135d xkbcomp-1.4.3.tar.bz2" diff --git a/user/xkeyboard-config/APKBUILD b/user/xkeyboard-config/APKBUILD index b2819e1ef..8ede47ac1 100644 --- a/user/xkeyboard-config/APKBUILD +++ b/user/xkeyboard-config/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xkeyboard-config -pkgver=2.28 +pkgver=2.29 pkgrel=0 pkgdesc="Keyboard configuration files for X11" url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" arch="noarch" license="X11 AND MIT" depends="" -makedepends="intltool libx11-dev xkbcomp cmd:xsltproc" +makedepends="intltool libx11-dev python3 xkbcomp cmd:xsltproc" subpackages="$pkgname-doc $pkgname-lang" source="https://www.X.Org/releases/individual/data/xkeyboard-config/xkeyboard-config-$pkgver.tar.bz2" @@ -32,4 +32,4 @@ package() { install -m755 -d "$pkgdir"/var/lib/xkb } -sha512sums="be38e61a7d3a1c03f9dc92fed5aada65fdb8b42272e874e01156a39de07f2a7c81846e9ba449aeb95661587f8d05217d549a1315ee0dd92facbb6158362e68ae xkeyboard-config-2.28.tar.bz2" +sha512sums="202255af097f3063d76341d1b4a7672662dc645f9bcd7afa87bc966a41db4c20fc6b8f4fbe2fcaec99b6bc458eac10129141a866a165857c46282f6705b78670 xkeyboard-config-2.29.tar.bz2" diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index de5664d60..c4b5755fc 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-server -pkgver=1.20.6 +pkgver=1.20.7 pkgrel=0 pkgdesc="X.Org X11 server" url="https://www.X.Org/" @@ -134,6 +134,6 @@ xwayland() { mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/ } -sha512sums="9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6 xorg-server-1.20.6.tar.bz2 +sha512sums="c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5 xorg-server-1.20.7.tar.bz2 d77151bc51766e1230a121c008ac1d0695275bf889b1db4b3330c1f8ee720b0e046cc935fa14aaef40b02fdea508e84e53959b560131ace14ace14943c8eb734 autoconfig-sis.patch a5f910e72ff9abd4e4a0c6806cdbe48d1b0b6cc0586f36568da5864a8dedc46a3112fe86d7a1969033f4d5b0def4dc6e5c11b656fbcc964732b417e6c9577f22 fix-musl-arm.patch" diff --git a/user/yakuake/APKBUILD b/user/yakuake/APKBUILD index 656958578..b57f1a969 100644 --- a/user/yakuake/APKBUILD +++ b/user/yakuake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=yakuake -pkgver=19.12.2 +pkgver=19.12.3 pkgrel=0 pkgdesc="Drop-down KDE terminal emulator" url="https://www.kde.org/applications/system/yakuake/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="61aa7055e4f65c8c60b7e2cd7306baefdf47c1b164e861f54f7816cad08f21ffc1b244a5a178273cc95c9c7c1d6f34a4cec4782773053f9dccf1c846025ab052 yakuake-19.12.2.tar.xz" +sha512sums="87ed8b0088b60ea707aebbbd5d70a385759af7779f10d5a0e3590ff1490bcf34e96f3020f203c05936a122a301c7f64edf3fa86493d8c1fcff41ff2f74917df7 yakuake-19.12.3.tar.xz" diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD index 490c9a3e9..adac93a71 100644 --- a/user/z3/APKBUILD +++ b/user/z3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=z3 -pkgver=4.8.6 +pkgver=4.8.7 pkgrel=0 pkgdesc="Mathematical theorem prover" url=" " @@ -37,4 +37,4 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1 z3-4.8.6.tar.gz" +sha512sums="145e2b2f1fa4edd0917107c7e1d54d779c7ed85c48af2ce6def4c90d1c4db05f74c9657e173cedf48770589fbe484c97fa1923295271cd3792523ffc4f67ed0c z3-4.8.7.tar.gz" |