aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Angelacos <nangel@alpinelinux.org>2015-09-25 17:57:13 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-09-30 14:00:41 +0200
commita18cf0d3343c487f4a6a262f0038f21d95c35b66 (patch)
treef716c5086c8b7a0cf01b35a80c3c0088ad08b372
parent5dc05d65ae32baccbc534c2e05d3a413f076dc0a (diff)
downloadaports-a18cf0d3343c487f4a6a262f0038f21d95c35b66.tar.bz2
aports-a18cf0d3343c487f4a6a262f0038f21d95c35b66.tar.xz
main/git Allow send-email to send patches greater than 16K in size.
Source: http://git.661346.n2.nabble.com/git-send-email-Connection-Closed-td7635648.html
-rw-r--r--main/git/0001-senddata-16K-workaround.patch21
-rw-r--r--main/git/APKBUILD6
2 files changed, 26 insertions, 1 deletions
diff --git a/main/git/0001-senddata-16K-workaround.patch b/main/git/0001-senddata-16K-workaround.patch
new file mode 100644
index 0000000000..2455b259c7
--- /dev/null
+++ b/main/git/0001-senddata-16K-workaround.patch
@@ -0,0 +1,21 @@
+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
+@@ -1347,7 +1347,15 @@ 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
++ }
++ $message") 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 bcd53e40e4..10d3f8deca 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=git
pkgver=2.6.0
-pkgrel=1
+pkgrel=2
pkgdesc="A distributed version control system"
url="https://www.git-scm.com/"
arch="all"
@@ -32,6 +32,7 @@ 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
"
@@ -237,13 +238,16 @@ _git_perl() {
md5sums="6b7d43d615fb3f0dfecf4d131e23f438 git-2.6.0.tar.xz
e63a201556c4f089de790805c09a2e5b bb-tar.patch
+820595e9651c98b696d2636a0a471824 0001-senddata-16K-workaround.patch
75b9d8f33fbec38a8e0e06baf5165b19 git-daemon.initd
2258e95d389ccc6de0b5111d53d9eed6 git-daemon.confd"
sha256sums="211beb96ff41a83727e39704431ac388ecb1cebb5219cda067999bce4e1e15a6 git-2.6.0.tar.xz
cb6319f47d81605e199771350154cbed0a6e85ef9042a689f2b405c64039f49c bb-tar.patch
+45632b49b0995984feb396c25e7baf8521341840ff78b9961bc62915a71e14e3 0001-senddata-16K-workaround.patch
7918837f77b4cebce70b600b2f6da00e4c0df6b946f4ff5671c797c37b2ffc4f git-daemon.initd
aaa80bd059db549dadf4c4e27a9aa41a4b5def844f8e563c493bc8513dcd981e git-daemon.confd"
sha512sums="efcde5fa3ac56d577e25259e74f19026438ccf8888b79429eec2f141bb2a63bb83e73f65b1ea96bcc1f9f894fb90ec1b5ea81b9f0c1806d25352f6b266e7202a git-2.6.0.tar.xz
6fa088a753c2a697e8dbef2032ed63e8c2a0553a41cff2fcff893c2f35c51d2c697054cc921c23ee606f77b93d0f340df85220b15e1c470bd352f7fba3986cd0 bb-tar.patch
+7af0b0efbdf242c672864bf3ebc7413cf789c81ab82410485168ac262d6aefb417b7fbf471aaafac52d03d0f473933339a39d64a9cd114800ce5f2d1415261a4 0001-senddata-16K-workaround.patch
1e707250d133d56100f0311e7c2610920d6d81809c425ebf3e6acb4a289b958707a90dc38e1c17720da6dc2758dd84bf957fe6aed3854eacea79226eb616e885 git-daemon.initd
9640f8078d68ed2678e5249da3f946fc21f50e858b94127a4221de73c6132101afcd46bc1fe33861e9a7f731c0dc9591915b8ebf376b8e690cd7135703966509 git-daemon.confd"