August 2006 - crux-commits

r1725 - crux-2.2/ports/opt/temperature.app
by crux＠crux.nu 14 Aug '06

14 Aug '06

Author: jw Date: 2006-08-14 10:53:01 +0200 (Mon, 14 Aug 2006) New Revision: 1725 Modified: crux-2.2/ports/opt/temperature.app/Pkgfile Log: temperature.app: fix url Modified: crux-2.2/ports/opt/temperature.app/Pkgfile =================================================================== --- crux-2.2/ports/opt/temperature.app/Pkgfile 2006-08-14 08:52:28 UTC (rev 1724) +++ crux-2.2/ports/opt/temperature.app/Pkgfile 2006-08-14 08:53:01 UTC (rev 1725) @@ -1,12 +1,12 @@ # Description: A temperature utility designed to be docked in Window Maker -# URL: http://www.fukt.bth.se/~per/temperature/ +# URL: http://www.fukt.bsnet.se/~per/temperature/ # Maintainer: Per Lid�n, core-ports at crux dot nu # Depends on: name=temperature.app version=1.4 release=1 -source=(http://www.fukt.bth.se/~per/temperature/Temperature.app-$version.tar.gz) +source=(http://www.fukt.bsnet.se/~per/temperature/Temperature.app-$version.tar.gz) build() { cd Temperature.app-$version

1 0

r1724 - crux-2.2/ports/opt/mixer.app
by crux＠crux.nu 14 Aug '06

14 Aug '06

Author: jw Date: 2006-08-14 10:52:28 +0200 (Mon, 14 Aug 2006) New Revision: 1724 Modified: crux-2.2/ports/opt/mixer.app/Pkgfile Log: mixer.app: fix url Modified: crux-2.2/ports/opt/mixer.app/Pkgfile =================================================================== --- crux-2.2/ports/opt/mixer.app/Pkgfile 2006-08-14 08:51:57 UTC (rev 1723) +++ crux-2.2/ports/opt/mixer.app/Pkgfile 2006-08-14 08:52:28 UTC (rev 1724) @@ -1,12 +1,12 @@ # Description: A mixer utility designed to be docked in Window Maker -# URL: http://www.fukt.bth.se/~per/mixer/ +# URL: http://www.fukt.bsnet.se/~per/mixer/ # Maintainer: Per Lid�n, core-ports at crux dot nu # Depends on: name=mixer.app version=1.8.0 release=1 -source=(http://www.fukt.bth.se/~per/mixer/Mixer.app-$version.tar.gz) +source=(http://www.fukt.bsnet.se/~per/mixer/Mixer.app-$version.tar.gz) build() { cd Mixer.app-$version

1 0

r1723 - crux-2.2/ports/opt/linux-identd
by crux＠crux.nu 14 Aug '06

14 Aug '06

Author: jw Date: 2006-08-14 10:51:57 +0200 (Mon, 14 Aug 2006) New Revision: 1723 Modified: crux-2.2/ports/opt/linux-identd/Pkgfile Log: linux-identd: fix url comment too Modified: crux-2.2/ports/opt/linux-identd/Pkgfile =================================================================== --- crux-2.2/ports/opt/linux-identd/Pkgfile 2006-08-14 08:45:40 UTC (rev 1722) +++ crux-2.2/ports/opt/linux-identd/Pkgfile 2006-08-14 08:51:57 UTC (rev 1723) @@ -1,5 +1,5 @@ # Description: An RFC 1413 identification daemon for Linux -# URL: http://www.fukt.bth.se/~per/identd/ +# URL: http://www.fukt.bsnet.se/~per/identd/ # Maintainer: Per Lid�n, core-ports at crux dot nu name=linux-identd

1 0

r1722 - crux-2.2/ports/opt/linux-identd
by crux＠crux.nu 14 Aug '06

14 Aug '06

