February 2006 - crux-commits

r754 - / crux-2.1/ports
by crux＠crux.nu 23 Feb '06

23 Feb '06

Author: jw Date: 2006-02-23 16:25:06 +0100 (Thu, 23 Feb 2006) New Revision: 754 Added: attic/ Removed: crux-2.1/ports/attic/ Log: make attic a top level directory Copied: attic (from rev 753, crux-2.1/ports/attic)

1 0

r753 - crux-2.1/ports/core/httpup
by crux＠crux.nu 23 Feb '06

23 Feb '06

Author: jw Date: 2006-02-23 15:22:27 +0100 (Thu, 23 Feb 2006) New Revision: 753 Modified: crux-2.1/ports/core/httpup/.md5sum crux-2.1/ports/core/httpup/Pkgfile Log: update httpup to 0.4.0g Modified: crux-2.1/ports/core/httpup/.md5sum =================================================================== --- crux-2.1/ports/core/httpup/.md5sum 2006-02-23 14:18:42 UTC (rev 752) +++ crux-2.1/ports/core/httpup/.md5sum 2006-02-23 14:22:27 UTC (rev 753) @@ -1,2 +1,2 @@ faa600a1b0349fe78b0eb463cab444df httpup -03394c2bf6a1616834244c732a1c1093 httpup-0.4.0f.tar.gz +0c34610acd857265cf259cd7402ca306 httpup-0.4.0g.tar.gz Modified: crux-2.1/ports/core/httpup/Pkgfile =================================================================== --- crux-2.1/ports/core/httpup/Pkgfile 2006-02-23 14:18:42 UTC (rev 752) +++ crux-2.1/ports/core/httpup/Pkgfile 2006-02-23 14:22:27 UTC (rev 753) @@ -4,7 +4,7 @@ # Depends on: curl name=httpup -version=0.4.0f +version=0.4.0g release=1 source=(http://jw.tks6.net/files/crux/${name}-$version.tar.gz httpup)

1 0

r752 - tools/httpup/trunk
by crux＠crux.nu 23 Feb '06

23 Feb '06

