summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/abuild/APKBUILD4
-rw-r--r--system/abuild/fix-apk-invocation.patch29
-rw-r--r--system/bc/APKBUILD4
-rw-r--r--system/cmake/APKBUILD4
-rw-r--r--system/easy-kernel/APKBUILD16
-rw-r--r--system/easy-kernel/config-aarch642
-rw-r--r--system/easy-kernel/config-m68k2
-rw-r--r--system/easy-kernel/config-pmmx2
-rw-r--r--system/easy-kernel/config-ppc29
-rw-r--r--system/easy-kernel/config-ppc6428
-rw-r--r--system/easy-kernel/config-sparc6424
-rw-r--r--system/easy-kernel/config-x86_642
-rw-r--r--system/git/APKBUILD4
-rw-r--r--system/iproute2/APKBUILD4
-rw-r--r--system/libarchive/APKBUILD6
-rw-r--r--system/libgpg-error/APKBUILD4
-rw-r--r--system/libpipeline/APKBUILD6
-rw-r--r--system/libxml2/APKBUILD11
-rw-r--r--system/libxml2/CVE-2019-20388.patch33
-rw-r--r--system/libxml2/CVE-2020-7595.patch32
-rw-r--r--system/libxslt/APKBUILD15
-rw-r--r--system/libxslt/CVE-2019-11068.patch120
-rw-r--r--system/libxslt/CVE-2019-13117.patch29
-rw-r--r--system/libxslt/CVE-2019-13118.patch71
-rw-r--r--system/lvm2/APKBUILD14
-rw-r--r--system/lvm2/dash.patch64
-rw-r--r--system/lvm2/fix-stdio-usage.patch20
-rw-r--r--system/man-db/APKBUILD6
-rw-r--r--system/man-db/man-db-2.8.5-iconv.patch22
-rw-r--r--system/man-pages/APKBUILD4
-rw-r--r--system/mawk/APKBUILD14
-rw-r--r--system/nspr/APKBUILD6
-rw-r--r--system/nspr/fix-getproto.patch13
-rw-r--r--system/nss/APKBUILD4
-rw-r--r--system/pcre/APKBUILD8
-rw-r--r--system/pkgconf/APKBUILD3
-rw-r--r--system/procps/0001-pt_BR-fix-translation-error.patch29
-rw-r--r--system/procps/APKBUILD11
-rw-r--r--system/rhash/APKBUILD5
-rw-r--r--system/rsync/APKBUILD14
-rw-r--r--system/strace/APKBUILD4
-rw-r--r--system/sysklogd/APKBUILD4
-rw-r--r--system/util-linux/APKBUILD6
-rw-r--r--system/xfsprogs/APKBUILD6
-rw-r--r--system/zsh/APKBUILD9
45 files changed, 286 insertions, 461 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"