diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/git/0001-senddata-16K-workaround.patch | 20 | ||||
| -rw-r--r-- | main/git/APKBUILD | 14 |
2 files changed, 5 insertions, 29 deletions
diff --git a/main/git/0001-senddata-16K-workaround.patch b/main/git/0001-senddata-16K-workaround.patch deleted file mode 100644 index 341a2a2e82..0000000000 --- a/main/git/0001-senddata-16K-workaround.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/git-send-email.perl b/git-send-email.perl -index ae9f869..b11dce8 100755 ---- a/git-send-email.perl -+++ b/git-send-email.perl -@@ -1365,7 +1365,14 @@ Message-Id: $message_id - $smtp->mail( $raw_from ) or die $smtp->message; - $smtp->to( @recipients ) or die $smtp->message; - $smtp->data or die $smtp->message; -- $smtp->datasend("$header\n$message") or die $smtp->message; -+ # Apparently datasend cannot send more than about 16 and large patches -+ # cannot be sent. Source: -+ # http://git.661346.n2.nabble.com/git-send-email-Connection-Closed-td7635648.html -+ $smtp->datasend("$header\n") or die $smtp->message; -+ my @lines = split /^/, $message; -+ foreach my $line (@lines) { -+ $smtp->datasend("$line") or die $smtp->message; -+ } - $smtp->dataend() or die $smtp->message; - $smtp->code =~ /250|200/ or die "Failed to send $subject\n".$smtp->message; - } diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 278dbbe0b0..f8356f0275 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git -pkgver=2.6.1 -pkgrel=1 +pkgver=2.6.3 +pkgrel=0 pkgdesc="A distributed version control system" url="https://www.git-scm.com/" arch="all" @@ -32,7 +32,6 @@ makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python-dev pcre-dev asciidoc xmlto perl-error tcl tk" source="git-$pkgver.tar.xz::https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz bb-tar.patch - 0001-senddata-16K-workaround.patch git-daemon.initd git-daemon.confd " @@ -236,18 +235,15 @@ _git_perl() { } -md5sums="dd4a3a7fe96598c553edd39d40c9c290 git-2.6.1.tar.xz +md5sums="5a6375349c3f13c8dbbabfc327bae429 git-2.6.3.tar.xz 0549894076c2081d886fa5ee44c20e23 bb-tar.patch -4f7bd16e389e7df50433cea04d967353 0001-senddata-16K-workaround.patch 75b9d8f33fbec38a8e0e06baf5165b19 git-daemon.initd 2258e95d389ccc6de0b5111d53d9eed6 git-daemon.confd" -sha256sums="fc7c727745d5eb0d796a16dc7c4b999c184830110e0aeb592c788597cc8e9ccd git-2.6.1.tar.xz +sha256sums="d697e4d3d76830996c05bfc2a1d88aa726415b276a884a40d137575e5d597da3 git-2.6.3.tar.xz 968e996a306dab643970c5ce1ac40926146b01b9c38a8fe81c74340a0302dbc7 bb-tar.patch -b1440ce71aa4c2d5396472514d4f4e4adf2f6cf6c72bb7811c083f3b4e3fa700 0001-senddata-16K-workaround.patch 7918837f77b4cebce70b600b2f6da00e4c0df6b946f4ff5671c797c37b2ffc4f git-daemon.initd aaa80bd059db549dadf4c4e27a9aa41a4b5def844f8e563c493bc8513dcd981e git-daemon.confd" -sha512sums="55516aeaa73baf180135a0812bfcb35e26699db034688049a11b4ec98faa6c23582e78a1a72a87332116bb88a2d7e9565ccc7891de883b82ad7524ee2809a25e git-2.6.1.tar.xz +sha512sums="c388235806c5cc67e6ee4ba56225b91f27c09305cbc4f988199a45897c0bf065b9e44f18bd671bb0483133598e5bfa08382742caaca8a77ca117b039bf59d024 git-2.6.3.tar.xz 85767b5e03137008d6a96199e769e3979f75d83603ac8cb13a3481a915005637409a4fd94e0720da2ec6cd1124f35eba7cf20109a94816c4b4898a81fbc46bd2 bb-tar.patch -3e481be3ece1a982b364955b0080dd648579d78bfcaca01f1120e0fc06cc41f162d9af50adf6eeb7cc20cf8bead6e18b2a313c444a2df3c71337ea827860cfc0 0001-senddata-16K-workaround.patch 1e707250d133d56100f0311e7c2610920d6d81809c425ebf3e6acb4a289b958707a90dc38e1c17720da6dc2758dd84bf957fe6aed3854eacea79226eb616e885 git-daemon.initd 9640f8078d68ed2678e5249da3f946fc21f50e858b94127a4221de73c6132101afcd46bc1fe33861e9a7f731c0dc9591915b8ebf376b8e690cd7135703966509 git-daemon.confd" |