Author: jw Date: 2006-02-23 15:18:42 +0100 (Thu, 23 Feb 2006) New Revision: 752 Modified: tools/httpup/trunk/AUTHORS tools/httpup/trunk/ChangeLog tools/httpup/trunk/Makefile tools/httpup/trunk/configparser.cpp tools/httpup/trunk/configparser.h tools/httpup/trunk/httpup.conf.example tools/httpup/trunk/httpup.cpp tools/httpup/trunk/httpup.h Log: httpup: sync with bzr repo (0.4.0g) Modified: tools/httpup/trunk/AUTHORS =================================================================== --- tools/httpup/trunk/AUTHORS 2006-02-23 13:57:14 UTC (rev 751) +++ tools/httpup/trunk/AUTHORS 2006-02-23 14:18:42 UTC (rev 752) @@ -7,3 +7,4 @@ Simone Rota for testing and bug reports J�rgen Daubert for testing Han Boetes for optimizing the repgen script +Oleksiy V. Khilkevich for the operation_timeout patch prototype Modified: tools/httpup/trunk/ChangeLog =================================================================== --- tools/httpup/trunk/ChangeLog 2006-02-23 13:57:14 UTC (rev 751) +++ tools/httpup/trunk/ChangeLog 2006-02-23 14:18:42 UTC (rev 752) @@ -1,4 +1,8 @@ -* 0.4.0f 22.09.2005 Johannes Winkelmann +* 0.4.0g 23.02.2006 Johannes Winkelmann +- change default timeout to 60s +- add configuration variable for timeout: operation_timeout + + * 0.4.0f 22.09.2005 Johannes Winkelmann - remove deflate option again * 0.4.0e 20.09.2005 Johannes Winkelmann Modified: tools/httpup/trunk/Makefile =================================================================== --- tools/httpup/trunk/Makefile 2006-02-23 13:57:14 UTC (rev 751) +++ tools/httpup/trunk/Makefile 2006-02-23 14:18:42 UTC (rev 752) @@ -5,7 +5,7 @@ ## Configuration # NAME=httpup -VERSION="0.4.0f" +VERSION="0.4.0g" CXX=g++ CXXFLAGS=-Wall -ansi -pedantic -DMF_VERSION='${VERSION}' LDFLAGS=-lcurl Modified: tools/httpup/trunk/configparser.cpp =================================================================== --- tools/httpup/trunk/configparser.cpp 2006-02-23 13:57:14 UTC (rev 751) +++ tools/httpup/trunk/configparser.cpp 2006-02-23 14:18:42 UTC (rev 752) @@ -3,10 +3,10 @@ // AUTHOR: Johannes Winkelmann, jw(a)tks6.net // COPYRIGHT: (c) 2002-2005 by Johannes Winkelmann // --------------------------------------------------------------------- -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. //////////////////////////////////////////////////////////////////////// #include <iostream> @@ -21,37 +21,44 @@ if (!fp) { return -1; } - + char line[512]; string s; while (fgets(line, 512, fp)) { if (line[strlen(line)-1] == '\n') { line[strlen(line)-1] = '\0'; - } + } s = line; - + + // strip comments string::size_type pos = s.find("#"); if (pos != string::npos) { s = s.substr(0, pos); } - if (s.length() > 10) { - string key = s.substr(0, 10); - string val = stripWhiteSpace(s.substr(10)); + // whitespace separates + pos = s.find(' '); + if (pos == string::npos) { + pos = s.find('\t'); + } + if (pos != string::npos) { + string key = s.substr(0, pos); + string val = stripWhiteSpace(s.substr(pos)); if (key == "proxy_host") { config.proxyHost = val; - } else if (s.substr(0, 10) == "proxy_port") { + } else if (key == "proxy_port") { config.proxyPort = val; - } else if (s.substr(0, 10) == "proxy_user") { + } else if (key == "proxy_user") { config.proxyUser = val; - } else if (s.substr(0, 10) == "proxy_pass") { + } else if (key == "proxy_pass") { config.proxyPassword = val; + } else if (key == "operation_timeout") { + config.operationTimeout = val; } } + } - } - fclose(fp); return 0; } @@ -65,6 +72,6 @@ while (isspace(output[output.length()-1])) { output = output.substr(0, output.length()-1); } - + return output; } Modified: tools/httpup/trunk/configparser.h =================================================================== --- tools/httpup/trunk/configparser.h 2006-02-23 13:57:14 UTC (rev 751) +++ tools/httpup/trunk/configparser.h 2006-02-23 14:18:42 UTC (rev 752) @@ -3,10 +3,10 @@ // AUTHOR: Johannes Winkelmann, jw(a)tks6.net // COPYRIGHT: (c) 2002-2005 by Johannes Winkelmann // --------------------------------------------------------------------- -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. //////////////////////////////////////////////////////////////////////// #ifndef _CONFIGPARSER_H_ @@ -16,12 +16,19 @@ struct Config { - Config() : proxyHost(""), proxyPort(""), proxyUser(""), proxyPassword("") + Config() + : proxyHost(""), + proxyPort(""), + proxyUser(""), + proxyPassword(""), + operationTimeout("") {} + std::string proxyHost; std::string proxyPort; std::string proxyUser; std::string proxyPassword; + std::string operationTimeout; }; class ConfigParser Modified: tools/httpup/trunk/httpup.conf.example =================================================================== --- tools/httpup/trunk/httpup.conf.example 2006-02-23 13:57:14 UTC (rev 751) +++ tools/httpup/trunk/httpup.conf.example 2006-02-23 14:18:42 UTC (rev 752) @@ -4,3 +4,6 @@ proxy_port 80 proxy_user winkj proxy_pass very_secret + +# timeout settings +operation_timeout 60 \ No newline at end of file Modified: tools/httpup/trunk/httpup.cpp =================================================================== --- tools/httpup/trunk/httpup.cpp 2006-02-23 13:57:14 UTC (rev 751) +++ tools/httpup/trunk/httpup.cpp 2006-02-23 14:18:42 UTC (rev 752) @@ -27,6 +27,7 @@ const string HttpUp::REPOCURRENTFILE = ".httpup-repo.current"; const string HttpUp::URLINFO = ".httpup-urlinfo"; +const int HttpUp::DEFAULT_TIMEOUT = 60; HttpUp::HttpUp(const HttpupArgparser& argParser, const string& url, const string& target, @@ -227,8 +228,18 @@ curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errorBuffer); curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_TIMEOUT, 30); + long timeout = DEFAULT_TIMEOUT; + if (config.operationTimeout != "") { + char* end = 0; + long config_timeout = 0; + config_timeout = strtol(config.operationTimeout.c_str(), &end, 10); + if (*end == 0) { + timeout = config_timeout; + } + } + curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); + // proxy, proxy auth if (config.proxyHost != "") { Modified: tools/httpup/trunk/httpup.h =================================================================== --- tools/httpup/trunk/httpup.h 2006-02-23 13:57:14 UTC (rev 751) +++ tools/httpup/trunk/httpup.h 2006-02-23 14:18:42 UTC (rev 752) @@ -49,6 +49,8 @@ static const std::string REPOCURRENTFILE; static const std::string REPOCURRENTFILEOLD; static const std::string URLINFO; + + static const int DEFAULT_TIMEOUT; private: int syncOrReturn(CURL* curl, char* curlErrorBuffer);

