August 2006 - crux-commits

r1715 - crux-2.2/ports/core/lilo
by crux＠crux.nu 12 Aug '06

12 Aug '06

Author: sip Date: 2006-08-12 11:30:55 +0200 (Sat, 12 Aug 2006) New Revision: 1715 Added: crux-2.2/ports/core/lilo/lilo-22.7.3.patch Removed: crux-2.2/ports/core/lilo/lilo-22.7.2.patch Modified: crux-2.2/ports/core/lilo/.md5sum crux-2.2/ports/core/lilo/Pkgfile Log: lilo: updated to 22.7.3 Modified: crux-2.2/ports/core/lilo/.md5sum =================================================================== --- crux-2.2/ports/core/lilo/.md5sum 2006-08-12 07:43:26 UTC (rev 1714) +++ crux-2.2/ports/core/lilo/.md5sum 2006-08-12 09:30:55 UTC (rev 1715) @@ -1,3 +1,3 @@ -00123b2693be0b5c9181c0b844343d07 lilo-22.7.2.patch -2bf1eb08c449a28ebadcf66c48a26567 lilo-22.7.2.src.tar.gz +3e05c2b0e0d30e821509eaaec0bbd47c lilo-22.7.3.patch +a3aacf90482e0c07492623042b901503 lilo-22.7.3.src.tar.gz e4be19b729f2c848e0838a937f960e1b lilo.conf Modified: crux-2.2/ports/core/lilo/Pkgfile =================================================================== --- crux-2.2/ports/core/lilo/Pkgfile 2006-08-12 07:43:26 UTC (rev 1714) +++ crux-2.2/ports/core/lilo/Pkgfile 2006-08-12 09:30:55 UTC (rev 1715) @@ -3,14 +3,14 @@ # Maintainer: Per Lid�n, core-ports at crux dot nu name=lilo -version=22.7.2 +version=22.7.3 release=1 source=(http://home.san.rr.com/johninsd/pub/linux/lilo/$name-$version.src.t… \ $name-$version.patch lilo.conf) build() { cd $name-$version - patch -p1 < ../$name-$version.patch + patch -p0 < ../$name-$version.patch sed -i 's|\./checkit||g' Makefile make all make ROOT=$PKG install Deleted: crux-2.2/ports/core/lilo/lilo-22.7.2.patch =================================================================== --- crux-2.2/ports/core/lilo/lilo-22.7.2.patch 2006-08-12 07:43:26 UTC (rev 1714) +++ crux-2.2/ports/core/lilo/lilo-22.7.2.patch 2006-08-12 09:30:55 UTC (rev 1715) @@ -1,29 +0,0 @@ -diff -Nru lilo-22.7.2.orig/Makefile lilo-22.7.2/Makefile ---- lilo-22.7.2.orig/Makefile 2006-07-08 11:59:25.735532000 +0200 -+++ lilo-22.7.2/Makefile 2006-07-08 12:01:54.420824250 +0200 -@@ -64,7 +64,7 @@ - # XL_SECS=n Support for extra large (non-standard) floppies. - - CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \ -- -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \ -+ -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVIRTUAL \ - -DATARAID -DMDPRAID - - # set the compiler optimization level -@@ -154,7 +154,7 @@ - # - # everything needed to run, just short of installation - # --all: lilo bootsect.b diag1.img # OBSOLETE: $(BOOTS) edit dparam.com activate -+all: lilo bootsect.b # diag1.img # OBSOLETE: $(BOOTS) edit dparam.com activate - if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then \ - make diagnostic; \ - make dosexe; fi -@@ -180,7 +180,6 @@ - # - test: test.img - test.img: -- ./checkit - echo Tested >test.img - # - # make the bootable diagnostic floppies Copied: crux-2.2/ports/core/lilo/lilo-22.7.3.patch (from rev 1714, crux-2.2/ports/core/lilo/lilo-22.7.2.patch) =================================================================== --- crux-2.2/ports/core/lilo/lilo-22.7.3.patch (rev 0) +++ crux-2.2/ports/core/lilo/lilo-22.7.3.patch 2006-08-12 09:30:55 UTC (rev 1715) @@ -0,0 +1,20 @@ +--- Makefile.orig 2006-08-12 11:27:22.726223250 +0200 ++++ Makefile 2006-08-12 11:28:32.070557000 +0200 +@@ -65,7 +65,7 @@ + # XL_SECS=n Support for extra large (non-standard) floppies. + + CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \ +- -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \ ++ -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVIRTUAL \ + -DMDPRAID + + # set the following if you wish LILO.COM to be installed +@@ -162,7 +162,7 @@ + # + # everything needed to run, just short of installation + # +-all: lilo bootsect.b diag1.img # OBSOLETE: $(BOOTS) edit dparam.com activate ++all: lilo bootsect.b # diag1.img OBSOLETE: $(BOOTS) edit dparam.com activate + if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then \ + make diagnostic; \ + make dosexe; fi