Author: jw Date: 2006-08-14 10:45:40 +0200 (Mon, 14 Aug 2006) New Revision: 1722 Modified: crux-2.2/ports/opt/linux-identd/Pkgfile Log: linux-identd: fix download url Modified: crux-2.2/ports/opt/linux-identd/Pkgfile =================================================================== --- crux-2.2/ports/opt/linux-identd/Pkgfile 2006-08-14 08:44:52 UTC (rev 1721) +++ crux-2.2/ports/opt/linux-identd/Pkgfile 2006-08-14 08:45:40 UTC (rev 1722) @@ -5,7 +5,7 @@ name=linux-identd version=1.3 release=3 -source=(http://www.fukt.bth.se/~per/identd/$name-$version.tar.gz identd) +source=(http://www.fukt.bsnet.se/~per/identd/$name-$version.tar.gz identd) build () { cd $name-$version

1 0

r1721 - crux-2.2/ports/core/libstdc++-compat
by crux＠crux.nu 14 Aug '06

14 Aug '06

Author: jw Date: 2006-08-14 10:44:52 +0200 (Mon, 14 Aug 2006) New Revision: 1721 Modified: crux-2.2/ports/core/libstdc++-compat/Pkgfile Log: libstdc++-compat: fix download url Modified: crux-2.2/ports/core/libstdc++-compat/Pkgfile =================================================================== --- crux-2.2/ports/core/libstdc++-compat/Pkgfile 2006-08-14 08:41:48 UTC (rev 1720) +++ crux-2.2/ports/core/libstdc++-compat/Pkgfile 2006-08-14 08:44:52 UTC (rev 1721) @@ -5,9 +5,9 @@ name=libstdc++-compat version=3.1 release=1 -source=(http://www.fukt.bth.se/~per/crux/files/libstdc++/libstdc++-2-libc6.1-1-2.9.0.so \ - http://www.fukt.bth.se/~per/crux/files/libstdc++/libstdc++-3-libc6.2-2-2.10… \ - http://www.fukt.bth.se/~per/crux/files/libstdc++/libstdc++.so.5.0.6) +source=(http://www.fukt.bsnet.se/~per/crux/files/libstdc++/libstdc++-2-libc6.1-1-2.9.0.so \ + http://www.fukt.bsnet.se/~per/crux/files/libstdc++/libstdc++-3-libc6.2-2-2.… \ + http://www.fukt.bsnet.se/~per/crux/files/libstdc++/libstdc++.so.5.0.6) build() { mkdir -p $PKG/usr/lib

1 0

r1720 - crux-2.2/ports/core/pkgutils
by crux＠crux.nu 14 Aug '06

14 Aug '06

Author: jw Date: 2006-08-14 10:41:48 +0200 (Mon, 14 Aug 2006) New Revision: 1720 Modified: crux-2.2/ports/core/pkgutils/Pkgfile Log: pkgutils: fix url also in comment Modified: crux-2.2/ports/core/pkgutils/Pkgfile =================================================================== --- crux-2.2/ports/core/pkgutils/Pkgfile 2006-08-14 08:40:19 UTC (rev 1719) +++ crux-2.2/ports/core/pkgutils/Pkgfile 2006-08-14 08:41:48 UTC (rev 1720) @@ -1,5 +1,5 @@ # Description: A set of utilities to manage software packages -# URL: http://www.fukt.bth.se/~per/pkgutils/ +# URL: http://www.fukt.bsnet.se/~per/pkgutils/ # Maintainer: Per Lid�n, core-ports at crux dot nu name=pkgutils

1 0

r1719 - crux-2.2/ports/core/ports
by crux＠crux.nu 14 Aug '06

14 Aug '06

Author: jw Date: 2006-08-14 10:40:19 +0200 (Mon, 14 Aug 2006) New Revision: 1719 Modified: crux-2.2/ports/core/ports/Pkgfile Log: ports: fix download url Modified: crux-2.2/ports/core/ports/Pkgfile =================================================================== --- crux-2.2/ports/core/ports/Pkgfile 2006-08-14 08:39:20 UTC (rev 1718) +++ crux-2.2/ports/core/ports/Pkgfile 2006-08-14 08:40:19 UTC (rev 1719) @@ -5,7 +5,7 @@ name=ports version=1.5 release=3 -source=(http://www.fukt.bth.se/~per/crux/files/ports/$name-$version.tar.gz \ +source=(http://www.fukt.bsnet.se/~per/crux/files/ports/$name-$version.tar.gz \ core.rsync opt.rsync contrib.rsync.inactive) build () {

1 0

r1718 - crux-2.2/ports/core/pkgutils
by crux＠crux.nu 14 Aug '06

14 Aug '06

Author: jw Date: 2006-08-14 10:39:20 +0200 (Mon, 14 Aug 2006) New Revision: 1718 Modified: crux-2.2/ports/core/pkgutils/Pkgfile Log: pkgutils: fix download url Modified: crux-2.2/ports/core/pkgutils/Pkgfile =================================================================== --- crux-2.2/ports/core/pkgutils/Pkgfile 2006-08-13 12:37:46 UTC (rev 1717) +++ crux-2.2/ports/core/pkgutils/Pkgfile 2006-08-14 08:39:20 UTC (rev 1718) @@ -5,7 +5,7 @@ name=pkgutils version=5.20 release=2 -source=(http://www.fukt.bth.se/~per/pkgutils/$name-$version.tar.gz \ +source=(http://www.fukt.bsnet.se/~per/pkgutils/$name-$version.tar.gz \ $name-largefiles.patch) build () {

1 0

r1717 - tools/webtools/timeline
by crux＠crux.nu 13 Aug '06

13 Aug '06

Author: sip Date: 2006-08-13 14:37:46 +0200 (Sun, 13 Aug 2006) New Revision: 1717 Modified: tools/webtools/timeline/rss.php Log: timeline: added notes to rss, more compact description for feed title Modified: tools/webtools/timeline/rss.php =================================================================== --- tools/webtools/timeline/rss.php 2006-08-13 11:38:41 UTC (rev 1716) +++ tools/webtools/timeline/rss.php 2006-08-13 12:37:46 UTC (rev 1717) @@ -1,16 +1,15 @@ <?php require_once('DB.php'); -$days = 15; -if (isset($_GET['days'])) { - $days = intval($_GET['days']); +$limit = 10; +if (isset($_GET['limit'])) { + $limit = intval($_GET['limit']); } $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"; +$sql = "select * from events order by event_tstamp desc limit $limit"; $res =& $db->Query($sql); if (DB::isError($res)) die("Query error"); @@ -18,10 +17,6 @@ $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 @@ -34,12 +29,24 @@ $description = preg_replace('/\[\[(\w+)\.(\w+)\]\] /s','$1.$2', $description); # strip wiki user with ~ $description = preg_replace('/\[\[~(\w+)\]\] /s','$1', $description); - - $evt['event_notes'] = "Notes"; + # Compact description for svn commits + $description = preg_replace('/Revision (.*) committed by .*/','r$1', $description); + # Compact description for wiki edits + $description = str_replace ("Wiki page ","", $description); + + $notes = ""; + $titlenotes = ""; + if ($evt['event_notes'] != "") { + $notes = $evt['event_notes']; + $titlenotes = ": ".$notes; + if (strlen($notes) > 40) { + $titlenotes = ": ".substr($notes,0,40)."..."; + } + } $timeline .= " <item> - <title>$description</title> - <description></description> + <title>$description$titlenotes</title> + <description>$notes</description> <link>$url</link> </item>\n"; }

1 0

r1716 - crux-2.2/ports/opt/git
by crux＠crux.nu 13 Aug '06

13 Aug '06

Author: tilman Date: 2006-08-13 13:38:41 +0200 (Sun, 13 Aug 2006) New Revision: 1716 Modified: crux-2.2/ports/opt/git/.footprint crux-2.2/ports/opt/git/.md5sum crux-2.2/ports/opt/git/Pkgfile Log: git: updated to 1.4.2 Modified: crux-2.2/ports/opt/git/.footprint =================================================================== --- crux-2.2/ports/opt/git/.footprint 2006-08-12 09:30:55 UTC (rev 1715) +++ crux-2.2/ports/opt/git/.footprint 2006-08-13 11:38:41 UTC (rev 1716) @@ -46,6 +46,7 @@ -rwxr-xr-x root/root usr/bin/git-imap-send -rwxr-xr-x root/root usr/bin/git-index-pack -rwxr-xr-x root/root usr/bin/git-init-db +-rwxr-xr-x root/root usr/bin/git-instaweb -rwxr-xr-x root/root usr/bin/git-local-fetch -rwxr-xr-x root/root usr/bin/git-log -rwxr-xr-x root/root usr/bin/git-lost-found @@ -106,6 +107,7 @@ -rwxr-xr-x root/root usr/bin/git-ssh-upload -rwxr-xr-x root/root usr/bin/git-status -rwxr-xr-x root/root usr/bin/git-stripspace +-rwxr-xr-x root/root usr/bin/git-svn -rwxr-xr-x root/root usr/bin/git-svnimport -rwxr-xr-x root/root usr/bin/git-symbolic-ref -rwxr-xr-x root/root usr/bin/git-tag @@ -170,6 +172,7 @@ -rw-r--r-- root/root usr/man/man1/git-imap-send.1.gz -rw-r--r-- root/root usr/man/man1/git-index-pack.1.gz -rw-r--r-- root/root usr/man/man1/git-init-db.1.gz +-rw-r--r-- root/root usr/man/man1/git-instaweb.1.gz -rw-r--r-- root/root usr/man/man1/git-local-fetch.1.gz -rw-r--r-- root/root usr/man/man1/git-log.1.gz -rw-r--r-- root/root usr/man/man1/git-lost-found.1.gz @@ -224,6 +227,7 @@ -rw-r--r-- root/root usr/man/man1/git-ssh-upload.1.gz -rw-r--r-- root/root usr/man/man1/git-status.1.gz -rw-r--r-- root/root usr/man/man1/git-stripspace.1.gz +-rw-r--r-- root/root usr/man/man1/git-svn.1.gz -rw-r--r-- root/root usr/man/man1/git-svnimport.1.gz -rw-r--r-- root/root usr/man/man1/git-symbolic-ref.1.gz -rw-r--r-- root/root usr/man/man1/git-tag.1.gz Modified: crux-2.2/ports/opt/git/.md5sum =================================================================== --- crux-2.2/ports/opt/git/.md5sum 2006-08-12 09:30:55 UTC (rev 1715) +++ crux-2.2/ports/opt/git/.md5sum 2006-08-13 11:38:41 UTC (rev 1716) @@ -1,2 +1,2 @@ -cde57291a326b958802e453b48a0e0bf git-1.4.1.1.tar.bz2 -252b85ac0ffb73d8f13fa1f45dd745b5 git-manpages-1.4.1.1.tar.bz2 +3fc9d2ab17b1060b908236d48102e9fa git-1.4.2.tar.bz2 +91e0d70c1856933f9b7699990e7d797b git-manpages-1.4.2.tar.bz2 Modified: crux-2.2/ports/opt/git/Pkgfile =================================================================== --- crux-2.2/ports/opt/git/Pkgfile 2006-08-12 09:30:55 UTC (rev 1715) +++ crux-2.2/ports/opt/git/Pkgfile 2006-08-13 11:38:41 UTC (rev 1716) @@ -5,7 +5,7 @@ # Nice to have: tk name=git -version=1.4.1.1 +version=1.4.2 release=1 source=(http://www.kernel.org/pub/software/scm/$name/$name-{,manpages-}$ver…

1 0