1 0

r751 - crux-2.1/ports/core/hicolor-icon-theme
by crux＠crux.nu 23 Feb '06

23 Feb '06

Author: jaeger Date: 2006-02-23 14:57:14 +0100 (Thu, 23 Feb 2006) New Revision: 751 Modified: crux-2.1/ports/core/hicolor-icon-theme/.md5sum crux-2.1/ports/core/hicolor-icon-theme/Pkgfile Log: hicolor-icon-theme: updated to version 0.9, fixes http://bugzilla.gnome.org/show_bug.cgi?id=315841 and adds missing directory entries Modified: crux-2.1/ports/core/hicolor-icon-theme/.md5sum =================================================================== --- crux-2.1/ports/core/hicolor-icon-theme/.md5sum 2006-02-22 17:05:34 UTC (rev 750) +++ crux-2.1/ports/core/hicolor-icon-theme/.md5sum 2006-02-23 13:57:14 UTC (rev 751) @@ -1 +1 @@ -b854ed36d523d5d72902b04c18f4b499 hicolor-icon-theme-0.8.tar.gz +1d0821cb80d394eac30bd8cec5b0b60c hicolor-icon-theme-0.9.tar.gz Modified: crux-2.1/ports/core/hicolor-icon-theme/Pkgfile =================================================================== --- crux-2.1/ports/core/hicolor-icon-theme/Pkgfile 2006-02-22 17:05:34 UTC (rev 750) +++ crux-2.1/ports/core/hicolor-icon-theme/Pkgfile 2006-02-23 13:57:14 UTC (rev 751) @@ -3,7 +3,7 @@ # Maintainer: Matt Housh, jaeger at morpheus dot net name=hicolor-icon-theme -version=0.8 +version=0.9 release=1 source=(http://icon-theme.freedesktop.org/releases/$name-$version.tar.gz)

1 0

r750 - crux-2.1/ports/opt/mod_ruby
by crux＠crux.nu 22 Feb '06

22 Feb '06

