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

Comparing:
freebsd/sysutils/psmisc.patch (file contents), Revision 339 by douglas, 2010-08-12T00:04:19-07:00 vs.
freebsd/diff/sysutils/psmisc/psmisc.2011-08-07T05:34:02Z.diff (file contents), Revision 494 by douglas, 2012-02-19T14:53:40-08: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-08-01 00:13:14.000000000 -0700
3	<	+++ psmisc/Makefile     2010-08-12 00:02:19.087759857 -0700
4	<	@@ -7,20 +7,39 @@
2	>	--- /usr/ports/sysutils/psmisc/Makefile 2010-10-05 22:58:11.000000000 -0700
3	>	+++ psmisc/Makefile     2011-08-06 22:32:59.138989182 -0700
4	>	@@ -6,19 +6,19 @@
5	>	#
6
7		PORTNAME=      psmisc
8	<	PORTVERSION=   22.12
9	<	+PORTREVISION=  1
8	>	-PORTVERSION=   22.13
9	>	+PORTVERSION=   22.14
10		CATEGORIES=    sysutils
11	<	MASTER_SITES=  SF/${PORTNAME}/${PORTNAME}
11	>	MASTER_SITES=  SF/${PORTNAME}/${PORTNAME}/
12
13	<	MAINTAINER=    sunpoet@sunpoet.net
13	>	MAINTAINER=    douglas@douglasthrift.net
14		COMMENT=       A port of the Linux pstree, killall and pidof commands
15
16	<	+BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
16	>	+LICENSE=       GPLv2
17		+
18	+	BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
19	+
20		CONFLICTS=     pidof-[0-9]* pstree-2.[0-9]*
21
22	<	-CONFIGURE_ARGS=        --disable-nls
23	<	+LICENSE=       GPLv2
21	<	+
22	>	-LICENSE=       GPLv2
23	>	-
24		GNU_CONFIGURE= yes
25		USE_GMAKE=     yes
26
27	<	+OPTIONS=       NLS "Native Language Support via gettext utilities" On
28	<	+
29	<	+.include <bsd.port.pre.mk>
30	<	+
31	<	MAN1=          killall.1 pstree.1
32	<	-PLIST_FILES=   bin/killall bin/pidof bin/pstree bin/pstree.x11
33	<	+
34	<	+.if defined(WITHOUT_NLS)
35	<	+CONFIGURE_ARGS+=--disable-nls
36	<	+PLIST_SUB+=    NLS="@comment "
37	<	+.else
38	<	+USE_GETTEXT=   yes
39	<	+CONFIGURE_ARGS+=--enable-nls
40	<	+CPPFLAGS+=     -I${LOCALBASE}/include
41	<	+LDFLAGS+=      -L${LOCALBASE}/lib
42	<	+CONFIGURE_ENV+=        CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
43	<	+PLIST_SUB+=    NLS=""
44	<	+.endif
45	<
46	<	post-patch:
47	<	@${REINPLACE_CMD} -e '/^#define COMM_LEN / s|16|254|' ${WRKSRC}/src/comm.h
46	<	@@ -28,4 +47,4 @@
47	<	post-install:
48	<	@${LN} -fs killall ${PREFIX}/bin/pidof
49	<
50	<	-.include <bsd.port.mk>
51	<	+.include <bsd.port.post.mk>
52	<	diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/files/patch-src-Makefile.in psmisc/files/patch-src-Makefile.in
53	<	--- /usr/ports/sysutils/psmisc/files/patch-src-Makefile.in      2010-08-01 00:13:14.000000000 -0700
54	<	+++ psmisc/files/patch-src-Makefile.in  2010-08-11 23:40:24.404739181 -0700
27	>	@@ -34,9 +34,6 @@
28	>	.else
29	>	USE_GETTEXT=   yes
30	>	CONFIGURE_ARGS=        --enable-nls
31	>	-CPPFLAGS+=     -I${LOCALBASE}/include
32	>	-LDFLAGS+=      -L${LOCALBASE}/lib
33	>	-CONFIGURE_ENV+=        CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
34	>	PLIST_SUB+=    NLS=""
35	>	.endif
36	>
37	>	diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/distinfo psmisc/distinfo
38	>	--- /usr/ports/sysutils/psmisc/distinfo 2011-03-19 05:33:10.000000000 -0700
39	>	+++ psmisc/distinfo     2011-08-06 20:48:51.620144975 -0700
40	>	@@ -1,2 +1,2 @@
41	>	-SHA256 (psmisc-22.13.tar.gz) = 06d25e8ebb4722dbcede98a787c39a9ed341f8e58fde10c0b2d6b35990b35daa
42	>	-SIZE (psmisc-22.13.tar.gz) = 382389
43	>	+SHA256 (psmisc-22.14.tar.gz) = 22bbf4561837af475c0d8d14e3b9cab453998c787212c107fac7faf2f281e26e
44	>	+SIZE (psmisc-22.14.tar.gz) = 382024
45	>	diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/files/patch-src-killall.c psmisc/files/patch-src-killall.c
46	>	--- /usr/ports/sysutils/psmisc/files/patch-src-killall.c        2010-01-02 08:40:10.000000000 -0800
47	>	+++ psmisc/files/patch-src-killall.c    2011-08-06 21:51:02.097478158 -0700
48		@@ -1,5 +1,5 @@
49	<	---- src/Makefile.in.orig       2010-07-12 19:38:08.000000000 +0800
50	<	-+++ src/Makefile.in    2010-07-31 18:58:38.000000000 +0800
51	<	+--- src/Makefile.in.orig       2010-07-12 04:38:08.000000000 -0700
52	<	++++ src/Makefile.in    2010-08-11 23:39:30.652095791 -0700
53	<	@@ -34,8 +34,8 @@
54	<	POST_UNINSTALL = :
55	<	build_triplet = @build@
56	<	@@ -37,32 +37,37 @@
64	<	prtstat_SOURCES = prtstat.c prtstat.h
65	<	BUILT_SOURCES = signames.h
66	<	EXTRA_DIST = signames.c
67	<	-@@ -545,14 +543,20 @@
68	<	-
69	<	+@@ -299,19 +297,19 @@
70	<	+       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
71	<	+ fuser$(EXEEXT): $(fuser_OBJECTS) $(fuser_DEPENDENCIES)
72	<	+       @rm -f fuser$(EXEEXT)
73	<	+-      $(LINK) $(fuser_OBJECTS) $(fuser_LDADD) $(LIBS)
74	<	++      $(LINK) $(fuser_OBJECTS) $(fuser_LDADD) $(LIBS) $(INTLLIBS)
75	<	+ killall$(EXEEXT): $(killall_OBJECTS) $(killall_DEPENDENCIES)
76	<	+       @rm -f killall$(EXEEXT)
77	<	+-      $(LINK) $(killall_OBJECTS) $(killall_LDADD) $(LIBS)
78	<	++      $(LINK) $(killall_OBJECTS) $(killall_LDADD) $(LIBS) $(INTLLIBS)
79	<	+ peekfd$(EXEEXT): $(peekfd_OBJECTS) $(peekfd_DEPENDENCIES)
80	<	+       @rm -f peekfd$(EXEEXT)
81	<	+-      $(LINK) $(peekfd_OBJECTS) $(peekfd_LDADD) $(LIBS)
82	<	++      $(LINK) $(peekfd_OBJECTS) $(peekfd_LDADD) $(LIBS) $(INTLLIBS)
83	<	+ prtstat$(EXEEXT): $(prtstat_OBJECTS) $(prtstat_DEPENDENCIES)
84	<	+       @rm -f prtstat$(EXEEXT)
85	<	+-      $(LINK) $(prtstat_OBJECTS) $(prtstat_LDADD) $(LIBS)
86	<	++      $(LINK) $(prtstat_OBJECTS) $(prtstat_LDADD) $(LIBS) $(INTLLIBS)
87	<	+ pstree$(EXEEXT): $(pstree_OBJECTS) $(pstree_DEPENDENCIES)
88	<	+       @rm -f pstree$(EXEEXT)
89	<	+-      $(LINK) $(pstree_OBJECTS) $(pstree_LDADD) $(LIBS)
90	<	++      $(LINK) $(pstree_OBJECTS) $(pstree_LDADD) $(LIBS) $(INTLLIBS)
91	<
92	<	+ mostlyclean-compile:
93	<	+       -rm -f *.$(OBJEXT)
94	<	+@@ -547,7 +545,7 @@
95	<	signames.h: signames.c Makefile
96	<	--              export LC_ALL=C ; \
97	<	--              @CPP@ -dM $< |\
98	<	+               export LC_ALL=C ; \
99	<	+               @CPP@ -dM $< |\
100	<	-              tr -s '\t ' ' ' | sort -n -k 3 | sed \
101	<	--      's:#define SIG\([A-Z]\+[0-9]*\) \([0-9]\+\) *\(\|/\*.*\)$$:{\ \2,"\1" },:p;d' | \
102	<	--                grep -v '[0-9][0-9][0-9]' >signames.h || \
103	<	--                { rm -f signames.h; exit 1; }
104	<	--              grep '^{ 1,"HUP" },$$' signames.h >/dev/null || \
105	<	--                { rm -f signames.h; exit 1; }
106	<	-+              @CPP@ -dM $< | {\
107	<	-+                      signames=`kill -l | tr a-z A-Z`; \
108	<	-+                      while read define name value; do \
109	<	-+                              [ "$$define" = '#define' ] || continue; \
110	<	-+                              case "$$value" in \
111	<	-+                              *[!0-9]*) continue; \
112	<	-+                              esac; \
113	<	-+                              for signame in $$signames; do \
114	<	-+                                      if [ "$$name" = "SIG$$signame" ]; then \
115	<	-+                                              echo "{ $$value, \"$$signame\" },"; \
116	<	-+                                      fi; \
117	<	-+                              done; \
118	<	-+                      done; \
119	<	-+              } | sort -n -k 2 > signames.h
120	<	-
121	<	- install-exec-hook:
122	<	-               cd $(DESTDIR)$(bindir) && \
123	<	++              tr -s '\t ' ' ' | sort -n -k 3 | gsed \
124	<	+       's:#define SIG\([A-Z]\+[0-9]*\) \([0-9]\+\) *\(\|/\*.*\)$$:{\ \2,"\1" },:p;d' | \
125	<	+                 grep -v '[0-9][0-9][0-9]' >signames.h || \
126	<	+                 { rm -f signames.h; exit 1; }
127	<	diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/files/patch-src-pstree.c psmisc/files/patch-src-pstree.c
128	<	--- /usr/ports/sysutils/psmisc/files/patch-src-pstree.c 2010-08-01 00:13:14.000000000 -0700
129	<	+++ psmisc/files/patch-src-pstree.c     2010-08-11 23:28:33.395505589 -0700
130	<	@@ -1,14 +1,16 @@
131	<	--- src/pstree.c.orig  2009-12-27 15:46:47.000000000 +0900
132	<	+++ src/pstree.c       2010-01-03 00:52:21.437862505 +0900
133	<	-@@ -37,6 +37,7 @@
134	<	+@@ -37,6 +37,9 @@
135	<	#include <term.h>
136	<	#include <termios.h>
137	<	#include <langinfo.h>
138	<	++#ifdef __FreeBSD__
139	<	+#include <limits.h>
140	<	++#endif
141	<	#include <assert.h>
49	>	---- src/killall.c.orig 2009-12-18 21:45:36.000000000 +0900
50	>	-+++ src/killall.c      2010-01-03 00:37:34.818411284 +0900
51	>	+--- src/killall.c.orig 2011-06-20 04:43:24.000000000 -0700
52	>	++++ src/killall.c      2011-08-06 21:48:35.014330713 -0700
53	>	@@ -36,6 +36,8 @@
54	>	#include <dirent.h>
55	>	#include <signal.h>
56	>	@@ -9,7 +9,7 @@
57		#include <sys/types.h>
58		#include <sys/stat.h>
59	<	-@@ -590,7 +591,11 @@
60	<	+@@ -590,7 +594,11 @@
61	<	struct dirent *de;
62	<	FILE *file;
63	<	struct stat st;
64	<	@@ -20,31 +22,53 @@
65	<	char *buffer;
66	<	size_t buffer_size;
67	<	char readbuf[BUFSIZ + 1];
68	<	-@@ -623,7 +628,7 @@
69	<	+@@ -623,7 +631,11 @@
70	<	if ((pid = (pid_t) atoi(de->d_name)) != 0) {
71	<	if (! (path = malloc(strlen(PROC_BASE) + strlen(de->d_name) + 10)))
72	<	exit(2);
73	<	--      sprintf(path, "%s/%d/stat", PROC_BASE, pid);
74	<	++#ifdef __FreeBSD__
75	<	+      sprintf(path, "%s/%d/status", PROC_BASE, pid);
76	<	++#else
77	<	+       sprintf(path, "%s/%d/stat", PROC_BASE, pid);
78	<	++#endif
79	<	if ((file = fopen(path, "r")) != NULL) {
80	<	empty = 0;
81	<	sprintf(path, "%s/%d", PROC_BASE, pid);
82	<	-@@ -638,6 +643,10 @@
83	<	+@@ -638,6 +650,29 @@
84	<	perror(path);
85	<	exit(1);
59	>	#include <getopt.h>
60	>	-@@ -83,40 +85,35 @@
61	>	+@@ -87,40 +89,35 @@
62	>	ignore_case = 0, pidof;
63	>	static long younger_than = 0, older_than = 0;
64	>
65	>	@@ -34,10 +34,10 @@
66	>	-    else
67	>	-        printf (_("Signal %s(%s%d) ? (y/N) "), name, process_group ? "pgid " : "",
68	>	-              pid);
69	>	+-
70	>	+-    fflush (stdout);
71	>	+  int ch, c;
72	>
73	>	--    fflush (stdout);
74	>	--
75	>	-    if (getline (&line, &len, stdin) < 0)
76	>	-      return 0;
77	>	-    /* Check for default */
78	>	@@ -74,7 +74,16 @@
79	>	}
80	>
81	>	static double
82	>	-@@ -356,7 +353,7 @@
83	>	+@@ -197,7 +194,7 @@
84	>	+
85	>	+       while (fgets(buf, sizeof buf, f))
86	>	+       {
87	>	+-              if (sscanf (buf, "Uid:\t%d", &puid))
88	>	++              if (sscanf (buf, "%*s %*d %*d %*d %*d %*s %*s %*s %*s %*s %*s %*s %d", &puid))
89	>	+               {
90	>	+                       re = uid==puid;
91	>	+                       break;
92	>	+@@ -360,7 +357,7 @@
93		}
94	<	+#ifdef __FreeBSD__
95	<	-+        if (fscanf(file, "%s %*d %d", comm, &ppid) == 2)
96	<	-+          add_proc(comm, pid, ppid, st.st_uid, NULL, 0, 0);
97	<	++        /* Read comm and ppid */
98	<	++        if (fscanf(file, "%s %*d %d", readbuf, &ppid) == 2) {
99	<	++          tmpptr = readbuf;
100	<	++          size = 0;
101	<	++          /* Unescape comm */
102	<	++          do {
103	<	++            if (*tmpptr == '\\')
104	<	++            {
105	<	++              char tmp = tmpptr[4];
106	<	++              tmpptr[4] = 0;
107	<	++              comm[size++] = strtol(++tmpptr, NULL, 8);
108	<	++              tmpptr += 2;
109	<	++              tmpptr[1] = tmp;
110	<	++            }
111	<	++            else
112	<	++              comm[size++] = *tmpptr;
113	<	++          } while (*++tmpptr);
114	<	++          comm[size] = 0;
115	<	++          /* Balance braces */
116	<	++          {
117	<	++            {
118	<	+#else
119	<	size = fread(readbuf, 1, BUFSIZ, file);
120	<	if (ferror(file) == 0) {
121	<	readbuf[size] = 0;
122	<	-@@ -725,6 +734,7 @@
123	<	-             }
124	<	-           }
125	<	-         }
126	<	+@@ -692,6 +727,7 @@
127	<	+                   (void) closedir(taskdir);
128	<	+                 }
129	<	+               free(taskpath);
130	<	+#endif /*__FreeBSD__*/
131	<	-         (void) fclose(file);
132	<	-       }
133	<	-       free(path);
134	<	+               if (!print_args)
135	<	+ #ifdef WITH_SELINUX
136	<	+                 add_proc(comm, pid, ppid, st.st_uid, NULL, 0, 0, scontext);
137	<	diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/pkg-plist psmisc/pkg-plist
138	<	--- /usr/ports/sysutils/psmisc/pkg-plist        1969-12-31 16:00:00.000000000 -0800
139	<	+++ psmisc/pkg-plist    2010-05-18 22:50:42.730462413 -0700
140	<	@@ -0,0 +1,26 @@
141	<	+bin/killall
142	<	+bin/pidof
143	<	+bin/pstree
144	<	+bin/pstree.x11
145	<	+%%NLS%%share/locale/bg/LC_MESSAGES/psmisc.mo
146	<	+%%NLS%%share/locale/ca/LC_MESSAGES/psmisc.mo
147	<	+%%NLS%%share/locale/cs/LC_MESSAGES/psmisc.mo
148	<	+%%NLS%%share/locale/de/LC_MESSAGES/psmisc.mo
149	<	+%%NLS%%share/locale/el/LC_MESSAGES/psmisc.mo
150	<	+%%NLS%%share/locale/eu/LC_MESSAGES/psmisc.mo
151	<	+%%NLS%%share/locale/fi/LC_MESSAGES/psmisc.mo
152	<	+%%NLS%%share/locale/fr/LC_MESSAGES/psmisc.mo
153	<	+%%NLS%%share/locale/hu/LC_MESSAGES/psmisc.mo
232	<	+%%NLS%%share/locale/id/LC_MESSAGES/psmisc.mo
233	<	+%%NLS%%share/locale/it/LC_MESSAGES/psmisc.mo
234	<	+%%NLS%%share/locale/ja/LC_MESSAGES/psmisc.mo
235	<	+%%NLS%%share/locale/nb/LC_MESSAGES/psmisc.mo
236	<	+%%NLS%%share/locale/nl/LC_MESSAGES/psmisc.mo
237	<	+%%NLS%%share/locale/pl/LC_MESSAGES/psmisc.mo
238	<	+%%NLS%%share/locale/pt/LC_MESSAGES/psmisc.mo
239	<	+%%NLS%%share/locale/ro/LC_MESSAGES/psmisc.mo
240	<	+%%NLS%%share/locale/ru/LC_MESSAGES/psmisc.mo
241	<	+%%NLS%%share/locale/sv/LC_MESSAGES/psmisc.mo
242	<	+%%NLS%%share/locale/vi/LC_MESSAGES/psmisc.mo
243	<	+%%NLS%%share/locale/zh_CN/LC_MESSAGES/psmisc.mo
244	<	+%%NLS%%share/locale/zh_TW/LC_MESSAGES/psmisc.mo
94	>	#endif /*WITH_SELINUX*/
95	>	/* load process name */
96	>	@@ -83,7 +92,7 @@
97	>	continue;
98	>	if (!(file = fopen (path, "r")))
99	>	{
100	>	-@@ -364,7 +361,7 @@
101	>	+@@ -368,7 +365,7 @@
102	>	continue;
103	>	}
104	>	free (path);
105	>	@@ -92,7 +101,7 @@
106	>	if (!okay) {
107	>	fclose(file);
108	>	continue;
109	>	-@@ -386,65 +383,6 @@
110	>	+@@ -390,65 +387,6 @@
111	>	got_long = 0;
112	>	command = NULL;         /* make gcc happy */
113	>	length = strlen (comm);
114	>	@@ -158,7 +167,7 @@
115	>	/* mach by process name */
116	>	for (j = 0; j < names; j++)
117	>	{
118	>	-@@ -495,7 +433,7 @@
119	>	+@@ -499,7 +437,7 @@
120	>	{
121	>	int ok = 1;
122	>
123	>	@@ -167,12 +176,12 @@
124	>	continue;
125	>
126	>	if (stat (path, &st) < 0)
127	>	-@@ -842,7 +780,7 @@
128	>	-     fprintf (stderr, _("Maximum number of names is %d\n"), MAX_NAMES);
129	>	-     exit (1);
130	>	-   }
131	>	--  if (stat("/proc/self/stat", &isproc)==-1) {
132	>	-+  if (stat("/proc/curproc/status", &isproc)==-1) {
133	>	-     fprintf (stderr, _("%s is empty (not mounted ?)\n"), PROC_BASE);
134	>	-     exit (1);
135	>	-   }
136	>	+@@ -693,7 +631,7 @@
137	>	+   struct stat isproc;
138	>	+   pid_t pid = getpid();
139	>	+
140	>	+-  snprintf(filename, sizeof(filename), PROC_BASE"/%d/stat", (int) pid);
141	>	++  snprintf(filename, sizeof(filename), PROC_BASE"/%d/status", (int) pid);
142	>	+   return stat(filename, &isproc) == 0;
143	>	+ }
144	>	+
145	>	diff -Nrux .svn -x work /usr/ports/sysutils/psmisc/pkg-descr psmisc/pkg-descr
146	>	--- /usr/ports/sysutils/psmisc/pkg-descr        2005-10-05 00:49:45.000000000 -0700
147	>	+++ psmisc/pkg-descr    2010-10-05 23:40:48.818176312 -0700
148	>	@@ -1,4 +1,4 @@
149	>	A port of the Linux pstree, killall and pidof commands.
150	>	Does not include the 'fuser' command.
151	>
152	>	-WWW: http://psmisc.sourceforge.net
153	>	+WWW: http://psmisc.sourceforge.net/

Diff Legend

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