diff options
| -rw-r--r-- | system/git/APKBUILD | 8 | ||||
| -rw-r--r-- | system/git/bb-tar.patch | 8 | ||||
| -rw-r--r-- | system/git/dont-test-other-encodings.patch | 16 |
3 files changed, 14 insertions, 18 deletions
diff --git a/system/git/APKBUILD b/system/git/APKBUILD index d3b64080d..4446e214a 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.18.0 +pkgver=2.19.1 pkgrel=0 pkgdesc="A distributed version control system" url="https://www.git-scm.com/" @@ -30,7 +30,6 @@ makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev pcre2-dev asciidoctor xmlto perl-error" checkdepends="python3" source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz - bb-tar.patch dont-test-other-encodings.patch git-daemon.initd git-daemon.confd @@ -167,8 +166,7 @@ subtree_doc() { gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1 } -sha512sums="db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46 git-2.18.0.tar.xz -85767b5e03137008d6a96199e769e3979f75d83603ac8cb13a3481a915005637409a4fd94e0720da2ec6cd1124f35eba7cf20109a94816c4b4898a81fbc46bd2 bb-tar.patch -1e1cf54be8db0b7a63de2267f3cb0359070a50dcd940e5329a126f1d9f26b2596b93f2b836adc953e4d5b148bbba2eb8234dfeb2929ac3c1e3162507781141f6 dont-test-other-encodings.patch +sha512sums="a1bc1032b1de9eb9ea8b7c385cd009f64247e13066e0a91e9682e35400ded05f88c23b523cca4782f57544060d6ba0f9d3bec944399cda5771a4945c38bb9b98 git-2.19.1.tar.xz +ef6c31ac1474fa128aecf86eda75653fdd0fe7a09d35914c1a03749abf9c92cbc01f8064b2b697ca796fa18bec717b9bcb1aac6d36d02ce8ed4270d4728e72f0 dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" diff --git a/system/git/bb-tar.patch b/system/git/bb-tar.patch deleted file mode 100644 index d9433ef12..000000000 --- a/system/git/bb-tar.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/templates/Makefile Mon Oct 26 02:57:33 2009 -+++ b/templates/Makefile Mon Nov 9 14:56:27 2009 -@@ -63,4 +63,4 @@ - install: all - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_instdir_SQ)' - (cd blt && $(TAR) cf - .) | \ -- (cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xof -) -+ (cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xf -) diff --git a/system/git/dont-test-other-encodings.patch b/system/git/dont-test-other-encodings.patch index 54a4012fe..29c4bdb34 100644 --- a/system/git/dont-test-other-encodings.patch +++ b/system/git/dont-test-other-encodings.patch @@ -191,12 +191,14 @@ We can't support Japanese people using musl cat >expected <<EOF author $UTF8_NAME summary $UTF8_MSG ---- git-2.18.0/t/t0028-working-tree-encoding.sh.old 2018-06-21 17:18:50.000000000 +0000 -+++ git-2.18.0/t/t0028-working-tree-encoding.sh 2018-09-05 17:42:14.650000000 +0000 -@@ -6,240 +6,4 @@ +--- git-2.19.1/t/t0028-working-tree-encoding.sh.old 2018-09-27 20:46:40.000000000 +0000 ++++ git-2.19.1/t/t0028-working-tree-encoding.sh 2018-10-22 20:59:17.530000000 +0000 +@@ -4,246 +4,4 @@ - GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING + . ./test-lib.sh +-GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING +- -test_expect_success 'setup test files' ' - git config core.eol lf && - @@ -394,7 +396,11 @@ We can't support Japanese people using musl - test_i18ngrep "error: BOM is required" err.out -' - --test_expect_success 'check roundtrip encoding' ' +-test_lazy_prereq ICONV_SHIFT_JIS ' +- iconv -f UTF-8 -t SHIFT-JIS </dev/null +-' +- +-test_expect_success ICONV_SHIFT_JIS 'check roundtrip encoding' ' - test_when_finished "rm -f roundtrip.shift roundtrip.utf16" && - test_when_finished "git reset --hard HEAD" && - |