Author: jue Date: 2006-02-22 18:05:34 +0100 (Wed, 22 Feb 2006) New Revision: 750 Modified: crux-2.1/ports/opt/mod_ruby/.footprint crux-2.1/ports/opt/mod_ruby/.md5sum crux-2.1/ports/opt/mod_ruby/Pkgfile Log: mod_ruby: update to 1.2.5 Modified: crux-2.1/ports/opt/mod_ruby/.footprint =================================================================== --- crux-2.1/ports/opt/mod_ruby/.footprint 2006-02-22 16:46:24 UTC (rev 749) +++ crux-2.1/ports/opt/mod_ruby/.footprint 2006-02-22 17:05:34 UTC (rev 750) @@ -9,8 +9,10 @@ -rw-r--r-- root/root usr/lib/ruby/1.8/apache/eruby-debug.rb -rw-r--r-- root/root usr/lib/ruby/1.8/apache/eruby-run.rb -rw-r--r-- root/root usr/lib/ruby/1.8/apache/query.rb +-rw-r--r-- root/root usr/lib/ruby/1.8/apache/rails-dispatcher.rb -rw-r--r-- root/root usr/lib/ruby/1.8/apache/rd2html.rb -rw-r--r-- root/root usr/lib/ruby/1.8/apache/registry.rb -rw-r--r-- root/root usr/lib/ruby/1.8/apache/ruby-debug.rb +-rw-r--r-- root/root usr/lib/ruby/1.8/apache/ruby-profile.rb -rw-r--r-- root/root usr/lib/ruby/1.8/apache/ruby-run.rb -rw-r--r-- root/root usr/lib/ruby/1.8/auto-reload.rb Modified: crux-2.1/ports/opt/mod_ruby/.md5sum =================================================================== --- crux-2.1/ports/opt/mod_ruby/.md5sum 2006-02-22 16:46:24 UTC (rev 749) +++ crux-2.1/ports/opt/mod_ruby/.md5sum 2006-02-22 17:05:34 UTC (rev 750) @@ -1 +1 @@ -2b803c021297517eecb3dc6cf77b9534 mod_ruby-1.2.4.tar.gz +3c867008bd6518c1fec395d9040cd964 mod_ruby-1.2.5.tar.gz Modified: crux-2.1/ports/opt/mod_ruby/Pkgfile =================================================================== --- crux-2.1/ports/opt/mod_ruby/Pkgfile 2006-02-22 16:46:24 UTC (rev 749) +++ crux-2.1/ports/opt/mod_ruby/Pkgfile 2006-02-22 17:05:34 UTC (rev 750) @@ -5,7 +5,7 @@ # Group: apache name=mod_ruby -version=1.2.4 +version=1.2.5 release=1 source=(http://modruby.net/archive/$name-$version.tar.gz)

1 0

r749 - crux-2.1/ports/opt/pure-ftpd
by crux＠crux.nu 22 Feb '06

22 Feb '06

Author: jue Date: 2006-02-22 17:46:24 +0100 (Wed, 22 Feb 2006) New Revision: 749 Modified: crux-2.1/ports/opt/pure-ftpd/.md5sum Log: pure-ftpd: fixed md5sum error, ticket #95 Modified: crux-2.1/ports/opt/pure-ftpd/.md5sum =================================================================== --- crux-2.1/ports/opt/pure-ftpd/.md5sum 2006-02-22 10:46:35 UTC (rev 748) +++ crux-2.1/ports/opt/pure-ftpd/.md5sum 2006-02-22 16:46:24 UTC (rev 749) @@ -1,3 +1,3 @@ ad1738ef0302bbb6153b2c3de832fec7 pure-ftpd -2b9fc86e8090a746cf57b11a55e3c0a8 pure-ftpd-1.0.21.tar.bz2 +ca8a8dbec0cd9c8ea92fc4c37ea9c410 pure-ftpd-1.0.21.tar.bz2 306d1de5a60a29ad8b9b664bd272941f pure-ftpd.conf

1 0

r748 - crux-2.1/ports/opt/cryptsetup-luks
by crux＠crux.nu 22 Feb '06

22 Feb '06

Author: viper Date: 2006-02-22 11:46:35 +0100 (Wed, 22 Feb 2006) New Revision: 748 Modified: crux-2.1/ports/opt/cryptsetup-luks/.md5sum crux-2.1/ports/opt/cryptsetup-luks/Pkgfile Log: Cryptsetup-luks: Updated to version 1.0.2! Modified: crux-2.1/ports/opt/cryptsetup-luks/.md5sum =================================================================== --- crux-2.1/ports/opt/cryptsetup-luks/.md5sum 2006-02-22 10:46:09 UTC (rev 747) +++ crux-2.1/ports/opt/cryptsetup-luks/.md5sum 2006-02-22 10:46:35 UTC (rev 748) @@ -1 +1 @@ -b2415f67ceed3ad2c7dd2e878cf7787d cryptsetup-luks-1.0.1.tar.bz2 +cd6899ecf517c3414386476bd97f97d3 cryptsetup-luks-1.0.2.tar.bz2 Modified: crux-2.1/ports/opt/cryptsetup-luks/Pkgfile =================================================================== --- crux-2.1/ports/opt/cryptsetup-luks/Pkgfile 2006-02-22 10:46:09 UTC (rev 747) +++ crux-2.1/ports/opt/cryptsetup-luks/Pkgfile 2006-02-22 10:46:35 UTC (rev 748) @@ -4,7 +4,7 @@ # Depends on: libdevmapper, libgcrypt, popt name=cryptsetup-luks -version=1.0.1 +version=1.0.2 release=1 source=(http://luks.endorphin.org/source/$name-$version.tar.bz2)

