Accepting request 50922 from Base:System

Accepted submit request 50922 from user elvigia

OBS-URL: https://build.opensuse.org/request/show/50922
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=50

openssh-deprecated-oom_adj.patch

@@ -0,0 +1,17 @@
+--- openbsd-compat/port-linux.c.orig
++++ openbsd-compat/port-linux.c
+@@ -208,12 +208,12 @@ 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
+  */
+-#define OOM_ADJ_NOKILL	-17
++#define OOM_ADJ_NOKILL	-1000
+ 
+ static int oom_adj_save = INT_MIN;
+ 

openssh.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 14 16:00:19 UTC 2010 - crrodriguez@opensuse.org
+
+- Fix warning "oom_adj is deprecated use oom_score_adj instead" 
+
 -------------------------------------------------------------------
 Mon Sep 13 14:47:10 CEST 2010 - anicka@suse.cz
 

openssh.spec

@@ -69,6 +69,7 @@ Patch16:        %{name}-%{version}-pts.diff
 Patch17:        %{name}-%{version}-homechroot.patch
 Patch18:        %{name}-%{version}-sshconfig-knownhostschanges.diff
 Patch19:        %{name}-%{version}-host_ident.diff
+Patch20:	    openssh-deprecated-oom_adj.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package      askpass
@@ -114,6 +115,7 @@ Window System passphrase dialog for OpenSSH.
 %patch17
 %patch18
 %patch19 -p1
+%patch20
 cp -v %{SOURCE4} .
 cp -v %{SOURCE6} .
 cd ../x11-ssh-askpass-%{xversion}