From 9a0e94508e53b84e68536adff1063b0ce0cf85d8 Mon Sep 17 00:00:00 2001 From: Kiyoshi Aman Date: Mon, 18 Nov 2019 22:40:06 -0500 Subject: system/git: upgrade to 2.24.0 --- system/git/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'system/git') diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 4fb71e2a5..505ae0a0d 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik # Maintainer: A. Wilcox pkgname=git -pkgver=2.22.1 +pkgver=2.24.0 pkgrel=0 pkgdesc="A distributed version control system" url="https://www.git-scm.com/" @@ -29,7 +29,7 @@ subpackages="$pkgname-doc $pkgname-subtree-doc:subtree_doc:noarch " makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev - pcre2-dev asciidoctor xmlto perl-error" + pcre2-dev asciidoctor xmlto perl-error docbook-xsl-ns" checkdepends="python3" source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz dont-test-other-encodings.patch @@ -164,7 +164,7 @@ subtree_doc() { gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1 } -sha512sums="8fa0900e1a583cdacbafa2e0d00a4cb50ad225c11227f6a811b721e56677b62b1354995e2b7117a66b1e89dbcb2cddc1eee7ef1e57723d9615a063a318095f14 git-2.22.1.tar.xz +sha512sums="31c8c001fdea3b1e3e732cc42299979f1329d564f76d3950c90a0090afc1fa1ba50bdb7f86da92066843887986cc73a34c13dd651566d1af9036ecbe8aee42c3 git-2.24.0.tar.xz 315e4666c425b31a7f7a447e777cbf2a1050feac9b4d4b8a61c05248024e790d4d18f3336faf2a2c68584e05e8194c22a09e1caba1352cfec194e0bc01277a6c dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" -- cgit v1.2.3-70-g09d2 From c9107f36db837bd3ede97a9b3cf7b1c56d66eddd Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sat, 21 Dec 2019 00:45:29 +0000 Subject: system/g*: fix metadata --- system/gettext-tiny/APKBUILD | 9 +++------ system/gettys-openrc/APKBUILD | 3 ++- system/git/APKBUILD | 23 +++++++++++------------ system/gmp/APKBUILD | 6 +----- system/grep/APKBUILD | 5 +++-- system/gzip/APKBUILD | 2 +- 6 files changed, 21 insertions(+), 27 deletions(-) (limited to 'system/git') diff --git a/system/gettext-tiny/APKBUILD b/system/gettext-tiny/APKBUILD index 6edd0b4b3..a2e541df5 100644 --- a/system/gettext-tiny/APKBUILD +++ b/system/gettext-tiny/APKBUILD @@ -2,15 +2,14 @@ # Maintainer: A. Wilcox pkgname=gettext-tiny pkgver=0.3.0_pre1 -pkgrel=6 +pkgrel=7 pkgdesc="An internationalisation and localisation system" url="https://github.com/sabotage-linux/gettext-tiny" arch="all" options="!check" # No test suite. license="MIT" -depends="!gettext" -depends_dev="!gettext-dev" -install="" +depends="" +makedepends="" subpackages="$pkgname-dev" source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz omg-i-cant-believe-im-doing-ua-crap.patch @@ -23,12 +22,10 @@ source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz " build() { - cd "$builddir" make LIBINTL=MUSL prefix=/usr } package() { - cd "$builddir" make LIBINTL=MUSL DESTDIR="$pkgdir" prefix=/usr install } diff --git a/system/gettys-openrc/APKBUILD b/system/gettys-openrc/APKBUILD index 7ce5b8e09..4fab39d06 100644 --- a/system/gettys-openrc/APKBUILD +++ b/system/gettys-openrc/APKBUILD @@ -4,11 +4,12 @@ pkgname=gettys-openrc pkgver=0.0.2.1 pkgrel=0 pkgdesc="Dynamic getty services" -url="https://adelielinux.org/" +url="https://www.adelielinux.org/" arch="noarch" options="!check" # No test suite. license="NCSA" depends="execline s6" +makedepends="" source="gettys.confd gettys.initd" package() { diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 505ae0a0d..35b792322 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -3,19 +3,14 @@ pkgname=git pkgver=2.24.0 pkgrel=0 -pkgdesc="A distributed version control system" +pkgdesc="Distributed version control system" url="https://www.git-scm.com/" arch="all" license="GPL-2.0+" depends="perl-error" -replaces="git-perl perl-git" - -# secfixes: -# 2.19.2: -# - CVE-2018-19486 -# 2.14.1: -# - CVE-2017-1000117 - +checkdepends="python3" +makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev + pcre2-dev asciidoctor xmlto perl-error docbook-xsl-ns" # note that order matters subpackages="$pkgname-doc $pkgname-bash-completion:completion:noarch @@ -28,9 +23,7 @@ subpackages="$pkgname-doc $pkgname-subtree::noarch $pkgname-subtree-doc:subtree_doc:noarch " -makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev - pcre2-dev asciidoctor xmlto perl-error docbook-xsl-ns" -checkdepends="python3" +replaces="git-perl perl-git" source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz dont-test-other-encodings.patch git-daemon.initd @@ -38,6 +31,12 @@ source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz " _gitcoredir=/usr/libexec/git-core +# secfixes: +# 2.19.2: +# - CVE-2018-19486 +# 2.14.1: +# - CVE-2017-1000117 + prepare() { default_prepare cat >> config.mak <<-EOF diff --git a/system/gmp/APKBUILD b/system/gmp/APKBUILD index 69f4b2c9c..ab8f1b70b 100644 --- a/system/gmp/APKBUILD +++ b/system/gmp/APKBUILD @@ -6,21 +6,19 @@ pkgdesc="A free library for arbitrary precision arithmetic" url="https://gmplib.org/" arch="all" license="LGPL-3.0+ OR GPL-2.0+" +depends="" makedepends="m4 texinfo libtool" -depends= subpackages="$pkgname-doc $pkgname-dev libgmpxx" source="https://gmplib.org/download/gmp/gmp-$pkgver.tar.xz " prepare() { - cd "$builddir" default_prepare # force update to libtool with fixed cross-build support libtoolize -f } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,12 +33,10 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="${pkgdir}" install } check() { - cd "$builddir" [ "$CBUILD" = "$CHOST" ] && make check } diff --git a/system/grep/APKBUILD b/system/grep/APKBUILD index 962d7d1e1..e8225712c 100644 --- a/system/grep/APKBUILD +++ b/system/grep/APKBUILD @@ -4,12 +4,13 @@ pkgname=grep pkgver=3.3 pkgrel=0 -pkgdesc="Searches input files for lines containing a match to a specified pattern" +pkgdesc="Pattern matching utilities" url="https://www.gnu.org/software/grep/grep.html" arch="all" license="GPL-3.0+" -makedepends="pcre-dev autoconf automake" +depends="" checkdepends="coreutils bash diffutils" +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 diff --git a/system/gzip/APKBUILD b/system/gzip/APKBUILD index 698fc2c74..8528c74e6 100644 --- a/system/gzip/APKBUILD +++ b/system/gzip/APKBUILD @@ -4,7 +4,7 @@ pkgname=gzip pkgver=1.10 pkgrel=0 -pkgdesc="A popular data compression program" +pkgdesc="The GNU data compression program" subpackages="$pkgname-doc" url="https://www.gnu.org/software/gzip/" arch="all" -- cgit v1.2.3-70-g09d2 From bcf59c2bb3e2e9c42ed6d97c213a1f12feef4019 Mon Sep 17 00:00:00 2001 From: Molly Miller Date: Thu, 12 Dec 2019 23:31:21 +0000 Subject: system/git: [cve] bump to 2.24.1 --- system/git/APKBUILD | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'system/git') diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 35b792322..ba6a1b3fd 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik # Maintainer: A. Wilcox pkgname=git -pkgver=2.24.0 +pkgver=2.24.1 pkgrel=0 pkgdesc="Distributed version control system" url="https://www.git-scm.com/" @@ -32,6 +32,16 @@ source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz _gitcoredir=/usr/libexec/git-core # secfixes: +# 2.24.1 +# - CVE-2019-1348 +# - CVE-2019-1349 +# - CVE-2019-1350 +# - CVE-2019-1351 +# - CVE-2019-1352 +# - CVE-2019-1353 +# - CVE-2019-1354 +# - CVE-2019-1387 +# - CVE-2019-19604 # 2.19.2: # - CVE-2018-19486 # 2.14.1: @@ -163,7 +173,7 @@ subtree_doc() { gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1 } -sha512sums="31c8c001fdea3b1e3e732cc42299979f1329d564f76d3950c90a0090afc1fa1ba50bdb7f86da92066843887986cc73a34c13dd651566d1af9036ecbe8aee42c3 git-2.24.0.tar.xz +sha512sums="010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7 git-2.24.1.tar.xz 315e4666c425b31a7f7a447e777cbf2a1050feac9b4d4b8a61c05248024e790d4d18f3336faf2a2c68584e05e8194c22a09e1caba1352cfec194e0bc01277a6c dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" -- cgit v1.2.3-70-g09d2 From e3af131b32798d656d80ddce45f16ee04897421b Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 22 Dec 2019 02:46:00 +0000 Subject: system/git: fix secfixes comment --- system/git/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/git') diff --git a/system/git/APKBUILD b/system/git/APKBUILD index ba6a1b3fd..07adcfdaa 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -32,7 +32,7 @@ source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz _gitcoredir=/usr/libexec/git-core # secfixes: -# 2.24.1 +# 2.24.1: # - CVE-2019-1348 # - CVE-2019-1349 # - CVE-2019-1350 -- cgit v1.2.3-70-g09d2 From ec1d2fc6b5639d227670e0a689135fd5ab6bffbb Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 14 Jan 2020 08:25:47 +0000 Subject: system/git: Bump to 2.25.0 --- system/git/APKBUILD | 8 +- system/git/dont-test-other-encodings.patch | 135 ----------------------------- 2 files changed, 4 insertions(+), 139 deletions(-) (limited to 'system/git') diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 07adcfdaa..0440b0f0b 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik # Maintainer: A. Wilcox pkgname=git -pkgver=2.24.1 +pkgver=2.25.0 pkgrel=0 pkgdesc="Distributed version control system" url="https://www.git-scm.com/" @@ -22,6 +22,7 @@ subpackages="$pkgname-doc $pkgname-gitweb $pkgname-subtree::noarch $pkgname-subtree-doc:subtree_doc:noarch + $pkgname-lang " replaces="git-perl perl-git" source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz @@ -50,7 +51,6 @@ _gitcoredir=/usr/libexec/git-core prepare() { default_prepare cat >> config.mak <<-EOF - NO_GETTEXT=YesPlease NO_SVN_TESTS=YesPlease NO_REGEX=YesPlease USE_ASCIIDOCTOR=1 @@ -173,7 +173,7 @@ subtree_doc() { gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1 } -sha512sums="010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7 git-2.24.1.tar.xz -315e4666c425b31a7f7a447e777cbf2a1050feac9b4d4b8a61c05248024e790d4d18f3336faf2a2c68584e05e8194c22a09e1caba1352cfec194e0bc01277a6c dont-test-other-encodings.patch +sha512sums="8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191 git-2.25.0.tar.xz +0a0935d876024d96156df3aeec06b47fd9e370484d4552786c450cb500ae671a631e64c30994ec39f43a2f313f75d68909688ea92b47327d1af65e365dc77480 dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" diff --git a/system/git/dont-test-other-encodings.patch b/system/git/dont-test-other-encodings.patch index 9019d4cab..7d176d57a 100644 --- a/system/git/dont-test-other-encodings.patch +++ b/system/git/dont-test-other-encodings.patch @@ -1,140 +1,5 @@ We can't support Japanese people using musl ---- git-2.14.1/t/t3900-i18n-commit.sh.old 2017-08-09 14:54:31.000000000 -0500 -+++ git-2.14.1/t/t3900-i18n-commit.sh 2017-09-10 21:10:09.269860087 -0500 -@@ -76,132 +76,4 @@ - test_i18ngrep "did not conform" "$HOME"/stderr - ' - --for H in ISO8859-1 eucJP ISO-2022-JP --do -- test_expect_success "$H setup" ' -- git config i18n.commitencoding $H && -- git checkout -b $H C0 && -- echo $H >F && -- git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt -- ' --done -- --for H in ISO8859-1 eucJP ISO-2022-JP --do -- test_expect_success "check encoding header for $H" ' -- E=$(git cat-file commit '$H' | sed -ne "s/^encoding //p") && -- test "z$E" = "z'$H'" -- ' --done -- --test_expect_success 'config to remove customization' ' -- git config --unset-all i18n.commitencoding && -- if Z=$(git config --get-all i18n.commitencoding) -- then -- echo Oops, should have failed. -- false -- else -- test z = "z$Z" -- fi && -- git config i18n.commitencoding UTF-8 --' -- --test_expect_success 'ISO8859-1 should be shown in UTF-8 now' ' -- compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt --' -- --for H in eucJP ISO-2022-JP --do -- test_expect_success "$H should be shown in UTF-8 now" ' -- compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt -- ' --done -- --test_expect_success 'config to add customization' ' -- git config --unset-all i18n.commitencoding && -- if Z=$(git config --get-all i18n.commitencoding) -- then -- echo Oops, should have failed. -- false -- else -- test z = "z$Z" -- fi --' -- --for H in ISO8859-1 eucJP ISO-2022-JP --do -- test_expect_success "$H should be shown in itself now" ' -- git config i18n.commitencoding '$H' && -- compare_with '$H' "$TEST_DIRECTORY"/t3900/'$H'.txt -- ' --done -- --test_expect_success 'config to tweak customization' ' -- git config i18n.logoutputencoding UTF-8 --' -- --test_expect_success 'ISO8859-1 should be shown in UTF-8 now' ' -- compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt --' -- --for H in eucJP ISO-2022-JP --do -- test_expect_success "$H should be shown in UTF-8 now" ' -- compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt -- ' --done -- --for J in eucJP ISO-2022-JP --do -- if test "$J" = ISO-2022-JP -- then -- ICONV=$J -- else -- ICONV= -- fi -- git config i18n.logoutputencoding $J -- for H in eucJP ISO-2022-JP -- do -- test_expect_success "$H should be shown in $J now" ' -- compare_with '$H' "$TEST_DIRECTORY"/t3900/'$J'.txt $ICONV -- ' -- done --done -- --for H in ISO8859-1 eucJP ISO-2022-JP --do -- test_expect_success "No conversion with $H" ' -- compare_with "--encoding=none '$H'" "$TEST_DIRECTORY"/t3900/'$H'.txt -- ' --done -- --test_commit_autosquash_flags () { -- H=$1 -- flag=$2 -- test_expect_success "commit --$flag with $H encoding" ' -- git config i18n.commitencoding $H && -- git checkout -b $H-$flag C0 && -- echo $H >>F && -- git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt && -- test_tick && -- echo intermediate stuff >>G && -- git add G && -- git commit -a -m "intermediate commit" && -- test_tick && -- echo $H $flag >>F && -- git commit -a --$flag HEAD~1 && -- E=$(git cat-file commit '$H-$flag' | -- sed -ne "s/^encoding //p") && -- test "z$E" = "z$H" && -- git config --unset-all i18n.commitencoding && -- git rebase --autosquash -i HEAD^^^ && -- git log --oneline >actual && -- test_line_count = 3 actual -- ' --} -- --test_commit_autosquash_flags eucJP fixup -- --test_commit_autosquash_flags ISO-2022-JP squash -- - test_done --- git-2.14.1/t/t5100-mailinfo.sh.old 2017-08-09 14:54:31.000000000 -0500 +++ git-2.14.1/t/t5100-mailinfo.sh 2017-09-10 23:26:39.206126739 -0500 @@ -27,6 +27,7 @@ -- cgit v1.2.3-70-g09d2 From 87584140abe9d40089d81496a8bd232d11488c14 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 25 Feb 2020 10:10:45 +0000 Subject: system/git: Bump to 2.25.1 --- system/git/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'system/git') 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 # Maintainer: A. Wilcox 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" -- cgit v1.2.3-70-g09d2