1 0

r747 - crux-2.1/ports/opt/postfix
by crux＠crux.nu 22 Feb '06

22 Feb '06

Author: viper Date: 2006-02-22 11:46:09 +0100 (Wed, 22 Feb 2006) New Revision: 747 Modified: crux-2.1/ports/opt/postfix/.md5sum crux-2.1/ports/opt/postfix/Pkgfile Log: Postfix: Updated to version 2.2.9! Modified: crux-2.1/ports/opt/postfix/.md5sum =================================================================== --- crux-2.1/ports/opt/postfix/.md5sum 2006-02-21 23:24:12 UTC (rev 746) +++ crux-2.1/ports/opt/postfix/.md5sum 2006-02-22 10:46:09 UTC (rev 747) @@ -1,3 +1,3 @@ be543b65525f544386a2d8395ea19cdf aliases -971bf94de3e8433c8965c27b42d56b9a postfix-2.2.8.tar.gz +be78631bd9b6bf7735e43abfa54d69f6 postfix-2.2.9.tar.gz d18be5c17604f9c712a28339ff0f61cb postfix.rc Modified: crux-2.1/ports/opt/postfix/Pkgfile =================================================================== --- crux-2.1/ports/opt/postfix/Pkgfile 2006-02-21 23:24:12 UTC (rev 746) +++ crux-2.1/ports/opt/postfix/Pkgfile 2006-02-22 10:46:09 UTC (rev 747) @@ -5,7 +5,7 @@ # Depends on: cyrus-sasl, openssl, db name=postfix -version=2.2.8 +version=2.2.9 release=1 source=(ftp://postfix.ulimit.org/postfix/official/$name-$version.tar.gz aliases postfix.rc)

1 0

r746 - crux-2.1/ports/opt/docbook-xsl
by crux＠crux.nu 21 Feb '06

21 Feb '06

Author: jw Date: 2006-02-22 00:24:12 +0100 (Wed, 22 Feb 2006) New Revision: 746 Modified: crux-2.1/ports/opt/docbook-xsl/post-install Log: fix post-install of docbook-xsl Modified: crux-2.1/ports/opt/docbook-xsl/post-install =================================================================== --- crux-2.1/ports/opt/docbook-xsl/post-install 2006-02-21 17:34:49 UTC (rev 745) +++ crux-2.1/ports/opt/docbook-xsl/post-install 2006-02-21 23:24:12 UTC (rev 746) @@ -1,6 +1,6 @@ #!/bin/sh -version=1.65.1 +version=1.69.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

r745 - crux-2.1/ports/opt/rxvt-unicode
by crux＠crux.nu 21 Feb '06

21 Feb '06

Author: tilman Date: 2006-02-21 18:34:49 +0100 (Tue, 21 Feb 2006) New Revision: 745 Modified: crux-2.1/ports/opt/rxvt-unicode/.md5sum crux-2.1/ports/opt/rxvt-unicode/Pkgfile Log: rxvt-unicode: updated to 7.7 Modified: crux-2.1/ports/opt/rxvt-unicode/.md5sum =================================================================== --- crux-2.1/ports/opt/rxvt-unicode/.md5sum 2006-02-21 17:16:01 UTC (rev 744) +++ crux-2.1/ports/opt/rxvt-unicode/.md5sum 2006-02-21 17:34:49 UTC (rev 745) @@ -1 +1 @@ -37d471287da22af3cab426938ba198cf rxvt-unicode-7.6.tar.bz2 +68298390375da1b34f89a0aa634c9b20 rxvt-unicode-7.7.tar.bz2 Modified: crux-2.1/ports/opt/rxvt-unicode/Pkgfile =================================================================== --- crux-2.1/ports/opt/rxvt-unicode/Pkgfile 2006-02-21 17:16:01 UTC (rev 744) +++ crux-2.1/ports/opt/rxvt-unicode/Pkgfile 2006-02-21 17:34:49 UTC (rev 745) @@ -4,7 +4,7 @@ # Depends on: x11, perl name=rxvt-unicode -version=7.6 +version=7.7 release=1 source=(http://dist.schmorp.de/$name/$name-$version.tar.bz2)

1 0