August 2006 - crux-commits

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

10 Aug '06

Author: jw Date: 2006-08-10 18:33:53 +0200 (Thu, 10 Aug 2006) New Revision: 1705 Modified: tools/webtools/timeline/tlcacher.php Log: Generate a 'diff' link for wiki edits Modified: tools/webtools/timeline/tlcacher.php =================================================================== --- tools/webtools/timeline/tlcacher.php 2006-08-10 15:00:23 UTC (rev 1704) +++ tools/webtools/timeline/tlcacher.php 2006-08-10 16:33:53 UTC (rev 1705) @@ -186,6 +186,7 @@ foreach ($wikiedits as $ed) { preg_match('/\[\[.*\]\] ./', $ed, $matches); $page = $matches[0]; + $page_diff = str_replace("]]", "?action=diff|diff]]", $page); preg_match('/by \[\[.*\]\]/', $ed, $matches); $user = $matches[0]; preg_match("/\=(.*)\=/s",$ed,$matches); @@ -197,7 +198,7 @@ preg_match('/(..\:..)/',$date,$matches); $time = $matches[0]; $date = date("Y-m-d", $tstamp); - $description = "Wiki page $page edited $user"; + $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);

1 0

r1704 - in tools: . webtools webtools/timeline
by crux＠crux.nu 10 Aug '06

10 Aug '06

