From 395414e5a80ef2f45ee934dbde2eac76c460cdfb Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Sun, 27 Apr 2014 23:16:49 +0200 Subject: [PATCH] procps: Updated (3.2.8 -> 3.3.9) (using procps-ng now! see note!) Note: Because the original procps project is pretty unmaintained a fork called procps-ng was initiated by Debian, Redhat and Suse. This update is replacing the sources with those provided by the procps-ng project. --- base/procps/dev-null.patch | 31 -------- base/procps/procps-3.2.8-make-3.82.patch | 38 --------- .../procps-autogen-no-update-potfiles.patch | 30 +++++++ base/procps/procps-opensde-install.patch | 32 ++++++++ base/procps/procps-tinfo-linking.patch | 79 +++++++++++++++++++ base/procps/procps-top-DL_LIB.patch | 40 ++++++++++ base/procps/procps.conf | 15 +++- base/procps/procps.desc | 9 +-- base/procps/termios.h.patch | 31 -------- 9 files changed, 196 insertions(+), 109 deletions(-) delete mode 100644 base/procps/dev-null.patch delete mode 100644 base/procps/procps-3.2.8-make-3.82.patch create mode 100644 base/procps/procps-autogen-no-update-potfiles.patch create mode 100644 base/procps/procps-opensde-install.patch create mode 100644 base/procps/procps-tinfo-linking.patch create mode 100644 base/procps/procps-top-DL_LIB.patch delete mode 100644 base/procps/termios.h.patch diff --git a/base/procps/dev-null.patch b/base/procps/dev-null.patch deleted file mode 100644 index 26e6e51fd..000000000 --- a/base/procps/dev-null.patch +++ /dev/null @@ -1,31 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../procps/dev-null.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - --o /dev/null unlinks /dev/null and leaves a regular file. - - - Rene Rebe - ---- procps-3.2.5/Makefile.orig 2005-11-05 11:46:08.900000000 +0100 -+++ procps-3.2.5/Makefile 2005-11-05 11:43:20.060000000 +0100 -@@ -108,7 +108,7 @@ - # Unlike the kernel one, this check_gcc goes all the way to - # producing an executable. There might be a -m64 that works - # until you go looking for a 64-bit curses library. --check_gcc = $(shell if $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) dummy.c $(ALL_LDFLAGS) $(1) -o /dev/null $(CURSES) > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) -+check_gcc = $(shell if $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) dummy.c $(ALL_LDFLAGS) $(1) -o - $(CURSES) > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) - - # Be 64-bit if at all possible. In a cross-compiling situation, one may - # do "make m64=-m32 lib64=lib" to produce 32-bit executables. DO NOT diff --git a/base/procps/procps-3.2.8-make-3.82.patch b/base/procps/procps-3.2.8-make-3.82.patch deleted file mode 100644 index 411ae7449..000000000 --- a/base/procps/procps-3.2.8-make-3.82.patch +++ /dev/null @@ -1,38 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../procps/procps-3.2.8-make-3.82.patch -# Copyright (C) 2012 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -Description: Fix build using make >= 3.82 - ---- procps-3.2.8/Makefile.orig 2012-10-21 02:26:06.961308206 +0200 -+++ procps-3.2.8/Makefile 2012-10-21 02:26:26.205720768 +0200 -@@ -8,7 +8,7 @@ - # hasn't grown big enough to need something complicated, and the - # dependency tracking files are an ugly annoyance. - # --# This file includes */module.mk files which add on to variables: -+# This file includes proc/module.mk ps/module.mk files which add on to variables: - # FOO += bar/baz - # - # -@@ -174,7 +174,7 @@ - # want this rule first, use := on ALL, and ALL not filled in yet - all: do_all - ---include */module.mk -+-include proc/module.mk ps/module.mk - - do_all: $(ALL) - diff --git a/base/procps/procps-autogen-no-update-potfiles.patch b/base/procps/procps-autogen-no-update-potfiles.patch new file mode 100644 index 000000000..f80acdb83 --- /dev/null +++ b/base/procps/procps-autogen-no-update-potfiles.patch @@ -0,0 +1,30 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../procps/procps-autogen-no-update-potfiles.patch +# Copyright (C) 2014 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Do not try to update pot files When running `autogen.sh` + +./autogen.sh: line 64: po/update-potfiles: No such file or directory + +--- a/autogen.sh ++++ b/autogen.sh +@@ -61,7 +61,6 @@ + rm -rf autom4te.cache + + set -e +-po/update-potfiles + autopoint --force $AP_OPTS + if ! grep -q datarootdir po/Makefile.in.in; then + echo autopoint does not honor dataroot variable, patching. diff --git a/base/procps/procps-opensde-install.patch b/base/procps/procps-opensde-install.patch new file mode 100644 index 000000000..fdf79a65a --- /dev/null +++ b/base/procps/procps-opensde-install.patch @@ -0,0 +1,32 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../procps/procps-opensde-install.patch +# Copyright (C) 2014 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +By default we use --prefix=/usr and without this patch we end up with most +binaries being installed in /usr/usr/bin. + +NOTE: This patch is OpenSDE specific! + +--- a/configure.ac ++++ b/configure.ac +@@ -70,7 +70,7 @@ + AC_FUNC_REALLOC + AC_FUNC_STRTOD + +-usrbin_execdir='${exec_prefix}/usr/bin' ++usrbin_execdir='${exec_prefix}/bin' + AC_SUBST([usrbin_execdir]) + + AM_GNU_GETTEXT_VERSION([0.14.1]) diff --git a/base/procps/procps-tinfo-linking.patch b/base/procps/procps-tinfo-linking.patch new file mode 100644 index 000000000..573066f0d --- /dev/null +++ b/base/procps/procps-tinfo-linking.patch @@ -0,0 +1,79 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../procps/procps-tinfo-linking.patch +# Copyright (C) 2014 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Fix linking in the case libtinfo is a standalone library + +In the case of top we get an error like this +------------------------------------------------------------------------ + CCLD top +/bin/ld: top.o: undefined reference to symbol 'tparm' +/bin/ld: note: 'tparm' is defined in DSO /lib/libtinfo.so.5 so try adding it to the linker command line +/lib/libtinfo.so.5: could not read symbols: Invalid operation +collect2: error: ld returned 1 exit status +------------------------------------------------------------------------ + +Before checking for ncurses we check for libtinfo and set TINFO_LIBS which +simply gets add uncondtionally because in the case libtinfo is not stand- +alone the TINFO_LIBS variable will be empty. + +--- a/configure.ac ++++ b/configure.ac +@@ -128,6 +128,12 @@ + if test "x$with_ncurses" = xno; then + AM_CONDITIONAL(WITH_NCURSES, false) + else ++ PKG_CHECK_MODULES([TINFO], [tinfo], [], [ ++ AC_CHECK_LIB(tinfo, tparm, [have_tinfo=yes], [have_tinfo=no]) ++ if test "x$have_tinfo" = xyes; then ++ TINFO_LIBS="-ltinfo" ++ fi ++ ]) + PKG_CHECK_MODULES([NCURSES], [ncurses], [], [ + AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no]) + AC_CHECK_HEADERS(curses.h ncurses.h term.h, [], [have_ncurses=no], AC_INCLUDES_DEFAULT) +@@ -147,6 +153,7 @@ + fi + fi + AC_SUBST([NCURSES_LIBS]) ++AC_SUBST([TINFO_LIBS]) + AC_SUBST([WATCH_NCURSES_LIBS]) + + AC_ARG_WITH([systemd], +--- a/Makefile.am ++++ b/Makefile.am +@@ -76,9 +76,9 @@ + slabtop.1 \ + watch.1 + slabtop_SOURCES = slabtop.c $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/fileutils.c +-slabtop_LDADD = @NCURSES_LIBS@ ++slabtop_LDADD = @NCURSES_LIBS@ @TINFO_LIBS@ + watch_SOURCES = watch.c $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/fileutils.c +-watch_LDADD = @WATCH_NCURSES_LIBS@ ++watch_LDADD = @WATCH_NCURSES_LIBS@ @TINFO_LIBS@ + endif + + if BUILD_SKILL +--- a/top/Makefile.am ++++ b/top/Makefile.am +@@ -19,7 +19,7 @@ + dist_man_MANS = \ + top.1 + +-top_LDADD = @NCURSES_LIBS@ ++top_LDADD = @NCURSES_LIBS@ @TINFO_LIBS@ + endif + + EXTRA_DIST = diff --git a/base/procps/procps-top-DL_LIB.patch b/base/procps/procps-top-DL_LIB.patch new file mode 100644 index 000000000..597729054 --- /dev/null +++ b/base/procps/procps-top-DL_LIB.patch @@ -0,0 +1,40 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../procps/procps-top-DL_LIB.patch +# Copyright (C) 2014 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Remove ${DL_LIB} from the LDFLAGS + +strangely the Makefile for `top` includes this: +-------------------------------------------------------------------------- +DL_LIB = none required +-------------------------------------------------------------------------- + +which leads to an error when linking: +-------------------------------------------------------------------------- + CCLD top +i686-unknown-linux-musl-gcc: error: none: No such file or directory +i686-unknown-linux-musl-gcc: error: required: No such file or directory +-------------------------------------------------------------------------- + +--- a/top/Makefile.am ++++ b/top/Makefile.am +@@ -4,7 +4,6 @@ + -DLOCALEDIR=\"$(localedir)\" + + AM_LDFLAGS = ../proc/libprocps.la +-AM_LDFLAGS += $(DL_LIB) + + if WITH_NCURSES + usrbin_exec_PROGRAMS = \ diff --git a/base/procps/procps.conf b/base/procps/procps.conf index 5ce93a85a..5bcdeaac7 100644 --- a/base/procps/procps.conf +++ b/base/procps/procps.conf @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../procps/procps.conf +# Copyright (C) 2014 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -12,9 +13,15 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -# we prefer the coreutils kill ... -var_insert makeinstopt " " "SKIP='/bin/kill /usr/share/man/man1/kill.1' \ - lib64=${libdir##*/}" +autogen=1 -var_append makeinstopt ' ' 'ldconfig=true' +# Workaround to get stuff installed at the right location +# see: procps-opensde-install.patch +bindir=/bin +sbindir=/sbin +libdir=/lib +# use kill command provided by util-linux if available +if pkginstalled util-linux; then + var_append extraconfopt ' ' "--disable-kill" +fi diff --git a/base/procps/procps.desc b/base/procps/procps.desc index 3d11a5647..6595ed644 100644 --- a/base/procps/procps.desc +++ b/base/procps/procps.desc @@ -1,9 +1,8 @@ - [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../procps/procps.desc -[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2014 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -37,7 +36,7 @@ [T] memory statistics about processes, memory, paging, block I/O, traps [T] and CPU activity. -[U] http://procps.sourceforge.net/ +[U] http://procps-ng.sourceforge.net/ [A] Michael K. Johnson [M] The OpenSDE Community @@ -46,8 +45,8 @@ [L] GPL [S] Stable -[V] 3.2.8 +[V] 3.3.9 [P] X -?-3-----9 185.600 -[D] 171134911 procps-3.2.8.tar.gz http://procps.sourceforge.net/ +[D] 4084282217 procps-ng-3.3.9.tar.xz http://dl.sourceforge.net/sourceforge/procps-ng/ diff --git a/base/procps/termios.h.patch b/base/procps/termios.h.patch deleted file mode 100644 index 335e1b309..000000000 --- a/base/procps/termios.h.patch +++ /dev/null @@ -1,31 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../procps/termios.h.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -At leat with dietlibc termios.h is not included thru the other includes of -procps, thus the storage size of the winsize struct is not known in several -files. We just include it globally to make sure it is available in any file. - - - Rene Rebe - ---- ./proc/procps.h.vanilla 2005-07-28 17:48:01.000000000 +0200 -+++ ./proc/procps.h 2005-07-28 17:48:08.000000000 +0200 -@@ -109,4 +109,6 @@ - #define HIDDEN_ALIAS(x) extern __typeof(x) x##_direct __attribute__((alias(#x))) - #endif - -+#include -+ - #endif