Bug 55115 – (selinux) psmisc nonls patch fails

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Boyd Waters 2004-06-24 21:48:44 UTC]

>>> Unpacking psmisc-21.4.tar.gz to /var/tmp/portage/psmisc-21.4/work
selinux
 * Applying psmisc-21.4-selinux.diff.bz2...                                   [ ok ]
 * Applying psmisc-21.4-no-nls.patch...

 * Failed Patch: psmisc-21.4-no-nls.patch!
 *
 * Include in your bugreport the contents of:

Likewise 21.2



Portage 2.0.50-r8 (x86, gcc-3.4.0, glibc-2.3.4.20040619-r0, 2.6.7-rc3-love2)=================================================================System uname: 2.6.7-rc3-love2 i686 AMD Duron(tm) ProcessorGentoo Base System version 1.4.16Autoconf: sys-devel/autoconf-2.59-r4Automake: sys-devel/automake-1.8.5-r1ACCEPT_KEYWORDS="x86 ~x86"AUTOCLEAN="yes"CFLAGS="-O2 -mtune=athlon -fomit-frame-pointer -fforce-addr"CHOST="i686-pc-linux-gnu"COMPILER="gcc3"CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3/share/config /usr/share/config /var/qmail/control"CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"CXXFLAGS="-O2 -mtune=athlon -fomit-frame-pointer -fforce-addr"DISTDIR="/usr/portage/distfiles"FEATURES="autoaddcvs ccache sandbox sfperms strict"GENTOO_MIRRORS="http://gentoo.oregonstate.edu http://distro.ibiblio.org/pub/Linux/distributions/gentoo"MAKEOPTS="-j2"PKGDIR="/usr/portage/packages"PORTAGE_TMPDIR="/var/tmp"PORTDIR="/usr/portage"PORTDIR_OVERLAY="/usr/local/portage"SYNC="rsync://rsync.gentoo.org/gentoo-portage"USE="berkdb crypt hardened ncurses nptl pam perl pic pie python readline selinux ssl tcpd x86 zlib"

[Comment 1 Boyd Waters 2004-06-24 21:51:12 UTC]

Created attachment 34106 [details]
Results of the failed epatch

[Comment 2 Boyd Waters 2004-06-24 22:45:57 UTC]

I should mention that each of the patches for nonls and selinux succeed independently, but fail when applied one after the other. Of course...

[Comment 3 Boyd Waters 2004-06-24 23:23:00 UTC]

Created attachment 34110 [details, diff]
Patch that applies no nls AFTER selinux

[Comment 4 Boyd Waters 2004-06-24 23:27:11 UTC]

I modified the ebuild to use the no-nls-after-selinux patch:

--- psmisc-21.4.ebuild     2004-06-15 01:36:28.000000000 -0600
+++ psmisc-21.4-r1.ebuild  2004-06-25 00:14:43.272403040 -0600
@@ -26,8 +26,10 @@
        if use selinux; then
                # Necessary selinux patch
                epatch ${FILESDIR}/${SELINUX_PATCH}
+               use nls || epatch ${FILESDIR}/${P}-no-nls-selinux.patch
+       else
+               use nls || epatch ${FILESDIR}/${P}-no-nls.patch
        fi
-       use nls || epatch ${FILESDIR}/${P}-no-nls.patch
 }

[Comment 5 Boyd Waters 2004-06-24 23:50:21 UTC]

Sorry -- Typing this on Mac OS X with  cut-and-paste from Terminal.app 
leads to line-wrapping wrapping weirdness.... I'll try again, going from Emacs this time...


Portage 2.0.50-r8 (x86, gcc-3.4.0, glibc-2.3.4.20040619-r0, 2.6.7-rc3-love2)
=================================================================
System uname: 2.6.7-rc3-love2 i686 AMD Duron(tm) Processor
Gentoo Base System version 1.4.16
Autoconf: sys-devel/autoconf-2.59-r4
Automake: sys-devel/automake-1.8.5-r1
ACCEPT_KEYWORDS="x86 ~x86"
AUTOCLEAN="yes"
CFLAGS="-O2 -mtune=athlon -fomit-frame-pointer -fforce-addr"
CHOST="i686-pc-linux-gnu"
COMPILER="gcc3"
CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3/share/config /usr/share/config /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-O2 -mtune=athlon -fomit-frame-pointer -fforce-addr"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs ccache sandbox sfperms strict"
GENTOO_MIRRORS="http://gentoo.oregonstate.edu http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="berkdb crypt hardened ncurses nptl pam perl pic pie python readline selinux ssl tcpd x86 zlib"

[Comment 6 solar (RETIRED) 2004-06-25 06:02:53 UTC]

hi.. I broke this for you while working on uclibc support.
psmisc before the patch never really supported -nls (but now it does)
Anyway I've added the updated no-nls-selinux and ebuild changes 
and tested that it unpacks properly with.
env USE='selinux -nls' ebuild psmisc-21.4.ebuild clean unpack

I did not add it as -r1 however.

[Comment 7 solar (RETIRED) 2004-06-25 06:13:20 UTC]

Note:
 Not tested with psmisc-21.2-r4.ebuild
 If somebody does and it fails, lets please push for psmisc-21.4 going stable.

[Comment 8 Adam Mondl (RETIRED) 2004-09-08 11:06:34 UTC]

psmisc-21.2-r4 does indeed seem to fail(http://bugs.gentoo.org/show_bug.cgi?id=62271) so 21.4 should start making its way towards being marked stable. :)

[Comment 9 Adam Mondl (RETIRED) 2004-09-09 13:29:30 UTC]

21.4 with solar's patch is now in the stable tree.  Boyd can you try out the new package to confirm that the problem is fixed?

[Comment 10 Boyd Waters 2004-10-04 11:50:50 UTC]

Sorry for the delay, I've been away from Gentoo linux for some time (working with gentoo-macosx and FreeBSD at the moment).
I will try to test this week to verify solution.

[Comment 11 petre rodan (RETIRED) 2004-11-21 23:57:31 UTC]

*** Bug 62271 has been marked as a duplicate of this bug. ***

[Comment 12 petre rodan (RETIRED) 2004-11-22 10:46:51 UTC]

21.4 (the current stable psmisc) works as expected using the -nls +selinux combination.