Hello community,
here is the log from the commit of package procps for openSUSE:Factory checked
in at 2013-09-26 19:42:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/procps (Old)
and /work/SRC/openSUSE:Factory/.procps.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procps"
Changes:
--------
--- /work/SRC/openSUSE:Factory/procps/procps.changes 2013-08-04
17:07:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.procps.new/procps.changes 2013-09-26
19:42:51.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Aug 30 14:58:48 UTC 2013 - wer...@suse.de
+
+- Add patch procps-ng-3.3.8-shmem.patch to show shared memory in
+ 'free' again
+- Add patch procps-ng-3.3.8-libselinux.patch to be able to enable
+ selinux
+
+-------------------------------------------------------------------
New:
----
procps-ng-3.3.8-libselinux.patch
procps-ng-3.3.8-shmem.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ procps.spec ++++++
--- /var/tmp/diff_new_pack.atKVA9/_old 2013-09-26 19:42:56.000000000 +0200
+++ /var/tmp/diff_new_pack.atKVA9/_new 2013-09-26 19:42:56.000000000 +0200
@@ -85,6 +85,10 @@
Patch27: 0001-top-refine-some-miscellaneous-signals-interrupt-stuf.patch
# PATCH-FIX-OPENSUSE -- trifle rest of the old terabyte patch
Patch28: procps-ng-3.3.8-vmstat-terabyte.dif
+# PATCH-FIX-UPSTREAM -- Show shared memory in 'free' again
+Patch29: procps-ng-3.3.8-shmem.patch
+# PATCH-FIX-UPSTREAM -- Add enable-libselinux switch
+Patch30: procps-ng-3.3.8-libselinux.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -157,6 +161,8 @@
%patch26 -p1
%patch27 -p1
%patch28
+%patch29 -p1
+%patch30 -p1
%build
test -s .tarball-version || echo %{version} > .tarball-version
@@ -179,6 +185,7 @@
--enable-sigwinch \
--enable-wide-percent \
--enable-w-from \
+ --enable-libselinux \
--with-pic=yes \
%if 0%{?suse_version} > 1230
--with-systemd \
++++++ procps-ng-3.3.8-libselinux.patch ++++++
| From: Jaromir Capik <jca...@redhat.com>
| To: procps-ng <pro...@freelists.org>
| Subject: [procps] Re: --enable-libselinux switch
|
diff -Naur procps-ng-3.3.8.orig/configure.ac procps-ng-3.3.8/configure.ac
--- procps-ng-3.3.8.orig/configure.ac 2013-05-25 23:39:39.000000000 +0200
+++ procps-ng-3.3.8/configure.ac 2013-08-06 19:53:49.595654086 +0200
@@ -111,6 +111,14 @@
AC_DEFINE([WITH_WATCH8BIT], [1], [Enable 8 bit clean watch])
fi
+AC_ARG_ENABLE([libselinux],
+ AS_HELP_STRING([--enable-libselinux], [enable libselinux]),
+ [enable_libselinux=$enableval],
+ [enable_libselinux="no"])
+if test "$enable_libselinux" = "yes"; then
+ AC_DEFINE([ENABLE_LIBSELINUX], [1], [Enable libselinux])
+fi
+
# Optional packages - AC_ARG_WITH
AC_ARG_WITH([ncurses],
AS_HELP_STRING([--without-ncurses], [build only applications not needing
ncurses]),
diff -Naur procps-ng-3.3.8.orig/ps/output.c procps-ng-3.3.8/ps/output.c
--- procps-ng-3.3.8.orig/ps/output.c 2013-05-25 23:39:40.000000000 +0200
+++ procps-ng-3.3.8/ps/output.c 2013-08-06 19:55:32.477650664 +0200
@@ -1282,6 +1282,8 @@
/****************** FLASK & seLinux security stuff **********************/
// move the bulk of this to libproc sometime
+#if !ENABLE_LIBSELINUX
+
static int pr_context(char *restrict const outbuf, const proc_t *restrict
const pp){
char filename[48];
size_t len;
@@ -1310,7 +1312,8 @@
return 1;
}
-#if 0
+#else
+
// This needs more study, considering:
// 1. the static linking option (maybe disable this in that case)
// 2. the -z and -Z option issue
@@ -1345,6 +1348,7 @@
}
return len;
}
+
#endif
>From 4f0fe2993a92ac355ea8da3f1434cba0389ef389 Mon Sep 17 00:00:00 2001
From: Jim Warner <james.war...@comcast.net>
Date: Wed, 7 Aug 2013 12:58:57 -0500
Subject: [PATCH] ps: address a potential 'newline' quirk the libselinux
Sometimes with libselinux present but SELinux inactive
the context reported is "unconfined" which contains an
embedded newline. This then causes misalignment of any
subsequent data. So, ps will now protect against that.
Reference(s):
http://www.freelists.org/post/procps/enablelibselinux-switch,14
Signed-off-by: Jim Warner <james.war...@comcast.net>
---
ps/output.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/ps/output.c b/ps/output.c
index b7b21d1..d457a89 100644
--- a/ps/output.c
+++ b/ps/output.c
@@ -1339,6 +1339,7 @@ static int pr_context(char *restrict const outbuf, const
proc_t *restrict const
len = strlen(context);
if(len > max_len) len = max_len;
memcpy(outbuf, context, len);
+ if (outbuf[len-1] == '\n') --len;
outbuf[len] = '\0';
free(context);
}else{
--
1.8.1.2
++++++ procps-ng-3.3.8-selinux.patch ++++++
--- /var/tmp/diff_new_pack.atKVA9/_old 2013-09-26 19:42:56.000000000 +0200
+++ /var/tmp/diff_new_pack.atKVA9/_new 2013-09-26 19:42:56.000000000 +0200
@@ -9,25 +9,6 @@
if WITH_SYSTEMD
AM_LDFLAGS += @SYSTEMD_LIBS@
---- ps/output.c
-+++ ps/output.c 2013-05-29 11:02:06.109939431 +0000
-@@ -1282,6 +1282,7 @@ fail:
- /****************** FLASK & seLinux security stuff **********************/
- // move the bulk of this to libproc sometime
-
-+#if 0
- static int pr_context(char *restrict const outbuf, const proc_t *restrict
const pp){
- char filename[48];
- size_t len;
-@@ -1310,7 +1311,7 @@ fail:
- return 1;
- }
-
--#if 0
-+#else
- // This needs more study, considering:
- // 1. the static linking option (maybe disable this in that case)
- // 2. the -z and -Z option issue
--- ps/parser.c
+++ ps/parser.c 2013-05-29 10:57:34.177440830 +0000
@@ -238,7 +238,7 @@ static const char *parse_sysv_option(voi
++++++ procps-ng-3.3.8-shmem.patch ++++++
| From: Jaromir Capik <jca...@redhat.com>
| To: procps-ng <pro...@freelists.org>
| Subject: [procps] shared memory in 'free'
|
diff --git a/proc/sysinfo.c b/proc/sysinfo.c
index 15cdb83..8e4aca2 100644
--- a/proc/sysinfo.c
+++ b/proc/sysinfo.c
@@ -629,13 +629,14 @@ void meminfo(void){
{"LowTotal", &kb_low_total},
{"Mapped", &kb_mapped}, // kB version of vmstat nr_mapped
{"MemFree", &kb_main_free}, // important
- {"MemShared", &kb_main_shared}, // important, but now gone!
+ {"MemShared", &kb_main_shared}, // obsolete since kernel 2.6! (sharing
the variable with Shmem replacement)
{"MemTotal", &kb_main_total}, // important
{"NFS_Unstable", &kb_nfs_unstable},
{"PageTables", &kb_pagetables}, // kB version of vmstat
nr_page_table_pages
{"ReverseMaps", &nr_reversemaps}, // same as vmstat nr_page_table_pages
{"SReclaimable", &kb_swap_reclaimable}, // "swap reclaimable" (dentry and
inode structures)
{"SUnreclaim", &kb_swap_unreclaimable},
+ {"Shmem", &kb_main_shared}, // sharing the output variable with
obsolete MemShared (kernel 2.6 and later)
{"Slab", &kb_slab}, // kB version of vmstat nr_slab
{"SwapCached", &kb_swap_cached},
{"SwapFree", &kb_swap_free}, // important
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
