diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
| commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
| tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /package/openssh | |
| parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
| parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) | |
fix conflict
Diffstat (limited to 'package/openssh')
| -rw-r--r-- | package/openssh/Makefile | 4 | ||||
| -rw-r--r-- | package/openssh/patches/patch-openbsd-compat_port-linux_c | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 0ce3b3f52..0eca41056 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 5.6p1 +PKG_VERSION:= 5.8p2 PKG_RELEASE:= 1 -PKG_MD5SUM:= e6ee52e47c768bf0ec42a232b5d18fb0 +PKG_MD5SUM:= 0541579adf9d55abb15ef927048d372e PKG_DESCR:= OpenSSH PKG_SECTION:= net/security PKG_DEPENDS:= zlib libopenssl libpthread diff --git a/package/openssh/patches/patch-openbsd-compat_port-linux_c b/package/openssh/patches/patch-openbsd-compat_port-linux_c deleted file mode 100644 index cf57335e0..000000000 --- a/package/openssh/patches/patch-openbsd-compat_port-linux_c +++ /dev/null @@ -1,14 +0,0 @@ -avoid following warning in syslog: -sshd (1111): /proc/1111/oom_adj is deprecated, please use /proc/1111/oom_score_adj instead. - ---- openssh-5.6p1.orig/openbsd-compat/port-linux.c 2010-03-01 05:52:50.000000000 +0100 -+++ openssh-5.6p1/openbsd-compat/port-linux.c 2011-01-27 19:16:12.000000000 +0100 -@@ -208,7 +208,7 @@ ssh_selinux_change_context(const char *n - #endif /* WITH_SELINUX */ - - #ifdef LINUX_OOM_ADJUST --#define OOM_ADJ_PATH "/proc/self/oom_adj" -+#define OOM_ADJ_PATH "/proc/self/oom_score_adj" - /* - * The magic "don't kill me", as documented in eg: - * http://lxr.linux.no/#linux+v2.6.32/Documentation/filesystems/proc.txt |