1 0

r1714 - crux-2.2/ports/opt/ncftp
by crux＠crux.nu 12 Aug '06

12 Aug '06

Author: sten Date: 2006-08-12 09:43:26 +0200 (Sat, 12 Aug 2006) New Revision: 1714 Modified: crux-2.2/ports/opt/ncftp/.md5sum crux-2.2/ports/opt/ncftp/Pkgfile Log: ncftp: update to 3.2.0 Modified: crux-2.2/ports/opt/ncftp/.md5sum =================================================================== --- crux-2.2/ports/opt/ncftp/.md5sum 2006-08-12 07:43:07 UTC (rev 1713) +++ crux-2.2/ports/opt/ncftp/.md5sum 2006-08-12 07:43:26 UTC (rev 1714) @@ -1 +1 @@ -66cf8dacec848eb11a70632fe9f21807 ncftp-3.1.9-src.tar.bz2 +384b7f01d725c89ccd30692628b3ac1b ncftp-3.2.0-src.tar.bz2 Modified: crux-2.2/ports/opt/ncftp/Pkgfile =================================================================== --- crux-2.2/ports/opt/ncftp/Pkgfile 2006-08-12 07:43:07 UTC (rev 1713) +++ crux-2.2/ports/opt/ncftp/Pkgfile 2006-08-12 07:43:26 UTC (rev 1714) @@ -1,10 +1,10 @@ # Description: a powerful ftp client with a very nice text-based interface # URL: http://www.ncftp.com # Maintainer: sten, nick dot steeves at shaw dot ca -# Packager: Jan Andersson, janneand at yahoo dot com +# Packager: name=ncftp -version=3.1.9 +version=3.2.0 release=1 source=(ftp://ftp.ncftp.com/$name/$name-$version-src.tar.bz2)

1 0

r1713 - crux-2.2/ports/opt/lm_sensors
by crux＠crux.nu 12 Aug '06

12 Aug '06

Author: sten Date: 2006-08-12 09:43:07 +0200 (Sat, 12 Aug 2006) New Revision: 1713 Modified: crux-2.2/ports/opt/lm_sensors/.md5sum Log: lm_sensors: update md5sum Modified: crux-2.2/ports/opt/lm_sensors/.md5sum =================================================================== --- crux-2.2/ports/opt/lm_sensors/.md5sum 2006-08-11 22:05:56 UTC (rev 1712) +++ crux-2.2/ports/opt/lm_sensors/.md5sum 2006-08-12 07:43:07 UTC (rev 1713) @@ -1 +1 @@ -6a5327c9e291c5e2bef62e2277bce962 lm_sensors-2.10.0.tar.gz +c9a1b4fc8660d2cd8715b0a05f89b83f lm_sensors-2.10.0.tar.gz

1 0

r1712 - tools/webtools/timeline
by crux＠crux.nu 11 Aug '06

11 Aug '06