Author: sip Date: 2006-08-10 17:00:23 +0200 (Thu, 10 Aug 2006) New Revision: 1704 Added: tools/webtools/ tools/webtools/timeline/ tools/webtools/timeline/timeline.php tools/webtools/timeline/timeline.sql tools/webtools/timeline/tlcacher.php Log: Imported webtools section with timeline scripts Added: tools/webtools/timeline/timeline.php =================================================================== --- tools/webtools/timeline/timeline.php (rev 0) +++ tools/webtools/timeline/timeline.php 2006-08-10 15:00:23 UTC (rev 1704) @@ -0,0 +1,44 @@ +<?php +require_once('DB.php'); +Markup("timeline", "directives", "/\$:timeline(\\s+.*)?\\s*:\$/e", + "'<:block>'.GetEvents()"); + + +function GetEvents() { + +$days = 30; +if (isset($_POST['days'])) { + $days = intval($_POST['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"); + + +$timeline .= '<table cellspacing="0" border="0" cellpadding="0">'."\n"; +$currdate = "noway"; +while ($evt =& $res->fetchRow()) { + if ($evt['event_date'] != $currdate) { + $timeline .= '<tr><td class="timeline-head" colspan="3"><span class="timeline-date">'.$evt['event_date']."</span></td></tr>\n"; + } + $event_description = $evt['event_description']; + if ($evt['event_notes'] != "") { + $event_description .= ": ".$evt['event_notes']; + } + $img = '<img src="/images/'.$evt['event_type'].'.png">'; + $timeline .= '<tr><td align="right" valign="top" width="60">'.$evt['event_time'].'</td><td align="center" valign="top" width="30">'.$img.'</td><td valign="top">'.$event_description.'</td></tr>'; + $timeline .= "\n"; + $currdate = $evt['event_date']; +} +$timeline .= "</table>\n"; +$timeline .= '<br><form method="post" action="pmwiki.php?n=Main.Test">Show the latest <input size="4" type="text" name="days" value="'.$days.'"> days <input type="submit" value="Show"></form>'."\n"; +return $timeline; + +} +?> Added: tools/webtools/timeline/timeline.sql =================================================================== --- tools/webtools/timeline/timeline.sql (rev 0) +++ tools/webtools/timeline/timeline.sql 2006-08-10 15:00:23 UTC (rev 1704) @@ -0,0 +1,11 @@ +create table events ( + 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_description text, + event_notes text +); Added: tools/webtools/timeline/tlcacher.php =================================================================== --- tools/webtools/timeline/tlcacher.php (rev 0) +++ tools/webtools/timeline/tlcacher.php 2006-08-10 15:00:23 UTC (rev 1704) @@ -0,0 +1,215 @@ +#!/usr/bin/php +<?php + +/* Caches the timeline events into a sqlite db */ + +require_once('DB.php'); + +/**************** Configuration ***********************/ + +// PEAR dns for the flyspray db and sqlite cache db, +// ie +// $dsn = 'mysql://username:password@host/dbname'; +// $dsnc = 'sqlite:////path/to/database.db'; +require_once("tlcacher_config.php"); + +// Url of the detailed task +$task_url="https://crux.nu/bugs/?do=details&id=%s"; +// Path of the subversion repository +$repo_path = "/home/crux/repo"; + +// Subversion commands +$svn_cmd = "/usr/bin/svn --non-interactive --config-dir /"; +$svnlook_cmd = "/usr/bin/svnlook"; + +// Url of the online repo viewer +$svn_url = "http://crux.nu/svnweb/CRUX/revision/?rev=%s"; + +// Path of the recent changes pmwiki file +$wiki_file = "/home/crux/public_html/wiki.d/Site.AllRecentChanges"; + +// Map svn users to wiki profiles +$username_map = array( + "jaeger" => "jaeger", + "jue" => "JuergenDaubert", + "jw" => "JohannesWinkelmann", + "sip" => "SimoneRota" , + "jdolan" => "JasonThomasDolan", + "jheino" => "JukkaHeino", + "tilman" => "TilmanSauerbeck", + "viper" => "SimonGlo�ner", + "sten" => "NickSteeves" +); + +// Event: cache_id, tstamp, type(icon), date, time, user, description, notes +$events = array(); + +/**************** Last cached events *******************/ + +$dbc =& DB::connect($dsnc); +if (DB::isError($dbc)) die("Cannot connect to S database"); +$dbc->setFetchMode(DB_FETCHMODE_ASSOC); +$last_cached_sql = "select cache_id from events where event_type='svn_commit' order by cache_id desc"; +$res =& $dbc->limitQuery($last_cached_sql,0,1); +if (DB::isError($res)) die("Query error"); +if ($res->numRows() === 0) { + $last_svn = 0; +} else { + $row =& $res->fetchRow(); + $last_svn = $row['cache_id']; +} +$last_cached_sql = "select cache_id from events where event_type like 'task%' order by cache_id desc"; +$res =& $dbc->limitQuery($last_cached_sql,0,1); +if (DB::isError($res)) die("Query error"); +if ($res->numRows() === 0) { + $last_task = 0; +} else { + $row =& $res->fetchRow(); + $last_task = $row['cache_id']; +} +$last_cached_sql = "select cache_id from events where event_type = 'wiki_changed' order by cache_id desc"; +$res =& $dbc->limitQuery($last_cached_sql,0,1); +if (DB::isError($res)) die("Query error"); +if ($res->numRows() === 0) { + $last_wiki = 0; +} else { + $row =& $res->fetchRow(); + $last_wiki = $row['cache_id']; +} +/**************** Flyspray events ***********************/ + +$db =& DB::connect($dsn); +if (DB::isError($db)) die("Cannot connect to M database"); +$db->setFetchMode(DB_FETCHMODE_ASSOC); + +$sql = "select history_id, event_date, event_type, user_name, flyspray_history.task_id, item_summary, closure_comment + from flyspray_history + join flyspray_users on flyspray_users.user_id = flyspray_history.user_id + join flyspray_tasks on flyspray_tasks.task_id = flyspray_history.task_id + where history_id > $last_task"; + +$res =& $db->Query($sql); +if (DB::isError($res)) die("Query error"); + +while ($row =& $res->fetchRow()) { + // $etype = $fs_events[$row['event_type']]; + $etype = $row['event_type']; + $euser = $row['user_name']; + $etid = $row['task_id']; + $edate = $row['event_date']; + $cache_id = $row['history_id']; + $description = ""; + $date = date("Y-m-d", $edate); + $time = date("H:i", $edate); + switch ($etype) { + case "1": // new task + $icon = "task_opened"; + $description = "New task [[ ".sprintf($task_url,$etid)." | $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"; + if ($row['closure_comment'] != "" && $row['closure_comment'] != 0) { // weird flyspray! + $notes = $row['closure_comment']; + } else { + $notes = ""; + } + break; + case "3": // task edited : fields, comments, attachments, ownership, related tasks, etc. + case "4": + case "5": + case "6": + case "7": + case "8": + case "14": + case "15": + case "16": + case "22": + case "23": + case "24": + case "25": + $icon = "task_changed"; + $description = "Task [[ ".sprintf($task_url,$etid)." | $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,); + } +} + + +/**************** Subversion events ********************/ +$out = array(); +$res = 0; +exec("$svnlook_cmd youngest $repo_path", $out, $res); +$svn_latest = trim($out[0]); +if ($svn_latest != $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) != "-----") { + $revline = split("\|", $line); + if (count($revline) == 4) { + $rev = substr(trim($revline[0]),1); + $user = trim($revline[1]); + $wikiname = $username_map[$user]; + if ($wikiname != "") + $user = "[[~" . $wikiname . "|" . $user . "]]"; + $date = substr($revline[2],1,10); + $time = substr($revline[2],12,5); + $revurl = "[[ ".sprintf($svn_url, $rev)." | $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); + } + } + } +} + +/****************** PmWiki events *********************/ +$lines = file($wiki_file); +$chline = ""; +foreach ($lines as $line) { + if (substr($line,0,5) == "text=") { + $chline = substr($line,7); + } +} +if ($chline != "") { + $wikiedits = split('\*', $chline); + $icon = "wiki_changed"; + foreach ($wikiedits as $ed) { + preg_match('/\[\[.*\]\] ./', $ed, $matches); + $page = $matches[0]; + preg_match('/by \[\[.*\]\]/', $ed, $matches); + $user = $matches[0]; + preg_match("/\=(.*)\=/s",$ed,$matches); + $notes = $matches[1]; + preg_match("/\. \. \. (.*?) by/s",$ed,$matches); + $date = $matches[1]; + $date = str_replace(", at", "", $date); // old entry format + $tstamp = strtotime($date); + preg_match('/(..\:..)/',$date,$matches); + $time = $matches[0]; + $date = date("Y-m-d", $tstamp); + $description = "Wiki page $page edited $user"; + if ($tstamp > $last_wiki) { + $events[] = array( 'cache_id' => $tstamp, 'tstamp' => $tstamp, 'icon' => $icon, 'date' => $date, + 'time' => $time, 'user' => $user, 'description' => $description, 'notes' => $notes); + } + } +} + +/*************** Finally, all events *********************/ +$sth = $dbc->prepare("insert into events values (NULL, ?, ?, ?, ?, ?, ?, ?, ?)"); +foreach ($events as $evt) { + $res = $dbc->execute($sth, $evt); + if (DB::isError($res)) die("Query error"); +} + +?> Property changes on: tools/webtools/timeline/tlcacher.php ___________________________________________________________________ Name: svn:executable + *

1 0

r1703 - crux-2.2/ports/core/sendmail
by crux＠crux.nu 10 Aug '06

10 Aug '06

Author: jw Date: 2006-08-10 08:24:16 +0200 (Thu, 10 Aug 2006) New Revision: 1703 Modified: crux-2.2/ports/core/sendmail/.md5sum crux-2.2/ports/core/sendmail/Pkgfile Log: sendmail: update to 8.13.8 Modified: crux-2.2/ports/core/sendmail/.md5sum =================================================================== --- crux-2.2/ports/core/sendmail/.md5sum 2006-08-09 13:46:39 UTC (rev 1702) +++ crux-2.2/ports/core/sendmail/.md5sum 2006-08-10 06:24:16 UTC (rev 1703) @@ -1,6 +1,6 @@ 3ee264f266988582628f4846b29412ff aliases b8beb17bbd902abe29769bea02fdceb5 sendmail -5327e065cb0c1919122c8cecbeddbc28 sendmail.8.13.7.tar.gz +5f29c94b42e0bb74d546b2ae84203a1e sendmail.8.13.8.tar.gz f58ec5515e1c19aaa3d6ab1e9d1d51fb sendmail.mc 8447ea0f862a5e5519cc3c0659470e47 sendmail.mk 01b8884ef1b04d8cb057c73348975ed2 site.config.m4 Modified: crux-2.2/ports/core/sendmail/Pkgfile =================================================================== --- crux-2.2/ports/core/sendmail/Pkgfile 2006-08-09 13:46:39 UTC (rev 1702) +++ crux-2.2/ports/core/sendmail/Pkgfile 2006-08-10 06:24:16 UTC (rev 1703) @@ -3,7 +3,7 @@ # Maintainer: Per Lid�n, core-ports at crux dot nu name=sendmail -version=8.13.7 +version=8.13.8 release=1 source=(http://www.sendmail.org/ftp/$name.$version.tar.gz \ aliases sendmail sendmail.mk sendmail.mc site.config.m4)

1 0

r1702 - crux-2.2/ports/core/udev
by crux＠crux.nu 09 Aug '06

09 Aug '06

Author: jaeger Date: 2006-08-09 15:46:39 +0200 (Wed, 09 Aug 2006) New Revision: 1702 Modified: crux-2.2/ports/core/udev/.md5sum crux-2.2/ports/core/udev/Pkgfile crux-2.2/ports/core/udev/start_udev Log: udev: fixed mount permissions on /dev tmpfs for drivers requiring exec access Modified: crux-2.2/ports/core/udev/.md5sum =================================================================== --- crux-2.2/ports/core/udev/.md5sum 2006-08-09 13:38:57 UTC (rev 1701) +++ crux-2.2/ports/core/udev/.md5sum 2006-08-09 13:46:39 UTC (rev 1702) @@ -1,5 +1,5 @@ c0da74341672681c9bd924439ea4e84d cdrom.rules 6c4a8bd7aef573838305e212ffb9bc6a cdsymlinks -00a1035b4c7c289ce2f2cb5040dc611e start_udev +40ab559668ab739473fa9f4a45ba28da start_udev f4effef7807ce1dc91ab581686ef197b udev-096.tar.bz2 6ef52d52f45ca91daea3cfa840d1083b udev-config-20060715.tar.bz2 Modified: crux-2.2/ports/core/udev/Pkgfile =================================================================== --- crux-2.2/ports/core/udev/Pkgfile 2006-08-09 13:38:57 UTC (rev 1701) +++ crux-2.2/ports/core/udev/Pkgfile 2006-08-09 13:46:39 UTC (rev 1702) @@ -4,7 +4,7 @@ name=udev version=096 -release=1 +release=2 source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.… http://crux.nu/files/udev-config-20060715.tar.bz2 start_udev cdrom.rules cdsymlinks) Modified: crux-2.2/ports/core/udev/start_udev =================================================================== --- crux-2.2/ports/core/udev/start_udev 2006-08-09 13:38:57 UTC (rev 1701) +++ crux-2.2/ports/core/udev/start_udev 2006-08-09 13:46:39 UTC (rev 1702) @@ -1,7 +1,7 @@ #!/bin/sh -# mount /dev as a tmpfs -/bin/mount -n -t tmpfs udev /dev +# mount /dev as a tmpfs; note: some video drivers require exec access in /dev +/bin/mount -n -t tmpfs udev /dev -o exec,nosuid,mode=0755 # unset hotplugger echo > /proc/sys/kernel/hotplug

1 0

r1701 - crux-2.2/ports/opt/gtk
by crux＠crux.nu 09 Aug '06

09 Aug '06

Author: jaeger Date: 2006-08-09 15:38:57 +0200 (Wed, 09 Aug 2006) New Revision: 1701 Added: crux-2.2/ports/opt/gtk/gtk+-2.10.1-stock-icon.diff Modified: crux-2.2/ports/opt/gtk/.md5sum crux-2.2/ports/opt/gtk/Pkgfile Log: gtk: added cptn's modified stock icon patch Modified: crux-2.2/ports/opt/gtk/.md5sum =================================================================== --- crux-2.2/ports/opt/gtk/.md5sum 2006-08-08 15:32:11 UTC (rev 1700) +++ crux-2.2/ports/opt/gtk/.md5sum 2006-08-09 13:38:57 UTC (rev 1701) @@ -1,3 +1,4 @@ 501ae79b5b7a93a8338e999274f4dcbb gdk-pixbuf.loaders +17510dcd6cb2672d9e530beb9bee86a4 gtk+-2.10.1-stock-icon.diff 7f1d39031d50de8228211aa3230d4acd gtk+-2.10.1.tar.bz2 a6ab21dcf3d52be4b2c002d6a74dddf9 gtk.immodules Modified: crux-2.2/ports/opt/gtk/Pkgfile =================================================================== --- crux-2.2/ports/opt/gtk/Pkgfile 2006-08-08 15:32:11 UTC (rev 1700) +++ crux-2.2/ports/opt/gtk/Pkgfile 2006-08-09 13:38:57 UTC (rev 1701) @@ -5,12 +5,13 @@ name=gtk version=2.10.1 -release=1 +release=2 source=(ftp://ftp.gtk.org/pub/gtk/v2.10/${name}+-$version.tar.bz2 \ - gdk-pixbuf.loaders gtk.immodules) + gdk-pixbuf.loaders gtk.immodules $name+-$version-stock-icon.diff) build () { -cd gtk+-$version + cd gtk+-$version + patch -p1 -i $SRC/$name+-$version-stock-icon.diff ./configure --prefix=/usr make make DESTDIR=$PKG install Added: crux-2.2/ports/opt/gtk/gtk+-2.10.1-stock-icon.diff =================================================================== --- crux-2.2/ports/opt/gtk/gtk+-2.10.1-stock-icon.diff (rev 0) +++ crux-2.2/ports/opt/gtk/gtk+-2.10.1-stock-icon.diff 2006-08-09 13:38:57 UTC (rev 1701) @@ -0,0 +1,65 @@ +--- gtk+-2.10.1/gtk/gtkfilesystem.c.orig 2006-08-07 22:23:22.436475760 +0200 ++++ gtk+-2.10.1/gtk/gtkfilesystem.c 2006-08-07 22:25:38.673764544 +0200 +@@ -301,15 +301,21 @@ + GtkIconTheme *icon_theme; + + icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget)); +- pixbuf = gtk_icon_theme_load_icon (icon_theme, info->icon_name, +- pixel_size, 0, NULL); ++ if (gtk_icon_theme_has_icon (icon_theme, info->icon_name)) ++ pixbuf = gtk_icon_theme_load_icon (icon_theme, info->icon_name, ++ pixel_size, 0, NULL); + } + } + + if (!pixbuf) + { + /* load a fallback icon */ +- pixbuf = gtk_widget_render_icon (widget, GTK_STOCK_FILE, GTK_ICON_SIZE_SMALL_TOOLBAR, NULL); ++ pixbuf = gtk_widget_render_icon (widget, ++ gtk_file_info_get_is_folder (info) ++ ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE, ++ GTK_ICON_SIZE_SMALL_TOOLBAR, ++ NULL); ++ + if (!pixbuf && error) + g_set_error (error, + GTK_FILE_SYSTEM_ERROR, +@@ -648,7 +654,7 @@ + GError **error) + { + gchar *icon_name; +- GdkPixbuf *pixbuf; ++ GdkPixbuf *pixbuf = NULL; + + g_return_val_if_fail (GTK_IS_FILE_SYSTEM (file_system), NULL); + g_return_val_if_fail (volume != NULL, NULL); +@@ -658,15 +664,22 @@ + + icon_name = gtk_file_system_volume_get_icon_name (file_system, volume, + error); +- if (!icon_name) ++ if (icon_name) + { +- return NULL; ++ GtkIconTheme *icon_theme; ++ ++ icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget)); ++ if (gtk_icon_theme_has_icon (icon_theme, icon_name)) ++ pixbuf = gtk_icon_theme_load_icon (icon_theme, ++ icon_name, pixel_size, 0, NULL); ++ g_free (icon_name); + } + +- pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget)), +- icon_name, pixel_size, 0, NULL); +- g_free (icon_name); +- ++ if (!pixbuf) ++ pixbuf = gtk_widget_render_icon (widget, ++ GTK_STOCK_HARDDISK, ++ GTK_ICON_SIZE_SMALL_TOOLBAR, ++ NULL); + return pixbuf; + } +

1 0

r1700 - crux-2.2/ports/opt/rxvt-unicode
by crux＠crux.nu 08 Aug '06

08 Aug '06

Author: tilman Date: 2006-08-08 17:32:11 +0200 (Tue, 08 Aug 2006) New Revision: 1700 Modified: crux-2.2/ports/opt/rxvt-unicode/.md5sum crux-2.2/ports/opt/rxvt-unicode/Pkgfile Log: rxvt-unicode: updated to 7.9 Modified: crux-2.2/ports/opt/rxvt-unicode/.md5sum =================================================================== --- crux-2.2/ports/opt/rxvt-unicode/.md5sum 2006-08-07 10:03:07 UTC (rev 1699) +++ crux-2.2/ports/opt/rxvt-unicode/.md5sum 2006-08-08 15:32:11 UTC (rev 1700) @@ -1 +1 @@ -8bb2746eaa814f90d795534d67d9198a rxvt-unicode-7.8.tar.bz2 +7a0c73ccf0e31808ad37b61e730cd10e rxvt-unicode-7.9.tar.bz2 Modified: crux-2.2/ports/opt/rxvt-unicode/Pkgfile =================================================================== --- crux-2.2/ports/opt/rxvt-unicode/Pkgfile 2006-08-07 10:03:07 UTC (rev 1699) +++ crux-2.2/ports/opt/rxvt-unicode/Pkgfile 2006-08-08 15:32:11 UTC (rev 1700) @@ -4,7 +4,7 @@ # Depends on: x11, perl name=rxvt-unicode -version=7.8 +version=7.9 release=1 source=(http://dist.schmorp.de/$name/$name-$version.tar.bz2)

1 0

r1699 - crux-2.2/ports/core/nfs-utils
by crux＠crux.nu 07 Aug '06

07 Aug '06

Author: jw Date: 2006-08-07 12:03:07 +0200 (Mon, 07 Aug 2006) New Revision: 1699 Modified: crux-2.2/ports/core/nfs-utils/.md5sum crux-2.2/ports/core/nfs-utils/Pkgfile Log: nfs-utils: update to 1.0.10 Modified: crux-2.2/ports/core/nfs-utils/.md5sum =================================================================== --- crux-2.2/ports/core/nfs-utils/.md5sum 2006-08-07 06:45:18 UTC (rev 1698) +++ crux-2.2/ports/core/nfs-utils/.md5sum 2006-08-07 10:03:07 UTC (rev 1699) @@ -1,4 +1,4 @@ c5ccf58f5f9f57aba75c8b72219eb6e6 exports 73ad69a472b77946167025b946e0794a nfs -73981058e49b0b4ce2a15e21960529f5 nfs-utils-1.0.9.tar.gz +1949634d0dc896696d8a880bdca622c8 nfs-utils-1.0.10.tar.gz 91238e88d73c9841b9e8beb24aafa873 nfsserver Modified: crux-2.2/ports/core/nfs-utils/Pkgfile =================================================================== --- crux-2.2/ports/core/nfs-utils/Pkgfile 2006-08-07 06:45:18 UTC (rev 1698) +++ crux-2.2/ports/core/nfs-utils/Pkgfile 2006-08-07 10:03:07 UTC (rev 1699) @@ -3,7 +3,7 @@ # Maintainer: Per Lid�n, core-ports at crux dot nu name=nfs-utils -version=1.0.9 +version=1.0.10 release=1 source=(http://dl.sourceforge.net/nfs/$name-$version.tar.gz \ exports nfs nfsserver)

1 0

r1698 - crux-2.2/ports/core/curl
by crux＠crux.nu 07 Aug '06

07 Aug '06

Author: jw Date: 2006-08-07 08:45:18 +0200 (Mon, 07 Aug 2006) New Revision: 1698 Modified: crux-2.2/ports/core/curl/.footprint crux-2.2/ports/core/curl/.md5sum crux-2.2/ports/core/curl/Pkgfile Log: curl: update to 7.15.5 Modified: crux-2.2/ports/core/curl/.footprint =================================================================== --- crux-2.2/ports/core/curl/.footprint 2006-08-06 16:46:54 UTC (rev 1697) +++ crux-2.2/ports/core/curl/.footprint 2006-08-07 06:45:18 UTC (rev 1698) @@ -37,6 +37,7 @@ -rw-r--r-- root/root usr/man/man3/curl_escape.3.gz -rw-r--r-- root/root usr/man/man3/curl_formadd.3.gz -rw-r--r-- root/root usr/man/man3/curl_formfree.3.gz +-rw-r--r-- root/root usr/man/man3/curl_formget.3.gz -rw-r--r-- root/root usr/man/man3/curl_free.3.gz -rw-r--r-- root/root usr/man/man3/curl_getdate.3.gz -rw-r--r-- root/root usr/man/man3/curl_getenv.3.gz @@ -45,6 +46,7 @@ -rw-r--r-- root/root usr/man/man3/curl_global_init_mem.3.gz -rw-r--r-- root/root usr/man/man3/curl_mprintf.3.gz -rw-r--r-- root/root usr/man/man3/curl_multi_add_handle.3.gz +-rw-r--r-- root/root usr/man/man3/curl_multi_assign.3.gz -rw-r--r-- root/root usr/man/man3/curl_multi_cleanup.3.gz -rw-r--r-- root/root usr/man/man3/curl_multi_fdset.3.gz -rw-r--r-- root/root usr/man/man3/curl_multi_info_read.3.gz Modified: crux-2.2/ports/core/curl/.md5sum =================================================================== --- crux-2.2/ports/core/curl/.md5sum 2006-08-06 16:46:54 UTC (rev 1697) +++ crux-2.2/ports/core/curl/.md5sum 2006-08-07 06:45:18 UTC (rev 1698) @@ -1 +1 @@ -d9345a55c8bc67eafcd37fa1b728e00e curl-7.15.4.tar.bz2 +594142c7d53bbdd988e8cef6354eeeff curl-7.15.5.tar.bz2 Modified: crux-2.2/ports/core/curl/Pkgfile =================================================================== --- crux-2.2/ports/core/curl/Pkgfile 2006-08-06 16:46:54 UTC (rev 1697) +++ crux-2.2/ports/core/curl/Pkgfile 2006-08-07 06:45:18 UTC (rev 1698) @@ -4,7 +4,7 @@ # Depends: openssl name=curl -version=7.15.4 +version=7.15.5 release=1 source=(http://curl.haxx.se/download/$name-$version.tar.bz2)

1 0

r1697 - crux-2.2/ports/core/flex
by crux＠crux.nu 06 Aug '06

06 Aug '06

Author: jue Date: 2006-08-06 18:46:54 +0200 (Sun, 06 Aug 2006) New Revision: 1697 Removed: crux-2.2/ports/core/flex/flex-2.5.31.patch Modified: crux-2.2/ports/core/flex/.md5sum crux-2.2/ports/core/flex/Pkgfile Log: flex: update to 2.5.33 Modified: crux-2.2/ports/core/flex/.md5sum =================================================================== --- crux-2.2/ports/core/flex/.md5sum 2006-08-06 11:26:11 UTC (rev 1696) +++ crux-2.2/ports/core/flex/.md5sum 2006-08-06 16:46:54 UTC (rev 1697) @@ -1,2 +1 @@ -ad1a7cf56f7a6ee3a8a2f5cbc485fd00 flex-2.5.31.patch -363dcc4afc917dc51306eb9d3de0152f flex-2.5.31.tar.bz2 +343374a00b38d9e39d1158b71af37150 flex-2.5.33.tar.bz2 Modified: crux-2.2/ports/core/flex/Pkgfile =================================================================== --- crux-2.2/ports/core/flex/Pkgfile 2006-08-06 11:26:11 UTC (rev 1696) +++ crux-2.2/ports/core/flex/Pkgfile 2006-08-06 16:46:54 UTC (rev 1697) @@ -1,18 +1,15 @@ # Description: Fast Lexical Analyzer Generator -# URL: http://lex.sourceforge.net/ +# URL: http://flex.sourceforge.net/ # Maintainer: Per Lid�n, core-ports at crux dot nu name=flex -version=2.5.31 -release=2 -source=(http://dl.sourceforge.net/sourceforge/flex/$name-$version.tar.bz2 \ - $name-$version.patch) +version=2.5.33 +release=1 +source=(http://dl.sourceforge.net/sourceforge/flex/$name-$version.tar.bz2) build() { cd $name-$version - patch -p1 < ../$name-$version.patch ./configure --prefix=/usr --disable-nls - touch doc/flex.1 scan.c make make DESTDIR=$PKG install ln -sf flex $PKG/usr/bin/lex Deleted: crux-2.2/ports/core/flex/flex-2.5.31.patch =================================================================== --- crux-2.2/ports/core/flex/flex-2.5.31.patch 2006-08-06 11:26:11 UTC (rev 1696) +++ crux-2.2/ports/core/flex/flex-2.5.31.patch 2006-08-06 16:46:54 UTC (rev 1697) @@ -1,253 +0,0 @@ -diff -Naur flex-2.5.31.orig/filter.c flex-2.5.31/filter.c ---- flex-2.5.31.orig/filter.c 2003-03-25 11:39:08.000000000 -0500 -+++ flex-2.5.31/filter.c 2004-03-01 23:14:28.868777672 -0500 -@@ -157,11 +157,15 @@ - if (chain->filter_func) { - int r; - -- /* setup streams again */ -+ /* setup streams again -- Removed. POSIX states that children inherit -+ open streams in the parent. Also, ANSI C99 states that the stdin -+ and stdout macors need not be modified lvalues; so this code is -+ broken in the first place. - if ((stdin = fdopen (0, "r")) == NULL) - flexfatal (_("fdopen(0) failed")); - if ((stdout = fdopen (1, "w")) == NULL) - flexfatal (_("fdopen(1) failed")); -+ */ - - if ((r = chain->filter_func (chain)) == -1) - flexfatal (_("filter_func failed")); -@@ -181,9 +185,11 @@ - if (dup2 (pipes[1], 1) == -1) - flexfatal (_("dup2(pipes[1],1)")); - close (pipes[1]); -+ /* This is not legal; stfout does not need to be a modifiable -+ lvalue - if ((stdout = fdopen (1, "w")) == NULL) - flexfatal (_("fdopen(1) failed")); -- -+ */ - return true; - } - -diff -Naur flex-2.5.31.orig/flex.skl flex-2.5.31/flex.skl ---- flex-2.5.31.orig/flex.skl 2003-03-31 20:51:38.000000000 -0500 -+++ flex-2.5.31/flex.skl 2004-03-01 23:14:28.870777368 -0500 -@@ -27,6 +27,11 @@ - %# Macros for runtime processing stage. - m4_changecom - m4_changequote -+ -+%# Let user use our quoting strings -+m4_changequote({, }) -+m4_define( {m4_userquote_start}, {m4_changequote(<, >)[[m4_changequote([[, ]])}) -+m4_define( {m4_userquote_end}, {m4_changequote(<, >)]]m4_changequote([[, ]])}) - m4_changequote([[, ]]) - - %# -@@ -345,19 +350,19 @@ - %# yyscan_t yyscanner; - %# - %# Generate traditional function defs -- m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) -+ m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\]] - M4_YY_DECL_LAST_ARG]]) -- m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) -- $1 $2; -+ m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\]] -+ $1 $2; [[\]] - M4_YY_DECL_LAST_ARG]]) -- m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) -- $1 $2; -- $3 $4; -+ m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\]] -+ $1 $2; [[\]] -+ $3 $4; [[\]] - M4_YY_DECL_LAST_ARG]]) -- m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) -- $1 $2; -- $3 $4; -- $5 $6; -+ m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\]] -+ $1 $2; [[\]] -+ $3 $4; [[\]] -+ $5 $6; [[\]] - M4_YY_DECL_LAST_ARG]]) - ]], - [[ -@@ -724,6 +729,7 @@ - - m4_ifdef( [[M4_YY_NO_UNISTD_H]],, - [[ -+#ifndef YY_NO_UNISTD_H - /* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. -@@ -734,6 +740,7 @@ - %if-c++-only - #include <unistd.h> - %endif -+#endif - ]]) - - #ifndef YY_EXTRA_TYPE -@@ -1124,9 +1131,9 @@ - m4_dnl The bison pure parser is used. Redefine yylex to - m4_dnl accept the lval parameter. - -- m4_define( [[M4_YY_LEX_PROTO]], -+ m4_define( [[M4_YY_LEX_PROTO]], [[\]] - [[M4_YY_PARAMS(YYSTYPE * yylval_param M4_YY_PROTO_LAST_ARG)]]) -- m4_define( [[M4_YY_LEX_DECLARATION]], -+ m4_define( [[M4_YY_LEX_DECLARATION]], [[\]] - [[YYFARGS1(YYSTYPE *,yylval_param)]]) - ]]) - -@@ -1134,9 +1141,9 @@ - [[ - m4_dnl Locations are used. yylex should also accept the ylloc parameter. - -- m4_define( [[M4_YY_LEX_PROTO]], -+ m4_define( [[M4_YY_LEX_PROTO]], [[\]] - [[M4_YY_PARAMS(YYSTYPE * yylval_param, YYLTYPE * yylloc_param M4_YY_PROTO_LAST_ARG)]]) -- m4_define( [[M4_YY_LEX_DECLARATION]], -+ m4_define( [[M4_YY_LEX_DECLARATION]], [[\]] - [[YYFARGS2(YYSTYPE *,yylval_param, YYLTYPE *,yylloc_param)]]) - ]]) - -@@ -2251,11 +2258,11 @@ - * @note If you want to scan bytes that may contain NUL values, then use - * yy_scan_bytes() instead. - */ --YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str) -+YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,yy_str) - { - m4_dnl M4_YY_DECL_GUTS_VAR(); - -- return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG); -+ return yy_scan_bytes( yy_str, strlen(yy_str) M4_YY_CALL_LAST_ARG); - } - %endif - ]]) -diff -Naur flex-2.5.31.orig/gen.c flex-2.5.31/gen.c ---- flex-2.5.31.orig/gen.c 2003-03-30 14:58:44.000000000 -0500 -+++ flex-2.5.31/gen.c 2004-03-01 23:14:28.862778584 -0500 -@@ -1812,7 +1812,6 @@ - if (yytext_is_array) { - if (!reentrant){ - indent_puts ("static int yy_more_offset = 0;"); -- }else{ - indent_puts ("static int yy_prev_more_offset = 0;"); - } - } -diff -Naur flex-2.5.31.orig/main.c flex-2.5.31/main.c ---- flex-2.5.31.orig/main.c 2003-03-31 20:51:38.000000000 -0500 -+++ flex-2.5.31/main.c 2004-03-01 23:14:28.863778432 -0500 -@@ -199,6 +199,7 @@ - { - #if ENABLE_NLS - setlocale (LC_MESSAGES, ""); -+ setlocale (LC_CTYPE, ""); - textdomain (PACKAGE); - bindtextdomain (PACKAGE, LOCALEDIR); - #endif -@@ -1595,7 +1596,6 @@ - outn ("#else"); - outn (yy_stdinit); - outn ("#endif"); -- outn ("#endif"); - } - - else { -diff -Naur flex-2.5.31.orig/scan.c flex-2.5.31/scan.c ---- flex-2.5.31.orig/scan.c 2003-04-01 11:33:17.000000000 -0500 -+++ flex-2.5.31/scan.c 2004-03-01 23:14:28.860778888 -0500 -@@ -1619,11 +1619,13 @@ - #define LINEDIR 18 - #define CODEBLOCK_MATCH_BRACE 19 - -+#ifndef YY_NO_UNISTD_H - /* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ - #include <unistd.h> -+#endif - - #ifndef YY_EXTRA_TYPE - #define YY_EXTRA_TYPE void * -diff -Naur flex-2.5.31.orig/scan.l flex-2.5.31/scan.l ---- flex-2.5.31.orig/scan.l 2003-03-31 20:51:38.000000000 -0500 -+++ flex-2.5.31/scan.l 2004-03-01 23:14:28.864778280 -0500 -@@ -194,8 +194,14 @@ - <COMMENT>{ - "*/" ACTION_ECHO; yy_pop_state(); - "*" ACTION_ECHO; -- [^*\n]+ ACTION_ECHO; -- [^*\n]*{NL} ++linenum; ACTION_ECHO; -+ [\[\]] ACTION_ECHO; -+ [^*\[\]\n]+ ACTION_ECHO; -+ [^*\[\]\n]*{NL} ++linenum; ACTION_ECHO; -+ \[\[ add_action("[" "[]" "]m4_" "userquote_start()"); -+ \]\] add_action("[" "[]" "]m4_" "userquote_end()"); -+ /* Macros need to be clearly separated from surrounding -+ * text and this file needs to go through flex untouched. -+ */ - } - - <LINEDIR>{ -diff -Naur flex-2.5.31.orig/skel.c flex-2.5.31/skel.c ---- flex-2.5.31.orig/skel.c 2003-04-01 11:33:08.000000000 -0500 -+++ flex-2.5.31/skel.c 2004-03-01 23:14:28.867777824 -0500 -@@ -404,16 +404,16 @@ - "%# yyscan_t yyscanner;", - "%#", - "%# Generate traditional function defs", -- " m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG)", -+ " m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\\]]", - " M4_YY_DECL_LAST_ARG]])", -- " m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG)", -+ " m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\\]]", - " $1 $2;", - " M4_YY_DECL_LAST_ARG]])", -- " m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG)", -+ " m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\\]]", - " $1 $2;", - " $3 $4;", - " M4_YY_DECL_LAST_ARG]])", -- " m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG)", -+ " m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\\]]", - " $1 $2;", - " $3 $4;", - " $5 $6;", -@@ -783,6 +783,7 @@ - "", - "m4_ifdef( [[M4_YY_NO_UNISTD_H]],,", - "[[", -+ "#ifndef YY_NO_UNISTD_H", - "/* Special case for \"unistd.h\", since it is non-ANSI. We include it way", - " * down here because we want the user's section 1 to have been scanned first.", - " * The user has a chance to override it with an option.", -@@ -793,6 +794,7 @@ - "%if-c++-only", - "#include <unistd.h>", - "%endif", -+ "#endif", - "]])", - "", - "#ifndef YY_EXTRA_TYPE", -@@ -2454,11 +2456,11 @@ - " * @note If you want to scan bytes that may contain NUL values, then use", - " * yy_scan_bytes() instead.", - " */", -- "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str)", -+ "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,yy_str)", - "{", - " m4_dnl M4_YY_DECL_GUTS_VAR();", - "", -- " return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG);", -+ " return yy_scan_bytes( yy_str, strlen(yy_str) M4_YY_CALL_LAST_ARG);", - "}", - "%endif", - "]])",

1 0

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

06 Aug '06

Author: tilman Date: 2006-08-06 13:26:11 +0200 (Sun, 06 Aug 2006) New Revision: 1696 Modified: crux-2.2/ports/opt/lftp/.md5sum crux-2.2/ports/opt/lftp/Pkgfile Log: lftp: updated to 3.5.3 Modified: crux-2.2/ports/opt/lftp/.md5sum =================================================================== --- crux-2.2/ports/opt/lftp/.md5sum 2006-08-06 08:48:34 UTC (rev 1695) +++ crux-2.2/ports/opt/lftp/.md5sum 2006-08-06 11:26:11 UTC (rev 1696) @@ -1 +1 @@ -9f40e9963de53c111d676171b9f810cd lftp-3.5.2.tar.bz2 +c01baaa3521e2bed8d1d1c4fd11ef384 lftp-3.5.3.tar.bz2 Modified: crux-2.2/ports/opt/lftp/Pkgfile =================================================================== --- crux-2.2/ports/opt/lftp/Pkgfile 2006-08-06 08:48:34 UTC (rev 1695) +++ crux-2.2/ports/opt/lftp/Pkgfile 2006-08-06 11:26:11 UTC (rev 1696) @@ -4,7 +4,7 @@ # Depends on: openssl name=lftp -version=3.5.2 +version=3.5.3 release=1 source=(http://ftp.yars.free.net/$name/$name-$version.tar.bz2)

1 0