Browse Source

psmisc: Updated (22.6 -> 22.11)

Note:

Also rediff'ed 'install.patch' and removed not needed 'no-glibcism.patch' (the
name of the patch is misleading anyway)!
user/karasz/test/ecn
Christian Wiese 15 years ago committed by Christian Wiese
parent
commit
155153797b
  1. 9
      base/psmisc/install.patch
  2. 42
      base/psmisc/no-glibcism.patch
  3. 6
      base/psmisc/psmisc.desc

9
base/psmisc/install.patch

@ -2,6 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../psmisc/install.patch
# Copyright (C) 2010 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -14,14 +15,14 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- psmisc-21.9/src/Makefile.in.orig 2005-12-16 12:55:48.000000000 +0100
+++ psmisc-21.9/src/Makefile.in 2005-12-19 13:25:26.000000000 +0100
@@ -468,7 +468,7 @@
--- psmisc-22.11/src/Makefile.in.orig 2010-04-08 14:41:34.000000000 +0200
+++ psmisc-22.11/src/Makefile.in 2010-04-19 15:56:12.518003067 +0200
@@ -547,7 +547,7 @@
install-exec-hook:
cd $(DESTDIR)$(bindir) && \
- ( [ -h pstree.x11 ] || $(LN_S) pstree pstree.x11)
+ ( [ -h pstree.x11 ] || $(LN_S) -f pstree pstree.x11)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

42
base/psmisc/no-glibcism.patch

@ -1,42 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../psmisc/no-glibcism.patch
# Copyright (C) 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 ---
Though I have not looked it up in standards this looks quite like a glibc'ism,
of course dietlibc does not include this crap and other C libraries might
neither.
- Rene Rebe <rene@exactcode.de>
--- psmisc-21.9/src/pstree.c.vanilla 2006-01-06 23:19:57.000000000 +0100
+++ psmisc-21.9/src/pstree.c 2006-01-06 23:22:53.000000000 +0100
@@ -48,8 +48,6 @@
#include <selinux/selinux.h>
#endif /*WITH_SELINUX*/
-extern const char *__progname;
-
#ifndef MAX_DEPTH
#define MAX_DEPTH 100
#endif
@@ -810,7 +808,7 @@
textdomain(PACKAGE);
#endif
- if (!strcmp(__progname, "pstree.x11"))
+ if (strstr(argv[0], "pstree.x11"))
wait_end=1;
/*

6
base/psmisc/psmisc.desc

@ -3,7 +3,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../psmisc/psmisc.desc
[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY]
@ -32,8 +32,8 @@
[L] GPL
[S] Stable
[V] 22.6
[V] 22.11
[P] X -1---5---9 185.700
[D] 85006982 psmisc-22.6.tar.gz http://dl.sourceforge.net/sourceforge/psmisc/
[D] 4265404876 psmisc-22.11.tar.gz http://dl.sourceforge.net/sourceforge/psmisc/

Loading…
Cancel
Save