diff options
Diffstat (limited to 'system')
33 files changed, 272 insertions, 449 deletions
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD index b2ccb8f8d..5f780a690 100644 --- a/system/abuild/APKBUILD +++ b/system/abuild/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abuild -pkgver=3.3.1 -pkgrel=4 +pkgver=3.4.1 +pkgrel=0 pkgdesc="Script to build APK packages" url="https://code.foxkit.us/adelie/abuild" arch="all" options="suid !check" license="GPL-2.0-only" +pkggroups="abuild" depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 libc-utils attr libarchive-tools pkgconf patch lzip" if [ "$CBUILD" = "$CHOST" ]; then @@ -15,16 +16,11 @@ fi makedepends_build="pkgconfig" makedepends_host="openssl-dev zlib-dev" makedepends="$makedepends_host $makedepends_build" -install="$pkgname.pre-install $pkgname.pre-upgrade" subpackages="abuild-rootbld:_rootbld:noarch $pkgname-doc" -pkggroups="abuild" -source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz +install="$pkgname.pre-install $pkgname.pre-upgrade" +source="https://distfiles.adelielinux.org/source/abuild-$pkgver.tar.xz keyhole.patch - auto-dev-symbols.patch - bang.patch - modernise.patch " -builddir="$srcdir/$pkgname-$pkgver+adelie" # secfixes: # 3.3.1-r1: @@ -32,7 +28,6 @@ builddir="$srcdir/$pkgname-$pkgver+adelie" prepare() { default_prepare - sed -i -e "/^CHOST=/s/=.*/=$CHOST/" abuild.conf } @@ -58,8 +53,5 @@ _rootbld() { mkdir -p "$subpkgdir" } -sha512sums="c358f84d198527eeeac1a1aacc101174e18f9f34f692b12a4e4deb6b32d5f3ebdc703c90de6a6f81f195a81eebb90a11f9bfea13ef5db531d9b5d5ae6ecd6a66 abuild-3.3.1+adelie.tar.xz -757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d keyhole.patch -2aa43539fc465f5abdc7c3d994363b80d1f7494c2d659093e5a2c45056e07617506ad8ea98f0e7d4ebe2596802b76605cd7c9f3ffc5a30c488c30bb36248e3d2 auto-dev-symbols.patch -0fccb03673f2f72a7bd2d2afd1c79141eeb73b3119e83fff966fb8a2851c0484912be70a7b384be1dc384c344cf27427e2fc2426c2f9bf56aa5625f32436524d bang.patch -b5b200da56c4319d332a7c5ddf38879fba0a4af723e1c6492f80a101afc8711d978dd7e1e5c31c80ed7fee15dcb19e7c449c92761b509a8063e417869885edc5 modernise.patch" +sha512sums="6446171cc68d8341b5267816e7a05e0dc7b8a4e89c8c8410ae61e9501b163cc32db888476b14f032c16ef15bdd4dd4844e087394c2d061db8281f7bdfb34d450 abuild-3.4.1.tar.xz +757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d keyhole.patch" diff --git a/system/abuild/auto-dev-symbols.patch b/system/abuild/auto-dev-symbols.patch deleted file mode 100644 index 1fbca7bad..000000000 --- a/system/abuild/auto-dev-symbols.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- abuild-3.3.1+adelie/abuild.in.old 2019-03-07 00:48:00.110000000 +0000 -+++ abuild-3.3.1+adelie/abuild.in 2019-12-20 23:44:19.956669659 +0000 -@@ -1651,6 +1651,7 @@ - default_dbg() { - local f - pkgdesc="$pkgdesc (debug symbols)" -+ install_if="symbols $pkgname=$pkgver-r$pkgrel" - - binfiles=$(scanelf -R "$pkgdir" | grep ET_DYN | sed "s:$pkgdir\/::g" | sed "s:ET_DYN ::g") - for f in $binfiles; do -@@ -1681,6 +1682,7 @@ - local i= j= - depends="$depends_dev" - pkgdesc="$pkgdesc (development files)" -+ install_if="dev $pkgname=$pkgver-r$pkgrel" - - cd "$pkgdir" || return 0 - local libdirs=usr/ diff --git a/system/abuild/bang.patch b/system/abuild/bang.patch deleted file mode 100644 index 7140f4dd8..000000000 --- a/system/abuild/bang.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/abuild.in b/abuild.in -index acee26f..6e06f29 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -1,4 +1,4 @@ --#!/bin/sh -e -+#!/bin/bash -e - - # abuild - build apk packages (light version of makepkg) - # Copyright (c) 2008-2015 Natanael Copa <ncopa@alpinelinux.org> diff --git a/system/abuild/modernise.patch b/system/abuild/modernise.patch deleted file mode 100644 index b87b098f9..000000000 --- a/system/abuild/modernise.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 9221c1d06e9185b734d58c155764ed24fcfc48ed Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Tue, 14 Jan 2020 04:46:41 -0600 -Subject: [PATCH 1/2] newapkbuild: Drastically modernise output APKBUILD file - ---- - newapkbuild.in | 44 +++++++++++++++++++++++++++++++------------- - 1 file changed, 31 insertions(+), 13 deletions(-) - -diff --git a/newapkbuild.in b/newapkbuild.in -index 85f838f..dbcef14 100644 ---- a/newapkbuild.in -+++ b/newapkbuild.in -@@ -68,13 +68,9 @@ build_cmake() { - -DCMAKE_BUILD_TYPE=RelWithDebugInfo \\ - -DCMAKE_CXX_FLAGS="\$CXXFLAGS" \\ - -DCMAKE_C_FLAGS="\$CFLAGS" \\ -- \${CMAKE_CROSSOPTS} -+ \${CMAKE_CROSSOPTS} \\ -+ . - make --} -- --check() { -- cd "\$builddir" -- CTEST_OUTPUT_ON_FAILURE=TRUE ctest - __EOF__ - } - -@@ -115,6 +111,12 @@ check_make() { - __EOF__ - } - -+check_cmake() { -+ cat >>APKBUILD<<__EOF__ -+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest -+__EOF__ -+} -+ - check_python() { - cat >>APKBUILD<<__EOF__ - python3 setup.py test -@@ -193,7 +195,7 @@ newaport() { - python) makedepends="python3-dev";; - cmake) makedepends="cmake";; - meson) makedepends="meson";; -- *) makedepends="\$depends_dev";; -+ *) makedepends="";; - esac - - # Replace pkgver in $source -@@ -226,9 +228,15 @@ url="$url" - arch="all" - license="$license" - depends="$depends" --depends_dev="" - makedepends="$makedepends" -+__EOF__ -+ if [ -n "$install" ]; then -+ cat >>APKBUILD<<__EOF__ - install="$install" -+__EOF__ -+ fi -+ -+ cat >>APKBUILD<<__EOF__ - subpackages="\$pkgname-dev \$pkgname-doc" - source="$source" - __EOF__ -@@ -241,7 +249,12 @@ __EOF__ - builddir=$(echo ${i#*/} | sed "s/$pv/\$pkgver/g") - fi - done -- printf 'builddir="$srcdir/%s"\n\n' "$builddir" >> APKBUILD -+ if [ -n "$sdir" ] && [ "$sdir" = "src/$pkgname-$pv" ]; then -+ # No builddir needed. -+ : -+ else -+ printf 'builddir="$srcdir/%s"\n\n' "$builddir" >> APKBUILD -+ fi - - # Subpackage -dev is usually required only for C/C++. Since depends_dev - # confuses a lot people, remove it if there's no .h or .hpp file. -@@ -271,7 +284,6 @@ __EOF__ - # Create build() function - cat >>APKBUILD<<__EOF__ - build() { -- cd "\$builddir" - __EOF__ - - case "$buildtype" in -@@ -287,6 +299,8 @@ __EOF__ - build_perl;; - python) - build_python;; -+ *) -+ printf '# Add build instructions here.' >> APKBUILD - esac - - cat >>APKBUILD<<__EOF__ -@@ -297,14 +311,17 @@ __EOF__ - # Create check() function - cat >>APKBUILD<<__EOF__ - check() { -- cd "\$builddir" - __EOF__ - - case "$buildtype" in -- make|cmake|autotools|perl) -+ make|autotools|perl) - check_make;; -+ cmake) -+ check_cmake;; - python) - check_python;; -+ *) -+ printf '# Add test instructions here.' >> APKBUILD - esac - - cat >>APKBUILD<<__EOF__ -@@ -315,7 +332,6 @@ __EOF__ - # Create package() function - cat >>APKBUILD<<__EOF__ - package() { -- cd "\$builddir" - __EOF__ - - case "$buildtype" in -@@ -329,6 +345,8 @@ __EOF__ - package_perl;; - python) - package_python;; -+ *) -+ printf '# Add packaging instructions here.' >> APKBUILD - esac - - if [ -n "$cpinitd" ]; then --- -2.24.1 - -From 59cb9822c0ac347d58f1c37627a58fe14dce965d Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Tue, 14 Jan 2020 04:47:36 -0600 -Subject: [PATCH 2/2] newapkbuild: Newline after source - ---- - newapkbuild.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/newapkbuild.in b/newapkbuild.in -index dbcef14..9c4ffbf 100644 ---- a/newapkbuild.in -+++ b/newapkbuild.in -@@ -251,7 +251,7 @@ __EOF__ - done - if [ -n "$sdir" ] && [ "$sdir" = "src/$pkgname-$pv" ]; then - # No builddir needed. -- : -+ printf '\n' >> APKBUILD - else - printf 'builddir="$srcdir/%s"\n\n' "$builddir" >> APKBUILD - fi --- -2.24.1 - diff --git a/system/adelie-keys/APKBUILD b/system/adelie-keys/APKBUILD index ba7143df3..8cde54b6f 100644 --- a/system/adelie-keys/APKBUILD +++ b/system/adelie-keys/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> pkgname=adelie-keys pkgver=1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Adélie Linux's official signing keys" url="https://www.adelielinux.org/" arch="noarch" @@ -9,10 +9,30 @@ options="!check" # No test suite license="Public-Domain" # there is no way to copyright key files depends="" makedepends="" -source="packages@adelielinux.org.pub" +source="packages@adelielinux.org.pub + powerpc-1@packages.adelielinux.org.pub + powerpc-2@packages.adelielinux.org.pub + x86-1@packages.adelielinux.org.pub + x86-2@packages.adelielinux.org.pub + arm64-1@packages.adelielinux.org.pub + arm64-2@packages.adelielinux.org.pub + armv7-1@packages.adelielinux.org.pub + armv7-2@packages.adelielinux.org.pub + " package() { - install -D -m 644 "$srcdir"/packages@adelielinux.org.pub \ - "$pkgdir"/etc/apk/keys/packages@adelielinux.org.pub + for key in $source; do + install -D -m 644 "$srcdir"/$key \ + "$pkgdir"/etc/apk/keys/$key + done } -sha512sums="d4e083e02c181079bfc6e2ff10773d0b987523851b9aa963b2c75b136ebc8bd9e17cde7f7a660f21552cddc80aed9be162930e50a45ce548f353a4c2b9aa72f4 packages@adelielinux.org.pub" + +sha512sums="d4e083e02c181079bfc6e2ff10773d0b987523851b9aa963b2c75b136ebc8bd9e17cde7f7a660f21552cddc80aed9be162930e50a45ce548f353a4c2b9aa72f4 packages@adelielinux.org.pub +e21525f5f218f319990ee5fd972f1c8d71950723d73aff38c8e48eaff483a52ba883fb14e80e82f69bca800037e3aaba170b7f54676a339d37948d1ed843c862 powerpc-1@packages.adelielinux.org.pub +6588c5592bdb57e55a684bea771eeb0d02e3cbd701d4f241f37acff17c93a8888745f6f4b5f64feb958ac0a8e1be710788872436b96812abe83d58d1b098a44b powerpc-2@packages.adelielinux.org.pub +e8b833be00ea8bafb2cf2d854e20370a6902689931c6386ce7f0f998cc5e0caebb6c06592d48ed49ff23cae8a50891841ac08523ed9318d73fc05413c030d9bf x86-1@packages.adelielinux.org.pub +619a1add8255f70ab7532120ebae8d83f8717675236c8f8af51473e0e59acf83c6dc68b5103211de022abe6a67c000630f8ad6c5841ace5355756efb52fa368d x86-2@packages.adelielinux.org.pub +2c5500c075d3e819aacb78ba0e867cac7e5d2c7aee8ebb4b96baf4113eae4a83f65bbb70abb9195a9adcff585f7271a7b0313d32d366e6e2ae816c9d6f32d97e arm64-1@packages.adelielinux.org.pub +e9702e9d6bf7cb19c23a9e146feee7152d99a5d6154d18760ec10b997c3b966b8d6be2e11ebb6283fef46ffe5219f5b32261359055e665c9725e02297601f10d arm64-2@packages.adelielinux.org.pub +beecae9dd76b20c02b1c75117394b79a6187e897a5f54a66a7003507ef0c27b297337508fa8da5e6ea8b79c55868609e58a7461710acc4500850255d1c4b6c95 armv7-1@packages.adelielinux.org.pub +e6107854e25dc13892d60974d4a9eded19c1b882b8e99e651b2817cdb5c9f1a415efcd9d15ff6692d97738104b51bbf4be5a1ed34f482d170a0841be3d523a6e armv7-2@packages.adelielinux.org.pub" diff --git a/system/adelie-keys/arm64-1@packages.adelielinux.org.pub b/system/adelie-keys/arm64-1@packages.adelielinux.org.pub new file mode 100644 index 000000000..8bafca217 --- /dev/null +++ b/system/adelie-keys/arm64-1@packages.adelielinux.org.pub @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3qokI0/9FAiN5PrOnoRO +bDJV6kTuNz+KBFBU1hAK+EzeklTxtBDQlefYcc9VzMBCopUMC2jLb3qNligmTl+y +gUzfv/Ftb9G3DPn598B5Eap0AFctqqk9oS5x1C4tkl9ID3FR/qTNCIRBFLZbdNMv +w91GedBVc4pGXQbZr3TRIpEIyhlsRdmQLlc3aqkBDdG5X1WT8KcOXWdx/SsRcwFg +xsiVeCtnGxC0HWWxsDKbdAl2mhv/DqdL7ZXDBFIWlXJuKUjGCLG3+yE2dueLIY/i +BT1vRL2qlLwcX9yxEYnNmQACIB+xAgfI7Z3z4+tq4sACcs61MJGm3C2xODT/Wm/4 +nNbp/rQ5lystHK6dwN1MeHPBcPZM2S6BhnvTJLzlmEKmMOaz7B6bq0QBFhgqt4U3 +9/s2W2mazvNVxF35GPzXBh3Viv4URdJ7Q/DB5Igf/lKcrcTlupKKpVh0i6oJvu5s +pYMwLIQ+ySNubLl2sTHiSS4PoazP6vMEEDx03oLy3qwyUlnRwi+MCqhjNxyJMBc4 +zZZ4QafUYm+rR8GrP0Rd9b6jcVuE64U9xNWr1HEzYXjy0VHgXhq1sSbei6PX9n1j +sPO/MjjQUQEmFy+dBlCwK3d9WxRi80z+qdhbhJ4U0jpElkR0vsBHi/kHjOUs5lDa +k5+Hr4b2dBu8M6YShUGyhjcCAwEAAQ== +-----END PUBLIC KEY----- diff --git a/system/adelie-keys/arm64-2@packages.adelielinux.org.pub b/system/adelie-keys/arm64-2@packages.adelielinux.org.pub new file mode 100644 index 000000000..50fffb0e3 --- /dev/null +++ b/system/adelie-keys/arm64-2@packages.adelielinux.org.pub @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApUEZcMLTlLoH/CvA1ZsU +H1z4udxYSw/2yrAFwJNoa1juTkaw0p46ZeI5XBA+Cx/qj7IORS1XLdFEnl0o17Jp +rZ6K31U2M9BOdCI5f40AY+bpKFj84fGjbsP65xaWTVf1ahuQSXKjBANSPPBekoFA +7NlaWBzU2WWXA9QZeUgElktPIMUnHf4YvToBEkIrSb31cqEOYRubmkDsvibA+3YY +MGX48LWDRwOr6Y9051QPR18e464bjG+qLaSrKAnTi+gcH1MZsnKhRUTZZQVwCpmS +39eyfmLeH2QomGjr5jOTMLmzXB3rPRCdxfHsK0gBqs/kVrNQWOTl0Bhyx26nmHMf +7IEQI3WkQbUNZA1wXH2qIYpFic28V1YRIa6Hp+AhHGKHzvomAJ24n5HVCioDwicO +HzU/2lwd0eFZ236DcW/qtCh+IiqcVCA1ggRCANwalh519edoKQQGaVhgB809zoBt +Vrb9hsckCbAJa/MQs5paBr8dc4EU9GT04Z1Xx2JRfgWfKsJF3i0mmXqG33TOW/Bv +jAcQVxGYTpb15GePtIf3eOcnU0DdHd3YS+EqMYuGOU121pEOh2+/tSa99SY8PNdm +C91Wx40eioT2UFqJHOd0Q6hgEA+win+LR29LPi6c8cVkzsmOsJxMEsFKd3kIre9Y +Hk/XLs/3s9qsBrd8Q4estm8CAwEAAQ== +-----END PUBLIC KEY----- diff --git a/system/adelie-keys/armv7-1@packages.adelielinux.org.pub b/system/adelie-keys/armv7-1@packages.adelielinux.org.pub new file mode 100644 index 000000000..49d97b034 --- /dev/null +++ b/system/adelie-keys/armv7-1@packages.adelielinux.org.pub @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAso0/LbLfyWTiyr/wQeg5 +3m2o73jDtGuO9JceTbpp+UeKAleVnEO9jtiTSEqkTMHsz9qij6ssgUPAIjoyXVLR +b9jcds/+whmn8XfeVdK8kpqpsik35XKnUJSRuZxxoWVnG5dxv/MEllednD4Qgv7u +r3Xo318ND96KpTnIwCWuxwG83/r8fYA7UkAwg3d+EksXk9G2I1PH9tv5Vzm8Axmq +EVKn0a/vZGEPZ7XGBNW2ZDLf6JnWhj6rxUdFiK7wXBr1P+v9IZf3iP/g0c5MKngg +N04Gv9gKdVe84rVayJswEqIRpmgWrjj96Q/V/znW2saiG1FJvLVDAQvNYDTSrOY1 +4Vl1ZEgVWYy5yqBLJYT6/GJRNzCK2GY+TYZnvpcapgiul9wSebmhHAn3WLXvAfc/ +hrGYtsWnc62RX3c5wR66a9WCEneP+Zcb/W+X4wBaUOh9dwaCmkxvP4MJeI6RE97q +GZK8LHEmay1Yuo1YAm7pKm1PKYc34rSDB9OMxibh0MLHBP22tLaS8CI9tdHoCL4k +eN2OAIl//j+pvpb2SmUrE/sYbfosGAE6dB95//VifZPTctPKXoZ1BCAWMcufXj0s +ZtfVUx4wfRDPgBmBZHhcYwWZhwj31LemoKA8ofwkO/nqu5ELCUzWNeI6wmelAYF5 +mGMdAvexncv9XfD0FkCLgjkCAwEAAQ== +-----END PUBLIC KEY----- diff --git a/system/adelie-keys/armv7-2@packages.adelielinux.org.pub b/system/adelie-keys/armv7-2@packages.adelielinux.org.pub new file mode 100644 index 000000000..c69fe9249 --- /dev/null +++ b/system/adelie-keys/armv7-2@packages.adelielinux.org.pub @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0ysqkRKAHKlmgTuzOfUz +8C51wOpJHNrJoQEFeg7j5Ov3AlbGeThqtdSJMkFJerKlpFRVpdCcGihgb8pezspn +Zn5AFAwUnbsSKpfIc/Hy+rvlDda64TWeWX1wEeB82qSG5IOfwXLAv2pPXlFUEqdp +eOxZuURO2aSFz4ea+CNDNlJQItLRQz/AS/IoCKFtOUw2eYkT8gPjxUnwccqS/Ol3 +zG+e4g8Ai3uvLmoH52sJEwZ67gdL8R4+EIvf185XDO3IWPp+aNtn5Q0SK4gJe5Ao +2jGIHwTbmF42ZpsDp4/SOV/9spQBKoNpcutKrl0SKrH+37Dzjo/AabeIEWsWuJS4 +iiOk9rR2iRAYeXLa/653y70mTWgOUzJ2SKsFMTgwizJK+CcSkc7uWmE8PqXrzUQi +5xLHS93bbB7pfC9PGY3Qar8l3fsVdx3l1RSuaTWYCl47GMgqeOIAz7+0PNArRzji +yKl0RMC6aTfLjxWw4Nhx8aexZRLhD01W5HmfxUb6oReAZjoMPOGqWyB8FjNSz2mW +1pqMYkiyT7iLMMnca19WMp9EbvOAV58PeevnAnBdAP2ALA7Nnnq70GboJ3V0lYdw +Xupa9B0qg7PITKRCCztSsWk6XqpeZn+9OaPg/VewEa12v0qxG45xjTUwXBw6TkA5 +OImpHldSpXF7YxEauhJ6l08CAwEAAQ== +-----END PUBLIC KEY----- diff --git a/system/adelie-keys/powerpc-1@packages.adelielinux.org.pub b/system/adelie-keys/powerpc-1@packages.adelielinux.org.pub new file mode 100644 index 000000000..a8beee4ae --- /dev/null +++ b/system/adelie-keys/powerpc-1@packages.adelielinux.org.pub @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzQnVSXABOLrSCbrNb7XJ +M+4U3VtI0LKguIaQK2xtkzoL7z/kLGjg0vDrunPNyZooG78L9Sk/q1xKTBiHToV9 +n4XlELhYwh4jCucp7GIaTKZm91P9lB6RKnSl9SuB+snITeDAytASCMn0IVD4J5QJ +jYgg4tRuLGI8w++xwkOdpOjbYGFGNrOIIRroA+EmBM8pJ5FEEPPUS4Gt9e1iLSf4 +n/d2wzEsbl0MQndHTFsWw1PW8LWTmq5IVbrZ99hswFGgH49HogImnnOKrRYBAy0g +lIH8UZvHNqhiJ6cJ1cCj/Fh/5JLuemxZMiGT+xpkPMd2ih8b8Oou06zQTP1TMllO +vsznHTtn8Mk25A84qx16Bpmn0hOObiEZWDAjsVvPrLDDx364sNmluK+vI2UlrFLp +ReEyVJaMHMokE02ONZecLyOvMhTTSMRcPHTsrCr7RwvXx0edtoX3dypNAx2T5+le +Dzi3ua+boduJXRdgkt3va7DQYNtzKlgkgOCBRO5guJe6ja537Sllb7K6eKiMgpJm +n5RH7N1Vlrqn1NXKPQy5MH0d/y5rKXSbOKe48a9kZVIbiBaBMJkEusOwCFTUZuOj +ZCMuR0VyHorEI5uMrppj7bY42QLVSQRDO8hsH25Oun5A84bjb/9oy5bRpvIGSKQH +8fSqiLmgFw9qTDvg/soOm0ECAwEAAQ== +-----END PUBLIC KEY----- diff --git a/system/adelie-keys/powerpc-2@packages.adelielinux.org.pub b/system/adelie-keys/powerpc-2@packages.adelielinux.org.pub new file mode 100644 index 000000000..747503905 --- /dev/null +++ b/system/adelie-keys/powerpc-2@packages.adelielinux.org.pub @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA76g0RV9GXThDu4sdvI4Q +yKGHvg7m2khPWRMVE2D5Zf0I0UvZ5oKovuR2A9rECK9NAEj/2+cZkh9Jo4ll4obM +4NFVh7fjUj9DNnfSaOL4gnXtnvma6DmDM5qmcP8++ueYqkTTcion8gr4BqNPflqW +eQTdSTMkGBmekxmeK0CUvMOhRumPLVsEXanl13UM8yK/2747VUepuKvv4yLx4Cf5 +HMB7Ik9a0aHNcRY4sPOcyCcmrGFF1re7Dhh/gE/enKllC4sFYFPkpIh6pNmNxU50 +ur3FTHZHdm8e7XzkD1K2Sdb6CgXns6ZUpIOw/Yf1D3Dd2H1e7ZsA+2Vr2uB2aOEm +H3pKMJZ6i0uOgacbUsA2oYxjHjKUIhHNsek8+/q7542DUBTqtbkPgxyc1sLpS5Ol +0N4xNJX1CEnHGwcZOF3FLiR0AidnzrOBeYXEqYZqzJ0pXTybdrMydL2AJ3aUgKip +ehvU6rbNl60h+OyPTUbfB/p9QRHG10578tCuXYnTAwVCkRe0qId8oRTRBDBkNa+K +vVdJ4iLEhYgww3o9vJLRxegyuZjOcpvbWSEL+xGERI9iizA8zRA9kwnq/Zn8kljt +mZb4GF9TgSnPUmgNW/ORMDbcZCmrLpwD5FCnNBTmVGyobEebRHmL3p5+5Ae5CRm9 +GlnlB4uFSRN1muWFxGCOfGUCAwEAAQ== +-----END PUBLIC KEY----- diff --git a/system/adelie-keys/x86-1@packages.adelielinux.org.pub b/system/adelie-keys/x86-1@packages.adelielinux.org.pub new file mode 100644 index 000000000..0d8d7e212 --- /dev/null +++ b/system/adelie-keys/x86-1@packages.adelielinux.org.pub @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0H0IJ7fPzE05x3PUUzRt +LE47qdSZV6C67EmomNjOdrJOaLmkoP/jwKjFRuogcAZBxmu51lvAcgYQFjcDO0jo +ZcmcOcnRA4suBRfQCJYbI5p88SW8PKoKPLYhdNIY3e7KERT1qCCw6GyUlwievTsS +n+t+EZiG+R2eBhMrb6byxTdU+au6yLDGfTm/Di4pa8uOoAGaLPEjOxP9dPPFgmhv +t9/n+UsrfTwXcbP3WNkf5V9GuaQU8vjyPuRdSiId7viN2Rfh8ZETYXrpI+JyrnUc +ruSJyvBIQyjetSMX6CjuRqKGkWLVZAgDUlxZIaKtaD7m+jgJ+i9DnvbF0hl7AS/X +f9LCFNs+/dVlPiscD/JDzplBc2MCObs/dsO1b2bgF1iZWW5VljsuvA/0rhERAHNV +EJmRrpTXLQkG3LLCIpJe093EGCVhn0ma9ErFZdpgkn5CLpVsJj3Q/ufxPMZBVU4w +NBOh3FWXpGi8+B4absCkR2E6kE+o6pU9itMP4nLRf2CL9q/8KXt/55SHAaHxbrko +wDEeIB6O25tKeVxuQvDzxe4YRYlFrOO4VE+5YUeX8f0ESt23cHVr+jQmoImoXm96 +CEuhG8pSEPwx7mlf3mOWkNgYQPusIIdgcXaDY18Df1KRrYP/x5jpBbGxtiZEILs+ +8FagnR4Z7xCj/wdFm8UZ6zkCAwEAAQ== +-----END PUBLIC KEY----- diff --git a/system/adelie-keys/x86-2@packages.adelielinux.org.pub b/system/adelie-keys/x86-2@packages.adelielinux.org.pub new file mode 100644 index 000000000..b3f3a4046 --- /dev/null +++ b/system/adelie-keys/x86-2@packages.adelielinux.org.pub @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzBlRRdPuMHRlvsG04Yz+ +Ct8kU6mas28XIqnf6MtJ0xVgkoe8hfLtlR9zirdWRd2A3YoXfjgHKXkk6OsEeKc3 +au1xaKwvRwydqJ2yz6zZXoyxoY9z0w4VTLFeRj8YOacLqdeNbxgV4skGSKn+FePL +XB1Vrl7rbYgw2JisuHWTWRFpHq5zSCNOnumwQqXehx08TjXb1QAvKyUwpIAbkFkc +UBgxgSAkq48yCv2Nup8xRj3Vrh1cvit0Oy62gWxjhkv4mrkYKPVnaoSTDA5h/j5O +hLTfwHngv9ntR2rPSuxA0syHM/5UQu/cVAumR6F8QhTDIbVhevxj/gZFbGDH0jFM ++J4IL6U3/zJnj+q2PYXBrXgvafqfGlbU9gnBLTkMZxc9B0p9wN1GCr26HUtPRsEo +6zH1SUuZAm3ds39uNQReg5RNNvptaEtwzB97XSGrGWhxhBq3dCZjAXnE/0OcoJeO +AVfZ/vnCMIp2qKjOaC9doSbypFp0vzftRNke0KSC5x4n5yt6pc1bhPW4Sc6OXM9B +1CEs68JwdOTwRsgDhtD5MFM0OA/wQHsEHPW4tp0pWUold+Dvi/EpfFPZaHE91ShQ +nn0tIleySgY74VlRsW4wTwWsxmA0vySe1WYK5HG6zTjh8zkO4sf75uCGYuAj7Dsm +F5BtoIl6djxpvvTwHh70OEMCAwEAAQ== +-----END PUBLIC KEY----- diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD index cad3d7645..d1ff33d3b 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.4.0 +pkgver=2.5.1 pkgrel=0 pkgdesc="An arbitrary precision numeric processing language (calculator)" url="https://github.com/gavinhoward/bc" @@ -25,4 +25,4 @@ package() { make install } -sha512sums="43006a9f0b3acbc27fb3726536eb8723155521c3b29e187d54b350320f179454c526f5e5e66c0b3a1fca62003d1e830220d4753fd374efa3a0fa1f8a1d02e739 bc-2.4.0.tar.xz" +sha512sums="a2dec8f520a2c64df582a41bacb2f3ea275fbf01400668a7bcea1d3a90c0490516c20fd79932157ec0e313e845a34d100cf05985e8cdea456308c2aa8843bab4 bc-2.5.1.tar.xz" diff --git a/system/db/APKBUILD b/system/db/APKBUILD index d00896e08..587724143 100644 --- a/system/db/APKBUILD +++ b/system/db/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=db pkgver=5.3.28 -pkgrel=1 +pkgrel=2 pkgdesc="The Berkeley DB embedded database system" url="https://www.oracle.com/technology/software/products/berkeley-db/index.html" arch="all" @@ -12,6 +12,7 @@ makedepends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-c++:cxx" source="https://download.oracle.com/berkeley-db/db-$pkgver.tar.gz atomics.patch + time64.patch " prepare() { @@ -58,4 +59,5 @@ cxx() { } sha512sums="e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090 db-5.3.28.tar.gz -8ba96cfc3e484a839b8651214f0769b35273c6235de7e53d5118eb0347f5a477f75e3336a12f1399b7748c6b6ab95aec39c8b813d7b227dd61f37ed4ab52f7d5 atomics.patch" +8ba96cfc3e484a839b8651214f0769b35273c6235de7e53d5118eb0347f5a477f75e3336a12f1399b7748c6b6ab95aec39c8b813d7b227dd61f37ed4ab52f7d5 atomics.patch +5712bc36bd362820912bc899aff9738318b6f920e9fa71bef33c0d5c62dff7943827460b7b2194019738acfac2713954d01eab68c68ca02473f8d3f1a0950c48 time64.patch" diff --git a/system/db/time64.patch b/system/db/time64.patch new file mode 100644 index 000000000..12ef0508a --- /dev/null +++ b/system/db/time64.patch @@ -0,0 +1,18 @@ +By the comment's own admission, this cannot affect on-disk nor ABI because +'long' varies per architecture. So, this change is always correct. + +--- db-5.3.28/src/dbinc/clock.h.old 2013-09-09 15:35:08.000000000 +0000 ++++ db-5.3.28/src/dbinc/clock.h 2020-01-31 19:22:11.630000000 +0000 +@@ -54,11 +54,7 @@ + */ + typedef struct { + time_t tv_sec; /* seconds */ +-#ifdef HAVE_MIXED_SIZE_ADDRESSING +- int32_t tv_nsec; +-#else +- long tv_nsec; /* nanoseconds */ +-#endif ++ time_t tv_nsec; /* nanoseconds */ + } db_timespec; + + /* Operations on timespecs */ diff --git a/system/e2fsprogs/APKBUILD b/system/e2fsprogs/APKBUILD index 5231d8004..c72ff8c63 100644 --- a/system/e2fsprogs/APKBUILD +++ b/system/e2fsprogs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=e2fsprogs -pkgver=1.45.4 +pkgver=1.45.5 pkgrel=0 pkgdesc="Ext2/3/4 filesystem utilities" url="http://e2fsprogs.sourceforge.net" @@ -13,6 +13,7 @@ makedepends="$depends_dev linux-headers" subpackages="$pkgname-lang $pkgname-dev $pkgname-doc libcom_err $pkgname-libs" source="https://www.kernel.org/pub/linux/kernel/people/tytso/$pkgname/v$pkgver/$pkgname-$pkgver.tar.xz header-fix.patch + time64.patch " # secfixes: @@ -58,5 +59,6 @@ libcom_err() { mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/ } -sha512sums="408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda e2fsprogs-1.45.4.tar.xz -34ca45c64a132bb4b507cd4ffb763c6d1b7979eccfed20f63417e514871b47639d32f2a3ecff090713c21a0f02ac503d5093960c80401d64081c592d01af279d header-fix.patch" +sha512sums="d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce e2fsprogs-1.45.5.tar.xz +34ca45c64a132bb4b507cd4ffb763c6d1b7979eccfed20f63417e514871b47639d32f2a3ecff090713c21a0f02ac503d5093960c80401d64081c592d01af279d header-fix.patch +5f8ff2f096da4b445edff72dfa03f27dd8bf5b6733e724205f5661e32fd0bae92849a1aa53e20c6b60c026dc5ed68567b7866fade1ecd0187718509f03fe9145 time64.patch" diff --git a/system/e2fsprogs/time64.patch b/system/e2fsprogs/time64.patch new file mode 100644 index 000000000..043b7edd8 --- /dev/null +++ b/system/e2fsprogs/time64.patch @@ -0,0 +1,19 @@ +--- e2fsprogs-1.45.5/e2fsck/unix.c.old 2020-01-06 23:10:17.000000000 +0000 ++++ e2fsprogs-1.45.5/e2fsck/unix.c 2020-01-31 13:04:00.316309301 +0000 +@@ -45,6 +45,7 @@ + #ifdef HAVE_DIRENT_H + #include <dirent.h> + #endif ++#include <inttypes.h> + #include <libgen.h> + + #include "e2p/e2p.h" +@@ -1438,7 +1439,7 @@ + + fputs("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n", + ctx->problem_logf); +- fprintf(ctx->problem_logf, "<problem_log time=\"%lu\">\n", ++ fprintf(ctx->problem_logf, "<problem_log time=\"%"PRIu64"\">\n", + ctx->now); + fprintf(ctx->problem_logf, "<invocation prog=\"%s\"", + argv[0]); diff --git a/system/gettext-tiny/APKBUILD b/system/gettext-tiny/APKBUILD index 702b85130..ce62d5c99 100644 --- a/system/gettext-tiny/APKBUILD +++ b/system/gettext-tiny/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gettext-tiny pkgver=0.3.1_git20191130 -pkgrel=1 +pkgrel=2 pkgdesc="An internationalisation and localisation system" url="https://github.com/sabotage-linux/gettext-tiny" arch="all" @@ -12,6 +12,7 @@ depends="" makedepends="" subpackages="$pkgname-dev" source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz + keyword.patch line-length.patch respect-cflags.patch stop-doing-macro-crap.patch @@ -26,6 +27,7 @@ package() { } sha512sums="a318135626a0403a30a81fa475f7e1878b8af5a87053b0e00876c73b591508f3cf1e66d01f8d6a45013d1dc36a4da9f21fbf2b5050676826cb618b5b659aaaf7 gettext-tiny-0.3.1_git20191130.tar.xz +8efbf9c11429ab26f3c15e00c34258200598833b8f846a23e4c8d95023c2184d9dcf9cbb48d58eec1604442691af76e6f8e904ad7348016c393257aa30eae7cd keyword.patch 0a26a8481bffe2ce8c73f7f500963aea9db8379fb87849142d8efabf1656604b22f6ad345483256f14c388466f2f44e5924b9f65d88f26867a753a96d1529270 line-length.patch b4e7db4e415f6bc31f2214f2044506ad18ea0bd3cae4200d93bbd34aa493c7478a7f953d0a7e08f29f0fd5a5d7b7cbfa2bcfd5692c37e423706a1c193239bf1d respect-cflags.patch cd4cfc8cc6ea998f1e33ef666e3b9c3de3f3253994bccc942b177773c94f785e3892cb7d5f34bec1102dc7558236c07c5eac90e15d755e12ee06836336373526 stop-doing-macro-crap.patch" diff --git a/system/gettext-tiny/keyword.patch b/system/gettext-tiny/keyword.patch new file mode 100644 index 000000000..417f8c80a --- /dev/null +++ b/system/gettext-tiny/keyword.patch @@ -0,0 +1,13 @@ +diff --git a/src/msgfmt.c b/src/msgfmt.c +index 1120ff6..f75ab8b 100644 +--- a/src/msgfmt.c ++++ b/src/msgfmt.c +@@ -333,6 +333,8 @@ int main(int argc, char**argv) { + mode = m_desktop; + } else if(streq(A+2, "xml")) { + mode = m_xml; ++ } else if(streq(A+2, "keyword")) { ++ arg++; + } else if((locale = strstarts(A+2, "locale="))) { + } else if(streq(A+2, "check")) { + strict = true; diff --git a/system/grep/APKBUILD b/system/grep/APKBUILD index e8225712c..36763a41d 100644 --- a/system/grep/APKBUILD +++ b/system/grep/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=grep -pkgver=3.3 +pkgver=3.4 pkgrel=0 pkgdesc="Pattern matching utilities" url="https://www.gnu.org/software/grep/grep.html" @@ -14,7 +14,8 @@ makedepends="pcre-dev autoconf automake" subpackages="$pkgname-doc $pkgname-lang" source="https://mirrors.kernel.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz gnulib-tests-dont-require-gpg-passphrase.patch - fix-tests.patch" + fix-tests.patch + " build() { ./configure \ @@ -39,6 +40,6 @@ package() { rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } -sha512sums="e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db grep-3.3.tar.xz +sha512sums="0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206 grep-3.4.tar.xz fd97fccd661befc558b3afb3e32c82dd2cef511a05e6129d49540599297c1b59ab1f109e63a12f585a2348c26c28fb98330c348829d1fe61cf8149d0dd1c989c gnulib-tests-dont-require-gpg-passphrase.patch 9ba6b01c0c74933299afb469dadd2ea0c7e24befa34c691671a576063e32a1f0c735541e5e2bb0073d8afd814790909f7f895827aa8a2fbacdfcae380a7bcb11 fix-tests.patch" diff --git a/system/help2man/APKBUILD b/system/help2man/APKBUILD index dd9da63be..822ae754e 100644 --- a/system/help2man/APKBUILD +++ b/system/help2man/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=help2man -pkgver=1.47.11 +pkgver=1.47.12 pkgrel=0 pkgdesc="Create simple man pages from --help output" url="https://www.gnu.org/software/help2man" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="786a6bd4336c591cfeb0b4f2dc1429f6545e36514e7b238453c91368b8f531c46db2be025f02dc52e6dd8b971d6edbb4ff1a8e1b519f9253a3957ad7157790be help2man-1.47.11.tar.xz" +sha512sums="fb71e48e4a7a0f4316148295ea539b667a131149f4467da0f3e283389c9d9f2a5f1e9124ca8d64d6c3250d332a713d4e8de204ca9e7088840e74f316fa5221be help2man-1.47.12.tar.xz" diff --git a/system/libarchive/APKBUILD b/system/libarchive/APKBUILD index 0a19668f0..00af8aeb7 100644 --- a/system/libarchive/APKBUILD +++ b/system/libarchive/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libarchive -pkgver=3.4.0 -pkgrel=1 +pkgver=3.4.1 +pkgrel=0 pkgdesc="Multi-format archive and compression library" url="https://libarchive.org/" arch="all" @@ -54,5 +54,5 @@ tools() { ln -s bsdcpio "$subpkgdir"/usr/bin/cpio } -sha512sums="2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852 libarchive-3.4.0.tar.gz +sha512sums="fa7e9e5c8c00cd7e98f0ff373c300771f0a87317bca031c3030bac29b96b02ab66cf34905147e4135824bf9cdfdd1dedf3032e93d6d706c9a11e968da1ed8dad libarchive-3.4.1.tar.gz ff2567f243ba7e9ce20bc4f7fa422a922c5c23049004efdd8f71f29f93ab9be9aadd4c100e8c6dca318442d583fbad9bd6466017a23f83af18b9808c718b9fce seek-error.patch" diff --git a/system/libedit/APKBUILD b/system/libedit/APKBUILD index 63e80b875..77d98a701 100644 --- a/system/libedit/APKBUILD +++ b/system/libedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libedit -pkgver=20191025.3.1 +pkgver=20191231.3.1 _realver="${pkgver%%.*}-${pkgver#*.}" pkgrel=0 pkgdesc="Library providing line editing, history, and tokenisation functions" @@ -12,9 +12,7 @@ depends="" depends_dev="ncurses-dev" # XXX is this always unconditionally needed? makedepends="$depends_dev autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc" -source="https://thrysoee.dk/editline/libedit-$_realver.tar.gz - tinfo.patch - " +source="https://thrysoee.dk/editline/libedit-$_realver.tar.gz" builddir="$srcdir/$pkgname-$_realver" prepare() { @@ -41,5 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9f475249b984e02ece0af3a0efe353233fef644ecf37482e28597a3ce552ca5a07678939b2c4ecbe3d2b14761fa67f23d2e839a322b94c0feeeba9e403b2be00 libedit-20191025-3.1.tar.gz -b9cfb07733d14339cfb053b5c4249b74486268005474f65f377e412e5cccbe29d3ce55663a9795db0b682155084cca5a9424de348c7defdc8698dea042c2a674 tinfo.patch" +sha512sums="1df2eced98e8db1bb0af940678c154d87e3b11dd21e65a903682367f5feace5112f9a543b8e0cb04bbfeaaf73729f808db2d9c302637fc063e81c0a37777ac2c libedit-20191231-3.1.tar.gz" diff --git a/system/libedit/tinfo.patch b/system/libedit/tinfo.patch deleted file mode 100644 index 597529ca8..000000000 --- a/system/libedit/tinfo.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7aa660fd9d446567d3280765ba2a50a46b2a9159 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 12 Jun 2017 21:36:54 +0200 -Subject: [PATCH] configure: Support -ltinfo as split in newer ncurses - -The newer versions of ncurses support building terminfo routines -as a split -ltinfo library. Account for that by adding this library -to the search list. ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 9a571b2..5d714b5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -49,7 +49,9 @@ EL_MANTYPE - AC_CHECK_LIB(ncurses, tgetent,, - [AC_CHECK_LIB(curses, tgetent,, - [AC_CHECK_LIB(termcap, tgetent,, -- [AC_MSG_ERROR([libncurses, libcurses, or libtermcap is required!])] -+ [AC_CHECK_LIB(tinfo, tgetent,, -+ [AC_MSG_ERROR([libncurses, libcurses, libtermcap, or libtinfo is required!])] -+ )] - )] - )] - ) --- -2.13.1 - diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD index 10eee5514..7466d2844 100644 --- a/system/openssh/APKBUILD +++ b/system/openssh/APKBUILD @@ -2,9 +2,9 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=openssh -pkgver=7.9_p1 +pkgver=8.1_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=4 +pkgrel=0 pkgdesc="Port of OpenBSD's free SSH release" url="https://www.openssh.com/portable.html" arch="all" @@ -25,13 +25,10 @@ subpackages="$pkgname-doc " source="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz - bsd-compatible-realpath.patch - CVE-2018-20685.patch disable-forwarding-by-default.patch fix-utmpx.patch - openssh7.4-peaktput.patch - openssh-7.9_p1-openssl-1.0.2-compat.patch sftp-interactive.patch + time64-seccomp.patch sshd.initd sshd.confd @@ -149,13 +146,10 @@ openrc() { install_if="openssh-server=$pkgver-r$pkgrel openrc" } -sha512sums="0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e openssh-7.9p1.tar.gz -f2b8daa537ea3f32754a4485492cc6eb3f40133ed46c0a5a29a89e4bcf8583d82d891d94bf2e5eb1c916fa68ec094abf4e6cd641e9737a6c05053808012b3a73 bsd-compatible-realpath.patch -b8907d3d6ebceeca15f6bc97551a7613c68df5c31e4e76d43b7c0bd9ad42dedcabc20a2cc5404b89f40850a4765b24892bde50eab1db55c96ad5cf23bb1f8d04 CVE-2018-20685.patch +sha512sums="b987ea4ffd4ab0c94110723860273b06ed8ffb4d21cbd99ca144a4722dc55f4bf86f6253d500386b6bee7af50f066e2aa2dd095d50746509a10e11221d39d925 openssh-8.1p1.tar.gz f3d5960572ddf49635d4edbdff45835df1b538a81840db169c36b39862e6fa8b0393ca90626000b758f59567ff6810b2537304098652483b3b31fb438a061de6 disable-forwarding-by-default.patch -0c1e832cec420bc7b57558041d2288912a438db97050b87f6a57e94a2741a374cc5d141fe352968b0d1ba6accaff965794463fe9169d136678a8915a60d2f0b7 fix-utmpx.patch -398096a89aa104abeff31aa043ac406a6348e0fdd4d313b7888ee0b931d38fd71fc21bceee46145e88f03bc27e00890e068442faee2d33f86cfbc04d58ffa4b6 openssh7.4-peaktput.patch -dde28496df7ee74a2bbcf0aba389abefade3dc41f7d10dc6d3c1a0aca087478bafe10d31ec5e61e758084fa0a2a7c64314502091d900d9cee487c1bdc92722a6 openssh-7.9_p1-openssl-1.0.2-compat.patch -c1d09c65dbc347f0904edc30f91aa9a24b0baee50309536182455b544f1e3f85a8cecfa959e32be8b101d8282ef06dde3febbbc3f315489339dcf04155c859a9 sftp-interactive.patch +9033520d18ccfea87628c78008591ae8a143999868254eabc926ca0665611c9f09c221265b1b6f552b82eca58558244a020d615b55249a02f96e298c1f7ff520 fix-utmpx.patch +34c0673f550e7afcd47eda4fe1da48fb42e5344c95ba8064c9c3c137fda9c43635b0f7b8145d0300f59c79f75a396ebd467afb54cdaa42aa251d624d0752dc84 sftp-interactive.patch +ad5b209f7f3fff69c10bae34da143e071e107a2141eee94f393532d6bb04a36bfe6d9b5d2c08b713f67118503c38d11b4aad689df1df7c8a918d52db8326821d time64-seccomp.patch 394a420a36880bb0dd37dfd8727cea91fd9de6534050169e21212a46513ef3aaafe2752c338699b3d4ccd14871b26cf01a152df8060cd37f86ce0665fd53c63f sshd.initd ce0abddbd2004891f88efd8522c4b37a4989290269fab339c0fa9aacc051f7fd3b20813e192e92e0e64315750041cb74012d4321260f4865ff69d7a935b259d4 sshd.confd" diff --git a/system/openssh/CVE-2018-20685.patch b/system/openssh/CVE-2018-20685.patch deleted file mode 100644 index f2f1ecfc5..000000000 --- a/system/openssh/CVE-2018-20685.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001 -From: "djm@openbsd.org" <djm@openbsd.org> -Date: Fri, 16 Nov 2018 03:03:10 +0000 -Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer - to the - -current directory; based on report/patch from Harry Sintonen - -OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9 ---- - scp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/scp.c b/scp.c -index 60682c687..4f3fdcd3d 100644 ---- a/scp.c -+++ b/scp.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */ -+/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */ - /* - * scp - secure remote copy. This is basically patched BSD rcp which - * uses ssh to do the data transfer (instead of using rcmd). -@@ -1106,7 +1106,8 @@ sink(int argc, char **argv) - SCREWUP("size out of range"); - size = (off_t)ull; - -- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { -+ if (*cp == '\0' || strchr(cp, '/') != NULL || -+ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) { - run_err("error: unexpected filename: %s", cp); - exit(1); - } diff --git a/system/openssh/bsd-compatible-realpath.patch b/system/openssh/bsd-compatible-realpath.patch deleted file mode 100644 index 1cdb4f7c5..000000000 --- a/system/openssh/bsd-compatible-realpath.patch +++ /dev/null @@ -1,62 +0,0 @@ -fix issues with fortify-headers and the way openssh handles the needed -BSD compatible realpath(3). - -unconditionally use the provided realpath() as otherwise cross-builds -would try to use musl realpath() which is posix compliant and not -working to openssh expectations. - -diff -ru openssh-7.2p2.orig/openbsd-compat/openbsd-compat.h openssh-7.2p2/openbsd-compat/openbsd-compat.h ---- openssh-7.2p2.orig/openbsd-compat/openbsd-compat.h 2016-03-09 20:04:48.000000000 +0200 -+++ openssh-7.2p2/openbsd-compat/openbsd-compat.h 2016-07-18 13:33:16.260357745 +0300 -@@ -68,17 +68,7 @@ - void *reallocarray(void *, size_t, size_t); - #endif - --#if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH) --/* -- * glibc's FORTIFY_SOURCE can redefine this and prevent us picking up the -- * compat version. -- */ --# ifdef BROKEN_REALPATH --# define realpath(x, y) _ssh_compat_realpath(x, y) --# endif -- --char *realpath(const char *path, char *resolved); --#endif -+char *ssh_realpath(const char *path, char *resolved); - - #ifndef HAVE_RRESVPORT_AF - int rresvport_af(int *alport, sa_family_t af); -diff -ru openssh-7.2p2.orig/openbsd-compat/realpath.c openssh-7.2p2/openbsd-compat/realpath.c ---- openssh-7.2p2.orig/openbsd-compat/realpath.c 2016-03-09 20:04:48.000000000 +0200 -+++ openssh-7.2p2/openbsd-compat/realpath.c 2016-07-18 13:33:45.420721690 +0300 -@@ -31,7 +31,7 @@ - - #include "includes.h" - --#if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH) -+#if 1 - - #include <sys/types.h> - #include <sys/param.h> -@@ -58,7 +58,7 @@ - * in which case the path which caused trouble is left in (resolved). - */ - char * --realpath(const char *path, char *resolved) -+ssh_realpath(const char *path, char *resolved) - { - struct stat sb; - char *p, *q, *s; -diff -ru openssh-7.2p2.orig/sftp-server.c openssh-7.2p2/sftp-server.c ---- openssh-7.2p2.orig/sftp-server.c 2016-03-09 20:04:48.000000000 +0200 -+++ openssh-7.2p2/sftp-server.c 2016-07-18 13:34:29.131267241 +0300 -@@ -1162,7 +1162,7 @@ - } - debug3("request %u: realpath", id); - verbose("realpath \"%s\"", path); -- if (realpath(path, resolvedname) == NULL) { -+ if (ssh_realpath(path, resolvedname) == NULL) { - send_status(id, errno_to_portable(errno)); - } else { - Stat s; diff --git a/system/openssh/fix-utmpx.patch b/system/openssh/fix-utmpx.patch index 7f05add35..5e43eaf06 100644 --- a/system/openssh/fix-utmpx.patch +++ b/system/openssh/fix-utmpx.patch @@ -1,6 +1,6 @@ --- openssh-7.7p1/loginrec.c.old 2018-04-02 00:38:28.000000000 -0500 +++ openssh-7.7p1/loginrec.c 2018-06-15 22:09:00.091482769 -0500 -@@ -1656,7 +1656,11 @@ +@@ -1659,7 +1659,11 @@ const char *ttyn) { int fd; diff --git a/system/openssh/openssh-7.9_p1-openssl-1.0.2-compat.patch b/system/openssh/openssh-7.9_p1-openssl-1.0.2-compat.patch deleted file mode 100644 index c1c310e8f..000000000 --- a/system/openssh/openssh-7.9_p1-openssl-1.0.2-compat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c -index 8b4a3627..590b66d1 100644 ---- a/openbsd-compat/openssl-compat.c -+++ b/openbsd-compat/openssl-compat.c -@@ -76,7 +76,7 @@ ssh_OpenSSL_add_all_algorithms(void) - ENGINE_load_builtin_engines(); - ENGINE_register_all_complete(); - --#if OPENSSL_VERSION_NUMBER < 0x10001000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - OPENSSL_config(NULL); - #else - OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | diff --git a/system/openssh/openssh7.4-peaktput.patch b/system/openssh/openssh7.4-peaktput.patch deleted file mode 100644 index 6fc6140a6..000000000 --- a/system/openssh/openssh7.4-peaktput.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/progressmeter.c -+++ b/progressmeter.c -@@ -69,6 +69,8 @@ - static off_t start_pos; /* initial position of transfer */ - static off_t end_pos; /* ending position of transfer */ - static off_t cur_pos; /* transfer position as of last refresh */ -+static off_t last_pos; -+static off_t max_delta_pos = 0; - static volatile off_t *counter; /* progress counter */ - static long stalled; /* how long we have been stalled */ - static int bytes_per_second; /* current speed in bytes per second */ -@@ -128,12 +130,17 @@ - int hours, minutes, seconds; - int i, len; - int file_len; -+ off_t delta_pos; - - transferred = *counter - (cur_pos ? cur_pos : start_pos); - cur_pos = *counter; - now = monotime_double(); - bytes_left = end_pos - cur_pos; - -+ delta_pos = cur_pos - last_pos; -+ if (delta_pos > max_delta_pos) -+ max_delta_pos = delta_pos; -+ - if (bytes_left > 0) - elapsed = now - last_update; - else { -@@ -158,7 +165,7 @@ - - /* filename */ - buf[0] = '\0'; -- file_len = win_size - 35; -+ file_len = win_size - 45; - if (file_len > 0) { - len = snprintf(buf, file_len + 1, "\r%s", file); - if (len < 0) -@@ -188,6 +195,15 @@ - (off_t)bytes_per_second); - strlcat(buf, "/s ", win_size); - -+ /* instantaneous rate */ -+ if (bytes_left > 0) -+ format_rate(buf + strlen(buf), win_size - strlen(buf), -+ delta_pos); -+ else -+ format_rate(buf + strlen(buf), win_size - strlen(buf), -+ max_delta_pos); -+ strlcat(buf, "/s ", win_size); -+ - /* ETA */ - if (!transferred) - stalled += elapsed; -@@ -224,6 +240,7 @@ - - atomicio(vwrite, STDOUT_FILENO, buf, win_size - 1); - last_update = now; -+ last_pos = cur_pos; - } - - /*ARGSUSED*/ diff --git a/system/openssh/sftp-interactive.patch b/system/openssh/sftp-interactive.patch index ab14f3a6b..e4b8967bf 100644 --- a/system/openssh/sftp-interactive.patch +++ b/system/openssh/sftp-interactive.patch @@ -1,6 +1,6 @@ --- a/sftp.c 2014-10-24 10:32:15.793544472 +0500 +++ b/sftp.c 2014-10-24 10:35:22.329199875 +0500 -@@ -2076,8 +2076,10 @@ +@@ -2243,8 +2243,10 @@ signal(SIGINT, SIG_IGN); if (el == NULL) { diff --git a/system/openssh/time64-seccomp.patch b/system/openssh/time64-seccomp.patch new file mode 100644 index 000000000..9f9a8a247 --- /dev/null +++ b/system/openssh/time64-seccomp.patch @@ -0,0 +1,43 @@ +From b1c82f4b8adf3f42476d8a1f292df33fb7aa1a56 Mon Sep 17 00:00:00 2001 +From: Darren Tucker <dtucker@dtucker.net> +Date: Wed, 13 Nov 2019 23:19:35 +1100 +Subject: [PATCH] seccomp: Allow clock_nanosleep() in sandbox. + +seccomp: Allow clock_nanosleep() to make OpenSSH working with latest +glibc. Patch from Jakub Jelen <jjelen@redhat.com> via bz #3093. + +From 5af6fd5461bb709304e6979c8b7856c7af921c9e Mon Sep 17 00:00:00 2001 +From: Darren Tucker <dtucker@dtucker.net> +Date: Mon, 16 Dec 2019 13:55:56 +1100 +Subject: [PATCH] Allow clock_nanosleep_time64 in seccomp sandbox. + +Needed on Linux ARM. bz#3100, patch from jjelen@redhat.com. + +From b110cefdfbf5a20f49b774a55062d6ded2fb6e22 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 7 Jan 2020 16:26:45 -0800 +Subject: [PATCH] seccomp: Allow clock_gettime64() in sandbox. + +This helps sshd accept connections on mips platforms with +upcoming glibc ( 2.31 ) + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index b5cda70bb..96ab141f7 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -242,6 +242,15 @@ static const struct sock_filter preauth_insns[] = { + #ifdef __NR_nanosleep + SC_ALLOW(__NR_nanosleep), + #endif ++#ifdef __NR_clock_nanosleep ++ SC_ALLOW(__NR_clock_nanosleep), ++#endif ++#ifdef __NR_clock_nanosleep_time64 ++ SC_ALLOW(__NR_clock_nanosleep_time64), ++#endif ++#ifdef __NR_clock_gettime64 ++ SC_ALLOW(__NR_clock_gettime64), ++#endif + #ifdef __NR__newselect + SC_ALLOW(__NR__newselect), + #endif |