diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
| commit | 2c8917958da115704507aab835c41c1a4a63664d (patch) | |
| tree | e79c26b6347e2ae8444bcdbce1236cc48f63107e /package/openssh/patches/patch-openbsd-compat_port-linux_c | |
| parent | cf5ef7c683fa845a6e6412b319e0a1040aa0f445 (diff) | |
| parent | cd83ced050a5d68c922a0de054ac022cd4ff26ac (diff) | |
resolve conflict
Diffstat (limited to 'package/openssh/patches/patch-openbsd-compat_port-linux_c')
| -rw-r--r-- | package/openssh/patches/patch-openbsd-compat_port-linux_c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/package/openssh/patches/patch-openbsd-compat_port-linux_c b/package/openssh/patches/patch-openbsd-compat_port-linux_c new file mode 100644 index 000000000..cf57335e0 --- /dev/null +++ b/package/openssh/patches/patch-openbsd-compat_port-linux_c @@ -0,0 +1,14 @@ +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 |