diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:46:46 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:46:46 +0200 |
| commit | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (patch) | |
| tree | b2e2fcc845098bfb35ec584906fafe587ba45331 /package/openssh | |
| parent | b803209ad0f1f198072695109b30a726e0411084 (diff) | |
| parent | 0e0d27dc9662ffd759912233ddd71ccb99b9b681 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openssh')
| -rw-r--r-- | package/openssh/Makefile | 4 | ||||
| -rw-r--r-- | package/openssh/patches/patch-openbsd-compat_port-tun_c | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 27bc8dab8..1eb72097a 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 5.4p1 +PKG_VERSION:= 5.5p1 PKG_RELEASE:= 1 -PKG_MD5SUM:= da10af8a789fa2e83e3635f3a1b76f5e +PKG_MD5SUM:= 88633408f4cb1eb11ec7e2ec58b519eb PKG_DESCR:= OpenSSH server PKG_SECTION:= net PKG_DEPENDS:= zlib libopenssl libpthread diff --git a/package/openssh/patches/patch-openbsd-compat_port-tun_c b/package/openssh/patches/patch-openbsd-compat_port-tun_c new file mode 100644 index 000000000..a9ed6434b --- /dev/null +++ b/package/openssh/patches/patch-openbsd-compat_port-tun_c @@ -0,0 +1,11 @@ +--- openssh-5.5p1.orig/openbsd-compat/port-tun.c 2008-05-19 07:28:36.000000000 +0200 ++++ openssh-5.5p1/openbsd-compat/port-tun.c 2010-04-21 20:14:00.000000000 +0200 +@@ -213,7 +213,7 @@ sys_tun_infilter(struct Channel *c, char + if (len <= 0 || len > (int)(sizeof(rbuf) - sizeof(*af))) + return (-1); + ptr = (char *)&rbuf[0]; +- bcopy(buf, ptr + sizeof(u_int32_t), len); ++ memcpy(ptr + sizeof(u_int32_t), buf, len); + len += sizeof(u_int32_t); + af = (u_int32_t *)ptr; + |