December 2006 - crux-commits

ports/opt (2.3): sc: applied patches from debian:
by crux＠crux.nu 22 Dec '06

22 Dec '06

commit 8c2d6263a9d18d99061b30223f620e04c98b0a09 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Dec 22 18:25:19 2006 +0100 sc: applied patches from debian: diff --git a/sc/.footprint b/sc/.footprint index bc9264b..1e26ff4 100644 --- a/sc/.footprint +++ b/sc/.footprint @@ -3,11 +3,11 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/psc -rwxr-xr-x root/root usr/bin/sc -rwxr-xr-x root/root usr/bin/scqref -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/sc/ -drwxr-xr-x root/root usr/lib/sc/plugins/ --rw-r--r-- root/root usr/lib/sc/tutorial.sc drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/psc.1.gz -rw-r--r-- root/root usr/man/man1/sc.1.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/sc/ +drwxr-xr-x root/root usr/share/sc/plugins/ +-rw-r--r-- root/root usr/share/sc/tutorial.sc diff --git a/sc/.md5sum b/sc/.md5sum index 22326f7..30b238f 100644 --- a/sc/.md5sum +++ b/sc/.md5sum @@ -1,2 +1,2 @@ -26b011283b3fef961510b34a2ac1c334 sc-7.16.patch +658f3174eebc6d2dad667db71304b480 sc-7.16.patch 1db636e9b2dc7cd73c40aeece6852d47 sc-7.16.tar.gz diff --git a/sc/Pkgfile b/sc/Pkgfile index 32aea48..132aa3b 100644 --- a/sc/Pkgfile +++ b/sc/Pkgfile @@ -5,7 +5,7 @@ name=sc version=7.16 -release=2 +release=3 source=(http://www.ibiblio.org/pub/Linux/apps/financial/spreadsheet/$name-$… \ $name-$version.patch) @@ -14,7 +14,7 @@ build () { patch -p1 < $SRC/$name-$version.patch sed -i "/^CFLAGS/s/-O2 -pipe/$CFLAGS/" Makefile make - mkdir -p $PKG/usr/{bin,man/man1,lib/sc} + mkdir -p $PKG/usr/{bin,man/man1,share/sc} make prefix=$PKG/usr install sed -i "s|$PKG||g" $PKG/usr/man/man1/sc.1 } diff --git a/sc/sc-7.16.patch b/sc/sc-7.16.patch index 1d113ab..d232c3d 100644 --- a/sc/sc-7.16.patch +++ b/sc/sc-7.16.patch @@ -1,7 +1,439 @@ +diff -Nru sc-7.16.orig/Makefile sc-7.16/Makefile +--- sc-7.16.orig/Makefile 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/Makefile 2006-12-20 18:48:45.280553112 +0100 +@@ -32,7 +32,7 @@ + + # This is where the library file (tutorial) goes. + #LIBDIR=/usr/local/share/$(name) # reno +-LIBDIR=${prefix}/lib/$(name) ++LIBDIR=${prefix}/share/$(name) + LIBRARY=-DLIBDIR=\"${LIBDIR}\" + + # Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up +diff -Nru sc-7.16.orig/abbrev.c sc-7.16/abbrev.c +--- sc-7.16.orig/abbrev.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/abbrev.c 2006-12-20 18:48:45.280553112 +0100 +@@ -19,10 +19,15 @@ + #include <stdio.h> + #include <stdlib.h> + #include <ctype.h> ++#include <curses.h> ++#include <unistd.h> + #include "sc.h" + + static struct abbrev *abbr_base; + ++int are_abbrevs(void); ++ ++ + void + add_abbr(char *string) + { +@@ -87,7 +92,7 @@ + } + } + +- if (expansion == NULL) ++ if (expansion == NULL){ + if ((a = find_abbr(string, strlen(string), &prev))) { + error("abbrev \"%s %s\"", a->abbr, a->exp); + return; +@@ -95,6 +100,7 @@ + error("abreviation \"%s\" doesn't exist", string); + return; + } ++ } + + if (find_abbr(string, strlen(string), &prev)) + del_abbr(string); +@@ -122,7 +128,7 @@ + del_abbr(char *abbrev) + { + struct abbrev *a; +- struct abbrev **prev; ++ struct abbrev **prev=0; + + if (!(a = find_abbr(abbrev, strlen(abbrev), prev))) + return; +diff -Nru sc-7.16.orig/cmds.c sc-7.16/cmds.c +--- sc-7.16.orig/cmds.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/cmds.c 2006-12-20 18:48:45.280553112 +0100 +@@ -478,7 +478,7 @@ + int i, qtmp; + char buf[50]; + struct frange *fr; +- struct ent *obuf; ++ struct ent *obuf=0; + + if ((fr = find_frange(currow, curcol))) + rs = fr->or_right->row - currow + 1; +@@ -535,7 +535,7 @@ + int cs = maxcol - curcol + 1; + int i, qtmp; + char buf[50]; +- struct ent *obuf; ++ struct ent *obuf=0; + + if (cs - arg < 0) { + cs = cs > 0 ? cs : 0; +@@ -810,7 +810,7 @@ + + if (to_insert == 'r') { + insertrow(numrows, 0); +- if (fr = find_frange(currow, curcol)) ++ if ((fr = find_frange(currow, curcol))) + deltac = fr->or_left->col - mincol; + else { + for (i = 0; i < numrows; i++) +@@ -2279,7 +2279,7 @@ + ret->e.r.right.vp = lookat(newrow, newcol); + ret->e.r.right.vf = e->e.r.right.vf; + } else { +- struct enode *temprange; ++ struct enode *temprange=0; + + if (freeenodes) { + ret = freeenodes; +@@ -2337,8 +2337,7 @@ + break; + case 'f': + case 'F': +- if (range && ret->op == 'F' || +- !range && ret->op == 'f') ++ if ((range && ret->op == 'F') || (!range && ret->op == 'f')) + Rdelta = Cdelta = 0; + ret->e.o.left = copye(e->e.o.left, Rdelta, Cdelta, + r1, c1, r2, c2, transpose); +@@ -2798,7 +2797,7 @@ + write_cells(register FILE *f, int r0, int c0, int rn, int cn, int dr, int dc) + { + register struct ent **pp; +- int r, c, rs, cs, mf; ++ int r, c, rs=0, cs=0, mf; + char *dpointptr; + + mf = modflg; +@@ -2861,12 +2860,12 @@ + if ((plugin = findplugin(p+1, 'w')) != NULL) { + if (!plugin_exists(plugin, strlen(plugin), save + 1)) { + error("plugin not found"); +- return; ++ return -1; + } + *save = '|'; + if ((strlen(save) + strlen(fname) + 20) > PATHLEN) { + error("Path too long"); +- return; ++ return -1; + } + sprintf(save + strlen(save), " %s%d:", coltoa(c0), r0); + sprintf(save + strlen(save), "%s%d \"%s\"", coltoa(cn), rn, fname); +@@ -2883,13 +2882,14 @@ + } + #endif /* VMS */ + +- if (*fname == '\0') ++ if (*fname == '\0'){ + if (isatty(STDOUT_FILENO) || *curfile != '\0') + fname = curfile; + else { + write_fd(stdout, r0, c0, rn, cn); + return (0); + } ++ } + + #ifdef MSDOS + namelen = 12; +@@ -2981,12 +2981,12 @@ + if ((plugin = findplugin(p+1, 'r')) != NULL) { + if (!(plugin_exists(plugin, strlen(plugin), save + 1))) { + error("plugin not found"); +- return; ++ return -1; + } + *save = '|'; + if ((strlen(save) + strlen(fname) + 2) > PATHLEN) { + error("Path too long"); +- return; ++ return -1; + } + sprintf(save + strlen(save), " \"%s\"", fname); + eraseflg = 0; +diff -Nru sc-7.16.orig/color.c sc-7.16/color.c +--- sc-7.16.orig/color.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/color.c 2006-12-20 18:48:45.280553112 +0100 +@@ -19,6 +19,7 @@ + + #include <curses.h> + #include <ctype.h> ++#include <unistd.h> + #include "sc.h" + + /* a linked list of free [struct ent]'s, uses .next as the pointer */ +diff -Nru sc-7.16.orig/frame.c sc-7.16/frame.c +--- sc-7.16.orig/frame.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/frame.c 2006-12-20 18:48:45.280553112 +0100 +@@ -18,6 +18,9 @@ + + #include <stdio.h> + #include <ctype.h> ++#include <stdlib.h> ++#include <curses.h> ++#include <unistd.h> + #include "sc.h" + + static struct frange *frame_base; +diff -Nru sc-7.16.orig/help.c sc-7.16/help.c +--- sc-7.16.orig/help.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/help.c 2006-12-20 18:48:45.280553112 +0100 +@@ -11,6 +11,7 @@ + char *revision = "$Revision: 7.16 $"; + #else + #include <curses.h> ++#include <unistd.h> + #include "sc.h" + #endif /* QREF */ + +diff -Nru sc-7.16.orig/interp.c sc-7.16/interp.c +--- sc-7.16.orig/interp.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/interp.c 2006-12-20 18:48:45.290552829 +0100 +@@ -1572,12 +1572,12 @@ + copy(struct ent *dv1, struct ent *dv2, struct ent *v1, struct ent *v2) + { + struct ent *p; +- struct ent *n; ++/* struct ent *n;*/ + static int minsr = -1, minsc = -1; + static int maxsr = -1, maxsc = -1; + int mindr, mindc; + int maxdr, maxdc; +- int vr, vc; ++/* int vr, vc;*/ + int r, c; + int deltar, deltac; + +@@ -2066,7 +2066,7 @@ + *line = '\0'; + } + } +- if (!col_hidden[c]) ++ if (!col_hidden[c]){ + if (gs.g_type == G_STR) { + if (p && p->label + #if defined(REGCOMP) +@@ -2099,6 +2099,7 @@ + #endif + #endif + break; ++ } + if (r == endr && c == endc) { + error("String not found"); + #if defined(REGCOMP) +@@ -2471,13 +2472,11 @@ + int + constant(register struct enode *e) + { +- return ( +- e == NULL ++ return e == NULL + || e->op == O_CONST + || e->op == O_SCONST +- || e->op == 'm' && constant(e->e.o.left) +- || ( +- e->op != O_VAR ++ || (e->op == 'm' && constant(e->e.o.left)) ++ || (e->op != O_VAR + && !(e->op & REDUCE) + && constant(e->e.o.left) + && constant(e->e.o.right) +@@ -2491,9 +2490,7 @@ + && e->op != LASTCOL + && e->op != NUMITER + && e->op != FILENAME +- && optimize +- ) +- ); ++ && optimize ); + } + + void +diff -Nru sc-7.16.orig/lex.c sc-7.16/lex.c +--- sc-7.16.orig/lex.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/lex.c 2006-12-20 18:48:45.290552829 +0100 +@@ -34,6 +34,8 @@ + #include <signal.h> + #include <setjmp.h> + #include <ctype.h> ++#include <unistd.h> ++#include <math.h> + #include "sc.h" + + #ifdef NONOTIMEOUT +@@ -107,7 +109,7 @@ + yylex() + { + char *p = line + linelim; +- int ret; ++ int ret=0; + static int isfunc = 0; + static bool isgoto = 0; + static bool colstate = 0; +@@ -326,7 +328,7 @@ + strcpy((char *)path, HomeDir); + strcat((char *)path, "/.sc/plugins/"); + strncat((char *)path, name, len); +- if (fp = fopen((char *)path, "r")) { ++ if ((fp = fopen((char *)path, "r"))) { + fclose(fp); + return 1; + } +@@ -334,7 +336,7 @@ + strcpy((char *)path, LIBDIR); + strcat((char *)path, "/plugins/"); + strncat((char *)path, name, len); +- if (fp = fopen((char *)path, "r")) { ++ if ((fp = fopen((char *)path, "r"))) { + fclose(fp); + return 1; + } +diff -Nru sc-7.16.orig/range.c sc-7.16/range.c +--- sc-7.16.orig/range.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/range.c 2006-12-20 18:48:45.290552829 +0100 +@@ -18,6 +18,8 @@ + + #include <stdio.h> + #include <ctype.h> ++#include <unistd.h> ++#include <curses.h> + #include "sc.h" + + static struct range *rng_base; +diff -Nru sc-7.16.orig/sc.c sc-7.16/sc.c +--- sc-7.16.orig/sc.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/sc.c 2006-12-20 18:48:45.290552829 +0100 +@@ -212,7 +212,7 @@ + + if (dbidx < 0) + return; +- if (p = delbuf[dbidx]) { ++ if ((p = delbuf[dbidx])) { + scxfree(delbuffmt[dbidx]); + delbuffmt[dbidx] = NULL; + } +@@ -845,7 +845,7 @@ + break; + case 'C': + color = !color; +- if (has_colors()) ++ if (has_colors()){ + if (color) { + attron(COLOR_PAIR(1)); + bkgd(COLOR_PAIR(1) | ' '); +@@ -853,6 +853,7 @@ + attron(COLOR_PAIR(0)); + bkgd(COLOR_PAIR(0) | ' '); + } ++ } + error("Color %sabled.", color ? "en" : "dis"); + break; + case 'N': +diff -Nru sc-7.16.orig/sc.h sc-7.16/sc.h +--- sc-7.16.orig/sc.h 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/sc.h 2006-12-20 18:48:45.290552829 +0100 +@@ -612,6 +612,9 @@ + extern int rowlimit; + extern int collimit; + ++void yankr(struct ent *v1, struct ent *v2); ++ ++ + #if BSD42 || SYSIII + + #ifndef cbreak +diff -Nru sc-7.16.orig/screen.c sc-7.16/screen.c +--- sc-7.16.orig/screen.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/screen.c 2006-12-20 18:48:45.290552829 +0100 +@@ -234,11 +234,12 @@ + i = stcol; + lcols = 0; + col = rescol + frcols; +- if (fr && stcol >= fr->or_left->col) ++ if (fr && stcol >= fr->or_left->col){ + if (stcol < fr->ir_left->col) + i = fr->or_left->col; + else + col += flcols; ++ } + for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && + i < maxcols; i++) { + lcols++; +@@ -328,11 +329,12 @@ + i = stcol; + lcols = 0; + col = rescol + frcols; +- if (fr && stcol >= fr->or_left->col) ++ if (fr && stcol >= fr->or_left->col){ + if (stcol < fr->ir_left->col) + i = fr->or_left->col; + else + col += flcols; ++ } + for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && + i < maxcols; i++) { + lcols++; +@@ -377,11 +379,12 @@ + i = strow; + rows = 0; + row = RESROW + fbrows; +- if (fr && strow >= fr->or_left->row) ++ if (fr && strow >= fr->or_left->row){ + if (strow < fr->ir_left->row) + i = fr->or_left->row; + else + row += ftrows; ++ } + for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; + i++) { + rows++; +@@ -460,11 +463,12 @@ + i = strow; + rows = 0; + row = RESROW + fbrows; +- if (fr && strow >= fr->or_left->row) ++ if (fr && strow >= fr->or_left->row){ + if (strow < fr->ir_left->row) + i = fr->or_left->row; + else + row += ftrows; ++ } + for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; + i++) { + rows++; +diff -Nru sc-7.16.orig/sort.c sc-7.16/sort.c +--- sc-7.16.orig/sort.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/sort.c 2006-12-20 18:48:45.290552829 +0100 +@@ -19,6 +19,8 @@ + #include <stdio.h> + #include <ctype.h> + #include <stdlib.h> ++#include <unistd.h> ++#include <curses.h> + #include "sc.h" + + int compare(const void *row1, const void *row2); diff -Nru sc-7.16.orig/vi.c sc-7.16/vi.c ---- sc-7.16.orig/vi.c 2005-04-02 14:49:15.000000000 +0200 -+++ sc-7.16/vi.c 2005-04-02 14:55:05.000000000 +0200 -@@ -40,7 +40,7 @@ +--- sc-7.16.orig/vi.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/vi.c 2006-12-20 18:48:45.290552829 +0100 +@@ -17,6 +17,8 @@ + #include <curses.h> + #include <ctype.h> + #include <stdlib.h> ++#include <unistd.h> ++#include <sys/wait.h> + #include "sc.h" + + #if defined(REGCOMP) +@@ -40,7 +42,7 @@ #define istext(a) (isalnum(a) || ((a) == '_')) @@ -10,9 +442,60 @@ diff -Nru sc-7.16.orig/vi.c sc-7.16/vi.c #define true 1 #define false 0 +@@ -667,8 +669,10 @@ + static struct range *nextmatch; + int len; + +- if (linelim > 0 && isalnum(line[linelim-1]) || line[linelim-1] == '_' || +- (completethis && line[linelim-1] == ' ')) { ++ if ((linelim > 0 && isalnum(line[linelim-1])) || ++ line[linelim-1] == '_' || ++ (completethis && line[linelim-1] == ' ')) { ++ + if (!completethis) { + for (completethis = line + linelim - 1; isalnum(*completethis) || + *completethis == '_'; completethis--) /* */; +@@ -715,7 +719,7 @@ + showdr() + { + int minsr, minsc, maxsr, maxsc; +- char *p; ++ /*char *p;*/ + char r[12]; + struct frange *fr = find_frange(currow, curcol); + +@@ -1566,7 +1570,7 @@ + search_again(bool reverse) + { + int prev_match; +- int found_it; ++ int found_it=0; + #if !defined(REGCOMP) && !defined(RE_COMP) && !defined(REGCMP) + char *look_here; + int do_next; +@@ -1777,7 +1781,7 @@ + static void + match_paren() + { +- register int i; ++ /*register int i;*/ + int nest = 1; + int tmp = linelim; + +diff -Nru sc-7.16.orig/vmtbl.c sc-7.16/vmtbl.c +--- sc-7.16.orig/vmtbl.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/vmtbl.c 2006-12-20 18:48:45.290552829 +0100 +@@ -16,6 +16,7 @@ + # include <curses.h> + #endif /* PSC */ + ++#include <unistd.h> + #include "sc.h" + + /* diff -Nru sc-7.16.orig/xmalloc.c sc-7.16/xmalloc.c ---- sc-7.16.orig/xmalloc.c 2005-04-02 14:49:15.000000000 +0200 -+++ sc-7.16/xmalloc.c 2005-04-02 14:50:06.000000000 +0200 +--- sc-7.16.orig/xmalloc.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/xmalloc.c 2006-12-20 18:48:45.290552829 +0100 @@ -4,11 +4,12 @@ */

1 0

ports/opt (2.3): mysql-ruby: update to 2.7.3
by crux＠crux.nu 22 Dec '06

22 Dec '06

commit 69a605cb2b9aa67507946eddf4c9d444ba32830c Author: Juergen Daubert <jue(a)jue.li> Date: Fri Dec 22 18:26:48 2006 +0100 mysql-ruby: update to 2.7.3 diff --git a/mysql-ruby/.md5sum b/mysql-ruby/.md5sum index 49a182f..9f6ee49 100644 --- a/mysql-ruby/.md5sum +++ b/mysql-ruby/.md5sum @@ -1 +1 @@ -bc94c201ca8ae34a01ec8de4427d04b7 mysql-ruby-2.7.2.tar.gz +033b768396dfff8124803c849a34d216 mysql-ruby-2.7.3.tar.gz diff --git a/mysql-ruby/Pkgfile b/mysql-ruby/Pkgfile index 8f70952..a913f96 100644 --- a/mysql-ruby/Pkgfile +++ b/mysql-ruby/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ruby, mysql name=mysql-ruby -version=2.7.2 +version=2.7.3 release=1 source=(http://tmtm.org/downloads/mysql/ruby/$name-$version.tar.gz)

1 0

ports/opt (2.3): [security] thunderbird: updated to version 1.5.0.9, see http://www.mozilla.org/projects/security/known-vulnerabilities.html#thunderbird1.5.0.9
by crux＠crux.nu 22 Dec '06

22 Dec '06

commit 739d4c72e04066625025ac8f981e8dacaeb2f53c Author: Matt Housh <jaeger(a)crux.nu> Date: Thu Dec 21 14:42:42 2006 -0600 [security] thunderbird: updated to version 1.5.0.9, see http://www.mozilla.org/projects/security/known-vulnerabilities.html#thunder… diff --git a/thunderbird/.md5sum b/thunderbird/.md5sum index 992d3be..8b8a5ea 100644 --- a/thunderbird/.md5sum +++ b/thunderbird/.md5sum @@ -1,2 +1,2 @@ f346e07ab1a6ecb55cc7f08fda1306ce mozconfig -c3933149147567471000e53dbeac7429 thunderbird-1.5.0.7-source.tar.bz2 +bb74629a8d99a6653c5ab978cf9c6227 thunderbird-1.5.0.9-source.tar.bz2 diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile index 286a0f3..0121d4a 100644 --- a/thunderbird/Pkgfile +++ b/thunderbird/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libidl, gtk, libjpeg, libpng, zlib, expat name=thunderbird -version=1.5.0.7 +version=1.5.0.9 release=1 source=(http://ftp.mozilla.org/pub/mozilla.org/$name/releases/$version/sour… \ mozconfig)

1 0

ports/opt (2.3): mplayerplug-in: changed README file
by crux＠crux.nu 22 Dec '06

22 Dec '06

commit 27dee1a906016af214721fc6fd86514983120b73 Author: Simon Gloßner <viper(a)hometux.de> Date: Wed Dec 20 20:01:14 2006 +0100 mplayerplug-in: changed README file diff --git a/mplayerplug-in/README b/mplayerplug-in/README index 86f0e2d..c81dcb7 100644 --- a/mplayerplug-in/README +++ b/mplayerplug-in/README @@ -11,8 +11,8 @@ REQUIREMENTS - faac - liba52 - You should then recompile and upgrade mplayer, so that is built - with support for these codecs. + You should then recompile and upgrade mplayer, so that it is + built with support for these codecs. To watch videos on sites that only support IE you need to install the following Firefox extension:

1 0

ports/opt (2.3): smartmontools: updated to 5.37
by crux＠crux.nu 22 Dec '06

22 Dec '06

commit 21e791ba2bc4c93cd2ab99b0dd4ccb7d6c5fd4ad Author: Simon Gloßner <viper(a)hometux.de> Date: Thu Dec 21 09:45:43 2006 +0100 smartmontools: updated to 5.37 diff --git a/smartmontools/.md5sum b/smartmontools/.md5sum index d3550bd..5abd8e6 100644 --- a/smartmontools/.md5sum +++ b/smartmontools/.md5sum @@ -1,2 +1,2 @@ 482b47077510dbac2bf8ce72907ff9f8 smartd -2e424f2d35efa38a29ebca419c1dbe3c smartmontools-5.36.tar.gz +4ab3668b7d1362ce923f64a211e0e568 smartmontools-5.37.tar.gz diff --git a/smartmontools/Pkgfile b/smartmontools/Pkgfile index ab8fddc..44cb937 100644 --- a/smartmontools/Pkgfile +++ b/smartmontools/Pkgfile @@ -4,7 +4,7 @@ # Packager: Jürgen Daubert, juergen dot daubert at t-online dot de name=smartmontools -version=5.36 +version=5.37 release=1 source=(http://dl.sourceforge.net/$name/$name-$version.tar.gz \ smartd) @@ -14,6 +14,7 @@ build () { ./configure \ --prefix=/usr \ + --mandir=/usr/man \ --sysconfdir=/etc make make DESTDIR=$PKG install

1 0

ports/opt (2.3): [security] firefox: updated to version 2.0.0.1, see http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.1
by crux＠crux.nu 22 Dec '06

22 Dec '06

commit 234bc2b5ab9b49316636c666d910dbefbcb6c176 Author: Matt Housh <jaeger(a)crux.nu> Date: Wed Dec 20 23:16:04 2006 -0600 [security] firefox: updated to version 2.0.0.1, see http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox… diff --git a/firefox/.footprint b/firefox/.footprint index 4b4117c..fa3fdac 100644 --- a/firefox/.footprint +++ b/firefox/.footprint @@ -1980,6 +1980,18 @@ drwxr-xr-x root/root usr/include/firefox/system_wrappers/bsd/ -rw-r--r-- root/root usr/include/firefox/system_wrappers/builtin.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/byteswap.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/c_asm.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-atsui.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-beos.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-ft.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-glitz.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-nquartz.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-os2.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-pdf.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-ps.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-quartz.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-win32.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-xlib-xrender.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-xlib.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/callconv.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/cderr.h @@ -2050,7 +2062,7 @@ drwxr-xr-x root/root usr/include/firefox/system_wrappers/freetype/ -rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/freetype.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/ftcache.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/ftglyph.h --rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/ftoutlin.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/ftoutln.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/ttnameid.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/tttables.h drwxr-xr-x root/root usr/include/firefox/system_wrappers/fribidi/ @@ -2091,6 +2103,9 @@ drwxr-xr-x root/root usr/include/firefox/system_wrappers/gtk/ -rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkcontainer.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkdialog.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkentry.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkfixed.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkiconfactory.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkimage.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkimmulticontext.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkinvisible.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkmain.h @@ -2103,6 +2118,7 @@ drwxr-xr-x root/root usr/include/firefox/system_wrappers/gtk/ -rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkstock.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkstyle.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtktextview.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkversion.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkvscrollbar.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkwidget.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkwindow.h @@ -2274,10 +2290,12 @@ drwxr-xr-x root/root usr/include/firefox/system_wrappers/photon/ -rw-r--r-- root/root usr/include/firefox/system_wrappers/photon/PxImage.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/pk11func.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/pk11pqg.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/pk11pub.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/pk11sdr.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/pkcs11t.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/pkcs12.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/pmddim.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/png.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/poll.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/portable.h drwxr-xr-x root/root usr/include/firefox/system_wrappers/private/ @@ -2557,6 +2575,7 @@ drwxr-xr-x root/root usr/include/firefox/system_wrappers/wx/xrc/ -rw-r--r-- root/root usr/include/firefox/system_wrappers/wx/xrc/xmlres.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/xpt_struct.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/xpt_xdr.h +-rw-r--r-- root/root usr/include/firefox/system_wrappers/zlib.h -rw-r--r-- root/root usr/include/firefox/system_wrappers/zmouse.h drwxr-xr-x root/root usr/include/firefox/toolkitcomps/ -rw-r--r-- root/root usr/include/firefox/toolkitcomps/nsICommandLine.h diff --git a/firefox/.md5sum b/firefox/.md5sum index 2046f3d..8332e06 100644 --- a/firefox/.md5sum +++ b/firefox/.md5sum @@ -1,4 +1,4 @@ -03709c15cba0e0375ff5336d538f77e7 firefox-2.0-source.tar.bz2 +7a1fc804ed735c5b7e9b1498bac8b5db firefox-2.0.0.1-source.tar.bz2 0eceebd5fbc394248c8c94d66fc95d66 firefox.desktop 19ec3915f76e7eb820ad2c59730ee2be firefox.png a95e9f62cc3b2b0c4ad906c2a9f44bcf mozconfig diff --git a/firefox/Pkgfile b/firefox/Pkgfile index df1c8bc..d9f7456 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libidl, gtk, libpng, libjpeg, zlib name=firefox -version=2.0 +version=2.0.0.1 release=1 source=(http://ftp.mozilla.org/pub/mozilla.org/$name/releases/$version/sour… \ http://crux.nu/files/$name/$name.desktop \

1 0

ports/opt (2.2): sc: applied patches from debian:
by crux＠crux.nu 22 Dec '06

22 Dec '06

commit 8c2d6263a9d18d99061b30223f620e04c98b0a09 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Dec 22 18:25:19 2006 +0100 sc: applied patches from debian: diff --git a/sc/.footprint b/sc/.footprint index bc9264b..1e26ff4 100644 --- a/sc/.footprint +++ b/sc/.footprint @@ -3,11 +3,11 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/psc -rwxr-xr-x root/root usr/bin/sc -rwxr-xr-x root/root usr/bin/scqref -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/sc/ -drwxr-xr-x root/root usr/lib/sc/plugins/ --rw-r--r-- root/root usr/lib/sc/tutorial.sc drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/psc.1.gz -rw-r--r-- root/root usr/man/man1/sc.1.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/sc/ +drwxr-xr-x root/root usr/share/sc/plugins/ +-rw-r--r-- root/root usr/share/sc/tutorial.sc diff --git a/sc/.md5sum b/sc/.md5sum index 22326f7..30b238f 100644 --- a/sc/.md5sum +++ b/sc/.md5sum @@ -1,2 +1,2 @@ -26b011283b3fef961510b34a2ac1c334 sc-7.16.patch +658f3174eebc6d2dad667db71304b480 sc-7.16.patch 1db636e9b2dc7cd73c40aeece6852d47 sc-7.16.tar.gz diff --git a/sc/Pkgfile b/sc/Pkgfile index 32aea48..132aa3b 100644 --- a/sc/Pkgfile +++ b/sc/Pkgfile @@ -5,7 +5,7 @@ name=sc version=7.16 -release=2 +release=3 source=(http://www.ibiblio.org/pub/Linux/apps/financial/spreadsheet/$name-$… \ $name-$version.patch) @@ -14,7 +14,7 @@ build () { patch -p1 < $SRC/$name-$version.patch sed -i "/^CFLAGS/s/-O2 -pipe/$CFLAGS/" Makefile make - mkdir -p $PKG/usr/{bin,man/man1,lib/sc} + mkdir -p $PKG/usr/{bin,man/man1,share/sc} make prefix=$PKG/usr install sed -i "s|$PKG||g" $PKG/usr/man/man1/sc.1 } diff --git a/sc/sc-7.16.patch b/sc/sc-7.16.patch index 1d113ab..d232c3d 100644 --- a/sc/sc-7.16.patch +++ b/sc/sc-7.16.patch @@ -1,7 +1,439 @@ +diff -Nru sc-7.16.orig/Makefile sc-7.16/Makefile +--- sc-7.16.orig/Makefile 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/Makefile 2006-12-20 18:48:45.280553112 +0100 +@@ -32,7 +32,7 @@ + + # This is where the library file (tutorial) goes. + #LIBDIR=/usr/local/share/$(name) # reno +-LIBDIR=${prefix}/lib/$(name) ++LIBDIR=${prefix}/share/$(name) + LIBRARY=-DLIBDIR=\"${LIBDIR}\" + + # Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up +diff -Nru sc-7.16.orig/abbrev.c sc-7.16/abbrev.c +--- sc-7.16.orig/abbrev.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/abbrev.c 2006-12-20 18:48:45.280553112 +0100 +@@ -19,10 +19,15 @@ + #include <stdio.h> + #include <stdlib.h> + #include <ctype.h> ++#include <curses.h> ++#include <unistd.h> + #include "sc.h" + + static struct abbrev *abbr_base; + ++int are_abbrevs(void); ++ ++ + void + add_abbr(char *string) + { +@@ -87,7 +92,7 @@ + } + } + +- if (expansion == NULL) ++ if (expansion == NULL){ + if ((a = find_abbr(string, strlen(string), &prev))) { + error("abbrev \"%s %s\"", a->abbr, a->exp); + return; +@@ -95,6 +100,7 @@ + error("abreviation \"%s\" doesn't exist", string); + return; + } ++ } + + if (find_abbr(string, strlen(string), &prev)) + del_abbr(string); +@@ -122,7 +128,7 @@ + del_abbr(char *abbrev) + { + struct abbrev *a; +- struct abbrev **prev; ++ struct abbrev **prev=0; + + if (!(a = find_abbr(abbrev, strlen(abbrev), prev))) + return; +diff -Nru sc-7.16.orig/cmds.c sc-7.16/cmds.c +--- sc-7.16.orig/cmds.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/cmds.c 2006-12-20 18:48:45.280553112 +0100 +@@ -478,7 +478,7 @@ + int i, qtmp; + char buf[50]; + struct frange *fr; +- struct ent *obuf; ++ struct ent *obuf=0; + + if ((fr = find_frange(currow, curcol))) + rs = fr->or_right->row - currow + 1; +@@ -535,7 +535,7 @@ + int cs = maxcol - curcol + 1; + int i, qtmp; + char buf[50]; +- struct ent *obuf; ++ struct ent *obuf=0; + + if (cs - arg < 0) { + cs = cs > 0 ? cs : 0; +@@ -810,7 +810,7 @@ + + if (to_insert == 'r') { + insertrow(numrows, 0); +- if (fr = find_frange(currow, curcol)) ++ if ((fr = find_frange(currow, curcol))) + deltac = fr->or_left->col - mincol; + else { + for (i = 0; i < numrows; i++) +@@ -2279,7 +2279,7 @@ + ret->e.r.right.vp = lookat(newrow, newcol); + ret->e.r.right.vf = e->e.r.right.vf; + } else { +- struct enode *temprange; ++ struct enode *temprange=0; + + if (freeenodes) { + ret = freeenodes; +@@ -2337,8 +2337,7 @@ + break; + case 'f': + case 'F': +- if (range && ret->op == 'F' || +- !range && ret->op == 'f') ++ if ((range && ret->op == 'F') || (!range && ret->op == 'f')) + Rdelta = Cdelta = 0; + ret->e.o.left = copye(e->e.o.left, Rdelta, Cdelta, + r1, c1, r2, c2, transpose); +@@ -2798,7 +2797,7 @@ + write_cells(register FILE *f, int r0, int c0, int rn, int cn, int dr, int dc) + { + register struct ent **pp; +- int r, c, rs, cs, mf; ++ int r, c, rs=0, cs=0, mf; + char *dpointptr; + + mf = modflg; +@@ -2861,12 +2860,12 @@ + if ((plugin = findplugin(p+1, 'w')) != NULL) { + if (!plugin_exists(plugin, strlen(plugin), save + 1)) { + error("plugin not found"); +- return; ++ return -1; + } + *save = '|'; + if ((strlen(save) + strlen(fname) + 20) > PATHLEN) { + error("Path too long"); +- return; ++ return -1; + } + sprintf(save + strlen(save), " %s%d:", coltoa(c0), r0); + sprintf(save + strlen(save), "%s%d \"%s\"", coltoa(cn), rn, fname); +@@ -2883,13 +2882,14 @@ + } + #endif /* VMS */ + +- if (*fname == '\0') ++ if (*fname == '\0'){ + if (isatty(STDOUT_FILENO) || *curfile != '\0') + fname = curfile; + else { + write_fd(stdout, r0, c0, rn, cn); + return (0); + } ++ } + + #ifdef MSDOS + namelen = 12; +@@ -2981,12 +2981,12 @@ + if ((plugin = findplugin(p+1, 'r')) != NULL) { + if (!(plugin_exists(plugin, strlen(plugin), save + 1))) { + error("plugin not found"); +- return; ++ return -1; + } + *save = '|'; + if ((strlen(save) + strlen(fname) + 2) > PATHLEN) { + error("Path too long"); +- return; ++ return -1; + } + sprintf(save + strlen(save), " \"%s\"", fname); + eraseflg = 0; +diff -Nru sc-7.16.orig/color.c sc-7.16/color.c +--- sc-7.16.orig/color.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/color.c 2006-12-20 18:48:45.280553112 +0100 +@@ -19,6 +19,7 @@ + + #include <curses.h> + #include <ctype.h> ++#include <unistd.h> + #include "sc.h" + + /* a linked list of free [struct ent]'s, uses .next as the pointer */ +diff -Nru sc-7.16.orig/frame.c sc-7.16/frame.c +--- sc-7.16.orig/frame.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/frame.c 2006-12-20 18:48:45.280553112 +0100 +@@ -18,6 +18,9 @@ + + #include <stdio.h> + #include <ctype.h> ++#include <stdlib.h> ++#include <curses.h> ++#include <unistd.h> + #include "sc.h" + + static struct frange *frame_base; +diff -Nru sc-7.16.orig/help.c sc-7.16/help.c +--- sc-7.16.orig/help.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/help.c 2006-12-20 18:48:45.280553112 +0100 +@@ -11,6 +11,7 @@ + char *revision = "$Revision: 7.16 $"; + #else + #include <curses.h> ++#include <unistd.h> + #include "sc.h" + #endif /* QREF */ + +diff -Nru sc-7.16.orig/interp.c sc-7.16/interp.c +--- sc-7.16.orig/interp.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/interp.c 2006-12-20 18:48:45.290552829 +0100 +@@ -1572,12 +1572,12 @@ + copy(struct ent *dv1, struct ent *dv2, struct ent *v1, struct ent *v2) + { + struct ent *p; +- struct ent *n; ++/* struct ent *n;*/ + static int minsr = -1, minsc = -1; + static int maxsr = -1, maxsc = -1; + int mindr, mindc; + int maxdr, maxdc; +- int vr, vc; ++/* int vr, vc;*/ + int r, c; + int deltar, deltac; + +@@ -2066,7 +2066,7 @@ + *line = '\0'; + } + } +- if (!col_hidden[c]) ++ if (!col_hidden[c]){ + if (gs.g_type == G_STR) { + if (p && p->label + #if defined(REGCOMP) +@@ -2099,6 +2099,7 @@ + #endif + #endif + break; ++ } + if (r == endr && c == endc) { + error("String not found"); + #if defined(REGCOMP) +@@ -2471,13 +2472,11 @@ + int + constant(register struct enode *e) + { +- return ( +- e == NULL ++ return e == NULL + || e->op == O_CONST + || e->op == O_SCONST +- || e->op == 'm' && constant(e->e.o.left) +- || ( +- e->op != O_VAR ++ || (e->op == 'm' && constant(e->e.o.left)) ++ || (e->op != O_VAR + && !(e->op & REDUCE) + && constant(e->e.o.left) + && constant(e->e.o.right) +@@ -2491,9 +2490,7 @@ + && e->op != LASTCOL + && e->op != NUMITER + && e->op != FILENAME +- && optimize +- ) +- ); ++ && optimize ); + } + + void +diff -Nru sc-7.16.orig/lex.c sc-7.16/lex.c +--- sc-7.16.orig/lex.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/lex.c 2006-12-20 18:48:45.290552829 +0100 +@@ -34,6 +34,8 @@ + #include <signal.h> + #include <setjmp.h> + #include <ctype.h> ++#include <unistd.h> ++#include <math.h> + #include "sc.h" + + #ifdef NONOTIMEOUT +@@ -107,7 +109,7 @@ + yylex() + { + char *p = line + linelim; +- int ret; ++ int ret=0; + static int isfunc = 0; + static bool isgoto = 0; + static bool colstate = 0; +@@ -326,7 +328,7 @@ + strcpy((char *)path, HomeDir); + strcat((char *)path, "/.sc/plugins/"); + strncat((char *)path, name, len); +- if (fp = fopen((char *)path, "r")) { ++ if ((fp = fopen((char *)path, "r"))) { + fclose(fp); + return 1; + } +@@ -334,7 +336,7 @@ + strcpy((char *)path, LIBDIR); + strcat((char *)path, "/plugins/"); + strncat((char *)path, name, len); +- if (fp = fopen((char *)path, "r")) { ++ if ((fp = fopen((char *)path, "r"))) { + fclose(fp); + return 1; + } +diff -Nru sc-7.16.orig/range.c sc-7.16/range.c +--- sc-7.16.orig/range.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/range.c 2006-12-20 18:48:45.290552829 +0100 +@@ -18,6 +18,8 @@ + + #include <stdio.h> + #include <ctype.h> ++#include <unistd.h> ++#include <curses.h> + #include "sc.h" + + static struct range *rng_base; +diff -Nru sc-7.16.orig/sc.c sc-7.16/sc.c +--- sc-7.16.orig/sc.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/sc.c 2006-12-20 18:48:45.290552829 +0100 +@@ -212,7 +212,7 @@ + + if (dbidx < 0) + return; +- if (p = delbuf[dbidx]) { ++ if ((p = delbuf[dbidx])) { + scxfree(delbuffmt[dbidx]); + delbuffmt[dbidx] = NULL; + } +@@ -845,7 +845,7 @@ + break; + case 'C': + color = !color; +- if (has_colors()) ++ if (has_colors()){ + if (color) { + attron(COLOR_PAIR(1)); + bkgd(COLOR_PAIR(1) | ' '); +@@ -853,6 +853,7 @@ + attron(COLOR_PAIR(0)); + bkgd(COLOR_PAIR(0) | ' '); + } ++ } + error("Color %sabled.", color ? "en" : "dis"); + break; + case 'N': +diff -Nru sc-7.16.orig/sc.h sc-7.16/sc.h +--- sc-7.16.orig/sc.h 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/sc.h 2006-12-20 18:48:45.290552829 +0100 +@@ -612,6 +612,9 @@ + extern int rowlimit; + extern int collimit; + ++void yankr(struct ent *v1, struct ent *v2); ++ ++ + #if BSD42 || SYSIII + + #ifndef cbreak +diff -Nru sc-7.16.orig/screen.c sc-7.16/screen.c +--- sc-7.16.orig/screen.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/screen.c 2006-12-20 18:48:45.290552829 +0100 +@@ -234,11 +234,12 @@ + i = stcol; + lcols = 0; + col = rescol + frcols; +- if (fr && stcol >= fr->or_left->col) ++ if (fr && stcol >= fr->or_left->col){ + if (stcol < fr->ir_left->col) + i = fr->or_left->col; + else + col += flcols; ++ } + for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && + i < maxcols; i++) { + lcols++; +@@ -328,11 +329,12 @@ + i = stcol; + lcols = 0; + col = rescol + frcols; +- if (fr && stcol >= fr->or_left->col) ++ if (fr && stcol >= fr->or_left->col){ + if (stcol < fr->ir_left->col) + i = fr->or_left->col; + else + col += flcols; ++ } + for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && + i < maxcols; i++) { + lcols++; +@@ -377,11 +379,12 @@ + i = strow; + rows = 0; + row = RESROW + fbrows; +- if (fr && strow >= fr->or_left->row) ++ if (fr && strow >= fr->or_left->row){ + if (strow < fr->ir_left->row) + i = fr->or_left->row; + else + row += ftrows; ++ } + for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; + i++) { + rows++; +@@ -460,11 +463,12 @@ + i = strow; + rows = 0; + row = RESROW + fbrows; +- if (fr && strow >= fr->or_left->row) ++ if (fr && strow >= fr->or_left->row){ + if (strow < fr->ir_left->row) + i = fr->or_left->row; + else + row += ftrows; ++ } + for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; + i++) { + rows++; +diff -Nru sc-7.16.orig/sort.c sc-7.16/sort.c +--- sc-7.16.orig/sort.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/sort.c 2006-12-20 18:48:45.290552829 +0100 +@@ -19,6 +19,8 @@ + #include <stdio.h> + #include <ctype.h> + #include <stdlib.h> ++#include <unistd.h> ++#include <curses.h> + #include "sc.h" + + int compare(const void *row1, const void *row2); diff -Nru sc-7.16.orig/vi.c sc-7.16/vi.c ---- sc-7.16.orig/vi.c 2005-04-02 14:49:15.000000000 +0200 -+++ sc-7.16/vi.c 2005-04-02 14:55:05.000000000 +0200 -@@ -40,7 +40,7 @@ +--- sc-7.16.orig/vi.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/vi.c 2006-12-20 18:48:45.290552829 +0100 +@@ -17,6 +17,8 @@ + #include <curses.h> + #include <ctype.h> + #include <stdlib.h> ++#include <unistd.h> ++#include <sys/wait.h> + #include "sc.h" + + #if defined(REGCOMP) +@@ -40,7 +42,7 @@ #define istext(a) (isalnum(a) || ((a) == '_')) @@ -10,9 +442,60 @@ diff -Nru sc-7.16.orig/vi.c sc-7.16/vi.c #define true 1 #define false 0 +@@ -667,8 +669,10 @@ + static struct range *nextmatch; + int len; + +- if (linelim > 0 && isalnum(line[linelim-1]) || line[linelim-1] == '_' || +- (completethis && line[linelim-1] == ' ')) { ++ if ((linelim > 0 && isalnum(line[linelim-1])) || ++ line[linelim-1] == '_' || ++ (completethis && line[linelim-1] == ' ')) { ++ + if (!completethis) { + for (completethis = line + linelim - 1; isalnum(*completethis) || + *completethis == '_'; completethis--) /* */; +@@ -715,7 +719,7 @@ + showdr() + { + int minsr, minsc, maxsr, maxsc; +- char *p; ++ /*char *p;*/ + char r[12]; + struct frange *fr = find_frange(currow, curcol); + +@@ -1566,7 +1570,7 @@ + search_again(bool reverse) + { + int prev_match; +- int found_it; ++ int found_it=0; + #if !defined(REGCOMP) && !defined(RE_COMP) && !defined(REGCMP) + char *look_here; + int do_next; +@@ -1777,7 +1781,7 @@ + static void + match_paren() + { +- register int i; ++ /*register int i;*/ + int nest = 1; + int tmp = linelim; + +diff -Nru sc-7.16.orig/vmtbl.c sc-7.16/vmtbl.c +--- sc-7.16.orig/vmtbl.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/vmtbl.c 2006-12-20 18:48:45.290552829 +0100 +@@ -16,6 +16,7 @@ + # include <curses.h> + #endif /* PSC */ + ++#include <unistd.h> + #include "sc.h" + + /* diff -Nru sc-7.16.orig/xmalloc.c sc-7.16/xmalloc.c ---- sc-7.16.orig/xmalloc.c 2005-04-02 14:49:15.000000000 +0200 -+++ sc-7.16/xmalloc.c 2005-04-02 14:50:06.000000000 +0200 +--- sc-7.16.orig/xmalloc.c 2006-12-20 18:43:05.630179753 +0100 ++++ sc-7.16/xmalloc.c 2006-12-20 18:48:45.290552829 +0100 @@ -4,11 +4,12 @@ */

1 0

ports/opt (2.2): mysql-ruby: update to 2.7.3
by crux＠crux.nu 22 Dec '06

22 Dec '06

commit 69a605cb2b9aa67507946eddf4c9d444ba32830c Author: Juergen Daubert <jue(a)jue.li> Date: Fri Dec 22 18:26:48 2006 +0100 mysql-ruby: update to 2.7.3 diff --git a/mysql-ruby/.md5sum b/mysql-ruby/.md5sum index 49a182f..9f6ee49 100644 --- a/mysql-ruby/.md5sum +++ b/mysql-ruby/.md5sum @@ -1 +1 @@ -bc94c201ca8ae34a01ec8de4427d04b7 mysql-ruby-2.7.2.tar.gz +033b768396dfff8124803c849a34d216 mysql-ruby-2.7.3.tar.gz diff --git a/mysql-ruby/Pkgfile b/mysql-ruby/Pkgfile index 8f70952..a913f96 100644 --- a/mysql-ruby/Pkgfile +++ b/mysql-ruby/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ruby, mysql name=mysql-ruby -version=2.7.2 +version=2.7.3 release=1 source=(http://tmtm.org/downloads/mysql/ruby/$name-$version.tar.gz)

1 0

ports/opt (2.2): [security] thunderbird: updated to version 1.5.0.9, see http://www.mozilla.org/projects/security/known-vulnerabilities.html#thunderbird1.5.0.9
by crux＠crux.nu 21 Dec '06

21 Dec '06

commit 739d4c72e04066625025ac8f981e8dacaeb2f53c Author: Matt Housh <jaeger(a)crux.nu> Date: Thu Dec 21 14:42:42 2006 -0600 [security] thunderbird: updated to version 1.5.0.9, see http://www.mozilla.org/projects/security/known-vulnerabilities.html#thunder… diff --git a/thunderbird/.md5sum b/thunderbird/.md5sum index 992d3be..8b8a5ea 100644 --- a/thunderbird/.md5sum +++ b/thunderbird/.md5sum @@ -1,2 +1,2 @@ f346e07ab1a6ecb55cc7f08fda1306ce mozconfig -c3933149147567471000e53dbeac7429 thunderbird-1.5.0.7-source.tar.bz2 +bb74629a8d99a6653c5ab978cf9c6227 thunderbird-1.5.0.9-source.tar.bz2 diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile index 286a0f3..0121d4a 100644 --- a/thunderbird/Pkgfile +++ b/thunderbird/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libidl, gtk, libjpeg, libpng, zlib, expat name=thunderbird -version=1.5.0.7 +version=1.5.0.9 release=1 source=(http://ftp.mozilla.org/pub/mozilla.org/$name/releases/$version/sour… \ mozconfig)

1 0

ports/opt (2.2): smartmontools: updated to 5.37
by crux＠crux.nu 21 Dec '06

21 Dec '06

commit 21e791ba2bc4c93cd2ab99b0dd4ccb7d6c5fd4ad Author: Simon Gloßner <viper(a)hometux.de> Date: Thu Dec 21 09:45:43 2006 +0100 smartmontools: updated to 5.37 diff --git a/smartmontools/.md5sum b/smartmontools/.md5sum index d3550bd..5abd8e6 100644 --- a/smartmontools/.md5sum +++ b/smartmontools/.md5sum @@ -1,2 +1,2 @@ 482b47077510dbac2bf8ce72907ff9f8 smartd -2e424f2d35efa38a29ebca419c1dbe3c smartmontools-5.36.tar.gz +4ab3668b7d1362ce923f64a211e0e568 smartmontools-5.37.tar.gz diff --git a/smartmontools/Pkgfile b/smartmontools/Pkgfile index ab8fddc..44cb937 100644 --- a/smartmontools/Pkgfile +++ b/smartmontools/Pkgfile @@ -4,7 +4,7 @@ # Packager: Jürgen Daubert, juergen dot daubert at t-online dot de name=smartmontools -version=5.36 +version=5.37 release=1 source=(http://dl.sourceforge.net/$name/$name-$version.tar.gz \ smartd) @@ -14,6 +14,7 @@ build () { ./configure \ --prefix=/usr \ + --mandir=/usr/man \ --sysconfdir=/etc make make DESTDIR=$PKG install

1 0