Author: archaic Date: 2005-03-20 22:32:06 -0700 (Sun, 20 Mar 2005) New Revision: 881
Added: trunk/hlfs/psmisc-21.6-rpmatch-1.patch trunk/psmisc/psmisc-21.6-rpmatch-1.patch Removed: trunk/hlfs/psmisc-21.6-uClibc-2.patch trunk/psmisc/psmisc-21.6-uClibc-2.patch Log: Updated (and renamed) the psmisc patch to the upstream version. Added: trunk/hlfs/psmisc-21.6-rpmatch-1.patch =================================================================== --- trunk/hlfs/psmisc-21.6-rpmatch-1.patch 2005-03-20 18:24:31 UTC (rev 880) +++ trunk/hlfs/psmisc-21.6-rpmatch-1.patch 2005-03-21 05:32:06 UTC (rev 881) @@ -0,0 +1,38 @@ +Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) +Date: 2005-03-21 +Initial Package Version: 21.6 +Upstream Status: From upstream +ORIGIN: psmisc-cvs +Description: uClibc does not have rpmatch(). This patch makes configure check for +rpmatch() and creates a compatable function if it is not provided by the C library. + +Also see: +http://www.linuxfromscratch.org/hlfs/ +http://www.uclibc.org/ + +diff -Naur psmisc-21.6.orig/configure psmisc-21.6/configure +--- psmisc-21.6.orig/configure 2005-03-11 10:57:53.000000000 +0000 ++++ psmisc-21.6/configure 2005-03-21 05:15:23.000000000 +0000 +@@ -6129,7 +6129,7 @@ + + + +-for ac_func in strdup strerror strtoul ++for ac_func in strdup strerror strtoul rpmatch + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 +diff -Naur psmisc-21.6.orig/src/i18n.h psmisc-21.6/src/i18n.h +--- psmisc-21.6.orig/src/i18n.h 2004-11-09 11:25:15.000000000 +0000 ++++ psmisc-21.6/src/i18n.h 2005-03-21 05:15:57.000000000 +0000 +@@ -17,3 +17,10 @@ + + #endif + ++#ifndef HAVE_RPMATCH ++#define rpmatch(line) \ ++ ( (line == NULL)? -1 : \ ++ (*line == 'y' || *line == 'Y')? 1 : \ ++ (*line == 'n' || *line == 'N')? 0 : \ ++ -1 ) ++#endif Deleted: trunk/hlfs/psmisc-21.6-uClibc-2.patch =================================================================== --- trunk/hlfs/psmisc-21.6-uClibc-2.patch 2005-03-20 18:24:31 UTC (rev 880) +++ trunk/hlfs/psmisc-21.6-uClibc-2.patch 2005-03-21 05:32:06 UTC (rev 881) @@ -1,28 +0,0 @@ -Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) -Date: 2005-03-20 -Initial Package Version: 21.6 -Upstream Status: Not submitted - Reported -ORIGIN: Gentoo psmisc-21.6-nonls.patch -Description: uClibc does not have rpmatch(). This patch creates a compatable function. - -Also see: -http://www.linuxfromscratch.org/hlfs/ -http://www.uclibc.org/ - -diff -Naur psmisc-21.6.orig/src/i18n.h psmisc-21.6/src/i18n.h ---- psmisc-21.6.orig/src/i18n.h 2004-11-09 11:25:15.000000000 +0000 -+++ psmisc-21.6/src/i18n.h 2005-03-20 09:03:44.000000000 +0000 -@@ -15,5 +15,13 @@ - #define _(String) (String) - #endif - -+#ifdef __UCLIBC__ -+#define rpmatch(line) \ -+ ( (line == NULL) ? -1 : \ -+ (*line == 'y' || *line == 'Y') ? 1 : \ -+ (*line == 'n' || *line == 'N') ? 0 : \ -+ -1 ) -+#endif -+ - #endif - Added: trunk/psmisc/psmisc-21.6-rpmatch-1.patch =================================================================== --- trunk/psmisc/psmisc-21.6-rpmatch-1.patch 2005-03-20 18:24:31 UTC (rev 880) +++ trunk/psmisc/psmisc-21.6-rpmatch-1.patch 2005-03-21 05:32:06 UTC (rev 881) @@ -0,0 +1 @@ +link ../hlfs/psmisc-21.6-rpmatch-1.patch \ No newline at end of file Property changes on: trunk/psmisc/psmisc-21.6-rpmatch-1.patch ___________________________________________________________________ Name: svn:special + * Deleted: trunk/psmisc/psmisc-21.6-uClibc-2.patch =================================================================== --- trunk/psmisc/psmisc-21.6-uClibc-2.patch 2005-03-20 18:24:31 UTC (rev 880) +++ trunk/psmisc/psmisc-21.6-uClibc-2.patch 2005-03-21 05:32:06 UTC (rev 881) @@ -1 +0,0 @@ -link ../hlfs/psmisc-21.6-uClibc-2.patch \ No newline at end of file -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
