Clean up the patches #76230 by Milus János.

3 files changed, 16 insertions, 113 deletions

diff --git a/sys-apps/psmisc/files/psmisc-21.4-no-nls-selinux.patch b/sys-apps/psmisc/files/psmisc-21.4-no-nls-selinux.patch
deleted file mode 100644
index 8485845f1d8e..000000000000
--- a/sys-apps/psmisc/files/psmisc-21.4-no-nls-selinux.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- src/fuser.c.mps	2004-06-08 18:21:33 +0200
-+++ src/fuser.c	2004-06-08 18:27:13 +0200
-@@ -31,9 +31,13 @@
- #include <linux/kdev_t.h>	/* for MKDEV */
- #include <linux/major.h>	/* for LOOP_MAJOR */
- #endif
-+#ifdef USE_NLS
- #include <libintl.h>
- #include <locale.h>
- #define _(String) gettext (String)
-+#else
-+#define _(String) (String)
-+#endif
- 
- #include "comm.h"
- #include "loop.h"         /* for loop_info */
-@@ -1007,9 +1011,11 @@ main (int argc, char **argv)
-   no_files = 1;
- 
-   /* Setup the i18n */
-+#ifdef USE_NLS
-   setlocale(LC_ALL, "");
-   bindtextdomain(PACKAGE, LOCALEDIR);
-   textdomain(PACKAGE);
-+#endif
- 
-   if (argc < 2)
-     usage ();
---- src/killall.c.mps	2004-06-08 18:21:38 +0200
-+++ src/killall.c	2004-06-08 18:26:51 +0200
-@@ -26,9 +26,13 @@
- #include <selinux/selinux.h>
- #endif /*WITH_SELINUX*/
- 
-+#ifdef USE_NLS
- #include <libintl.h>
- #include <locale.h>
- #define _(String) gettext (String)
-+#else
-+#define _(String) (String)
-+#endif
- 
- #include "comm.h"
- #include "signals.h"
-@@ -461,10 +465,12 @@
-   pidof = strcmp (name, "killall");
-   sig_num = SIGTERM;
- 
-+#ifdef USE_NLS
-   /* Setup the i18n */
-   setlocale(LC_ALL, "");
-   bindtextdomain(PACKAGE, LOCALEDIR);
-   textdomain(PACKAGE);
-+#endif
- 
-   opterr = 0;
- #ifdef WITH_SELINUX
---- src/pstree.c.mps	2004-06-08 18:27:39 +0200
-+++ src/pstree.c	2004-06-08 18:28:03 +0200
-@@ -22,8 +22,12 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-+#ifdef USE_NLS
- #include <libintl.h>
- #define _(String) gettext (String)
-+#else
-+#define _(String) (String)
-+#endif
- 
- #include "comm.h"
- 
diff --git a/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch b/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch
index 89546b3a072d..4832e73aae18 100644
--- a/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch
+++ b/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch
@@ -1,9 +1,7 @@
---- src/fuser.c.mps	2004-06-08 18:21:33 +0200
-+++ src/fuser.c	2004-06-08 18:27:13 +0200
-@@ -31,9 +31,13 @@
- #include <linux/kdev_t.h>	/* for MKDEV */
- #include <linux/major.h>	/* for LOOP_MAJOR */
- #endif
+diff -ur psmisc-21.4.orig/src/fuser.c psmisc-21.4/src/fuser.c
+--- psmisc-21.4.orig/src/fuser.c	2005-01-01 16:10:44.601397328 -0500
++++ psmisc-21.4/src/fuser.c	2005-01-01 16:11:22.884577400 -0500
+@@ -31,3 +31,7 @@
 +#ifdef USE_NLS
  #include <libintl.h>
  #include <locale.h>
@@ -11,27 +9,17 @@
 +#else
 +#define _(String) (String)
 +#endif
- 
- #include "comm.h"
- #include "loop.h"         /* for loop_info */
-@@ -1007,9 +1011,11 @@ main (int argc, char **argv)
-   no_files = 1;
- 
-   /* Setup the i18n */
+@@ -1006,4 +1010,6 @@
 +#ifdef USE_NLS
+   /* Setup the i18n */
    setlocale(LC_ALL, "");
    bindtextdomain(PACKAGE, LOCALEDIR);
    textdomain(PACKAGE);
 +#endif
- 
-   if (argc < 2)
-     usage ();
---- src/killall.c.mps	2004-06-08 18:21:38 +0200
-+++ src/killall.c	2004-06-08 18:26:51 +0200
-@@ -25,9 +25,13 @@
- #include <selinux/fs_secure.h>
- #include <selinux/ss.h>
- #endif /*FLASK_LINUX*/
+diff -ur psmisc-21.4.orig/src/killall.c psmisc-21.4/src/killall.c
+--- psmisc-21.4.orig/src/killall.c	2005-01-01 16:10:44.602397176 -0500
++++ psmisc-21.4/src/killall.c	2005-01-01 16:11:54.860716288 -0500
+@@ -25,3 +25,7 @@
 +#ifdef USE_NLS
  #include <libintl.h>
  #include <locale.h>
@@ -39,33 +27,20 @@
 +#else
 +#define _(String) (String)
 +#endif
- 
- #include "comm.h"
- #include "signals.h"
-@@ -467,9 +471,11 @@ main (int argc, char **argv)
-   sig_num = SIGTERM;
- 
-   /* Setup the i18n */
+@@ -466,4 +470,6 @@
 +#ifdef USE_NLS
+   /* Setup the i18n */
    setlocale(LC_ALL, "");
    bindtextdomain(PACKAGE, LOCALEDIR);
    textdomain(PACKAGE);
 +#endif
- 
-   opterr = 0;
- #ifdef FLASK_LINUX
---- src/pstree.c.mps	2004-06-08 18:27:39 +0200
-+++ src/pstree.c	2004-06-08 18:28:03 +0200
-@@ -22,8 +22,12 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
+diff -ur psmisc-21.4.orig/src/pstree.c psmisc-21.4/src/pstree.c
+--- psmisc-21.4.orig/src/pstree.c	2005-01-01 16:10:44.602397176 -0500
++++ psmisc-21.4/src/pstree.c	2005-01-01 16:12:14.659706384 -0500
+@@ -22,2 +22,6 @@
 +#ifdef USE_NLS
  #include <libintl.h>
  #define _(String) gettext (String)
 +#else
 +#define _(String) (String)
 +#endif
- 
- #include "comm.h"
- 
diff --git a/sys-apps/psmisc/files/psmisc-21.4-selinux.diff.bz2 b/sys-apps/psmisc/files/psmisc-21.4-selinux.diff.bz2
index 689b09f5420d..78b287f55d2d 100644
--- a/sys-apps/psmisc/files/psmisc-21.4-selinux.diff.bz2
+++ b/sys-apps/psmisc/files/psmisc-21.4-selinux.diff.bz2