Commit 953b0f4d authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

psmisc: bump to version 22.16 



[Peter: Don't disable stack protection if toolchain has ssp support]
Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 13ee02d0

package/psmisc/psmisc-link-against-libintl.patch

+7 −31
Original line number Diff line number Diff line
@@ -14,44 +14,20 @@ the "autopoint" program, which itself depends on CVS being installed, 
for some strange reasons. That's the reason why we fall back to the

hacky solution of modifying the Makefile.in file.



Forward-ported Thomas's patch to psmisc 22.14

Forward-ported Thomas's patch to psmisc 22.16

from commit f066ed70cd6939838d4057f66798cbc1d972cc73



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



diff -Nura psmisc-22.14.orig/src/Makefile.in psmisc-22.14/src/Makefile.in

--- psmisc-22.14.orig/src/Makefile.in	2011-10-12 12:12:09.711983726 -0300

+++ psmisc-22.14/src/Makefile.in	2011-10-12 12:14:01.733350322 -0300

@@ -70,16 +70,16 @@

 PROGRAMS = $(bin_PROGRAMS)

 am_fuser_OBJECTS = fuser.$(OBJEXT) signals.$(OBJEXT)

 fuser_OBJECTS = $(am_fuser_OBJECTS)

-fuser_LDADD = $(LDADD)

+fuser_LDADD = $(LDADD) @INTLLIBS@

 am_killall_OBJECTS = killall.$(OBJEXT) signals.$(OBJEXT)

 killall_OBJECTS = $(am_killall_OBJECTS)

diff -Nura psmisc-22.16.orig/src/Makefile.in psmisc-22.16/src/Makefile.in

--- psmisc-22.16.orig/src/Makefile.in	2012-03-28 22:27:33.106660358 -0300

+++ psmisc-22.16/src/Makefile.in	2012-03-28 22:28:55.752219349 -0300

@@ -76,7 +76,7 @@

 killall_DEPENDENCIES =

 am_peekfd_OBJECTS = peekfd.$(OBJEXT)

 peekfd_OBJECTS = $(am_peekfd_OBJECTS)

-peekfd_LDADD = $(LDADD)

+peekfd_LDADD = $(LDADD) @INTLLIBS@

+peekfd_LDADD = $(LDADD) @LIBINTL@

 am_prtstat_OBJECTS = prtstat.$(OBJEXT)

 prtstat_OBJECTS = $(am_prtstat_OBJECTS)

-prtstat_LDADD = $(LDADD)

+prtstat_LDADD = $(LDADD) @INTLLIBS@

 am_pstree_OBJECTS = pstree.$(OBJEXT)

 pstree_OBJECTS = $(am_pstree_OBJECTS)

 pstree_DEPENDENCIES =

@@ -217,10 +217,10 @@

 	$(am__append_10)

 fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.h

 killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h

-killall_LDADD = @SELINUX_LIB@

+killall_LDADD = @SELINUX_LIB@ @INTLLIBS@

 peekfd_SOURCES = peekfd.c

 pstree_SOURCES = pstree.c comm.h i18n.h

-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@

+pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@

 prtstat_SOURCES = prtstat.c prtstat.h

 BUILT_SOURCES = signames.h

 EXTRA_DIST = signames.c 
 prtstat_DEPENDENCIES =

package/psmisc/psmisc.mk

+7 −2
Original line number Diff line number Diff line
@@ -4,10 +4,15 @@ 
#

#############################################################



PSMISC_VERSION = 22.14

PSMISC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psmisc

PSMISC_VERSION = 22.16

PSMISC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/psmisc/psmisc

PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)



ifneq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)

# Don't force -fstack-protector

PSMISC_CONF_OPT = --disable-harden-flags

endif



# build after busybox, we prefer fat versions while we're at it

ifeq ($(BR2_PACKAGE_BUSYBOX),y)

PSMISC_DEPENDENCIES += busybox