ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/pack/freebsd/diff/sysutils/psmisc/psmisc.2011-08-07T053402Z.diff
(Generate patch)

Comparing freebsd/sysutils/psmisc.patch (file contents):
Revision 281 by douglas, 2010-05-18T08:40:42-07:00 vs.
Revision 455 by douglas, 2011-08-06T22:25:30-07:00

# Line 1 | Line 1
1   diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/Makefile psmisc/Makefile
2 < --- /usr/ports/sysutils/psmisc/Makefile 2010-01-02 08:40:09.000000000 -0800
3 < +++ psmisc/Makefile     2010-05-18 08:37:45.668699414 -0700
4 < @@ -6,12 +6,12 @@
2 > --- /usr/ports/sysutils/psmisc/Makefile 2010-10-05 22:58:11.000000000 -0700
3 > +++ psmisc/Makefile     2011-08-06 22:21:50.947211076 -0700
4 > @@ -6,37 +6,34 @@
5   #
6  
7   PORTNAME=      psmisc
8 < -PORTVERSION=   22.9
9 < +PORTVERSION=   22.11
8 > -PORTVERSION=   22.13
9 > +PORTVERSION=   22.14
10   CATEGORIES=    sysutils
11 < MASTER_SITES=  SF
12 < MASTER_SITE_SUBDIR=    ${PORTNAME}/${PORTNAME}
11 > MASTER_SITES=  SF/${PORTNAME}/${PORTNAME}/
12  
13 < -MAINTAINER=    ports@FreeBSD.org
15 < +MAINTAINER=    douglas@douglasthrift.net
13 > MAINTAINER=    douglas@douglasthrift.net
14   COMMENT=       A port of the Linux pstree, killall and pidof commands
15  
16 + +LICENSE=       GPLv2
17 + +
18 + BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
19 +
20 + CONFLICTS=     pidof-[0-9]* pstree-2.[0-9]*
21 +
22 + -LICENSE=       GPLv2
23 + -
24   GNU_CONFIGURE= yes
19 – @@ -19,7 +19,7 @@
25   USE_GMAKE=     yes
26  
27 < CONFLICTS=     pstree-2.* \
28 < -               pidof-*
29 < +               pidof-[0-9]*
27 > -OPTIONS=       NLS "Native Language Support via gettext utilities" on
28 > +OPTIONS=       NLS "Native Language Support via gettext utilities" On
29 >
30 > -.include <bsd.port.options.mk>
31 > +.include <bsd.port.pre.mk>
32 >
33 > MAN1=          killall.1 pstree.1
34  
35 < PLIST_FILES=   bin/killall \
36 <                bin/pidof \
35 > .if defined(WITHOUT_NLS)
36 > -CONFIGURE_ARGS=        --disable-nls
37 > +CONFIGURE_ARGS+=--disable-nls
38 > PLIST_SUB+=    NLS="@comment "
39 > .else
40 > USE_GETTEXT=   yes
41 > -CONFIGURE_ARGS=        --enable-nls
42 > -CPPFLAGS+=     -I${LOCALBASE}/include
43 > -LDFLAGS+=      -L${LOCALBASE}/lib
44 > -CONFIGURE_ENV+=        CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
45 > +CONFIGURE_ARGS+=--enable-nls
46 > PLIST_SUB+=    NLS=""
47 > .endif
48 >
49 > @@ -46,4 +43,4 @@
50 > post-install:
51 >        @${LN} -fs killall ${PREFIX}/bin/pidof
52 >
53 > -.include <bsd.port.mk>
54 > +.include <bsd.port.post.mk>
55   diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/distinfo psmisc/distinfo
56 < --- /usr/ports/sysutils/psmisc/distinfo 2010-01-02 08:40:09.000000000 -0800
57 < +++ psmisc/distinfo     2010-05-18 04:02:47.141686600 -0700
58 < @@ -1,3 +1,3 @@
59 < -MD5 (psmisc-22.9.tar.gz) = c242530de46b951ab10a2237a6048a9c
60 < -SHA256 (psmisc-22.9.tar.gz) = c98aef4bc379790229c54c8e7d97b1d1ab898346bfffcde54fcf585a3e353edd
61 < -SIZE (psmisc-22.9.tar.gz) = 316530
62 < +MD5 (psmisc-22.11.tar.gz) = b5d32aa285b75c59dee96d3ea26a4881
63 < +SHA256 (psmisc-22.11.tar.gz) = 8fff37557f5150d89ef9afc03133731da3eaa2bad1a94f64355218a68b884536
64 < +SIZE (psmisc-22.11.tar.gz) = 375038
65 < diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/files/patch-src-pstree.c psmisc/files/patch-src-pstree.c
66 < --- /usr/ports/sysutils/psmisc/files/patch-src-pstree.c 2010-01-02 08:40:10.000000000 -0800
67 < +++ psmisc/files/patch-src-pstree.c     2010-05-18 07:21:54.752390269 -0700
68 < @@ -1,14 +1,17 @@
69 < ---- src/pstree.c.orig  2009-12-27 15:46:47.000000000 +0900
70 < -+++ src/pstree.c       2010-01-03 00:52:21.437862505 +0900
71 < -@@ -37,6 +37,7 @@
72 < +--- src/pstree.c.orig  2010-04-08 05:20:10.000000000 -0700
73 < ++++ src/pstree.c       2010-05-18 07:20:57.583839746 -0700
74 < +@@ -37,6 +37,10 @@
48 <  #include <term.h>
49 <  #include <termios.h>
50 <  #include <langinfo.h>
51 < ++#ifdef __FreeBSD__
52 < ++#include <locale.h>
53 < +#include <limits.h>
54 < ++#endif
55 <  #include <assert.h>
56 > --- /usr/ports/sysutils/psmisc/distinfo 2011-03-19 05:33:10.000000000 -0700
57 > +++ psmisc/distinfo     2011-08-06 20:48:51.620144975 -0700
58 > @@ -1,2 +1,2 @@
59 > -SHA256 (psmisc-22.13.tar.gz) = 06d25e8ebb4722dbcede98a787c39a9ed341f8e58fde10c0b2d6b35990b35daa
60 > -SIZE (psmisc-22.13.tar.gz) = 382389
61 > +SHA256 (psmisc-22.14.tar.gz) = 22bbf4561837af475c0d8d14e3b9cab453998c787212c107fac7faf2f281e26e
62 > +SIZE (psmisc-22.14.tar.gz) = 382024
63 > diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/files/patch-src-killall.c psmisc/files/patch-src-killall.c
64 > --- /usr/ports/sysutils/psmisc/files/patch-src-killall.c        2010-01-02 08:40:10.000000000 -0800
65 > +++ psmisc/files/patch-src-killall.c    2011-08-06 21:51:02.097478158 -0700
66 > @@ -1,5 +1,5 @@
67 > ---- src/killall.c.orig 2009-12-18 21:45:36.000000000 +0900
68 > -+++ src/killall.c      2010-01-03 00:37:34.818411284 +0900
69 > +--- src/killall.c.orig 2011-06-20 04:43:24.000000000 -0700
70 > ++++ src/killall.c      2011-08-06 21:48:35.014330713 -0700
71 > @@ -36,6 +36,8 @@
72 >  #include <dirent.h>
73 >  #include <signal.h>
74 > @@ -9,7 +9,7 @@
75    #include <sys/types.h>
76    #include <sys/stat.h>
77 < -@@ -590,7 +591,11 @@
78 < +@@ -590,7 +594,11 @@
79 <    struct dirent *de;
80 <    FILE *file;
81 <    struct stat st;
82 < @@ -20,31 +23,64 @@
83 <    char *buffer;
84 <    size_t buffer_size;
85 <    char readbuf[BUFSIZ + 1];
86 < -@@ -623,7 +628,7 @@
87 < +@@ -623,7 +631,11 @@
88 <      if ((pid = (pid_t) atoi(de->d_name)) != 0) {
89 <        if (! (path = malloc(strlen(PROC_BASE) + strlen(de->d_name) + 10)))
90 <          exit(2);
91 < --      sprintf(path, "%s/%d/stat", PROC_BASE, pid);
92 < -+      sprintf (path, "%s/%d/status", PROC_BASE, pid);
93 < ++#ifdef __FreeBSD__
94 < ++      sprintf(path, "%s/%d/status", PROC_BASE, pid);
95 < ++#else
96 < +       sprintf(path, "%s/%d/stat", PROC_BASE, pid);
97 < ++#endif
98 <        if ((file = fopen(path, "r")) != NULL) {
99 <          empty = 0;
100 <          sprintf(path, "%s/%d", PROC_BASE, pid);
101 < -@@ -638,6 +643,10 @@
102 < +@@ -638,6 +650,29 @@
103 <            perror(path);
104 <            exit(1);
77 >  #include <getopt.h>
78 > -@@ -83,40 +85,35 @@
79 > +@@ -87,40 +89,35 @@
80 >             ignore_case = 0, pidof;
81 >  static long younger_than = 0, older_than = 0;
82 >  
83 > @@ -34,10 +34,10 @@
84 > -    else
85 > -        printf (_("Signal %s(%s%d) ? (y/N) "), name, process_group ? "pgid " : "",
86 > -              pid);
87 > +-
88 > +-    fflush (stdout);
89 > +  int ch, c;
90 >  
91 > --    fflush (stdout);
92 > --
93 > -    if (getline (&line, &len, stdin) < 0)
94 > -      return 0;
95 > -    /* Check for default */
96 > @@ -74,7 +74,16 @@
97 >  }
98 >  
99 >  static double
100 > -@@ -356,7 +353,7 @@
101 > +@@ -197,7 +194,7 @@
102 > +      
103 > +       while (fgets(buf, sizeof buf, f))
104 > +       {
105 > +-              if (sscanf (buf, "Uid:\t%d", &puid))
106 > ++              if (sscanf (buf, "%*s %*d %*d %*d %*d %*s %*s %*s %*s %*s %*s %*s %d", &puid))
107 > +               {
108 > +                       re = uid==puid;
109 > +                       break;
110 > +@@ -360,7 +357,7 @@
111            }
112 < +#ifdef __FreeBSD__
113 < -+        if (fscanf(file, "%s %*d %d", comm, &ppid) == 2)
114 < -+          add_proc(comm, pid, ppid, st.st_uid, NULL, 0, 0);
115 < ++        /* Read comm and ppid */
116 < ++        if (fscanf(file, "%s %*d %d", readbuf, &ppid) == 2) {
117 < ++          tmpptr = readbuf;
118 < ++          size = 0;
119 < ++          /* Unescape comm */
120 < ++          do {
121 < ++            if (*tmpptr == '\\')
122 < ++            {
123 < ++              char tmp = tmpptr[4];
124 < ++              tmpptr[4] = 0;
125 < ++              comm[size++] = strtol(++tmpptr, NULL, 8);
126 < ++              tmpptr += 2;
127 < ++              tmpptr[1] = tmp;
128 < ++            }
129 < ++            else
130 < ++              comm[size++] = *tmpptr;
131 < ++          } while (*++tmpptr);
132 < ++          comm[size] = 0;
133 < ++          /* Balance braces */
134 < ++          {
135 < ++            {
136 < +#else
137 <          size = fread(readbuf, 1, BUFSIZ, file);
138 <          if (ferror(file) == 0) {
139 <            readbuf[size] = 0;
140 < -@@ -725,6 +734,7 @@
141 < -             }
142 < -           }
143 < -         }
144 < +@@ -692,6 +727,7 @@
145 < +                   (void) closedir(taskdir);
146 < +                 }
147 < +               free(taskpath);
148 < +#endif /*__FreeBSD__*/
149 < -         (void) fclose(file);
150 < -       }
151 < -       free(path);
152 < +               if (!print_args)
153 < + #ifdef WITH_SELINUX
154 < +                 add_proc(comm, pid, ppid, st.st_uid, NULL, 0, 0, scontext);
155 < +@@ -860,6 +896,10 @@
156 < +      * command-line options, if given.
157 < +      */
112 >  #endif /*WITH_SELINUX*/
113 >        /* load process name */
114 > @@ -83,7 +92,7 @@
115 >        continue;
116 >        if (!(file = fopen (path, "r")))
117 >        {
118 > -@@ -364,7 +361,7 @@
119 > +@@ -368,7 +365,7 @@
120 >          continue;
121 >        }
122 >        free (path);
123 > @@ -92,7 +101,7 @@
124 >        if (!okay) {
125 >        fclose(file);
126 >        continue;
127 > -@@ -386,65 +383,6 @@
128 > +@@ -390,65 +387,6 @@
129 >        got_long = 0;
130 >        command = NULL;         /* make gcc happy */
131 >        length = strlen (comm);
132 > @@ -158,7 +167,7 @@
133 >        /* mach by process name */
134 >        for (j = 0; j < names; j++)
135 >        {
136 > -@@ -495,7 +433,7 @@
137 > +@@ -499,7 +437,7 @@
138 >                {
139 >                  int ok = 1;
140 >  
141 > @@ -167,12 +176,12 @@
142 >                    continue;
143 >  
144 >                  if (stat (path, &st) < 0)
145 > -@@ -842,7 +780,7 @@
146 > -     fprintf (stderr, _("Maximum number of names is %d\n"), MAX_NAMES);
147 > -     exit (1);
148 > -   }
149 > --  if (stat("/proc/self/stat", &isproc)==-1) {
150 > -+  if (stat("/proc/curproc/status", &isproc)==-1) {
151 > -     fprintf (stderr, _("%s is empty (not mounted ?)\n"), PROC_BASE);
152 > -     exit (1);
153 > -   }
154 > +@@ -693,7 +631,7 @@
155 > +   struct stat isproc;
156 > +   pid_t pid = getpid();
157 > +
158 > +-  snprintf(filename, sizeof(filename), PROC_BASE"/%d/stat", (int) pid);
159 > ++  snprintf(filename, sizeof(filename), PROC_BASE"/%d/status", (int) pid);
160 > +   return stat(filename, &isproc) == 0;
161 > + }
162   +
134 – ++#ifdef __FreeBSD__
135 – ++    /* Actually set the locale because nl_langinfo won't do it. */
136 – ++    setlocale(LC_CTYPE, "");
137 – ++#endif
138 – +     if (isatty(1) && !strcmp(nl_langinfo(CODESET), "UTF-8")) {
139 – +         /* Use UTF-8 symbols if the locale's character set is UTF-8. */
140 – +         sym = &sym_utf;
163   diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/pkg-descr psmisc/pkg-descr
164   --- /usr/ports/sysutils/psmisc/pkg-descr        2005-10-05 00:49:45.000000000 -0700
165 < +++ psmisc/pkg-descr    2010-05-18 07:57:55.280442813 -0700
165 > +++ psmisc/pkg-descr    2010-10-05 23:40:48.818176312 -0700
166   @@ -1,4 +1,4 @@
167   A port of the Linux pstree, killall and pidof commands.
168   Does not include the 'fuser' command.

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines