summaryrefslogtreecommitdiffstats
path: root/main/openssh
diff options
context:
space:
mode:
authorBartłomiej Piotrowski <b@bpiotrowski.pl>2013-09-14 11:00:30 +0200
committerBartłomiej Piotrowski <b@bpiotrowski.pl>2013-09-14 11:00:30 +0200
commit373c1bee7743a7a7d4f2a785ccfb4b9d45b84560 (patch)
tree6733aa2084d284996303a6c8fe12b98792805bd5 /main/openssh
parent2672d97850a3eeaee0565720a4dd7426442a4fb7 (diff)
downloadaports-373c1bee7743a7a7d4f2a785ccfb4b9d45b84560.tar.bz2
aports-373c1bee7743a7a7d4f2a785ccfb4b9d45b84560.tar.xz
main/openssh: upgrade to 6.3_p1
Diffstat (limited to 'main/openssh')
-rw-r--r--main/openssh/APKBUILD16
-rw-r--r--main/openssh/openssh6.2-dynwindows.diff9
2 files changed, 13 insertions, 12 deletions
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD
index cb4fb27be..e14f8baef 100644
--- a/main/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=openssh
-pkgver=6.2_p2
+pkgver=6.3_p1
_myver=${pkgver%_*}${pkgver#*_}
-pkgrel=2
+pkgrel=0
pkgdesc="Port of OpenBSD's free SSH release"
url="http://www.openssh.org/portable.html"
arch="all"
@@ -99,20 +99,20 @@ client() {
"$subpkgdir"/usr/bin/ssh-copy-id || return 1
}
-md5sums="be46174dcbb77ebb4ea88ef140685de1 openssh-6.2p2.tar.gz
-1bf93a2d49f89c4b399ad361bd740921 openssh6.2-dynwindows.diff
+md5sums="225e75c9856f76011966013163784038 openssh-6.3p1.tar.gz
+2306a0f6ba8915c02c533e7bf6e64fe8 openssh6.2-dynwindows.diff
949ff348573438163240c60d6c3618eb openssh-peaktput.diff
c65d454dc5b149647273485fc184636d openssh-hmac-accel.diff
cb0dd08c413fad346f0c594107b4a2e0 sshd.initd
b35e9f3829f4cfca07168fcba98749c7 sshd.confd"
-sha256sums="7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b openssh-6.2p2.tar.gz
-db1ff210e444f91db53e565620f1a5a1570cd1a4b2c34aaba3cf7d79e9d3a045 openssh6.2-dynwindows.diff
+sha256sums="aea575ededd3ebd45c05d42d0a87af22c79131a847ea440c54e3fdd223f5a420 openssh-6.3p1.tar.gz
+4f78f16807c6b6a3a3773c000b85df0c56ea8a93dc35eaa6bbdffe6e30328e58 openssh6.2-dynwindows.diff
dab18c1fd1496c1ba4a4fe08c6c6b8cf3347fc82878d85498202f50168161f6b openssh-peaktput.diff
902ea83a9ef726f32b096280da0f1b722f4372886c65c4e28985ee57e725d95c openssh-hmac-accel.diff
3fa062fd4bfac64abf21f3c1d0548f1dfcf3c6e56e84ece14c848f53a293024e sshd.initd
29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41 sshd.confd"
-sha512sums="80c8fb6bb25e86e8261cc7c6671773cdc0d9b0da9c9ebca33b3d5278c44197734fe32e878e1f444b693c4b49b0a525458aa07e57c231cefafc23a9c6975b05df openssh-6.2p2.tar.gz
-4eabb5a9d6107a43deb408ebddaa697a0f76c977c0b2b8ce32979e1a2e163b83a932dd34f3fb2f6211d0e443dc1a5f49d4fcb646a80e52a609af497e4923f1d5 openssh6.2-dynwindows.diff
+sha512sums="9ae0d11b7305739345e84adbf9dae769705ff93b3d3c3ccd9b7fb887a69716518bee931fd698f2c67087ae75281a25bcfd72220cbac1c751715d540d208a6a9a openssh-6.3p1.tar.gz
+773cc0629e17a8f78e82be56e579855ea9b3ca8fd26360964aee854d717a7cfc2c9d4d654cf0fda5723c3aabe96e48ee2cfe6d1fd64b5717f0ef5eb997d00293 openssh6.2-dynwindows.diff
64f2c94f41225c76428440d778b0bf5657408123d1cd7d6cb4bdf5000bfba8ad80ec5e57acd0880adc7a8ea7e2f1a64e329b83cf8be630b9aaebff6ab138d025 openssh-peaktput.diff
aaa128126400171d0755038a846672aa7b1e87340edf73a672962d403abf404ef1821466b17da51dde25f04ec7533ae4a653399ccc912ea9c4a7b1a14032e76f openssh-hmac-accel.diff
1483e2bcd700da9b02f04508d490b472c816344787bf1675fef2f7e27f72b91e4323e4e8c1db701e47d81d37d6d4b0623eaeac46b2cf589ae5ad69f363baa594 sshd.initd
diff --git a/main/openssh/openssh6.2-dynwindows.diff b/main/openssh/openssh6.2-dynwindows.diff
index c903d30c1..2e1492792 100644
--- a/main/openssh/openssh6.2-dynwindows.diff
+++ b/main/openssh/openssh6.2-dynwindows.diff
@@ -420,9 +420,9 @@ diff -rNuwpB canonical/readconf.c dynamic/readconf.c
@@ -135,6 +135,7 @@ typedef enum {
oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
- oKexAlgorithms, oIPQoS, oRequestTTY,
+ oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown,
+ oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
- oDeprecated, oUnsupported
+ oIgnoredUnknownOption, oDeprecated, oUnsupported
} OpCodes;
@@ -247,6 +248,11 @@ static struct {
@@ -471,6 +471,7 @@ diff -rNuwpB canonical/readconf.c dynamic/readconf.c
options->ip_qos_interactive = -1;
options->ip_qos_bulk = -1;
options->request_tty = -1;
+ options->ignored_unknown = NULL;
+
+ options->hpn_disabled = -1;
+ options->hpn_buffer_size = -1;
@@ -1003,9 +1004,9 @@ diff -rNuwpB canonical/version.h dynamic/version.h
--- canonical/version.h 2013-05-10 02:02:21.000000000 -0400
+++ dynamic/version.h 2013-08-14 15:27:52.736478576 -0400
@@ -3,4 +3,5 @@
- #define SSH_VERSION "OpenSSH_6.2"
+ #define SSH_VERSION "OpenSSH_6.3"
- #define SSH_PORTABLE "p2"
+ #define SSH_PORTABLE "p1"
-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
+#define SSH_HPN "-hpn14v1"
+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN