September 2006 - crux-commits

r1805 - crux-2.2/ports/opt/licq
by crux＠crux.nu 03 Sep '06

03 Sep '06

Author: jw Date: 2006-09-03 15:21:09 +0200 (Sun, 03 Sep 2006) New Revision: 1805 Modified: crux-2.2/ports/opt/licq/Pkgfile Log: licq: adjust the version strings in the application to avoid false bug adjust the version strings in the application to avoid false bug adjust the version strings in the application to avoid false bug reports Modified: crux-2.2/ports/opt/licq/Pkgfile =================================================================== --- crux-2.2/ports/opt/licq/Pkgfile 2006-09-02 15:21:32 UTC (rev 1804) +++ crux-2.2/ports/opt/licq/Pkgfile 2006-09-03 13:21:09 UTC (rev 1805) @@ -6,11 +6,14 @@ name=licq version=1.3.4-RC1 -release=1 +release=2 source=(http://www.fanfic.org/~jon/licq-$version.tar.bz2) build () { cd $name-$version + sed -i -e "s|VERSION=1.3.2|VERSION=$version|g" configure + sed -i -e "s|VERSION=1.3.2|VERSION=$version|g" plugins/qt-gui/configure + sed -i -e "s|VERSION=1.3.2|VERSION=$version|g" plugins/msn/configure ./configure --prefix=/usr \ --disable-debug \ --disable-gpgme

1 0

r1804 - tools/prt-get/trunk/src
by crux＠crux.nu 02 Sep '06

02 Sep '06

Author: jw Date: 2006-09-02 17:21:32 +0200 (Sat, 02 Sep 2006) New Revision: 1804 Modified: tools/prt-get/trunk/src/versioncomparator.cpp Log: prt-get: fix corner case in version comparator Modified: tools/prt-get/trunk/src/versioncomparator.cpp =================================================================== --- tools/prt-get/trunk/src/versioncomparator.cpp 2006-09-02 14:16:05 UTC (rev 1803) +++ tools/prt-get/trunk/src/versioncomparator.cpp 2006-09-02 15:21:32 UTC (rev 1804) @@ -67,19 +67,19 @@ tokenizeMixed(tokens2[j], subtokens2); int subTokLen = normalizeVectors(subtokens1, subtokens2); for (int k = 0; k < subTokLen; ++k) { - if (isdigit(subtokens1[k][0])) { - long sl1 = strtol(subtokens1[k].c_str(), &error1, 10); - long sl2 = strtol(subtokens2[k].c_str(), &error2, 10); - + long sl1 = strtol(subtokens1[k].c_str(), &error1, 10); + long sl2 = strtol(subtokens2[k].c_str(), &error2, 10); + if (!error1 && !error2) { if (sl1 < sl2) { return LESS; } else if (sl1 > sl2) { return GREATER; } } else { - // pure string tokens + + // string tokens if (subtokens1[k][1] == 0 && subtokens2[k][1] == 0) { - + if (subtokens1[k][0] < subtokens2[k][0]) { return LESS; } else if (subtokens1[k][0] > subtokens2[k][0]) { @@ -179,6 +179,8 @@ } +#ifdef TEST + void check(const string& v1, const string& v2, VersionComparator::COMP_RESULT expected, bool compare=true) { @@ -210,7 +212,6 @@ } -#ifdef TEST int main(int argc, char** argv) { @@ -243,6 +244,8 @@ check("1.4.2a1-2", "1.4.2a2-2", LESS); check("1.4.2b1-2", "1.4.2a2-2", GREATER); check("1.4.2beta3", "1.4.2alpha2", GREATER); + check("1.4.2-some", "1.4.2-1", UNDEFINED); + check("1.4.2-1", "1.4.2-some", UNDEFINED); } else { check(argv[1], argv[2], UNDEFINED, false); }

1 0

r1803 - tools/prt-get/trunk/src
by crux＠crux.nu 02 Sep '06

02 Sep '06

Author: jw Date: 2006-09-02 16:16:05 +0200 (Sat, 02 Sep 2006) New Revision: 1803 Modified: tools/prt-get/trunk/src/versioncomparator.cpp Log: prt-get remove trailing whitespace from versioncomparator.cpp Modified: tools/prt-get/trunk/src/versioncomparator.cpp =================================================================== --- tools/prt-get/trunk/src/versioncomparator.cpp 2006-09-02 11:28:24 UTC (rev 1802) +++ tools/prt-get/trunk/src/versioncomparator.cpp 2006-09-02 14:16:05 UTC (rev 1803) @@ -88,11 +88,11 @@ } else { // smart guessing... // leaving out 'test', 'pre' and 'rc' - static const string versions = + static const string versions = "alpha beta gamma delta"; - string::size_type pos1 = + string::size_type pos1 = versions.find(subtokens1[k]); - string::size_type pos2 = + string::size_type pos2 = versions.find(subtokens2[k]); if (pos1 != string::npos && pos2 != string::npos) { if (pos1 < pos2) {

1 0

r1802 - crux-2.2/ports/opt/licq
by crux＠crux.nu 02 Sep '06

02 Sep '06

Author: jw Date: 2006-09-02 13:28:24 +0200 (Sat, 02 Sep 2006) New Revision: 1802 Modified: crux-2.2/ports/opt/licq/.footprint crux-2.2/ports/opt/licq/.md5sum crux-2.2/ports/opt/licq/Pkgfile Log: licq: update to 1.3.4-RC1 since 1.3.2 keeps crashing Modified: crux-2.2/ports/opt/licq/.footprint =================================================================== --- crux-2.2/ports/opt/licq/.footprint 2006-09-02 08:53:15 UTC (rev 1801) +++ crux-2.2/ports/opt/licq/.footprint 2006-09-02 11:28:24 UTC (rev 1802) @@ -50,6 +50,8 @@ -rwxr-xr-x root/root usr/lib/licq/protocol_msn.la -rwxr-xr-x root/root usr/lib/licq/protocol_msn.so drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/applications/ +-rw-r--r-- root/root usr/share/applications/licq.desktop drwxr-xr-x root/root usr/share/licq/ drwxr-xr-x root/root usr/share/licq/qt-gui/ drwxr-xr-x root/root usr/share/licq/qt-gui/dock.console/ @@ -233,8 +235,6 @@ -rw-r--r-- root/root usr/share/licq/qt-gui/emoticons/Mirabelis5/Smiley8.png -rw-r--r-- root/root usr/share/licq/qt-gui/emoticons/Mirabelis5/Smiley9.png -rw-r--r-- root/root usr/share/licq/qt-gui/emoticons/Mirabelis5/emoticons.xml -drwxr-xr-x root/root usr/share/licq/qt-gui/emoticons/None/ --rw-r--r-- root/root usr/share/licq/qt-gui/emoticons/None/emoticons.xml drwxr-xr-x root/root usr/share/licq/qt-gui/emoticons/bugeyes/ -rw-r--r-- root/root usr/share/licq/qt-gui/emoticons/bugeyes/README -rw-r--r-- root/root usr/share/licq/qt-gui/emoticons/bugeyes/bug_angel.png Modified: crux-2.2/ports/opt/licq/.md5sum =================================================================== --- crux-2.2/ports/opt/licq/.md5sum 2006-09-02 08:53:15 UTC (rev 1801) +++ crux-2.2/ports/opt/licq/.md5sum 2006-09-02 11:28:24 UTC (rev 1802) @@ -1 +1 @@ -0471bb8fed91eefb23dfe153c9a4a806 licq-1.3.2.tar.bz2 +82652b6b67adb7adda90be38e7a63cd3 licq-1.3.4-RC1.tar.bz2 Modified: crux-2.2/ports/opt/licq/Pkgfile =================================================================== --- crux-2.2/ports/opt/licq/Pkgfile 2006-09-02 08:53:15 UTC (rev 1801) +++ crux-2.2/ports/opt/licq/Pkgfile 2006-09-02 11:28:24 UTC (rev 1802) @@ -5,9 +5,9 @@ # Depends on: qt3 name=licq -version=1.3.2 +version=1.3.4-RC1 release=1 -source=(http://dl.sourceforge.net/licq/licq-$version.tar.bz2) +source=(http://www.fanfic.org/~jon/licq-$version.tar.bz2) build () { cd $name-$version

1 0

r1801 - crux-2.2/ports/opt/stunnel
by crux＠crux.nu 02 Sep '06

02 Sep '06

Author: jue Date: 2006-09-02 10:53:15 +0200 (Sat, 02 Sep 2006) New Revision: 1801 Modified: crux-2.2/ports/opt/stunnel/.md5sum crux-2.2/ports/opt/stunnel/Pkgfile crux-2.2/ports/opt/stunnel/stunnel-config.patch Log: stunnel: update to 4.16 Modified: crux-2.2/ports/opt/stunnel/.md5sum =================================================================== --- crux-2.2/ports/opt/stunnel/.md5sum 2006-09-02 08:21:31 UTC (rev 1800) +++ crux-2.2/ports/opt/stunnel/.md5sum 2006-09-02 08:53:15 UTC (rev 1801) @@ -1,3 +1,3 @@ 20d8078911733e4de22903034e725db6 stunnel -2c00153ad099a5f9c5609e8d1dbbe470 stunnel-4.15.tar.gz -19f91ef9788c54bdb38fb0fa2e3791c4 stunnel-config.patch +8ea5cae3eeaacc0271b766506b4b9d4a stunnel-4.16.tar.gz +53fcee46beb717d0827c925258197bd8 stunnel-config.patch Modified: crux-2.2/ports/opt/stunnel/Pkgfile =================================================================== --- crux-2.2/ports/opt/stunnel/Pkgfile 2006-09-02 08:21:31 UTC (rev 1800) +++ crux-2.2/ports/opt/stunnel/Pkgfile 2006-09-02 08:53:15 UTC (rev 1801) @@ -5,7 +5,7 @@ # Depends on: openssl, zlib, tcp_wrappers name=stunnel -version=4.15 +version=4.16 release=1 source=(http://www.stunnel.org/download/stunnel/src/$name-$version.tar.gz \ $name-config.patch $name) Modified: crux-2.2/ports/opt/stunnel/stunnel-config.patch =================================================================== --- crux-2.2/ports/opt/stunnel/stunnel-config.patch 2006-09-02 08:21:31 UTC (rev 1800) +++ crux-2.2/ports/opt/stunnel/stunnel-config.patch 2006-09-02 08:53:15 UTC (rev 1801) @@ -1,7 +1,7 @@ -diff -Nru stunnel-4.15.orig/src/Makefile.in stunnel-4.15/src/Makefile.in ---- stunnel-4.15.orig/src/Makefile.in 2006-03-12 12:49:36.000000000 +0100 -+++ stunnel-4.15/src/Makefile.in 2006-03-12 13:19:19.000000000 +0100 -@@ -222,7 +222,7 @@ +diff -Nru stunnel-4.16.orig/src/Makefile.in stunnel-4.16/src/Makefile.in +--- stunnel-4.16.orig/src/Makefile.in 2006-09-02 10:26:19.000000000 +0200 ++++ stunnel-4.16/src/Makefile.in 2006-09-02 10:26:34.000000000 +0200 +@@ -223,7 +223,7 @@ INCLUDES = -I/usr/kerberos/include # Additional compiler flags @@ -9,11 +9,11 @@ +AM_CPPFLAGS = -DLIBDIR='"$(libdir)"' -DCONFDIR='"$(sysconfdir)"' -DPIDFILE='"/var/run/stunnel/stunnel.pid"' # Win32 executable - EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak nogui.c -diff -Nru stunnel-4.15.orig/tools/stunnel.conf-sample.in stunnel-4.15/tools/stunnel.conf-sample.in ---- stunnel-4.15.orig/tools/stunnel.conf-sample.in 2006-03-12 12:49:36.000000000 +0100 -+++ stunnel-4.15/tools/stunnel.conf-sample.in 2006-03-12 13:19:47.000000000 +0100 -@@ -3,13 +3,13 @@ + EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak nogui.c os2.mak +diff -Nru stunnel-4.16.orig/tools/stunnel.conf-sample.in stunnel-4.16/tools/stunnel.conf-sample.in +--- stunnel-4.16.orig/tools/stunnel.conf-sample.in 2006-09-02 10:26:19.000000000 +0200 ++++ stunnel-4.16/tools/stunnel.conf-sample.in 2006-09-02 10:29:27.000000000 +0200 +@@ -3,16 +3,16 @@ ; Please make sure you understand them (especially the effect of chroot jail) ; Certificate/key is needed in server mode and optional in client mode @@ -22,16 +22,19 @@ +cert = /etc/ssl/certs/stunnel.crt +key = /etc/ssl/keys/stunnel.key + ; Protocol version (all, SSLv2, SSLv3, TLSv1) + sslVersion = SSLv3 + ; Some security enhancements for UNIX systems - comment them out on Win32 -chroot = @prefix@/var/lib/stunnel/ +chroot = /var/run/stunnel/ setuid = nobody --setgid = nogroup +-setgid = @DEFAULT_GROUP@ +setgid = nobody ; PID is created inside chroot jail pid = /stunnel.pid -@@ -36,7 +36,7 @@ +@@ -39,7 +39,7 @@ ; Some debugging stuff useful for troubleshooting ;debug = 7

1 0

r1800 - crux-2.2/ports/opt/samba
by crux＠crux.nu 02 Sep '06

02 Sep '06

Author: jue Date: 2006-09-02 10:21:31 +0200 (Sat, 02 Sep 2006) New Revision: 1800 Modified: crux-2.2/ports/opt/samba/.md5sum crux-2.2/ports/opt/samba/Pkgfile Log: samba: update to 3.0.23c Modified: crux-2.2/ports/opt/samba/.md5sum =================================================================== --- crux-2.2/ports/opt/samba/.md5sum 2006-09-02 08:20:59 UTC (rev 1799) +++ crux-2.2/ports/opt/samba/.md5sum 2006-09-02 08:21:31 UTC (rev 1800) @@ -1,2 +1,2 @@ 448caca4745aef1a842f4fdb1aa62e1e samba -f2d1a513fd7138fd1515d3bdf702f7c7 samba-3.0.23b.tar.gz +9e06d5e10f4ae84f7fafad75d1b4184c samba-3.0.23c.tar.gz Modified: crux-2.2/ports/opt/samba/Pkgfile =================================================================== --- crux-2.2/ports/opt/samba/Pkgfile 2006-09-02 08:20:59 UTC (rev 1799) +++ crux-2.2/ports/opt/samba/Pkgfile 2006-09-02 08:21:31 UTC (rev 1800) @@ -4,7 +4,7 @@ # Depends on: ncurses, readline name=samba -version=3.0.23b +version=3.0.23c release=1 source=(http://us1.samba.org/samba/ftp/stable/$name-$version.tar.gz \ samba)

1 0

r1799 - crux-2.2/ports/opt/mysql
by crux＠crux.nu 02 Sep '06

02 Sep '06

Author: jue Date: 2006-09-02 10:20:59 +0200 (Sat, 02 Sep 2006) New Revision: 1799 Modified: crux-2.2/ports/opt/mysql/.md5sum crux-2.2/ports/opt/mysql/Pkgfile Log: mysql: update to 5.0.24a Modified: crux-2.2/ports/opt/mysql/.md5sum =================================================================== --- crux-2.2/ports/opt/mysql/.md5sum 2006-09-02 08:20:18 UTC (rev 1798) +++ crux-2.2/ports/opt/mysql/.md5sum 2006-09-02 08:20:59 UTC (rev 1799) @@ -1,3 +1,3 @@ c92bf44516b82cad857fb386dbb64bfe my.cnf -df7026f7d5daf7fbcf5e684c534cec15 mysql-5.0.24.tar.gz +6b07546389f75c52611adb7af38c3667 mysql-5.0.24a.tar.gz 642a596f13ebd7e459c5ff2fd382f06b mysqld Modified: crux-2.2/ports/opt/mysql/Pkgfile =================================================================== --- crux-2.2/ports/opt/mysql/Pkgfile 2006-09-02 08:20:18 UTC (rev 1798) +++ crux-2.2/ports/opt/mysql/Pkgfile 2006-09-02 08:20:59 UTC (rev 1799) @@ -4,7 +4,7 @@ # Depends on: ncurses, zlib name=mysql -version=5.0.24 +version=5.0.24a release=1 source=(http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0/$name-$version.tar.gz \ my.cnf mysqld)

1 0

r1798 - crux-2.2/ports/opt/cups
by crux＠crux.nu 02 Sep '06

02 Sep '06

Author: jue Date: 2006-09-02 10:20:18 +0200 (Sat, 02 Sep 2006) New Revision: 1798 Modified: crux-2.2/ports/opt/cups/.footprint crux-2.2/ports/opt/cups/.md5sum crux-2.2/ports/opt/cups/Pkgfile Log: cups: update to 1.2.3 Modified: crux-2.2/ports/opt/cups/.footprint =================================================================== --- crux-2.2/ports/opt/cups/.footprint 2006-09-01 19:46:45 UTC (rev 1797) +++ crux-2.2/ports/opt/cups/.footprint 2006-09-02 08:20:18 UTC (rev 1798) @@ -31,6 +31,7 @@ drwxr-xr-x root/root usr/include/cups/ -rw-r--r-- root/root usr/include/cups/adminutil.h -rw-r--r-- root/root usr/include/cups/array.h +-rw-r--r-- root/root usr/include/cups/backend.h -rw-r--r-- root/root usr/include/cups/cups.h -rw-r--r-- root/root usr/include/cups/dir.h -rw-r--r-- root/root usr/include/cups/file.h @@ -421,6 +422,7 @@ -rw-r--r-- root/root usr/share/cups/templates/maintenance.tmpl -rw-r--r-- root/root usr/share/cups/templates/modify-class.tmpl -rw-r--r-- root/root usr/share/cups/templates/modify-printer.tmpl +-rw-r--r-- root/root usr/share/cups/templates/norestart.tmpl -rw-r--r-- root/root usr/share/cups/templates/option-boolean.tmpl -rw-r--r-- root/root usr/share/cups/templates/option-conflict.tmpl -rw-r--r-- root/root usr/share/cups/templates/option-header.tmpl Modified: crux-2.2/ports/opt/cups/.md5sum =================================================================== --- crux-2.2/ports/opt/cups/.md5sum 2006-09-01 19:46:45 UTC (rev 1797) +++ crux-2.2/ports/opt/cups/.md5sum 2006-09-02 08:20:18 UTC (rev 1798) @@ -1,3 +1,3 @@ 01b6a755c5b0fb7df2d2c94571f67e1d cups -091de9109c9252cb37427859e90190ad cups-1.2.2-source.tar.bz2 +7f65bae0054cd8335824942595d867ef cups-1.2.3-source.tar.bz2 2220f411940c4f7504ed4457c6304d4a cups-config.patch Modified: crux-2.2/ports/opt/cups/Pkgfile =================================================================== --- crux-2.2/ports/opt/cups/Pkgfile 2006-09-01 19:46:45 UTC (rev 1797) +++ crux-2.2/ports/opt/cups/Pkgfile 2006-09-02 08:20:18 UTC (rev 1798) @@ -4,9 +4,9 @@ # Depends on: libpng, libtiff, openssl name=cups -version=1.2.2 +version=1.2.3 release=1 -source=(ftp://ftp3.easysw.com/pub/cups/$version/$name-$version-source.tar.bz2 \ +source=(ftp://ftp.easysw.com/pub/cups/$version/$name-$version-source.tar.bz2 \ cups-config.patch cups) build () {

1 0

r1797 - crux-2.2/ports/opt/alsa-utils
by crux＠crux.nu 01 Sep '06

01 Sep '06

Author: jaeger Date: 2006-09-01 21:46:45 +0200 (Fri, 01 Sep 2006) New Revision: 1797 Modified: crux-2.2/ports/opt/alsa-utils/Pkgfile Log: alsa-utils: added dialog to dependencies list (required for alsaconf) Modified: crux-2.2/ports/opt/alsa-utils/Pkgfile =================================================================== --- crux-2.2/ports/opt/alsa-utils/Pkgfile 2006-09-01 19:37:00 UTC (rev 1796) +++ crux-2.2/ports/opt/alsa-utils/Pkgfile 2006-09-01 19:46:45 UTC (rev 1797) @@ -1,7 +1,7 @@ # Description: ALSA utils # URL: http://www.alsa-project.org # Maintainer: Matt Housh, jaeger at morpheus dot net -# Depends on: gettext, alsa-lib +# Depends on: gettext, alsa-lib, dialog name=alsa-utils version=1.0.11

1 0

r1796 - crux-2.2/ports/opt/docbook-xsl
by crux＠crux.nu 01 Sep '06

01 Sep '06

Author: jw Date: 2006-09-01 21:37:00 +0200 (Fri, 01 Sep 2006) New Revision: 1796 Modified: crux-2.2/ports/opt/docbook-xsl/Pkgfile crux-2.2/ports/opt/docbook-xsl/post-install Log: fox docbook-xsl's post-install Modified: crux-2.2/ports/opt/docbook-xsl/Pkgfile =================================================================== --- crux-2.2/ports/opt/docbook-xsl/Pkgfile 2006-08-31 15:46:31 UTC (rev 1795) +++ crux-2.2/ports/opt/docbook-xsl/Pkgfile 2006-09-01 19:37:00 UTC (rev 1796) @@ -6,7 +6,7 @@ name=docbook-xsl version=1.70.1 -release=1 +release=2 source=(http://dl.sourceforge.net/sourceforge/docbook/$name-$version.tar.gz) build() { Modified: crux-2.2/ports/opt/docbook-xsl/post-install =================================================================== --- crux-2.2/ports/opt/docbook-xsl/post-install 2006-08-31 15:46:31 UTC (rev 1795) +++ crux-2.2/ports/opt/docbook-xsl/post-install 2006-09-01 19:37:00 UTC (rev 1796) @@ -1,6 +1,6 @@ #!/bin/sh -version=1.69.1 +version=1.70.1 MASTER_CAT=/etc/xml/catalog XSL_PATH=file:///usr/share/xml/xsl/docbook/$version XSL_URLS="http://docbook.sourceforge.net/release/xsl/$version

1 0