Author: sip Date: 2006-08-12 00:05:56 +0200 (Sat, 12 Aug 2006) New Revision: 1712 Added: tools/webtools/timeline/rss.php Modified: tools/webtools/timeline/timeline.sql tools/webtools/timeline/tlcacher.php Log: timeline: added url field, added rss feed generator Added: tools/webtools/timeline/rss.php =================================================================== --- tools/webtools/timeline/rss.php (rev 0) +++ tools/webtools/timeline/rss.php 2006-08-11 22:05:56 UTC (rev 1712) @@ -0,0 +1,48 @@ +<?php +require_once('DB.php'); +$days = 15; +if (isset($_GET['days'])) { + $days = intval($_GET['days']); +} + +$dsn = 'sqlite:////home/crux/public_html/local/timeline.db'; +$db =& DB::connect($dsn); +if (DB::isError($db)) die("Cannot connect to database"); +$db->setFetchMode(DB_FETCHMODE_ASSOC); +$from = time() - ($days * 24 * 60 * 60); +$sql = "select * from events where event_tstamp >= $from order by event_tstamp desc"; +$res =& $db->Query($sql); +if (DB::isError($res)) die("Query error"); + +header ("Content-type: text/xml"); +$timeline .= '<?xml version="1.0"?>'."\n"; +$timeline .= '<rss version="2.0"><channel><title>CRUX timeline</title><description>CRUX: timeline (commits, tasks, wiki edits)</description><link>http://crux.nu</link>'; +while ($evt =& $res->fetchRow()) { + $event_description = $evt['event_description']; + if ($evt['event_notes'] != "") { + $event_description .= ": ".$evt['event_notes']; + } + $url = $evt['event_url']; + $url = str_replace("&","&", $url); + # strip diff link + $description = preg_replace('/$\[\[.*\]\]$/s','', $evt['event_description']); + # strip wiki link with url + $description = preg_replace('/\[\[(.*)\|(\d+)\]\]/s','$2', $description); + # strip users (svn) + $description = preg_replace('/\[\[~(.*)\|(.*)\]\]/s','$2', $description); + # strip wiki link without url + $description = preg_replace('/\[\[(\w+)\.(\w+)\]\] /s','$1.$2', $description); + # strip wiki user with ~ + $description = preg_replace('/\[\[~(\w+)\]\] /s','$1', $description); + + $evt['event_notes'] = "Notes"; + $timeline .= " + <item> + <title>$description</title> + <description></description> + <link>$url</link> + </item>\n"; +} +$timeline .= "</channel></rss>\n"; +echo $timeline; +?> Modified: tools/webtools/timeline/timeline.sql =================================================================== --- tools/webtools/timeline/timeline.sql 2006-08-10 21:40:11 UTC (rev 1711) +++ tools/webtools/timeline/timeline.sql 2006-08-11 22:05:56 UTC (rev 1712) @@ -2,10 +2,11 @@ event_id integer primary key, cache_id integer, event_tstamp integer, - event_type varchar(20), - event_date varchar(10), - event_time varchar(5), - event_user varchar(50), + event_type varchar, + event_date varchar, + event_time varchar, + event_user varchar, + event_url varchar, event_description text, event_notes text ); Modified: tools/webtools/timeline/tlcacher.php =================================================================== --- tools/webtools/timeline/tlcacher.php 2006-08-10 21:40:11 UTC (rev 1711) +++ tools/webtools/timeline/tlcacher.php 2006-08-11 22:05:56 UTC (rev 1712) @@ -41,7 +41,7 @@ "sten" => "NickSteeves" ); -// Event: cache_id, tstamp, type(icon), date, time, user, description, notes +// Event: cache_id, tstamp, type(icon), date, time, user, url, description, notes $events = array(); /**************** Last cached events *******************/ @@ -101,15 +101,16 @@ $description = ""; $date = date("Y-m-d", $edate); $time = date("H:i", $edate); + $url = sprintf($task_url,$etid); switch ($etype) { case "1": // new task $icon = "task_opened"; - $description = "New task [[ ".sprintf($task_url,$etid)." | $etid ]] opened by $euser"; + $description = "New task [[$url|$etid]] opened by $euser"; $notes = $row['item_summary']; break; case "2": // task closed $icon = "task_closed"; - $description = "Task [[ ".sprintf($task_url,$etid)." | $etid ]] closed by $euser"; + $description = "Task [[$url|$etid]] closed by $euser"; if ($row['closure_comment'] != "" && $row['closure_comment'] != 0) { // weird flyspray! $notes = $row['closure_comment']; } else { @@ -130,13 +131,13 @@ case "24": case "25": $icon = "task_changed"; - $description = "Task [[ ".sprintf($task_url,$etid)." | $etid ]] modified by $euser"; + $description = "Task [[$url|$etid]] modified by $euser"; $notes = ""; break; } if ($description !== "") { $events[] = array( 'cache_id' => $cache_id, 'tstamp' => $edate, 'icon' => $icon, 'date' => $date, - 'time' => $time, 'user' => $euser, 'description' => $description, 'notes' => $notes,); + 'time' => $time, 'user' => $euser, 'url'=> $url, 'description' => $description, 'notes' => $notes,); } } @@ -161,14 +162,15 @@ } $date = substr($revline[2],1,10); $time = substr($revline[2],12,5); - $revurl = "[[ ".sprintf($svn_url, $rev)." | $rev ]]"; + $url = sprintf($svn_url, $rev); + $revurl = "[[$url|$rev]]"; $description = "Revision $revurl committed by $user"; $tstamp = strtotime("$date $time:00"); } else { $icon = "svn_commit"; $notes = trim($line); $events[] = array( 'cache_id' => $rev, 'tstamp' => $tstamp, 'icon' => $icon, 'date' => $date, - 'time' => $time, 'user' => $user, 'description' => $description, 'notes' => $notes); + 'time' => $time, 'user' => $user, 'url'=>$url, 'description' => $description, 'notes' => $notes); } } } @@ -199,19 +201,21 @@ preg_match('/(..\:..)/',$date,$matches); $time = $matches[0]; $date = date("Y-m-d", $tstamp); - - $action = "?action=diff#" . urlencode($date . " " . $time) . "|diff"; - $page_diff = trim(str_replace("]]", $action."]]", $page)) + $action = "?action=diff#" . urlencode($date . " " . $time) . "|diff"; + $page_diff = trim(str_replace("]]", $action."]]", $page)); + preg_match('/\[\[(.*)\|diff\]\]/', $page_diff, $matches); + $url = $matches[1]; + $url = "http://crux.nu/".str_replace(".","/", $url); $description = "Wiki page $page edited $user ($page_diff)"; if ($tstamp > $last_wiki) { $events[] = array( 'cache_id' => $tstamp, 'tstamp' => $tstamp, 'icon' => $icon, 'date' => $date, - 'time' => $time, 'user' => $user, 'description' => $description, 'notes' => $notes); + 'time' => $time, 'user' => $user, 'url' => $url, 'description' => $description, 'notes' => $notes); } } } /*************** Finally, all events *********************/ -$sth = $dbc->prepare("insert into events values (NULL, ?, ?, ?, ?, ?, ?, ?, ?)"); +$sth = $dbc->prepare("insert into events values (NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); foreach ($events as $evt) { $res = $dbc->execute($sth, $evt); if (DB::isError($res)) die("Query error");

1 0

r1711 - tools/webtools/timeline
by crux＠crux.nu 10 Aug '06

10 Aug '06

Author: jw Date: 2006-08-10 23:40:11 +0200 (Thu, 10 Aug 2006) New Revision: 1711 Modified: tools/webtools/timeline/tlcacher.php Log: timeline: introduce proper anchors for wiki diff links Modified: tools/webtools/timeline/tlcacher.php =================================================================== --- tools/webtools/timeline/tlcacher.php 2006-08-10 21:12:00 UTC (rev 1710) +++ tools/webtools/timeline/tlcacher.php 2006-08-10 21:40:11 UTC (rev 1711) @@ -199,7 +199,9 @@ preg_match('/(..\:..)/',$date,$matches); $time = $matches[0]; $date = date("Y-m-d", $tstamp); - $page_diff = trim(str_replace("]]", "?action=diff#$date $time|diff]]", $page)); + + $action = "?action=diff#" . urlencode($date . " " . $time) . "|diff"; + $page_diff = trim(str_replace("]]", $action."]]", $page)) $description = "Wiki page $page edited $user ($page_diff)"; if ($tstamp > $last_wiki) { $events[] = array( 'cache_id' => $tstamp, 'tstamp' => $tstamp, 'icon' => $icon, 'date' => $date,

1 0

r1710 - tools/webtools/timeline
by crux＠crux.nu 10 Aug '06

10 Aug '06

Author: jw Date: 2006-08-10 23:12:00 +0200 (Thu, 10 Aug 2006) New Revision: 1710 Modified: tools/webtools/timeline/tlcacher.php Log: timeline: link anchors in diff link Modified: tools/webtools/timeline/tlcacher.php =================================================================== --- tools/webtools/timeline/tlcacher.php 2006-08-10 20:07:49 UTC (rev 1709) +++ tools/webtools/timeline/tlcacher.php 2006-08-10 21:12:00 UTC (rev 1710) @@ -188,7 +188,6 @@ foreach ($wikiedits as $ed) { preg_match('/\[\[.*\]\] ./', $ed, $matches); $page = $matches[0]; - $page_diff = trim(str_replace("]]", "?action=diff|diff]]", $page)); preg_match('/by \[\[.*\]\]/', $ed, $matches); $user = $matches[0]; preg_match("/\=(.*)\=/s",$ed,$matches); @@ -200,6 +199,7 @@ preg_match('/(..\:..)/',$date,$matches); $time = $matches[0]; $date = date("Y-m-d", $tstamp); + $page_diff = trim(str_replace("]]", "?action=diff#$date $time|diff]]", $page)); $description = "Wiki page $page edited $user ($page_diff)"; if ($tstamp > $last_wiki) { $events[] = array( 'cache_id' => $tstamp, 'tstamp' => $tstamp, 'icon' => $icon, 'date' => $date,

1 0

r1709 - tools/webtools/timeline
by crux＠crux.nu 10 Aug '06

10 Aug '06

Author: sip Date: 2006-08-10 22:07:49 +0200 (Thu, 10 Aug 2006) New Revision: 1709 Modified: tools/webtools/timeline/tlcacher.php Log: timeline: Fixed notice about missing key Modified: tools/webtools/timeline/tlcacher.php =================================================================== --- tools/webtools/timeline/tlcacher.php 2006-08-10 19:49:01 UTC (rev 1708) +++ tools/webtools/timeline/tlcacher.php 2006-08-10 20:07:49 UTC (rev 1709) @@ -155,9 +155,10 @@ if (count($revline) == 4) { $rev = substr(trim($revline[0]),1); $user = trim($revline[1]); - $wikiname = $username_map[$user]; - if ($wikiname != "") + if (array_key_exists($user, $username_map)) { + $wikiname = $username_map[$user]; $user = "[[~" . $wikiname . "|" . $user . "]]"; + } $date = substr($revline[2],1,10); $time = substr($revline[2],12,5); $revurl = "[[ ".sprintf($svn_url, $rev)." | $rev ]]";

1 0

r1708 - tools/webtools/timeline
by crux＠crux.nu 10 Aug '06

10 Aug '06

Author: sip Date: 2006-08-10 21:49:01 +0200 (Thu, 10 Aug 2006) New Revision: 1708 Modified: tools/webtools/timeline/tlcacher.php Log: fixed repeated revision numbers Modified: tools/webtools/timeline/tlcacher.php =================================================================== --- tools/webtools/timeline/tlcacher.php 2006-08-10 18:10:18 UTC (rev 1707) +++ tools/webtools/timeline/tlcacher.php 2006-08-10 19:49:01 UTC (rev 1708) @@ -147,6 +147,7 @@ exec("$svnlook_cmd youngest $repo_path", $out, $res); $svn_latest = trim($out[0]); if ($svn_latest != $last_svn) { + $last_svn++; exec("$svn_cmd log file://$repo_path -r$last_svn:HEAD", $out, $res); foreach ($out as $line) { if ($line != "" && substr($line, 0, 5) != "-----") {

1 0

r1707 - crux-2.2/ports/opt/lftp
by crux＠crux.nu 10 Aug '06

10 Aug '06

Author: tilman Date: 2006-08-10 20:10:18 +0200 (Thu, 10 Aug 2006) New Revision: 1707 Modified: crux-2.2/ports/opt/lftp/.md5sum crux-2.2/ports/opt/lftp/Pkgfile Log: lftp: updated to 3.5.4 Modified: crux-2.2/ports/opt/lftp/.md5sum =================================================================== --- crux-2.2/ports/opt/lftp/.md5sum 2006-08-10 16:43:36 UTC (rev 1706) +++ crux-2.2/ports/opt/lftp/.md5sum 2006-08-10 18:10:18 UTC (rev 1707) @@ -1 +1 @@ -c01baaa3521e2bed8d1d1c4fd11ef384 lftp-3.5.3.tar.bz2 +1c7f49822793d03588fd4080c40281a7 lftp-3.5.4.tar.bz2 Modified: crux-2.2/ports/opt/lftp/Pkgfile =================================================================== --- crux-2.2/ports/opt/lftp/Pkgfile 2006-08-10 16:43:36 UTC (rev 1706) +++ crux-2.2/ports/opt/lftp/Pkgfile 2006-08-10 18:10:18 UTC (rev 1707) @@ -4,7 +4,7 @@ # Depends on: openssl name=lftp -version=3.5.3 +version=3.5.4 release=1 source=(http://ftp.yars.free.net/$name/$name-$version.tar.bz2)

1 0

r1706 - tools/webtools/timeline
by crux＠crux.nu 10 Aug '06

10 Aug '06

Author: jw Date: 2006-08-10 18:43:36 +0200 (Thu, 10 Aug 2006) New Revision: 1706 Modified: tools/webtools/timeline/tlcacher.php Log: timeline: trim diff url Modified: tools/webtools/timeline/tlcacher.php =================================================================== --- tools/webtools/timeline/tlcacher.php 2006-08-10 16:33:53 UTC (rev 1705) +++ tools/webtools/timeline/tlcacher.php 2006-08-10 16:43:36 UTC (rev 1706) @@ -186,7 +186,7 @@ foreach ($wikiedits as $ed) { preg_match('/\[\[.*\]\] ./', $ed, $matches); $page = $matches[0]; - $page_diff = str_replace("]]", "?action=diff|diff]]", $page); + $page_diff = trim(str_replace("]]", "?action=diff|diff]]", $page)); preg_match('/by \[\[.*\]\]/', $ed, $matches); $user = $matches[0]; preg_match("/\=(.*)\=/s",$ed,$matches);

1 0