Attachment 108348 Details for Bug 149166 – psmisc-22.12.patch

[patch] psmisc-22.12.patch

psmisc-22.12.patch (text/plain), 5.98 KB, created by Sunpoet Po-Chuan Hsieh on 2010-08-01 05:10:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sunpoet Po-Chuan Hsieh

Created: 2010-08-01 05:10:04 UTC

Size: 5.98 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/sysutils/psmisc/Makefile /usr/ports/sunpoet/psmisc/Makefile
>--- /usr/ports/sysutils/psmisc/Makefile	2010-05-31 09:55:37.000000000 +0800
>+++ /usr/ports/sunpoet/psmisc/Makefile	2010-07-31 20:54:57.000000000 +0800
>@@ -6,14 +6,14 @@
> #
> 
> PORTNAME=	psmisc
>-PORTVERSION=	22.11
>+PORTVERSION=	22.12
> CATEGORIES=	sysutils
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
> 
> MAINTAINER=	sunpoet@sunpoet.net
> COMMENT=	A port of the Linux pstree, killall and pidof commands
> 
>-CONFLICTS=	pidof-[0-9]* pstree-2.*
>+CONFLICTS=	pidof-[0-9]* pstree-2.[0-9]*
> 
> CONFIGURE_ARGS=	--disable-nls
> GNU_CONFIGURE=	yes
>@@ -22,6 +22,9 @@
> MAN1=		killall.1 pstree.1
> PLIST_FILES=	bin/killall bin/pidof bin/pstree bin/pstree.x11
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e '/^#define COMM_LEN / s|16|254|' ${WRKSRC}/src/comm.h
>+
> post-install:
> 	@${LN} -fs killall ${PREFIX}/bin/pidof
> 
>diff -ruN --exclude=CVS /usr/ports/sysutils/psmisc/distinfo /usr/ports/sunpoet/psmisc/distinfo
>--- /usr/ports/sysutils/psmisc/distinfo	2010-05-31 09:55:37.000000000 +0800
>+++ /usr/ports/sunpoet/psmisc/distinfo	2010-07-25 03:58:11.000000000 +0800
>@@ -1,3 +1,3 @@
>-MD5 (psmisc-22.11.tar.gz) = b5d32aa285b75c59dee96d3ea26a4881
>-SHA256 (psmisc-22.11.tar.gz) = 8fff37557f5150d89ef9afc03133731da3eaa2bad1a94f64355218a68b884536
>-SIZE (psmisc-22.11.tar.gz) = 375038
>+MD5 (psmisc-22.12.tar.gz) = 16c83a351c292cfc845b27d6395e05fb
>+SHA256 (psmisc-22.12.tar.gz) = ba2f41a501da6137b2d94e54e855bea8246f65167c613d3990bd0ce49e996a7a
>+SIZE (psmisc-22.12.tar.gz) = 374354
>diff -ruN --exclude=CVS /usr/ports/sysutils/psmisc/files/patch-doc-Makefile.in /usr/ports/sunpoet/psmisc/files/patch-doc-Makefile.in
>--- /usr/ports/sysutils/psmisc/files/patch-doc-Makefile.in	2010-01-03 04:21:16.000000000 +0800
>+++ /usr/ports/sunpoet/psmisc/files/patch-doc-Makefile.in	2010-07-31 18:53:04.000000000 +0800
>@@ -1,6 +1,6 @@
>---- doc/Makefile.in.orig	2009-12-27 16:19:06.000000000 +0900
>-+++ doc/Makefile.in	2010-01-03 00:15:19.879070557 +0900
>-@@ -187,7 +187,7 @@
>+--- doc/Makefile.in.orig	2010-07-12 19:38:08.000000000 +0800
>++++ doc/Makefile.in	2010-07-31 18:52:50.000000000 +0800
>+@@ -189,7 +189,7 @@
>  top_build_prefix = @top_build_prefix@
>  top_builddir = @top_builddir@
>  top_srcdir = @top_srcdir@
>diff -ruN --exclude=CVS /usr/ports/sysutils/psmisc/files/patch-src-Makefile.in /usr/ports/sunpoet/psmisc/files/patch-src-Makefile.in
>--- /usr/ports/sysutils/psmisc/files/patch-src-Makefile.in	2010-01-03 04:21:16.000000000 +0800
>+++ /usr/ports/sunpoet/psmisc/files/patch-src-Makefile.in	2010-07-31 18:58:51.000000000 +0800
>@@ -1,5 +1,5 @@
>---- src/Makefile.in.orig	2009-12-27 16:19:06.000000000 +0900
>-+++ src/Makefile.in	2010-01-03 00:25:56.093987293 +0900
>+--- src/Makefile.in.orig	2010-07-12 19:38:08.000000000 +0800
>++++ src/Makefile.in	2010-07-31 18:58:38.000000000 +0800
> @@ -34,8 +34,8 @@
>  POST_UNINSTALL = :
>  build_triplet = @build@
>@@ -8,10 +8,10 @@
> -	prtstat$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
> +bin_PROGRAMS = killall$(EXEEXT) pstree$(EXEEXT) \
> +	$(am__EXEEXT_1) $(am__EXEEXT_2) \
>- 	$(am__EXEEXT_3)
>+ 	$(am__EXEEXT_3) $(am__EXEEXT_4) $(am__EXEEXT_5)
>  @WANT_PEEKFD_I386_TRUE@am__append_1 = peekfd
>  @WANT_PEEKFD_I386_TRUE@am__append_2 = -DI386
>-@@ -81,10 +81,10 @@
>+@@ -91,10 +91,8 @@
>  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
>  CCLD = $(CC)
>  LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
>@@ -19,19 +19,17 @@
> -	$(prtstat_SOURCES) $(pstree_SOURCES)
> -DIST_SOURCES = $(fuser_SOURCES) $(killall_SOURCES) $(peekfd_SOURCES) \
> -	$(prtstat_SOURCES) $(pstree_SOURCES)
>-+SOURCES = $(killall_SOURCES) \
>-+	$(pstree_SOURCES)
>-+DIST_SOURCES = $(killall_SOURCES) \
>-+	$(pstree_SOURCES)
>++SOURCES = $(killall_SOURCES) $(pstree_SOURCES)
>++DIST_SOURCES = $(killall_SOURCES) $(pstree_SOURCES)
>  ETAGS = etags
>  CTAGS = ctags
>  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>-@@ -208,10 +208,10 @@
>- 	$(am__append_4) $(am__append_6)
>+@@ -217,10 +215,10 @@
>+ 	$(am__append_10)
>  fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
>  killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
> -killall_LDADD = @SELINUX_LIB@
>-+killall_LDADD = 
>++killall_LDADD =
>  peekfd_SOURCES = peekfd.c
>  pstree_SOURCES = pstree.c comm.h i18n.h
> -pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
>@@ -39,10 +37,11 @@
>  prtstat_SOURCES = prtstat.c prtstat.h
>  BUILT_SOURCES = signames.h
>  EXTRA_DIST = signames.c 
>-@@ -537,13 +537,20 @@
>+@@ -545,14 +543,20 @@
>+ 
>  
>  signames.h: signames.c Makefile
>- 		export LC_ALL=C ; \
>+-		export LC_ALL=C ; \
> -		@CPP@ -dM $< |\
> -		tr -s '\t ' ' ' | sort -n -k 3 | sed \
> -	's:#define SIG$[A-Z]\+[0-9]*$ $[0-9]\+$ *$\|/\*.*$$$:{\ \2,"\1" },:p;d' | \
>diff -ruN --exclude=CVS /usr/ports/sysutils/psmisc/files/patch-src-comm.h /usr/ports/sunpoet/psmisc/files/patch-src-comm.h
>--- /usr/ports/sysutils/psmisc/files/patch-src-comm.h	2005-09-10 10:22:03.000000000 +0800
>+++ /usr/ports/sunpoet/psmisc/files/patch-src-comm.h	1970-01-01 08:00:00.000000000 +0800
>@@ -1,11 +0,0 @@
>---- src/comm.h.orig	Thu Dec 14 00:43:10 2000
>-+++ src/comm.h	Sat Sep 10 03:55:27 2005
>-@@ -11,7 +11,7 @@
>- #define COMM_LEN sizeof(dummy.comm)
>- extern struct task_struct dummy;
>- #else
>--#define COMM_LEN 16		/* synchronize with size of comm in struct task_struct in
>-+#define COMM_LEN 254		/* synchronize with size of comm in struct task_struct in
>- 				   /usr/include/linux/sched.h */
>- #endif
>- 
>diff -ruN --exclude=CVS /usr/ports/sysutils/psmisc/files/patch-src-pstree.c /usr/ports/sunpoet/psmisc/files/patch-src-pstree.c
>--- /usr/ports/sysutils/psmisc/files/patch-src-pstree.c	2010-01-03 04:21:16.000000000 +0800
>+++ /usr/ports/sunpoet/psmisc/files/patch-src-pstree.c	2010-07-31 20:52:53.000000000 +0800
>@@ -25,7 +25,7 @@
>        if (! (path = malloc(strlen(PROC_BASE) + strlen(de->d_name) + 10)))
>          exit(2);
> -      sprintf(path, "%s/%d/stat", PROC_BASE, pid);
>-+      sprintf (path, "%s/%d/status", PROC_BASE, pid);
>++      sprintf(path, "%s/%d/status", PROC_BASE, pid);
>        if ((file = fopen(path, "r")) != NULL) {
>          empty = 0;
>          sprintf(path, "%s/%d", PROC_BASE, pid);

Actions: View | Diff

Attachments on bug 149166: 108348