Revision: 2839
http://ipcop.svn.sourceforge.net/ipcop/?rev=2839&view=rev
Author: gespinasse
Date: 2009-05-13 06:25:32 +0000 (Wed, 13 May 2009)
Log Message:
-----------
Upgrade procps to 3.2.8
Drop watch UTF patch as we did not include watch in iso
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/procps
ipcop/trunk/lfs/procps
Removed Paths:
-------------
ipcop/trunk/src/patches/procps-3.2.7-watch_unicode-1.patch
Modified: ipcop/trunk/config/rootfiles/common/procps
===================================================================
--- ipcop/trunk/config/rootfiles/common/procps 2009-05-12 19:57:32 UTC (rev
2838)
+++ ipcop/trunk/config/rootfiles/common/procps 2009-05-13 06:25:32 UTC (rev
2839)
@@ -1,8 +1,6 @@
-## procps-3.2.7
-##
bin/kill
bin/ps
-lib/libproc-3.2.7.so
+lib/libproc-3.2.8.so
sbin/sysctl
usr/bin/free
#usr/bin/pgrep
Modified: ipcop/trunk/lfs/procps
===================================================================
--- ipcop/trunk/lfs/procps 2009-05-12 19:57:32 UTC (rev 2838)
+++ ipcop/trunk/lfs/procps 2009-05-13 06:25:32 UTC (rev 2839)
@@ -33,11 +33,11 @@
include Config
PKG_NAME = procps
-VER = 3.2.7
+VER = 3.2.8
HOST_ARCH = all
OTHER_SRC = yes
-THISAPP = procps-$(VER)
+THISAPP = $(PKG_NAME)-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = http://procps.sf.net
DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f490bca772b16472962c7b9f23b1e97d
+$(DL_FILE)_MD5 = 9532714b6846013ca9898984ba4cd7e0
install : $(TARGET)
@@ -82,8 +82,7 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)-watch_unicode-1.patch
-
+ # drop watch UTF8 patch as watch is not include
cd $(DIR_APP) && make -j $(PARALLELISM)
cd $(DIR_APP) && make install
Deleted: ipcop/trunk/src/patches/procps-3.2.7-watch_unicode-1.patch
===================================================================
--- ipcop/trunk/src/patches/procps-3.2.7-watch_unicode-1.patch 2009-05-12
19:57:32 UTC (rev 2838)
+++ ipcop/trunk/src/patches/procps-3.2.7-watch_unicode-1.patch 2009-05-13
06:25:32 UTC (rev 2839)
@@ -1,148 +0,0 @@
-Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date: 2008-10-11
-Initial Package Version: 3.2.7
-Upstream Status: Unknown
-Origin: http://wiki.linuxfromscratch.org/lfs/ticket/2113
-Description: Fixes a unicode related bug in the watch program
-
-
-diff -Naur procps-3.2.7.old/Makefile procps-3.2.7/Makefile
---- procps-3.2.7.old/Makefile 2006-06-24 12:02:25.000000000 +0300
-+++ procps-3.2.7/Makefile 2007-12-02 13:22:10.000000000 +0200
-@@ -67,7 +67,7 @@
- # plus the top-level Makefile to make it work stand-alone.
- _TARFILES := Makefile
-
--CURSES := -lncurses
-+CURSES := -lncursesw
-
- # This seems about right for the dynamic library stuff.
- # Something like this is probably needed to make the SE Linux
-
-diff -Naur procps-3.2.7.old/watch.c procps-3.2.7/watch.c
---- procps-3.2.7.old/watch.c 2006-06-17 12:18:38.000000000 +0300
-+++ procps-3.2.7/watch.c 2007-12-02 13:26:22.000000000 +0200
-@@ -25,6 +25,8 @@
- #include <termios.h>
- #include <locale.h>
- #include "proc/procps.h"
-+#include <wchar.h>
-+#include <wctype.h>
-
- #ifdef FORCE_8BIT
- #undef isprint
-@@ -134,6 +136,27 @@
- }
- }
-
-+static wint_t
-+readwc(FILE *stream, mbstate_t *mbs)
-+{
-+ for (;;) {
-+ int chr;
-+ char c;
-+ wchar_t wc;
-+ size_t len;
-+
-+ chr = getc(stream);
-+ if (chr == EOF)
-+ return WEOF;
-+ c = chr;
-+ len = mbrtowc(&wc, &c, 1, mbs);
-+ if (len == (size_t)-1)
-+ memset(mbs, 0, sizeof(*mbs));
-+ else if (len != (size_t)-2)
-+ return wc;
-+ }
-+}
-+
- int
- main(int argc, char *argv[])
- {
-@@ -239,6 +262,7 @@
- FILE *p;
- int x, y;
- int oldeolseen = 1;
-+ mbstate_t mbs;
-
- if (screen_size_changed) {
- get_terminal_size();
-@@ -266,49 +290,63 @@
- do_exit(2);
- }
-
-+ memset(&mbs, 0, sizeof(mbs));
- for (y = show_title; y < height; y++) {
- int eolseen = 0, tabpending = 0;
- for (x = 0; x < width; x++) {
-- int c = ' ';
-- int attr = 0;
-+ wint_t c = L' ';
-+ int attr = 0, c_width;
-+ cchar_t cc;
-+ wchar_t wstr[2];
-
- if (!eolseen) {
- /* if there is a tab pending, just spit
spaces until the
- next stop instead of reading
characters */
- if (!tabpending)
- do
-- c = getc(p);
-- while (c != EOF && !isprint(c)
-- && c != '\n'
-- && c != '\t');
-- if (c == '\n')
-+ c = readwc(p, &mbs);
-+ while (c != WEOF && !iswprint(c)
-+ && c != L'\n'
-+ && c != L'\t');
-+ if (c == L'\n')
- if (!oldeolseen && x == 0) {
- x = -1;
- continue;
- } else
- eolseen = 1;
-- else if (c == '\t')
-+ else if (c == L'\t')
- tabpending = 1;
-- if (c == EOF || c == '\n' || c == '\t')
-- c = ' ';
-+ if (c == WEOF || c == L'\n' || c ==
L'\t')
-+ c = L' ';
- if (tabpending && (((x + 1) % 8) == 0))
- tabpending = 0;
- }
-+ wstr[0] = c;
-+ wstr[1] = 0;
-+ setcchar (&cc, wstr, 0, 0, NULL);
- move(y, x);
- if (option_differences) {
-- int oldch = inch();
-- char oldc = oldch & A_CHARTEXT;
-+ cchar_t oldc;
-+ wchar_t oldwstr[2];
-+ attr_t attrs;
-+ short colors;
-+
-+ in_wch(&oldc);
-+ getcchar(&oldc, oldwstr, &attrs,
&colors, NULL);
- attr = !first_screen
-- && (c != oldc
-+ && (wstr[0] != oldwstr[0]
- ||
- (option_differences_cumulative
-- && (oldch & A_ATTRIBUTES)));
-+ && attrs));
- }
- if (attr)
- standout();
-- addch(c);
-+ add_wch(&cc);
- if (attr)
- standend();
-+ c_width = wcwidth(c);
-+ if (c_width > 1)
-+ x += c_width - 1;
- }
- oldeolseen = eolseen;
- }
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
