For details see: http://procps.sourceforge.net/changelog.html
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org --- config/rootfiles/common/procps | 2 +- lfs/procps | 6 ++-- .../procps-3.2.6-fix_unknown_HZ_value.patch | 35 ---------------------- .../procps-3.2.8-fix_unknown_HZ_value.patch | 35 ++++++++++++++++++++++ 4 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 src/patches/procps-3.2.6-fix_unknown_HZ_value.patch create mode 100644 src/patches/procps-3.2.8-fix_unknown_HZ_value.patch
diff --git a/config/rootfiles/common/procps b/config/rootfiles/common/procps index 2863167..1f32be9 100644 --- a/config/rootfiles/common/procps +++ b/config/rootfiles/common/procps @@ -1,6 +1,6 @@ bin/kill bin/ps -lib/libproc-3.2.6.so +lib/libproc-3.2.8.so sbin/sysctl usr/bin/free usr/bin/pgrep diff --git a/lfs/procps b/lfs/procps index ae30f2f..183a95c 100644 --- a/lfs/procps +++ b/lfs/procps @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2016 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 3.2.6 +VER = 3.2.8
THISAPP = procps-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7ce39ea27d7b3da0e8ad74dd41d06783 +$(DL_FILE)_MD5 = 9532714b6846013ca9898984ba4cd7e0
install : $(TARGET)
diff --git a/src/patches/procps-3.2.6-fix_unknown_HZ_value.patch b/src/patches/procps-3.2.6-fix_unknown_HZ_value.patch deleted file mode 100644 index 31d8593..0000000 --- a/src/patches/procps-3.2.6-fix_unknown_HZ_value.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur procps-3.2.6.org/proc/sysinfo.c procps-3.2.6/proc/sysinfo.c ---- procps-3.2.6.org/proc/sysinfo.c 2005-03-14 05:31:27.000000000 +0100 -+++ procps-3.2.6/proc/sysinfo.c 2011-10-02 12:51:32.000000000 +0200 -@@ -209,6 +209,7 @@ - static void init_libproc(void) __attribute__((constructor)); - static void init_libproc(void){ - have_privs = check_for_privs(); -+ init_Linux_version(); - // ought to count CPUs in /proc/stat instead of relying - // on glibc, which foolishly tries to parse /proc/cpuinfo - // -diff -Naur procps-3.2.6.org/proc/version.c procps-3.2.6/proc/version.c ---- procps-3.2.6.org/proc/version.c 2003-01-29 02:11:43.000000000 +0100 -+++ procps-3.2.6/proc/version.c 2011-10-02 12:52:36.000000000 +0200 -@@ -33,8 +33,7 @@ - - int linux_version_code; - --static void init_Linux_version(void) __attribute__((constructor)); --static void init_Linux_version(void) { -+void init_Linux_version(void) { - static struct utsname uts; - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ - -diff -Naur procps-3.2.6.org/proc/version.h procps-3.2.6/proc/version.h ---- procps-3.2.6.org/proc/version.h 2002-12-15 01:08:32.000000000 +0100 -+++ procps-3.2.6/proc/version.h 2011-10-02 12:53:10.000000000 +0200 -@@ -14,6 +14,7 @@ - - EXTERN_C_BEGIN - -+extern void init_Linux_version(void); - extern void display_version(void); /* display suite version */ - extern const char procps_version[]; /* global buf for suite version */ - diff --git a/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch b/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch new file mode 100644 index 0000000..08edaa6 --- /dev/null +++ b/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch @@ -0,0 +1,35 @@ +diff -Naur procps-3.2.6.org/proc/sysinfo.c procps-3.2.6/proc/sysinfo.c +--- procps-3.2.6.org/proc/sysinfo.c 2005-03-14 05:31:27.000000000 +0100 ++++ procps-3.2.6/proc/sysinfo.c 2011-10-02 12:51:32.000000000 +0200 +@@ -212,6 +212,7 @@ + static void init_libproc(void) __attribute__((constructor)); + static void init_libproc(void){ + have_privs = check_for_privs(); ++ init_Linux_version(); + // ought to count CPUs in /proc/stat instead of relying + // on glibc, which foolishly tries to parse /proc/cpuinfo + // +diff -Naur procps-3.2.6.org/proc/version.c procps-3.2.6/proc/version.c +--- procps-3.2.6.org/proc/version.c 2003-01-29 02:11:43.000000000 +0100 ++++ procps-3.2.6/proc/version.c 2011-10-02 12:52:36.000000000 +0200 +@@ -33,8 +33,7 @@ + + int linux_version_code; + +-static void init_Linux_version(void) __attribute__((constructor)); +-static void init_Linux_version(void) { ++void init_Linux_version(void) { + static struct utsname uts; + int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ + +diff -Naur procps-3.2.6.org/proc/version.h procps-3.2.6/proc/version.h +--- procps-3.2.6.org/proc/version.h 2002-12-15 01:08:32.000000000 +0100 ++++ procps-3.2.6/proc/version.h 2011-10-02 12:53:10.000000000 +0200 +@@ -14,6 +14,7 @@ + + EXTERN_C_BEGIN + ++extern void init_Linux_version(void); + extern void display_version(void); /* display suite version */ + extern const char procps_version[]; /* global buf for suite version */ +