From f00ece6b77eab640777a4821fd977a5c6389690e5a2354307ea7f08ec2b22854 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Tue, 19 Oct 2010 00:34:35 +0000 Subject: [PATCH] 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 | 17 +++++++++++++++++ openssh.changes | 5 +++++ openssh.spec | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 openssh-deprecated-oom_adj.patch diff --git a/openssh-deprecated-oom_adj.patch b/openssh-deprecated-oom_adj.patch new file mode 100644 index 0000000..051e1d3 --- /dev/null +++ b/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; + diff --git a/openssh.changes b/openssh.changes index 9d1dd8a..7f2be63 100644 --- a/openssh.changes +++ b/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 diff --git a/openssh.spec b/openssh.spec index b20f7b6..000419e 100644 --- a/openssh.spec +++ b/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}