tork-devel Mailing List for TorK - Anonymity Manager for KDE
Status: Alpha
Brought to you by:
hoganrobert
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(26) |
Aug
(23) |
Sep
(1) |
Oct
(14) |
Nov
(8) |
Dec
(21) |
2009 |
Jan
(23) |
Feb
(54) |
Mar
(1) |
Apr
|
May
(2) |
Jun
(6) |
Jul
|
Aug
(2) |
Sep
|
Oct
(5) |
Nov
(8) |
Dec
|
2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
2011 |
Jan
|
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <cod...@go...> - 2011-04-10 15:05:15
|
Revision: 107 Author: ro...@ro... Date: Sun Apr 10 07:39:57 2011 Log: Created wiki page through web user interface. http://code.google.com/p/torsocks/source/detail?r=107 Added: /wiki/VerifyingPackages.wiki ======================================= --- /dev/null +++ /wiki/VerifyingPackages.wiki Sun Apr 10 07:39:57 2011 @@ -0,0 +1,51 @@ +#summary Verifying Torsocks source packages + += Step 1: Import the Developer's Key = + +{{{ +gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x22F6856F +}}} + += Step 2: Verify the Key's fingerprint = + +{{{ +gpg --fingerprint 0x22F6856F +}}} + +This should look like: + +{{{ +pub 1024D/22F6856F 2006-08-19 + Key fingerprint = DDB4 6B5B 7950 CD47 E59B 5189 4C09 25CF 22F6 856F +uid Robert Hogan <hog...@to...> +uid Robert Hogan (WebKit contact address) <ro...@we...> +uid Robert Hogan <ro...@ro...> +sub 1024g/FC4A9460 2006-08-19 +}}} + += Step 3: Verify the Package's source = + +Download the source package and the signature file and verify the source package by doing: + +{{{ +gpg --verify /home/robert/torsocks-1.1.tar.gz.asc /home/robert/torsocks-1.1.tar.gz +}}} + +You should get something like: + +{{{ +gpg: Signature made Sat 11 Dec 2010 16:42:14 GMT using DSA key ID 22F6856F +gpg: Good signature from "Robert Hogan <hog...@to...>" +gpg: aka "Robert Hogan (WebKit contact address) <ro...@we...>" +gpg: aka "Robert Hogan <ro...@ro...>" +}}} + + +Here's some further advice from the [https://www.torproject.org/docs/verifying-signatures tor project page] regarding signature verification: + + Notice that there is a warning because you haven't assigned a trust index to this person. This means that GnuPG verified that the key made that signature, but it's up to you to decide if that key really belongs to the developer. The best method is to meet the developer in person and exchange key fingerprints. + + For your reference, this is an example of a BAD verification. It means that the signature and file contents do not match. In this case, you should not trust the file contents: + {{{ + gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5 + }}} |
From: <cod...@go...> - 2011-02-25 23:38:44
|
Revision: 105 Author: ro...@ro... Date: Fri Feb 25 14:43:19 2011 Log: Edited wiki page Source through web user interface. http://code.google.com/p/torsocks/source/detail?r=105 Modified: /wiki/Source.wiki ======================================= --- /wiki/Source.wiki Sat Dec 11 09:00:18 2010 +++ /wiki/Source.wiki Fri Feb 25 14:43:19 2011 @@ -12,14 +12,8 @@ cd ~ git clone git://git.torproject.org/git/torsocks cd torsocks -make -f Makefile.cvs +./autogen.sh ./configure make sudo make install }}} - -If configure fails, you may need to run: -{{{ -autoreconf -fiv -}}} -and follow the steps above again. |
From: <cod...@go...> - 2011-02-25 23:16:10
|
Revision: 106 Author: ro...@ro... Date: Fri Feb 25 14:44:19 2011 Log: Edited wiki page Source through web user interface. http://code.google.com/p/torsocks/source/detail?r=106 Modified: /wiki/Source.wiki ======================================= --- /wiki/Source.wiki Fri Feb 25 14:43:19 2011 +++ /wiki/Source.wiki Fri Feb 25 14:44:19 2011 @@ -3,7 +3,7 @@ = Introduction = Torsocks is hosted in the Tor project's git repository. -You can browse the source at: [http://git.torproject.org/checkout/torsocks http://git.torproject.org/checkout/torsocks]. +You can browse the source at: [https://gitweb.torproject.org/torsocks.git https://gitweb.torproject.org/torsocks.git]. = Details = |
From: <cod...@go...> - 2010-12-11 17:23:35
|
Revision: 103 Author: ro...@ro... Date: Sat Dec 11 09:00:08 2010 Log: Edited wiki page Source through web user interface. http://code.google.com/p/torsocks/source/detail?r=103 Modified: /wiki/Source.wiki ======================================= --- /wiki/Source.wiki Sun May 24 08:17:56 2009 +++ /wiki/Source.wiki Sat Dec 11 09:00:08 2010 @@ -17,3 +17,9 @@ make sudo make install }}} + +If configure fails, you may need to run: +{{{ +autoreconf -fiv +}} +and follow the steps above again. |
From: <cod...@go...> - 2010-12-11 17:13:23
|
Revision: 104 Author: ro...@ro... Date: Sat Dec 11 09:00:18 2010 Log: Edited wiki page Source through web user interface. http://code.google.com/p/torsocks/source/detail?r=104 Modified: /wiki/Source.wiki ======================================= --- /wiki/Source.wiki Sat Dec 11 09:00:08 2010 +++ /wiki/Source.wiki Sat Dec 11 09:00:18 2010 @@ -21,5 +21,5 @@ If configure fails, you may need to run: {{{ autoreconf -fiv -}} +}}} and follow the steps above again. |
From: Robert H. <hog...@us...> - 2010-07-24 12:24:14
|
Update of /cvsroot/tork/tork/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8797/src Modified Files: main.cpp Log Message: Prepare for 0.33 release Index: main.cpp =================================================================== RCS file: /cvsroot/tork/tork/src/main.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** main.cpp 14 Dec 2008 14:50:05 -0000 1.60 --- main.cpp 24 Jul 2010 12:24:04 -0000 1.61 *************** *** 39,43 **** static const char version[] = ""; ! static const char title[] = "TorK 0.31"; static KCmdLineOptions options[] = --- 39,43 ---- static const char version[] = ""; ! static const char title[] = "TorK 0.33"; static KCmdLineOptions options[] = |
From: Robert H. <hog...@us...> - 2010-07-24 12:21:22
|
Update of /cvsroot/tork/tork In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8117 Modified Files: ChangeLog create-release.sh Log Message: Prepare for 0.33 release Index: ChangeLog =================================================================== RCS file: /cvsroot/tork/tork/ChangeLog,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** ChangeLog 7 Nov 2009 15:01:00 -0000 1.70 --- ChangeLog 24 Jul 2010 12:21:14 -0000 1.71 *************** *** 1,2 **** --- 1,8 ---- + 2009-07-25 Robert Hogan <ro...@ro...> + TorK 0.33 + Bug Fixes/Feature Fixes + o Don't log netstat output when running a relay. Thanks to Sebastian Hahn and Damian + Johnson for pointing this out. + 2009-11-07 Robert Hogan <ro...@ro...> TorK 0.32 Index: create-release.sh =================================================================== RCS file: /cvsroot/tork/tork/create-release.sh,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** create-release.sh 7 Nov 2009 15:01:00 -0000 1.24 --- create-release.sh 24 Jul 2010 12:21:14 -0000 1.25 *************** *** 1,6 **** export CVS_RSH=ssh ! export VN=0.32 export VER=tork-$VN ! export TAG=v0_32 cd .. TOPDIR=$PWD --- 1,6 ---- export CVS_RSH=ssh ! export VN=0.33 export VER=tork-$VN ! export TAG=v0_33 cd .. TOPDIR=$PWD |
From: Robert H. <hog...@us...> - 2010-07-24 12:21:22
|
Update of /cvsroot/tork/tork/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8117/src Modified Files: version.h Log Message: Prepare for 0.33 release Index: version.h =================================================================== RCS file: /cvsroot/tork/tork/src/version.h,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** version.h 17 Jan 2009 15:49:08 -0000 1.41 --- version.h 24 Jul 2010 12:21:14 -0000 1.42 *************** *** 20,24 **** ***************************************************************************/ ! #define VERSION_TORK 0.31 ! #define TORK_VERSION "0.31" --- 20,24 ---- ***************************************************************************/ ! #define VERSION_TORK 0.33 ! #define TORK_VERSION "0.33" |
From: Robert H. <hog...@us...> - 2010-07-24 12:18:46
|
Update of /cvsroot/tork/tork/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7631/src Modified Files: tork.cpp Log Message: Disable netstat logging when running a relay Index: tork.cpp =================================================================== RCS file: /cvsroot/tork/tork/src/tork.cpp,v retrieving revision 1.201 retrieving revision 1.202 diff -C2 -d -r1.201 -r1.202 *** tork.cpp 20 Oct 2009 20:13:54 -0000 1.201 --- tork.cpp 24 Jul 2010 12:18:36 -0000 1.202 *************** *** 3940,3944 **** { ! if (!TorkConfig::logNonTorTraffic()) return; --- 3940,3946 ---- { ! // Don't log netstat traffic if the feature is disabled or we are running a relay ! if (!TorkConfig::logNonTorTraffic() ! || !TorkConfig::clientOnly()) return; *************** *** 3985,3988 **** --- 3987,3994 ---- QString item2; + // Don't print netstat output if we are running a relay + if (!TorkConfig::clientOnly()) + return; + if (!(netstatproc)) return; |
From: Robert H. <hog...@us...> - 2009-11-07 15:24:56
|
Update of /cvsroot/tork/tork/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26051/src Modified Files: Makefile.am Log Message: Removed tor ioslave for now due to build issues in a KDE4 environment Index: Makefile.am =================================================================== RCS file: /cvsroot/tork/tork/src/Makefile.am,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** Makefile.am 7 Nov 2009 15:16:24 -0000 1.73 --- Makefile.am 7 Nov 2009 15:24:47 -0000 1.74 *************** *** 14,19 **** SUBDIRS=icons arkollon $(geoipdir) privoxytemplates \ ! tor_ioslave menu upnp . ! # torkapplet konqplugin- removed from build DISTCLEANFILES=dcoptork.kidl --- 14,19 ---- SUBDIRS=icons arkollon $(geoipdir) privoxytemplates \ ! menu upnp . ! # torkapplet konqplugin tor_ioslave - removed from build DISTCLEANFILES=dcoptork.kidl |
From: Robert H. <hog...@us...> - 2009-11-07 15:16:34
|
Update of /cvsroot/tork/tork/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25294/src Modified Files: Makefile.am Log Message: Removed konqueror and kdesktop applet for now due to build issues in a KDE4 environment Index: Makefile.am =================================================================== RCS file: /cvsroot/tork/tork/src/Makefile.am,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** Makefile.am 7 Nov 2009 14:21:56 -0000 1.72 --- Makefile.am 7 Nov 2009 15:16:24 -0000 1.73 *************** *** 14,18 **** SUBDIRS=icons arkollon $(geoipdir) privoxytemplates \ ! torkapplet konqplugin tor_ioslave menu upnp . DISTCLEANFILES=dcoptork.kidl --- 14,19 ---- SUBDIRS=icons arkollon $(geoipdir) privoxytemplates \ ! tor_ioslave menu upnp . ! # torkapplet konqplugin- removed from build DISTCLEANFILES=dcoptork.kidl |
From: Robert H. <hog...@us...> - 2009-11-07 15:01:10
|
Update of /cvsroot/tork/tork In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23386 Modified Files: ChangeLog create-release.sh Log Message: Update changelog and release script Index: ChangeLog =================================================================== RCS file: /cvsroot/tork/tork/ChangeLog,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** ChangeLog 20 Jun 2009 09:29:15 -0000 1.69 --- ChangeLog 7 Nov 2009 15:01:00 -0000 1.70 *************** *** 1,4 **** ! 2009-02-21 Robert Hogan <ro...@ro...> ! introduce --with-external-torsocks option, so that packagers can have torsocks as an external dependency 2008-01-29 Robert Hogan <ro...@ro...> --- 1,13 ---- ! 2009-11-07 Robert Hogan <ro...@ro...> ! TorK 0.32 ! Bug Fixes/Feature Fixes ! o Remove torsocks code. TorK now depends on an independent installation of torsocks. ! (http://code.google.com/p/torsocks) ! o Fix crash when listing servers in Antarctica! ! o Remove some compiler errors for new versions of gcc. ! o Remove dependency on some system icons. ! o Updated Italian translation and some localization fixes from Flavio Capelli. ! o Use pkg-config to detect gnutls ! o Update some build files - thanks to Patrick Matthei. 2008-01-29 Robert Hogan <ro...@ro...> Index: create-release.sh =================================================================== RCS file: /cvsroot/tork/tork/create-release.sh,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** create-release.sh 20 Jun 2009 09:29:15 -0000 1.23 --- create-release.sh 7 Nov 2009 15:01:00 -0000 1.24 *************** *** 1,6 **** export CVS_RSH=ssh ! export VN=0.31 export VER=tork-$VN ! export TAG=v0_31 cd .. TOPDIR=$PWD --- 1,6 ---- export CVS_RSH=ssh ! export VN=0.32 export VER=tork-$VN ! export TAG=v0_32 cd .. TOPDIR=$PWD |
From: Robert H. <hog...@us...> - 2009-11-07 14:23:35
|
Update of /cvsroot/tork/tork/src/torsocks In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20098/torsocks Removed Files: usewithtor.1 usewithtor.in Log Message: Remove trailing files from torsocks --- usewithtor.1 DELETED --- --- usewithtor.in DELETED --- |
From: Robert H. <hog...@us...> - 2009-11-07 14:22:09
|
Update of /cvsroot/tork/tork In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19866 Modified Files: configure.in.in Log Message: Remove torsocks from source tree; rely on independent installation of torsocks Index: configure.in.in =================================================================== RCS file: /cvsroot/tork/tork/configure.in.in,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** configure.in.in 30 Jun 2009 18:23:32 -0000 1.28 --- configure.in.in 7 Nov 2009 14:21:56 -0000 1.29 *************** *** 460,1007 **** - dnl - tsocks - - AC_ARG_WITH(external-torsocks, - AS_HELP_STRING(--with-external-torsocks, Do not install torsocks)) - - AM_CONDITIONAL([EXTERNAL_TORSOCKS], [test "x$with_external_torsocks" = "xyes"]) - - if test x$with_external_torsocks = xyes; then - AC_DEFINE(EXTERNAL_TORSOCKS, 1, "Using External torsocks") - fi - - if test "x$with_external_torsocks" != "xyes"; then - - dnl Process this file with autoconf to produce a configure script. - - - dnl Our default prefix is /usr/ since most people will be using tsocks - dnl on Linux systems and that /usr/local/ stuff annoys them - dnl AC_PREFIX_DEFAULT(/usr) - - dnl if libdir hasn't been set by the user default it to /lib since - dnl tsocks needs to be on the root partition if put in the - dnl /etc/ld.so.preload file - dnl test "$libdir" = "\${exec_prefix}/lib" && libdir="/lib" - - dnl Arguments we allow - AC_ARG_ENABLE(socksdns, - [ --enable-socksdns force dns lookups to use tcp ]) - AC_ARG_ENABLE(tordns, - [ --disable-tordns don't override name lookup calls to use SOCKS ]) - AC_ARG_ENABLE(debug, - [ --disable-debug disable ALL error messages from tsocks ]) - AC_ARG_ENABLE(oldmethod, - [ --enable-oldmethod use the old method to override connect ]) - AC_ARG_ENABLE(hostnames, - [ --enable-hostnames enable hostname lookups for socks servers ]) - AC_ARG_ENABLE(envconf, - [ --disable-envconf do not allow TSOCKS_CONF_FILE to specify configuration file ]) - - dnl ----------------------------------- - dnl Get hostname and other information. - dnl ----------------------------------- - AC_CANONICAL_HOST - - dnl Checks for programs. - AC_PROG_CC - AC_PROG_INSTALL - AC_PROG_LN_S - - dnl Check if the C compiler accepts -Wall - AC_MSG_CHECKING(if the C compiler accepts -Wall) - OLDCFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wall" - AC_TRY_COMPILE(,,AC_MSG_RESULT(yes),[ - CFLAGS="$OLDCFLAGS" - AC_MSG_RESULT(no)]) - - dnl Checks for standard header files. - AC_HEADER_STDC - - dnl Check for the dynamic loader function header - AC_CHECK_HEADER(dlfcn.h,,AC_MSG_ERROR("dlfcn.h not found")) - - dnl Check for the socket header - AC_CHECK_HEADER(sys/socket.h,,AC_MSG_ERROR("sys/socket.h not found")) - - dnl Check for the arpa/inet.h header (inet_ntoa and inet_addr) - AC_CHECK_HEADER(arpa/inet.h,,AC_MSG_ERROR("arpa/inet.h not found")) - - dnl Check for the fcntl header - AC_CHECK_HEADER(fcntl.h,,AC_MSG_ERROR("fcntl.h not found")) - - dnl Check for the poll header - AC_CHECK_HEADER(sys/poll.h,,AC_MSG_ERROR("sys/poll.h not found")) - - dnl Check for the mmap header - AC_CHECK_HEADER(sys/mman.h,,AC_MSG_ERROR("sys/mman.h not found")) - - dnl Other headers we're interested in - AC_CHECK_HEADERS(unistd.h) - - dnl Checks for library functions. - AC_CHECK_FUNCS(strcspn strdup strerror strspn strtol mmap strcasecmp \ - strncasecmp strtol,,[AC_MSG_ERROR("Required function not found")]) - - dnl Find which version of gethostbyname_r we should be using (actually this - dnl isn't used right now). - dnl AX_FUNC_WHICH_GETHOSTBYNAME_R - - dnl First find the library that contains connect() (obviously - dnl the most important library for us). Once we've found it - dnl we chuck it on the end of LIBS, that lib may end up there - dnl more than once (since we do our search with an empty libs - dnl list) but that isn't a problem - OLDLIBS="${LIBS}" - LIBS= - CONNECTLIB= - for LIB in c socket; do - AC_CHECK_LIB("${LIB}",connect,[ - CONNECTLIB="${LIB}" - break - ],) - done - LIBS="${OLDLIBS} -l${CONNECTLIB}" - if test "${CONNECTLIB}" = ""; then - AC_MSG_ERROR('Could not find library containing connect()') - fi - - dnl Check for socket - AC_CHECK_FUNC(socket,, [ - AC_CHECK_LIB(socket, socket,,AC_MSG_ERROR("socket function not found"))]) - - dnl Check for a function to convert an ascii ip address - dnl to a sin_addr. - AC_CHECK_FUNC(inet_aton, AC_DEFINE([HAVE_INET_ATON],[],[Description]), [ - AC_CHECK_FUNC(inet_addr, AC_DEFINE([HAVE_INET_ADDR],[],[Description]), [ - AC_CHECK_LIB(nsl, inet_addr, [ AC_DEFINE([HAVE_INET_ADDR],[],[Description]) - LIBS="${LIBS} -lnsl" ], [ - AC_MSG_ERROR("Neither inet_aton or inet_addr present")])])]) - - dnl Look for gethostbyname (needed by tsocks and inspectsocks) - AC_CHECK_FUNC(gethostbyname, AC_DEFINE([HAVE_GETHOSTBYNAME],[],[Description]), [ - AC_CHECK_LIB(xnet, gethostbyname, AC_DEFINE([HAVE_GETHOSTBYNAME],[],[Description]), [ - AC_MSG_ERROR(["gethostbyname not found, name lookups in " \ - "tsocks and inspectsocks disabled"])])]) - - dnl The simple programs (saveme and inspectsocks) have no further - dnl requirements, so save the libs needed here and use them in the - dnl Makefile - SIMPLELIBS=${LIBS} - LIBS= - - dnl Checks for libraries. - dnl Replace `main' with a function in -ldl: - - AC_CHECK_LIB(dl, dlsym, [ tempdso="yes" ],tempdso="no") - if test "$tempdso" = "no"; then - AC_CHECK_LIB(c, dlsym,,AC_MSG_ERROR("dlsym() not found in libc or libdl." \ - "Check your system for libc.so and/or libdl.so.")) - fi - - AC_CHECK_LIB(resolv, res_query, [ tempres="no" ],tempres="yes") - if test "$tempres" = "no"; then - AC_DEFINE([SUPPORT_RES_API],[],[Support the res_query family of calls]) - fi - - dnl If we're using gcc here define _GNU_SOURCE - AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h) - AC_EGREP_CPP(yes, - [ - #include <dlfcn.h> - #ifdef RTLD_NEXT - yes - #endif - ], [ - AC_MSG_RESULT(yes) - ], [ - AC_MSG_RESULT(no) - AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h with _GNU_SOURCE) - AC_EGREP_CPP(yes, - [ - #define _GNU_SOURCE - #include <dlfcn.h> - #ifdef RTLD_NEXT - yes - #endif - ], [ - AC_MSG_RESULT(yes) - AC_DEFINE([USE_GNU_SOURCE],[],[Description]) - ], [ - AC_MSG_RESULT(no) - AC_DEFINE([USE_OLD_DLSYM],[],[Description]) - oldmethod="yes" - ]) - ]) - - if test "${enable_socksdns}" = "yes"; then - AC_DEFINE([USE_SOCKS_DNS],[],[Description]) - fi - - AC_MSG_CHECKING(whether to enable tordns) - if test "x${enable_tordns}" = "x"; then - AC_DEFINE([USE_TOR_DNS],[],[Description]) - DEADPOOL_O="\${DEADPOOL}.o" - AC_MSG_RESULT(yes) - else - DEADPOOL_O="" - AC_MSG_RESULT(no) - fi - AC_SUBST(DEADPOOL_O) - - if test "x${enable_envconf}" = "x"; then - AC_DEFINE([ALLOW_ENV_CONFIG],[],[Description]) - fi - - if test "${enable_oldmethod}" = "yes"; then - AC_DEFINE([USE_OLD_DLSYM],[],[Description]) - oldmethod="yes" - fi - - if test "x${enable_debug}" = "x"; then - AC_DEFINE([ALLOW_MSG_OUTPUT],[],[Description]) - fi - - AC_DEFINE([HOSTNAMES],[0],[Description]) - - if test "x${enable_hostnames}" = "xyes"; then - AC_DEFINE([HOSTNAMES],[1],[Description]) - fi - - if test "${enable_socksdns}" = "yes" -a \ - "x${enable_hostnames}" = "xyes" ; then - AC_MSG_ERROR("--enable-socksdns is not valid with --enable-hostnames") - fi - - if test "x${enable_tordns}" = "x" -a \ - "x${enable_hostnames}" = "xyes" ; then - AC_MSG_ERROR("--enable-tordns is not valid with --enable-hostnames") - fi - - dnl If we have to use the old method of overriding connect (i.e no - dnl RTLD_NEXT) we need to know the location of the library that - dnl contains connect(), select(), poll() and close() - if test "${oldmethod}" = "yes"; then - dnl We need to find the path to the library, to do - dnl this we use find on the usual suspects, i.e /lib and - dnl /usr/lib - - dnl Check that find is available, it should be somehere - dnl in the path - AC_CHECK_PROG(FIND, find, find) - if test "${FIND}" = ""; then - AC_MSG_ERROR('find not found in path') - fi - - dnl Find tail, it should always be somewhere in the path - dnl but for safety's sake - AC_CHECK_PROG(TAIL, tail, tail) - if test "${TAIL}" = ""; then - AC_MSG_ERROR('tail not found in path') - fi - - dnl Now find the library we need - AC_MSG_CHECKING(location of lib${CONNECTLIB}.so) - LIBCONNECT= - for DIR in '/lib' '/usr/lib'; do - if test "${LIBCONNECT}" = ""; then - LIBCONNECT=`$FIND $DIR -name "lib${CONNECTLIB}.so.?" 2>/dev/null | $TAIL -1` - fi - done - AC_DEFINE_UNQUOTED([LIBCONNECT],["${LIBCONNECT}"],[Description]) - if test "${LIBCONNECT}" = ""; then - AC_MSG_ERROR("not found!") - fi - - AC_MSG_RESULT($LIBCONNECT) - - dnl Now find the resolve library we need - AC_MSG_CHECKING(location of libresolv.so) - LIBRESOLV= - for DIR in '/lib' '/usr/lib'; do - if test "${LIBRESOLV}" = ""; then - LIBRESOLV=`$FIND $DIR -name "libresolv.so.?" 2>/dev/null | $TAIL -1` - fi - done - AC_DEFINE_UNQUOTED([LIBRESOLV],["${LIBRESOLV}"],[Description]) - if test "${LIBRESOLV}" = ""; then - AC_MSG_ERROR("not found!") - fi - - AC_MSG_RESULT($LIBRESOLV) - - dnl close() should be in libc, find it - AC_MSG_CHECKING(location of libc.so) - LIBC= - for DIR in '/lib' '/usr/lib'; do - if test "${LIBC}" = ""; then - LIBC=`$FIND $DIR -name "libc.so.?" 2>/dev/null | $TAIL -1` - fi - done - - AC_DEFINE_UNQUOTED([LIBC],["${LIBC}"],[Description]) - if test "${LIBC}" = ""; then - AC_MSG_ERROR("not found!") - fi - - AC_MSG_RESULT($LIBC) - fi - - dnl Find the correct select prototype on this machine - AC_MSG_CHECKING(for correct select prototype) - PROTO= - for testproto in 'int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout' - do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <sys/time.h> - #include <sys/types.h> - #include <unistd.h> - int select($testproto); - ],,[PROTO="$testproto";],) - fi - done - if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") - fi - AC_MSG_RESULT([select(${PROTO})]) - AC_DEFINE_UNQUOTED([SELECT_SIGNATURE],[${PROTO}],[Description]) - - dnl Find the correct connect prototype on this machine - AC_MSG_CHECKING(for correct connect prototype) - PROTO= - PROTO1='int __fd, const struct sockaddr * __addr, int len' - PROTO2='int __fd, const struct sockaddr_in * __addr, socklen_t __len' - PROTO3='int __fd, struct sockaddr * __addr, int __len' - PROTO4='int __fd, const struct sockaddr * __addr, socklen_t __len' - for testproto in "${PROTO1}" \ - "${PROTO2}" \ - "${PROTO3}" \ - "${PROTO4}" - do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <sys/types.h> - #include <sys/socket.h> - int connect($testproto); - ],,[PROTO="$testproto";],) - fi - done - if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") - fi - AC_MSG_RESULT([connect(${PROTO})]) - AC_DEFINE_UNQUOTED([CONNECT_SIGNATURE],[${PROTO}],[Description]) - - dnl Pick which of the sockaddr type arguments we need for - dnl connect(), we need to cast one of ours to it later - SOCKETARG="struct sockaddr *" - case "${PROTO}" in - *sockaddr_in*) - SOCKETARG="struct sockaddr_in *" - ;; - esac - AC_DEFINE_UNQUOTED([CONNECT_SOCKARG],[${SOCKETARG}],[Description]) - - dnl Find the correct close prototype on this machine - AC_MSG_CHECKING(for correct close prototype) - PROTO= - PROTO1='int fd' - for testproto in "${PROTO1}" - do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <stdlib.h> - int close($testproto); - ],,[PROTO="$testproto";],) - fi - done - if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") - fi - AC_MSG_RESULT([close(${PROTO})]) - AC_DEFINE_UNQUOTED([CLOSE_SIGNATURE], [${PROTO}],[Description]) - - - dnl Find the correct res_querydomain prototype on this machine - AC_MSG_CHECKING(for correct res_querydomain prototype) - PROTO= - PROTO1='const char *name, const char *domain, int class, int type, unsigned char *answer, int anslen' - for testproto in "${PROTO1}" - do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <resolv.h> - int res_querydomain($testproto); - ],,[PROTO="$testproto";],) - fi - done - if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") - fi - AC_MSG_RESULT([res_querydomain(${PROTO})]) - AC_DEFINE_UNQUOTED([RES_QUERYDOMAIN_SIGNATURE], [${PROTO}],[Description]) - - dnl Find the correct res_send prototype on this machine - AC_MSG_CHECKING(for correct res_send prototype) - PROTO= - PROTO1='const char *msg, int msglen, char *answer, int anslen' - PROTO2='const unsigned char *msg, int msglen, unsigned char *answer, int anslen' - for testproto in "${PROTO1}" \ - "${PROTO2}" - do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <resolv.h> - int res_send($testproto); - ],,[PROTO="$testproto";],) - fi - done - if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") - fi - AC_MSG_RESULT([res_send(${PROTO})]) - AC_DEFINE_UNQUOTED([RES_SEND_SIGNATURE], [${PROTO}],[Description]) - - - dnl Find the correct res_search prototype on this machine - AC_MSG_CHECKING(for correct res_search prototype) - PROTO= - PROTO1='const char *dname, int class, int type,unsigned char *answer, int anslen' - for testproto in "${PROTO1}" - do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <resolv.h> - int res_search($testproto); - ],,[PROTO="$testproto";],) - fi - done - if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") - fi - AC_MSG_RESULT([res_search(${PROTO})]) - AC_DEFINE_UNQUOTED([RES_SEARCH_SIGNATURE], [${PROTO}],[Description]) - - - dnl Find the correct res_query prototype on this machine - AC_MSG_CHECKING(for correct res_query prototype) - PROTO= - PROTO1='const char *dname, int class, int type,unsigned char *answer, int anslen' - for testproto in "${PROTO1}" - do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <resolv.h> - int res_query($testproto); - ],,[PROTO="$testproto";],) - fi - done - if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") - fi - AC_MSG_RESULT([res_query(${PROTO})]) - AC_DEFINE_UNQUOTED([RES_QUERY_SIGNATURE], [${PROTO}],[Description]) - - dnl Find the correct getpeername prototype on this machine - AC_MSG_CHECKING(for correct getpeername prototype) - PROTO= - PROTO1='int __fd, const struct sockaddr * __name, int *__namelen' - PROTO2='int __fd, const struct sockaddr_in * __name, socklen_t *__namelen' - PROTO3='int __fd, struct sockaddr * __name, socklen_t *__namelen' - PROTO4='int __fd, const struct sockaddr * __name, socklen_t *__namelen' - for testproto in "${PROTO1}" \ - "${PROTO2}" \ - "${PROTO3}" \ - "${PROTO4}" - do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <sys/socket.h> - int getpeername($testproto); - ],,[PROTO="$testproto";],) - fi - done - if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") - fi - AC_MSG_RESULT([getpeername(${PROTO})]) - AC_DEFINE_UNQUOTED(GETPEERNAME_SIGNATURE, [${PROTO}],[Description]) - - - dnl Find the correct poll prototype on this machine - AC_MSG_CHECKING(for correct poll prototype) - PROTO= - for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' \ - 'struct pollfd *ufds, nfds_t nfds, int timeout' - do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <sys/poll.h> - int poll($testproto); - ],,[PROTO="$testproto";],) - fi - done - if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") - fi - AC_MSG_RESULT([poll(${PROTO})]) - AC_DEFINE_UNQUOTED([POLL_SIGNATURE], [${PROTO}],[Description]) - - dnl Emit signature for gethostbyname - PROTO="const char *name" - AC_DEFINE_UNQUOTED([GETHOSTBYNAME_SIGNATURE], [${PROTO}],[Description]) - - dnl Emit signature for getaddrinfo - PROTO="const char *node, const char *service, void *hints, void *res" - AC_DEFINE_UNQUOTED([GETADDRINFO_SIGNATURE], [${PROTO}],[Description]) - - dnl Emit signature for getipnodebyname - PROTO="const char *name, int af, int flags, int *error_num" - AC_DEFINE_UNQUOTED([GETIPNODEBYNAME_SIGNATURE], [${PROTO}],[Description]) - - dnl Emit signature for gethostbyaddr - PROTO="const void *addr, socklen_t len, int type" - AC_DEFINE_UNQUOTED(GETHOSTBYADDR_SIGNATURE, [${PROTO}], [Description]) - - dnl Emit signature for sendto - PROTO="int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen" - AC_DEFINE_UNQUOTED(SENDTO_SIGNATURE, [${PROTO}], [Description]) - - dnl Emit signature for sendmsg - PROTO="int s, const struct msghdr *msg, int flags" - AC_DEFINE_UNQUOTED(SENDMSG_SIGNATURE, [${PROTO}], [Description]) - - dnl Output the special librarys (libdl etc needed for tsocks) - SPECIALLIBS=${LIBS} - AC_SUBST(SPECIALLIBS) - LIBS=${SIMPLELIBS} - - if test "x$prefix" = "xNONE"; then - prefix=$ac_default_prefix - fi - - if test "x$CONFDIR" = "x"; then - CONFDIR=`eval echo $sysconfdir` - fi - AC_SUBST(CONFDIR) - AH_TEMPLATE([CONFDIR],[torsock's configuration directory]) - AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR") - - AC_ARG_WITH(conf, - [ --with-conf=<file> location of configuration file (${CONFDIR}/torsocks.conf default)],[ - if test "${withval}" = "yes" ; then - AC_MSG_ERROR("--with-conf requires the location of the configuration file as an argument") - else - AC_DEFINE_UNQUOTED([CONF_FILE], ["${withval}"],[Description]) - fi - ], [ - AC_DEFINE_UNQUOTED([CONF_FILE], ["${CONFDIR}/torsocks.conf"],[Description]) - ]) - - fi - - dnl - end torsocks configuration dnl - libwhich --- 460,463 ---- *************** *** 1085,1088 **** --- 541,550 ---- # USE_GNU_SOURCE above is used instead and _GNU_SOURCE defined in shallot. + dnl Check for presence of torsocks + AC_CHECK_PROG(TORSOCKS, usewithtor, usewithtor) + if test "${TORSOCKS}" = ""; then + AC_MSG_ERROR('TorK requires torsocks: http://code.google.com/p/torsocks') + fi + dnl detect netfilter AC_CHECK_HEADERS(sys/types.h sys/socket.h) *************** *** 1099,1104 **** fi - if test "x$with_external_torsocks" != "xyes"; then - AC_CONFIG_FILES([src/torsocks/usewithtor src/torsocks/torsocks]) - fi AC_CONFIG_FILES([src/menu/tork]) --- 561,563 ---- |
From: Robert H. <hog...@us...> - 2009-11-07 14:22:08
|
Update of /cvsroot/tork/tork/doc/en In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19866/doc/en Modified Files: Makefile.in Log Message: Remove torsocks from source tree; rely on independent installation of torsocks Index: Makefile.in =================================================================== RCS file: /cvsroot/tork/tork/doc/en/Makefile.in,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Makefile.in 20 Jun 2009 09:29:15 -0000 1.49 --- Makefile.in 7 Nov 2009 14:21:56 -0000 1.50 *************** *** 81,85 **** DCOPIDLNG = @DCOPIDLNG@ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ - DEADPOOL_O = @DEADPOOL_O@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ --- 81,84 ---- *************** *** 93,101 **** EXTERNAL_GEOIP_FALSE = @EXTERNAL_GEOIP_FALSE@ EXTERNAL_GEOIP_TRUE = @EXTERNAL_GEOIP_TRUE@ - EXTERNAL_TORSOCKS_FALSE = @EXTERNAL_TORSOCKS_FALSE@ - EXTERNAL_TORSOCKS_TRUE = @EXTERNAL_TORSOCKS_TRUE@ F77 = @F77@ FFLAGS = @FFLAGS@ - FIND = @FIND@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GEOIP_VERSION_INFO = @GEOIP_VERSION_INFO@ --- 92,97 ---- *************** *** 135,139 **** LIBDL = @LIBDL@ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ - LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBJPEG = @LIBJPEG@ --- 131,134 ---- *************** *** 192,198 **** --- 187,195 ---- PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ *************** *** 201,209 **** SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ - SPECIALLIBS = @SPECIALLIBS@ SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ - TAIL = @TAIL@ TOPSUBDIRS = @TOPSUBDIRS@ UIC = @UIC@ UIC_TR = @UIC_TR@ --- 198,205 ---- SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TOPSUBDIRS = @TOPSUBDIRS@ + TORSOCKS = @TORSOCKS@ UIC = @UIC@ UIC_TR = @UIC_TR@ |
From: Robert H. <hog...@us...> - 2009-11-07 14:22:06
|
Update of /cvsroot/tork/tork/src/torsocks In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19866/src/torsocks Removed Files: Makefile.am common.c common.h dead_pool.c dead_pool.h inspectsocks.c parser.c parser.h saveme.c torsocks.1 torsocks.8 torsocks.conf torsocks.conf.5 torsocks.in tsocks.c tsocks.h validateconf.c Log Message: Remove torsocks from source tree; rely on independent installation of torsocks --- torsocks.conf.5 DELETED --- --- validateconf.c DELETED --- --- dead_pool.c DELETED --- --- common.c DELETED --- --- torsocks.1 DELETED --- --- torsocks.8 DELETED --- --- torsocks.in DELETED --- --- torsocks.conf DELETED --- --- parser.c DELETED --- --- tsocks.c DELETED --- --- Makefile.am DELETED --- --- dead_pool.h DELETED --- --- saveme.c DELETED --- --- tsocks.h DELETED --- --- parser.h DELETED --- --- inspectsocks.c DELETED --- --- common.h DELETED --- |
From: Robert H. <hog...@us...> - 2009-11-07 14:22:06
|
Update of /cvsroot/tork/tork/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19866/src Modified Files: Makefile.am torkview.cpp Log Message: Remove torsocks from source tree; rely on independent installation of torsocks Index: Makefile.am =================================================================== RCS file: /cvsroot/tork/tork/src/Makefile.am,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Makefile.am 22 Feb 2009 12:21:08 -0000 1.71 --- Makefile.am 7 Nov 2009 14:21:56 -0000 1.72 *************** *** 13,23 **** endif ! if EXTERNAL_TORSOCKS ! tsocks= ! else ! tsocks=torsocks ! endif ! ! SUBDIRS=icons arkollon $(geoipdir) $(tsocks) privoxytemplates \ torkapplet konqplugin tor_ioslave menu upnp . --- 13,17 ---- endif ! SUBDIRS=icons arkollon $(geoipdir) privoxytemplates \ torkapplet konqplugin tor_ioslave menu upnp . Index: torkview.cpp =================================================================== RCS file: /cvsroot/tork/tork/src/torkview.cpp,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** torkview.cpp 20 Jun 2009 09:29:15 -0000 1.124 --- torkview.cpp 7 Nov 2009 14:21:56 -0000 1.125 *************** *** 296,300 **** { ! QString command = "torkify " + text; QString icon = text.section(" ",0,0); KRun::runCommand( command, icon, icon ); --- 296,300 ---- { ! QString command = "usewithtor " + text; QString icon = text.section(" ",0,0); KRun::runCommand( command, icon, icon ); |
From: Robert H. <hog...@us...> - 2009-10-20 20:21:58
|
Update of /cvsroot/tork/tork In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25445 Removed Files: aclocal.m4 config.h.in Log Message: Remove two build files generated dynamically at build time --- aclocal.m4 DELETED --- --- config.h.in DELETED --- |
From: Robert H. <hog...@us...> - 2009-10-20 20:16:10
|
Update of /cvsroot/tork/tork/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24742/src Modified Files: upnpmanager.h torkview.h Log Message: Fix build warnings on most recent gcc Index: torkview.h =================================================================== RCS file: /cvsroot/tork/tork/src/torkview.h,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** torkview.h 25 Dec 2008 11:57:27 -0000 1.58 --- torkview.h 20 Oct 2009 20:16:00 -0000 1.59 *************** *** 136,140 **** const double* speedHistoryRx() const { return mSpeedHistoryRx; } const double* speedHistoryTx() const { return mSpeedHistoryTx; } ! const int historyBufferSize() const { return HISTORY_SIZE; } const int* historyPointer() const { return &mSpeedHistoryPtr; } const double* maxSpeed() const { return &mMaxSpeed; } --- 136,140 ---- const double* speedHistoryRx() const { return mSpeedHistoryRx; } const double* speedHistoryTx() const { return mSpeedHistoryTx; } ! int historyBufferSize() const { return HISTORY_SIZE; } const int* historyPointer() const { return &mSpeedHistoryPtr; } const double* maxSpeed() const { return &mMaxSpeed; } *************** *** 144,148 **** const double* sys_speedHistoryTx() const { return sys_mSpeedHistoryTx; } ! const int sys_historyBufferSize() const { return HISTORY_SIZE; } const int* sys_historyPointer() const { return &sys_mSpeedHistoryPtr; } --- 144,148 ---- const double* sys_speedHistoryTx() const { return sys_mSpeedHistoryTx; } ! int sys_historyBufferSize() const { return HISTORY_SIZE; } const int* sys_historyPointer() const { return &sys_mSpeedHistoryPtr; } *************** *** 412,416 **** const double* speedHistoryRx() const { return mSpeedHistoryRx; } const double* speedHistoryTx() const { return mSpeedHistoryTx; } ! const int historyBufferSize() const { return HISTORY_SIZE; } const int* historyPointer() const { return &mSpeedHistoryPtr; } const double* maxSpeed() const { return &mMaxSpeed; } --- 412,416 ---- const double* speedHistoryRx() const { return mSpeedHistoryRx; } const double* speedHistoryTx() const { return mSpeedHistoryTx; } ! int historyBufferSize() const { return HISTORY_SIZE; } const int* historyPointer() const { return &mSpeedHistoryPtr; } const double* maxSpeed() const { return &mMaxSpeed; } Index: upnpmanager.h =================================================================== RCS file: /cvsroot/tork/tork/src/upnpmanager.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** upnpmanager.h 14 Apr 2008 11:15:53 -0000 1.6 --- upnpmanager.h 20 Oct 2009 20:16:00 -0000 1.7 *************** *** 38,46 **** using namespace net; - class net::ForwardPort; - class net::ForwardPortList; - class kt::UPnPRouter; - class bt::HTTPRequest; - /** * Widget for the UPnP pref dialog page. --- 38,41 ---- |
From: Robert H. <hog...@us...> - 2009-10-20 20:14:04
|
Update of /cvsroot/tork/tork/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24464/src Modified Files: tork.cpp Log Message: Use icon installed by Tork for OSD icon in menubar Index: tork.cpp =================================================================== RCS file: /cvsroot/tork/tork/src/tork.cpp,v retrieving revision 1.200 retrieving revision 1.201 diff -C2 -d -r1.200 -r1.201 *** tork.cpp 12 Aug 2009 19:41:23 -0000 1.200 --- tork.cpp 20 Oct 2009 20:13:54 -0000 1.201 *************** *** 513,517 **** enableKonqi = new KAction(i18n("Enable/Disable Konqueror's use of Tor"),"konqueror", 0,this, SLOT(toggleKDESetting()),actionCollection(),"enable_konqi"); ! enableTormon = new KAction(i18n("Toggle Tor Traffic OSD"),"konsole", 0,this, SLOT(toggleTorMon()),actionCollection(),"enable_tormon"); browseHiddenServices = new KAction(i18n("Browse Hidden Services"),"tork_tor", 0,this, --- 513,517 ---- enableKonqi = new KAction(i18n("Enable/Disable Konqueror's use of Tor"),"konqueror", 0,this, SLOT(toggleKDESetting()),actionCollection(),"enable_konqi"); ! enableTormon = new KAction(i18n("Toggle Tor Traffic OSD"),"tork_konsole", 0,this, SLOT(toggleTorMon()),actionCollection(),"enable_tormon"); browseHiddenServices = new KAction(i18n("Browse Hidden Services"),"tork_tor", 0,this, |
From: Robert H. <hog...@us...> - 2009-10-20 20:12:52
|
Update of /cvsroot/tork/tork/admin In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24388/admin Modified Files: config.guess config.sub Log Message: Update two build files at suggestion of Patrick Matthei Index: config.guess =================================================================== RCS file: /cvsroot/tork/tork/admin/config.guess,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.guess 7 Jun 2007 21:06:06 -0000 1.2 --- config.guess 20 Oct 2009 20:12:44 -0000 1.3 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ! timestamp='2005-06-30' # This file is free software; you can redistribute it and/or modify it --- 2,9 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ! # Free Software Foundation, Inc. ! timestamp='2009-06-10' # This file is free software; you can redistribute it and/or modify it *************** *** 56,61 **** Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ! Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO --- 57,62 ---- Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ! 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO *************** *** 107,111 **** trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; ! { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || --- 108,112 ---- trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; ! { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || *************** *** 126,130 **** ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. --- 127,131 ---- ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. *************** *** 161,164 **** --- 162,166 ---- sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac *************** *** 169,173 **** eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ! | grep __ELF__ >/dev/null then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). --- 171,175 ---- eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ! | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). *************** *** 207,212 **** echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) ! echo powerppc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) --- 209,217 ---- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) ! echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) *************** *** 320,323 **** --- 325,331 ---- sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` *************** *** 326,331 **** echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; ! i86pc:SunOS:5.*:*) ! echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) --- 334,352 ---- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; ! i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ! eval $set_cc_for_build ! SUN_ARCH="i386" ! # If there is a compiler, see if it is configured for 64-bit objects. ! # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ! # This test works for both compilers. ! if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ! if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ! (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ! grep IS_64BIT_ARCH >/dev/null ! then ! SUN_ARCH="x86_64" ! fi ! fi ! echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) *************** *** 528,532 **** fi exit ;; ! *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then --- 549,553 ---- fi exit ;; ! *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then *************** *** 624,629 **** if [ ${HP_ARCH} = "hppa2.0w" ] then ! # avoid double evaluation of $set_cc_for_build ! test -n "$CC_FOR_BUILD" || eval $set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating --- 645,649 ---- if [ ${HP_ARCH} = "hppa2.0w" ] then ! eval $set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating *************** *** 637,641 **** if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ! grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" --- 657,661 ---- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ! grep -q __LP64__ then HP_ARCH="hppa2.0w" *************** *** 766,775 **** exit ;; *:FreeBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; ! i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; --- 786,802 ---- exit ;; *:FreeBSD:*:*) ! case ${UNAME_MACHINE} in ! pc98) ! echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ! amd64) ! echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ! *) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ! esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; ! *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; *************** *** 781,790 **** echo ${UNAME_MACHINE}-pc-pw32 exit ;; ! x86:Interix*:[34]*) ! echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' ! exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? --- 808,829 ---- echo ${UNAME_MACHINE}-pc-pw32 exit ;; ! *:Interix*:[3456]*) ! case ${UNAME_MACHINE} in ! x86) ! echo i586-pc-interix${UNAME_RELEASE} ! exit ;; ! EM64T | authenticamd | genuineintel) ! echo x86_64-unknown-interix${UNAME_RELEASE} ! exit ;; ! IA64) ! echo ia64-unknown-interix${UNAME_RELEASE} ! exit ;; ! esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? *************** *** 796,800 **** echo ${UNAME_MACHINE}-pc-uwin exit ;; ! amd64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; --- 835,839 ---- echo ${UNAME_MACHINE}-pc-uwin exit ;; ! amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; *************** *** 817,820 **** --- 856,869 ---- exit ;; arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; *************** *** 837,870 **** echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; ! mips:Linux:*:*) ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #undef CPU ! #undef mips ! #undef mipsel ! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mipsel ! #else ! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips ! #else ! CPU= ! #endif ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ! ;; ! mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU ! #undef mips64 ! #undef mips64el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mips64el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips64 #else CPU= --- 886,900 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; ! mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU ! #undef ${UNAME_MACHINE} ! #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=${UNAME_MACHINE} #else CPU= *************** *** 872,878 **** #endif EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu --- 902,915 ---- #endif EOF ! eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ! /^CPU/{ ! s: ::g ! p ! }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu *************** *** 891,898 **** EV68*) UNAME_MACHINE=alphaev68 ;; esac ! objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level --- 928,938 ---- EV68*) UNAME_MACHINE=alphaev68 ;; esac ! objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level *************** *** 918,924 **** --- 958,970 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so *************** *** 936,950 **** TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; esac # Determine whether the default compiler is a.out or elf --- 982,985 ---- *************** *** 963,967 **** # endif #else ! #ifdef __INTEL_COMPILER LIBC=gnu #else --- 998,1002 ---- # endif #else ! #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else *************** *** 973,977 **** #endif EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" --- 1008,1016 ---- #endif EOF ! eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ! /^LIBC/{ ! s: ::g ! p ! }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" *************** *** 1008,1012 **** echo ${UNAME_MACHINE}-pc-syllable exit ;; ! i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; --- 1047,1051 ---- echo ${UNAME_MACHINE}-pc-syllable exit ;; ! i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; *************** *** 1052,1057 **** # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about ! # the processor, so we play safe by assuming i386. ! echo i386-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) --- 1091,1099 ---- # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about ! # the processor, so we play safe by assuming i586. ! # Note: whatever this is, it MUST be the same as what config.sub ! # prints for the "djgpp" host, or else GDB configury will decide that ! # this is a cross-build. ! echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) *************** *** 1091,1094 **** --- 1133,1146 ---- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} *************** *** 1103,1107 **** echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; ! PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; --- 1155,1159 ---- echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; ! PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; *************** *** 1166,1169 **** --- 1218,1224 ---- echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} *************** *** 1175,1178 **** --- 1230,1242 ---- echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} *************** *** 1184,1188 **** UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac --- 1248,1251 ---- *************** *** 1263,1266 **** --- 1326,1335 ---- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac *************** *** 1423,1429 **** download the most up to date version of the config scripts from ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess and ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please --- 1492,1498 ---- download the most up to date version of the config scripts from ! http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and ! http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please Index: config.sub =================================================================== RCS file: /cvsroot/tork/tork/admin/config.sub,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.sub 7 Jun 2007 21:06:06 -0000 1.2 --- config.sub 20 Oct 2009 20:12:44 -0000 1.3 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ! timestamp='2005-07-01' # This file is (in principle) common to ALL GNU software. --- 2,9 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ! # Free Software Foundation, Inc. ! timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. *************** *** 72,77 **** GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ! Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO --- 73,78 ---- GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ! 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO *************** *** 120,125 **** maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ ! kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` --- 121,128 ---- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ! uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ! kopensolaris*-gnu* | \ ! storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` *************** *** 151,154 **** --- 154,160 ---- basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= *************** *** 172,175 **** --- 178,185 ---- os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 *************** *** 188,191 **** --- 198,205 ---- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 *************** *** 232,249 **** | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ ! | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ ! | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ ! | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ ! | mips64vr | mips64vrel \ | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ --- 246,267 ---- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ ! | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ ! | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ ! | lm32 \ ! | m32c | m32r | m32rle | m68000 | m68k | m88k \ ! | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ ! | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ *************** *** 258,263 **** | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ ! | ms1 \ | msp430 \ | ns16k | ns32k \ | or32 \ --- 276,283 ---- | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ ! | moxie \ ! | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ *************** *** 265,281 **** | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ ! | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ ! | sparcv8 | sparcv9 | sparcv9b \ ! | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ ! | z8k) ! basic_machine=$basic_machine-unknown ! ;; ! m32c) basic_machine=$basic_machine-unknown ;; --- 285,299 ---- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ ! | score \ ! | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ! | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ! | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ! | z8k | z80) basic_machine=$basic_machine-unknown ;; *************** *** 287,290 **** --- 305,311 ---- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' *************** *** 306,310 **** | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ! | avr-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ --- 327,331 ---- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ! | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ *************** *** 312,328 **** | d10v-* | d30v-* | dlx-* \ | elxsi-* \ ! | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ ! | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ ! | mips64vr-* | mips64vrel-* \ | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ --- 333,352 ---- | d10v-* | d30v-* | dlx-* \ | elxsi-* \ ! | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ ! | lm32-* \ ! | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ ! | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ *************** *** 337,342 **** | mipstx39-* | mipstx39el-* \ | mmix-* \ ! | ms1-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ --- 361,367 ---- | mipstx39-* | mipstx39el-* \ | mmix-* \ ! | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ *************** *** 345,364 **** | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ | sparclite-* \ ! | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ ! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ ! | xstormy16-* | xtensa-* \ | ymp-* \ ! | z8k-*) ;; ! m32c-*) ;; # Recognize the various machine names and aliases which stand --- 370,391 ---- | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ ! | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ ! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ! | xstormy16-* | xtensa*-* \ | ymp-* \ ! | z8k-* | z80-*) ;; ! # Recognize the basic CPU types without company name, with glob match. ! xtensa*) ! basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand *************** *** 424,427 **** --- 451,458 ---- os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple *************** *** 432,439 **** --- 463,486 ---- os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex *************** *** 464,469 **** os=-unicosmp ;; ! cr16c) ! basic_machine=cr16c-unknown os=-elf ;; --- 511,516 ---- os=-unicosmp ;; ! cr16) ! basic_machine=cr16-unknown os=-elf ;; *************** *** 503,506 **** --- 550,557 ---- os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc *************** *** 657,660 **** --- 708,719 ---- os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron *************** *** 672,675 **** --- 731,738 ---- os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent *************** *** 697,700 **** --- 760,766 ---- os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm *************** *** 795,798 **** --- 861,872 ---- os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti *************** *** 804,807 **** --- 878,887 ---- basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc *************** *** 860,863 **** --- 940,947 ---- os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k *************** *** 886,889 **** --- 970,977 ---- basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei *************** *** 897,900 **** --- 985,991 ---- os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown *************** *** 986,989 **** --- 1077,1084 ---- os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown *************** *** 1061,1064 **** --- 1156,1163 ---- os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none *************** *** 1099,1106 **** basic_machine=we32k-att ;; ! sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; ! sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; --- 1198,1205 ---- basic_machine=we32k-att ;; ! sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; ! sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; *************** *** 1169,1186 **** # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ ! | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ! | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ! | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ! | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ --- 1268,1288 ---- # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ ! | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ! | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ! | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ! | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ! | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ! | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ *************** *** 1188,1192 **** | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*) # Remember, each alternative MUST END IN *, to match a version number. ;; --- 1290,1295 ---- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ! | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; *************** *** 1206,1210 **** ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ ! | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; --- 1309,1313 ---- ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ ! | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; *************** *** 1318,1321 **** --- 1421,1427 ---- os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *************** *** 1340,1343 **** --- 1446,1455 ---- case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 *************** *** 1349,1355 **** os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ! ;; # This must come before the *-dec entry. pdp10-*) --- 1461,1467 ---- os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ! ;; # This must come before the *-dec entry. pdp10-*) *************** *** 1377,1380 **** --- 1489,1495 ---- os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf *************** *** 1395,1398 **** --- 1510,1516 ---- os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix *************** *** 1503,1507 **** vendor=sun ;; ! -aix*) vendor=ibm ;; --- 1621,1625 ---- vendor=sun ;; ! -cnk*|-aix*) vendor=ibm ;; |
From: Robert H. <hog...@us...> - 2009-10-13 20:20:00
|
Update of /cvsroot/tork/tork/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4096/src Modified Files: torclient.cpp Log Message: Tor spec had read/write bytes from stream bw wrong way round! Can't believe I didn't cop this Index: torclient.cpp =================================================================== RCS file: /cvsroot/tork/tork/src/torclient.cpp,v retrieving revision 1.137 retrieving revision 1.138 diff -C2 -d -r1.137 -r1.138 *** torclient.cpp 20 Jun 2009 09:29:15 -0000 1.137 --- torclient.cpp 13 Oct 2009 20:19:51 -0000 1.138 *************** *** 791,796 **** QString stream = info.section(" ",0,0); ! QString in = info.section(" ",1,1); ! QString out = info.section(" ",2,2); emit streamBwUpdate(stream, in, out); --- 791,797 ---- QString stream = info.section(" ",0,0); ! /* Tor spec had it wrong way round! */ ! QString out = info.section(" ",1,1); ! QString in = info.section(" ",2,2); emit streamBwUpdate(stream, in, out); |
From: Robert H. <hog...@us...> - 2009-08-12 19:41:32
|
Update of /cvsroot/tork/tork/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5657/src Modified Files: tork.h tork.cpp Log Message: Fix crash due to Antarctica missing from continents list! Prevent crash from happening if any new continents emerge ;-) Reported by a number of people. Index: tork.cpp =================================================================== RCS file: /cvsroot/tork/tork/src/tork.cpp,v retrieving revision 1.199 retrieving revision 1.200 diff -C2 -d -r1.199 -r1.200 *** tork.cpp 20 Jun 2009 09:29:15 -0000 1.199 --- tork.cpp 12 Aug 2009 19:41:23 -0000 1.200 *************** *** 566,569 **** --- 566,570 ---- m_CountryMenuAS = new KPopupMenu( this ); m_CountryMenuNA = new KPopupMenu( this ); + m_CountryMenuAN = new KPopupMenu( this ); m_CountryMenuSA = new KPopupMenu( this ); m_CountryMenuNN = new KPopupMenu( this ); *************** *** 574,577 **** --- 575,579 ---- continentMapList["AS"] = m_CountryMenuAS; continentMapList["NA"] = m_CountryMenuNA; + continentMapList["AN"] = m_CountryMenuAN; continentMapList["SA"] = m_CountryMenuSA; continentMapList["OC"] = m_CountryMenuOC; *************** *** 586,589 **** --- 588,592 ---- m_CountryMenu->insertItem( i18n( "Oceania" ), m_CountryMenuOC ); m_CountryMenu->insertItem( i18n( "Satellite" ), m_CountryMenuNN ); + m_CountryMenu->insertItem( i18n( "Antarctica" ), m_CountryMenuAN ); connect(m_CountryMenu,SIGNAL(aboutToShow()),SLOT(populateCountryMenu( ))); *************** *** 698,701 **** --- 701,705 ---- m_PseudoMenuAS = new KPopupMenu( this ); m_PseudoMenuNA = new KPopupMenu( this ); + m_PseudoMenuAN = new KPopupMenu( this ); m_PseudoMenuSA = new KPopupMenu( this ); m_PseudoMenuNN = new KPopupMenu( this ); *************** *** 706,709 **** --- 710,714 ---- continentMap["AS"] = m_PseudoMenuAS; continentMap["NA"] = m_PseudoMenuNA; + continentMap["AN"] = m_PseudoMenuAN; continentMap["SA"] = m_PseudoMenuSA; continentMap["OC"] = m_PseudoMenuOC; *************** *** 718,721 **** --- 723,727 ---- m_PseudoMenu->insertItem( i18n( "Oceania" ), m_PseudoMenuOC ); m_PseudoMenu->insertItem( i18n( "Satellite" ), m_PseudoMenuNN ); + m_PseudoMenu->insertItem( i18n( "Antarctica" ), m_PseudoMenuAN ); connect(m_PseudoMenu,SIGNAL(aboutToShow()),SLOT(populatePseudoMenu( ))); *************** *** 860,864 **** for ( QValueList<int>::Iterator it = tmplist.begin(); it != tmplist.end(); ++it ) { ! if ( continentMapList[GeoIP_country_continent[(*it)]]->findItem( (*it) ) ){ continue; --- 866,874 ---- for ( QValueList<int>::Iterator it = tmplist.begin(); it != tmplist.end(); ++it ) { ! if (!continentMapList.contains(GeoIP_country_continent[(*it)])) { ! kdDebug() << "unknown continent" << GeoIP_country_continent[(*it)] << endl; ! continue; ! } ! if ( continentMapList[GeoIP_country_continent[(*it)]]->findItem( (*it) ) ){ continue; *************** *** 881,888 **** for ( QValueList<int>::Iterator it = tmplist.begin(); it != tmplist.end(); ++it ) { ! ! if ( continentMap[GeoIP_country_continent[(*it)]]->findItem( (*it) ) ){ continue; } continentMap[GeoIP_country_continent[(*it)]]->insertItem( QString(GeoIP_country_code[(*it)]).contains("--") ? SmallIcon("help") : --- 891,901 ---- for ( QValueList<int>::Iterator it = tmplist.begin(); it != tmplist.end(); ++it ) { ! if (!continentMap.contains(GeoIP_country_continent[(*it)])) { ! kdDebug() << "unknown continent" << GeoIP_country_continent[(*it)] << endl; continue; } + + if ( continentMap[GeoIP_country_continent[(*it)]]->findItem( (*it) ) ) + continue; continentMap[GeoIP_country_continent[(*it)]]->insertItem( QString(GeoIP_country_code[(*it)]).contains("--") ? SmallIcon("help") : *************** *** 896,899 **** --- 909,917 ---- void tork::applyPseudonymity( int country_id ) { + if (!continentMap.contains(GeoIP_country_continent[country_id])) { + kdDebug() << "unknown continent" << GeoIP_country_continent[country_id] << endl; + return; + } + // Update Menu for ( QMap<QString, KPopupMenu*>::Iterator menu = continentMap.begin(); menu != continentMap.end(); ++menu ) Index: tork.h =================================================================== RCS file: /cvsroot/tork/tork/src/tork.h,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** tork.h 17 Jan 2009 15:49:08 -0000 1.114 --- tork.h 12 Aug 2009 19:41:23 -0000 1.115 *************** *** 334,337 **** --- 334,338 ---- KPopupMenu* m_PseudoMenuAS; KPopupMenu* m_PseudoMenuNA; + KPopupMenu* m_PseudoMenuAN; KPopupMenu* m_PseudoMenuAF; KPopupMenu* m_PseudoMenuNN; *************** *** 346,349 **** --- 347,351 ---- KPopupMenu* m_CountryMenuAS; KPopupMenu* m_CountryMenuNA; + KPopupMenu* m_CountryMenuAN; KPopupMenu* m_CountryMenuAF; KPopupMenu* m_CountryMenuNN; |
From: Robert H. <hog...@us...> - 2009-08-09 09:15:52
|
Update of /cvsroot/tork/tork/po In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18890/po Modified Files: de.po Log Message: Updated German Translation from Hans Ullrich Index: de.po =================================================================== RCS file: /cvsroot/tork/tork/po/de.po,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** de.po 14 Dec 2008 14:48:19 -0000 1.5 --- de.po 9 Aug 2009 09:15:39 -0000 1.6 *************** *** 3,7 **** # This file is put in the public domain. # ! # Hans <han...@lo...>, 2008. msgid "" msgstr "" --- 3,7 ---- # This file is put in the public domain. # ! # Hans <han...@lo...>, 2008, 2009. msgid "" msgstr "" *************** *** 9,13 **** "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-06-16 19:55+0100\n" ! "PO-Revision-Date: 2008-12-14 15:15+0100\n" "Last-Translator: Hans <han...@lo...>\n" "Language-Team: <de...@li...>\n" --- 9,13 ---- "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-06-16 19:55+0100\n" ! "PO-Revision-Date: 2009-08-06 14:12+0200\n" "Last-Translator: Hans <han...@lo...>\n" "Language-Team: <de...@li...>\n" *************** *** 61,70 **** #: hiddensrvs.ui.h:142 - #, fuzzy msgid "" "<p>Simple web service started. Test the service to ensure it's running. " "<br><b>thttpd -p %1 -h %2 -d %3" msgstr "" ! "<p> Einfache Web-Dienst gestartet. Testen Sie den Service, um sicherzustellen, da� er läuft." "<br> <b> thttpd-p %1-h %2-d %3" --- 61,69 ---- #: hiddensrvs.ui.h:142 msgid "" "<p>Simple web service started. Test the service to ensure it's running. " "<br><b>thttpd -p %1 -h %2 -d %3" msgstr "" ! "<p> Einfache Web-Dienst gestartet. Testen Sie den Service, um sicherzustellen, daà er läuft." "<br> <b> thttpd-p %1-h %2-d %3" *************** *** 84,88 **** #: hiddensrvs.ui.h:184 - #, fuzzy msgid "" "<p>Konqueror and TorK need to be using Tor in order to test a hidden " --- 83,86 ---- *************** *** 90,94 **** "Konqueror to use Tor!" msgstr "" ! "<p>Konqueror und Tork müssen mit Tor korrekt nutzen um einen versteckten " " Dienst zu nutzen . <br> <b> Um einen versteckten Dienst zu testen, starten " " Sie zuerst Tork und erlauben dann Konqueror, Tor zu nutzen!" --- 88,92 ---- "Konqueror to use Tor!" msgstr "" ! "<p>Konqueror und Tork müssen Tor korrekt nutzen um einen versteckten " " Dienst zu nutzen . <br> <b> Um einen versteckten Dienst zu testen, starten " " Sie zuerst Tork und erlauben dann Konqueror, Tor zu nutzen!" *************** *** 178,182 **** #: newfirstrunwizard.ui.h:235 - #, fuzzy msgid "" "<p>To be honest, I'm not that bright.It looks as if Privoxy is configured to " --- 176,179 ---- *************** *** 184,188 **** "you help me?Does Privoxy start by itself at boot-time?</p>" msgstr "" ! "<p>Um ehrlich zu sein bin ich nicht so besonders schlau. Es sieht zwar so " "aus als startet Privoxy wenn der Computer hochfährt aber ich bin nicht " "sicher. Können Sie mir helfen? Startet Privoxy von selbst, wenn der Computer " --- 181,185 ---- "you help me?Does Privoxy start by itself at boot-time?</p>" msgstr "" ! "<p>Um ehrlich zu sein, bin ich nicht so besonders schlau. Es sieht zwar so " "aus als startet Privoxy wenn der Computer hochfährt aber ich bin nicht " "sicher. Können Sie mir helfen? Startet Privoxy von selbst, wenn der Computer " *************** *** 258,262 **** #: newfirstrunwizard.ui.h:580 - #, fuzzy msgid "" "<p>OK, I didn't find any of the config files in the list.<br>To make tor " --- 255,258 ---- *************** *** 268,272 **** msgstr "" "<p> OK, ich habe nirgends Konfigurationsdateien in der Liste gefunden. <br> Um Tor" ! "zu nutzen, erstelle ich eine Konfigdatei namens config /usr/local/etc/tor/ torrc. Ich habe" "Tor aufgefordert, neu zu laden und die neue Konfigurationsdatei zu nutzen. <b> Sie werden aufgefordert für" "yout root-Passwort in einem Augenblick. <b> Dies ist zum Modifizieren der Datei und notwendig" --- 264,268 ---- msgstr "" "<p> OK, ich habe nirgends Konfigurationsdateien in der Liste gefunden. <br> Um Tor" ! "zu nutzen, erstelle ich eine Konfigdatei namens /usr/local/etc/tor/torrc. Ich habe" "Tor aufgefordert, neu zu laden und die neue Konfigurationsdatei zu nutzen. <b> Sie werden aufgefordert für" "yout root-Passwort in einem Augenblick. <b> Dies ist zum Modifizieren der Datei und notwendig" *************** *** 301,305 **** #: questions.h:61 msgid "You Are Running A Server Without Any Contact Information!" ! msgstr "Sie " #: questions.h:62 warnings.h:76 --- 297,301 ---- #: questions.h:61 msgid "You Are Running A Server Without Any Contact Information!" ! msgstr "Sie Lassen Einen Server Ohne Kontaktinformationen Laufen!" #: questions.h:62 warnings.h:76 *************** *** 355,361 **** #: questions.h:114 - #, fuzzy msgid "Sorry! You can't run a Tor Server!" ! msgstr "Ihr Tor Server" #: questions.h:115 --- 351,356 ---- #: questions.h:114 msgid "Sorry! You can't run a Tor Server!" ! msgstr "Verzeihung! Sie können keinen Tor Server laufen lassen!" #: questions.h:115 *************** *** 415,419 **** "You are connecting to a remote or local instance of Tor, it may not have the " "settings you've configured with TorK." ! msgstr "Sie verbinden sich zu einer entfernten oder lokalen Instaz von Tor, aber die Einstellungen von TorK könnten falsch konfiguriert sein." #: questions.h:170 --- 410,414 ---- "You are connecting to a remote or local instance of Tor, it may not have the " "settings you've configured with TorK." ! msgstr "Sie verbinden sich zu einer entfernten oder lokalen Instanz von Tor, aber die Einstellungen von TorK könnten falsch konfiguriert sein." #: questions.h:170 *************** *** 449,455 **** #: questions.h:195 - #, fuzzy msgid "TorK couldn't start your Privacy Proxy!" ! msgstr "Lokalsiere Ihren Privacy Proxy" #: questions.h:196 --- 444,449 ---- #: questions.h:195 msgid "TorK couldn't start your Privacy Proxy!" ! msgstr "TorK konnte Ihren Privacy Proxy nicht starten!" #: questions.h:196 *************** *** 459,463 **** "to Tor, then just click 'No' and take a look at the 'Konqueror' settings in " "the configuration dialog." ! msgstr "Dies könnte sein, weil Sie das bei Systemstart konfiguriert haben. Wenn dem so ist, und Sie glauben, daà es konfiguriert wurde, daà Tor lauscht, dann klicken Sie 'No' und schauen in den 'Konqueror' Einstellungen nach." #: questions.h:198 --- 453,457 ---- "to Tor, then just click 'No' and take a look at the 'Konqueror' settings in " "the configuration dialog." ! msgstr "Dies könnte sein, weil Sie das beim Systemstart konfiguriert haben. Wenn dem so ist, und Sie glauben, daà es konfiguriert wurde, daà Tor lauscht, dann klicken Sie 'No' und schauen in den 'Konqueror' Einstellungen nach." #: questions.h:198 *************** *** 529,533 **** #: questions.h:281 msgid "There was an error when applying your failsafe request." ! msgstr "Es gab einen Fehler bei der failsafe Anfrage." #: questions.h:283 --- 523,527 ---- #: questions.h:281 msgid "There was an error when applying your failsafe request." ! msgstr "Es gab einen Fehler bei der Failsafe Anfrage." #: questions.h:283 *************** *** 549,553 **** #: questions.h:308 msgid "Tor's Authentication Cookie Not Available!" ! msgstr "Tor's Authentifizierungs Cookide nicht verfügbar!" #: questions.h:309 --- 543,547 ---- #: questions.h:308 msgid "Tor's Authentication Cookie Not Available!" ! msgstr "Tor's Authentifizierungs Cookie nicht verfügbar!" #: questions.h:309 *************** *** 564,568 **** #: questions.h:322 msgid "Tor Controller is Not Responding!" ! msgstr "Der Tor Knotroller antwortet nicht!" #: questions.h:323 --- 558,562 ---- #: questions.h:322 msgid "Tor Controller is Not Responding!" ! msgstr "Der Tor Kontroller antwortet nicht!" #: questions.h:323 *************** *** 719,725 **** #: warnings.h:106 warnings.h:114 warnings.h:122 warnings.h:130 warnings.h:138 - #, fuzzy msgid "Problem Accessing Files!" ! msgstr "Folder Serving Files" #: warnings.h:108 --- 713,718 ---- #: warnings.h:106 warnings.h:114 warnings.h:122 warnings.h:130 warnings.h:138 msgid "Problem Accessing Files!" ! msgstr "Problem Zugriffs Dateien!" #: warnings.h:108 *************** *** 792,796 **** #: warnings.h:202 msgid "The Hidden Service You Are Trying to Reach is Currently Unavailable!" ! msgstr "Der versteckte Dienstm den Sie erreichen wollen ist momentan nicht verfügbar!" #: warnings.h:204 --- 785,789 ---- #: warnings.h:202 msgid "The Hidden Service You Are Trying to Reach is Currently Unavailable!" ! msgstr "Der versteckte Dienst den Sie erreichen wollen ist momentan nicht verfügbar!" #: warnings.h:204 *************** *** 838,842 **** #: warnings.h:244 msgid "Try again maybe." ! msgstr "Versuchs nochmal." #: warnings.h:250 --- 831,835 ---- #: warnings.h:244 msgid "Try again maybe." ! msgstr "Versuch nochmal." #: warnings.h:250 *************** *** 874,878 **** "Konqueror windows that were used non-anonymously are safe to use again for " "non-anonymous work!" ! msgstr "KKonqueror Fenster, die für nicht-anonyme Nutzung verwendet werden, sind nutzbar für anonyme Tätigkeiten!" #: warnings.h:286 --- 867,871 ---- "Konqueror windows that were used non-anonymously are safe to use again for " "non-anonymous work!" ! msgstr "Konqueror Fenster, die für nicht-anonyme Nutzung verwendet werden, sind nutzbar für anonyme Tätigkeiten!" #: warnings.h:286 *************** *** 886,890 **** #: warnings.h:295 msgid "Tor is ready for use as a client." ! msgstr "Tor ist bereit als Client!" #: warnings.h:297 --- 879,883 ---- #: warnings.h:295 msgid "Tor is ready for use as a client." ! msgstr "Tor ist bereit für die Verwendung als Client!" #: warnings.h:297 *************** *** 906,910 **** #: warnings.h:315 msgid "If you stored it elsewhere, please copy it to the suggested location above." ! msgstr "Wenn Sie es wÃrgendwoanders abgespeichert haben, kopieren Sie es bitte an den oben vorgeschlagenen Ort." #: warnings.h:324 --- 899,903 ---- #: warnings.h:315 msgid "If you stored it elsewhere, please copy it to the suggested location above." ! msgstr "Wenn Sie es irgend woanders abgespeichert haben, kopieren Sie es bitte an den oben vorgeschlagenen Ort." #: warnings.h:324 *************** *** 2215,2219 **** "appropriate face below the window title-bar, briefly describe what you like " "or dislike and click Send." ! msgstr "Jedes Mal wenn Sie frustrierende Erfahrung machen, klicken Sie bitte das traurige Gesicht unter dem Fenster Titel Balken, beschreiben kurz, was Ihnen gefallen oder missfallen hat und klicken auf senden." #: likeback.cpp:441 --- 2208,2212 ---- "appropriate face below the window title-bar, briefly describe what you like " "or dislike and click Send." ! msgstr "Jedes Mal, wenn Sie frustrierende Erfahrung machen, klicken Sie bitte das traurige Gesicht unter dem Fenster Titel Balken, beschreiben kurz, was Ihnen gefallen oder missfallen hat und klicken auf senden." #: likeback.cpp:441 *************** *** 2221,2225 **** "Each time you have a great experience, please click the smiling face below " "the window title-bar, briefly describe what you like and click Send." ! msgstr "Jedes Mal wenn Sie gute Erfahrung machen, klicken Sie bitte das freundliche Gesicht unter dem Fenster Titel Balken, beschreiben kurz, was Ihnen gefallen oder missfallen hat und klicken auf senden." #: likeback.cpp:445 --- 2214,2218 ---- "Each time you have a great experience, please click the smiling face below " "the window title-bar, briefly describe what you like and click Send." ! msgstr "Jedes Mal, wenn Sie gute Erfahrung machen, klicken Sie bitte das freundliche Gesicht unter dem Fenster Titel Balken, beschreiben kurz, was Ihnen gefallen oder missfallen hat und klicken auf senden." #: likeback.cpp:445 *************** *** 2227,2231 **** "Each time you have a frustrating experience, please click the frowning face " "below the window title-bar, briefly describe what you dislike and click Send." ! msgstr "Jedes Mal wenn Sie frustrierende Erfahrung machen, klicken Sie bitte das stirnrunzelnde Gesicht unter dem Fenster Titel Balken, beschreiben kurz, was Ihnen gefallen oder missfallen hat und klicken auf senden.." #: likeback.cpp:454 --- 2220,2224 ---- "Each time you have a frustrating experience, please click the frowning face " "below the window title-bar, briefly describe what you dislike and click Send." ! msgstr "Jedes Mal, wenn Sie frustrierende Erfahrung machen, klicken Sie bitte das stirnrunzelnde Gesicht unter dem Fenster Titel Balken, beschreiben kurz, was Ihnen gefallen oder missfallen hat und klicken auf senden.." #: likeback.cpp:454 *************** *** 2409,2413 **** #: main.cpp:49 msgid "Launch Anonymous Konversation" ! msgstr "Anonymes Konversation starten" #: main.cpp:50 --- 2402,2406 ---- #: main.cpp:49 msgid "Launch Anonymous Konversation" ! msgstr "Anonyme Konversation starten" #: main.cpp:50 *************** *** 2515,2519 **** #, no-c-format msgid "Max Bandwidth to Advertise:" ! msgstr "Maximale Bandbreite die bekanntgegeben wird:" #. i18n: file ./maxmin.ui line 124 --- 2508,2512 ---- #, no-c-format msgid "Max Bandwidth to Advertise:" ! msgstr "Maximale Bandbreite, die bekanntgegeben wird:" #. i18n: file ./maxmin.ui line 124 *************** *** 3054,3058 **** #, no-c-format msgid "I'm trying to connect to Tor." ! msgstr "Ich versuche zu Tor zu verbinden." #. i18n: file ./newfirstrunwizard.ui line 888 --- 3047,3051 ---- #, no-c-format msgid "I'm trying to connect to Tor." ! msgstr "Ich versuche mich zu Tor zu verbinden." #. i18n: file ./newfirstrunwizard.ui line 888 *************** *** 3501,3505 **** "</p>\n" "<p>Wenn sie den root-Benutzer Ansatz verwenden möchten, kann TorK eine Kopie " ! "von 'netzstat' erstellen, die mit root-Rechten läuft.<b>Dies ist allerdings " "keine gute Idee, wenn Sie Ihren Computer mit anderen teilen, da diese dann " "Ihren Datenverkehr überwachen können.</b>.</p>" --- 3494,3498 ---- "</p>\n" "<p>Wenn sie den root-Benutzer Ansatz verwenden möchten, kann TorK eine Kopie " ! "von 'netstat' erstellen, die mit root-Rechten läuft.<b>Dies ist allerdings " "keine gute Idee, wenn Sie Ihren Computer mit anderen teilen, da diese dann " "Ihren Datenverkehr überwachen können.</b>.</p>" *************** *** 3555,3559 **** #: newstreamosd.cpp:191 msgid "This displays all network activity currently being handled by Tor." ! msgstr "Dies zeight allen von Tor bearbeiteten Datenverkehr an." #. i18n: file ./paranoia.ui line 73 --- 3548,3552 ---- #: newstreamosd.cpp:191 msgid "This displays all network activity currently being handled by Tor." ! msgstr "Dies zeigt allen von Tor bearbeiteten Datenverkehr an." #. i18n: file ./paranoia.ui line 73 *************** *** 3693,3697 **** #, no-c-format msgid "Exit Servers To Avoid" ! msgstr "Zu vermeidende Exit-Server" #. i18n: file ./torservers.ui line 51 --- 3686,3692 ---- #, no-c-format msgid "Exit Servers To Avoid" ! msgstr "" ! "Z " ! "u vermeidende Exit-Server" #. i18n: file ./torservers.ui line 51 *************** *** 3905,3909 **** #, no-c-format msgid "Position on Circuit" ! msgstr "Position im Circuit" #. i18n: file ./torservers.ui line 449 --- 3900,3904 ---- #, no-c-format msgid "Position on Circuit" ! msgstr "Position im Kreissegment" #. i18n: file ./torservers.ui line 449 *************** *** 3917,3921 **** #, no-c-format msgid "Introduction" ! msgstr "Introduction" #. i18n: file ./torservers.ui line 465 --- 3912,3916 ---- #, no-c-format msgid "Introduction" ! msgstr "Einführung" #. i18n: file ./torservers.ui line 465 *************** *** 3923,3927 **** #, no-c-format msgid "Middle" ! msgstr "Middle" #. i18n: file ./torservers.ui line 502 --- 3918,3922 ---- #, no-c-format msgid "Middle" ! msgstr "Mitte" #. i18n: file ./torservers.ui line 502 *************** *** 3930,3934 **** #, no-c-format msgid "Clear Selected" ! msgstr "Clear Selected" #. i18n: file ./torservers.ui line 512 --- 3925,3929 ---- #, no-c-format msgid "Clear Selected" ! msgstr "Lösche Ausgewähltes" #. i18n: file ./torservers.ui line 512 *************** *** 4047,4051 **** "443, <br> it will also tell your router to forward traffic on these ports to " "Tor." ! msgstr "Dies wird Tor anweisen, Ihren Tor Server an den allgemeinen Ports 80 und 443 azuzeigen, <br> es wird ausserdem Ihren Router anweisen, den gesamten Datenstrom an diese Ports weiterzuleiten." #. i18n: file ./server.ui line 299 --- 4042,4046 ---- "443, <br> it will also tell your router to forward traffic on these ports to " "Tor." ! msgstr "Dies wird Tor anweisen, Ihren Tor Server an den allgemeinen Ports 80 und 443 anzuzeigen, <br> es wird auÃerdem Ihren Router anweisen, den gesamten Datenstrom an diese Ports weiterzuleiten." #. i18n: file ./server.ui line 299 *************** *** 4091,4095 **** #, no-c-format msgid "Performance Options" ! msgstr "Performance Optionen" #. i18n: file ./server.ui line 458 --- 4086,4090 ---- #, no-c-format msgid "Performance Options" ! msgstr "Leistung Optionen" #. i18n: file ./server.ui line 458 *************** *** 4252,4256 **** #, no-c-format msgid "tork_base" ! msgstr "tork_base" #. i18n: file ./torkview_base.ui line 186 --- 4247,4251 ---- #, no-c-format msgid "tork_base" ! msgstr "Tork_Basis" #. i18n: file ./torkview_base.ui line 186 *************** *** 4396,4400 **** #, no-c-format msgid "Clear after every:" ! msgstr "Löschen nach:" #. i18n: file ./torkview_base.ui line 747 --- 4391,4395 ---- #, no-c-format msgid "Clear after every:" ! msgstr "Löschen nach jedem:" #. i18n: file ./torkview_base.ui line 747 *************** *** 4712,4716 **** "important what you call it.</p>" msgstr "" ! "<p> Wenn Sie den Tor Server laufen lassen, erlauben Sie Benutzern des Tor Netzwerkes ihren Datenverkehr durch Ihren Computer laufen zu lassen. Ein laufender Tor Server beeinflusst jedoch nicht Ihre eigene Anonymitaet</p>\n" "<p> Jeder Tor Server hat einen Decknamen zur einfachen Erkennung. Es ist nicht so wichtig, wie der lautet.</p>" --- 4707,4711 ---- "important what you call it.</p>" msgstr "" ! "<p> Wenn Sie den Tor Server laufen lassen, erlauben Sie Benutzern des Tor Netzwerkes ihren Datenverkehr durch Ihren Computer laufen zu lassen. Ein laufender Tor Server beeinflusst jedoch nicht Ihre eigene Anonymität</p>\n" "<p> Jeder Tor Server hat einen Decknamen zur einfachen Erkennung. Es ist nicht so wichtig, wie der lautet.</p>" *************** *** 4742,4747 **** "help in the event of a problem.</p>" msgstr "" ! "<p>Falls Sie unbeabsichtigt den Server falsch konfiguriert haben, könnten andere Admins oder Ihr Tor Team Sie möglicherweise kontaktieren, damit Sie die feler beseitigen.</p>\n" ! "<p>Sie sind nicht gezwungen, eine Kontakt Email-Adresse anzugeben, aber es wird sicherlich bei Problemen helfen.</p>" #. i18n: file ./serverwizard.ui line 124 --- 4737,4742 ---- "help in the event of a problem.</p>" msgstr "" ! "<p>Falls Sie unbeabsichtigt den Server falsch konfiguriert haben, könnten andere Admins oder Ihr Tor Team Sie möglicherweise kontaktieren, damit Sie die Fehler beseitigen.</p>\n" ! "<p>Sie sind nicht gezwungen, eine Kontakt E-Mail-Adresse anzugeben, aber es wird sicherlich bei Problemen helfen.</p>" #. i18n: file ./serverwizard.ui line 124 *************** *** 4794,4798 **** "<b>No Routers Found. Check your local firewall and ensure your router has " "UPnP enabled.</b>" ! msgstr "<b>Keine Router gefunden. Prüfen Sie Ihre lokale Firewall und stellen Sie sicher, dass Ihr Roueter UPnP eingeschaltet hat.</b>" #. i18n: file ./running.ui line 42 --- 4789,4793 ---- "<b>No Routers Found. Check your local firewall and ensure your router has " "UPnP enabled.</b>" ! msgstr "<b>Keine Router gefunden. Prüfen Sie Ihre lokale Firewall und stellen Sie sicher, dass Ihr Router UPnP eingeschaltet hat.</b>" #. i18n: file ./running.ui line 42 *************** *** 5128,5132 **** #: tork.cpp:597 msgid "Anonymous Opera" ! msgstr "Anonymes Opera" #: tork.cpp:600 --- 5123,5127 ---- #: tork.cpp:597 msgid "Anonymous Opera" ! msgstr "Anonymer Opera" #: tork.cpp:600 *************** *** 5413,5417 **** "is because they may have javascript/java/plugins/flash enabled." msgstr "" ! "Alle <b>Koqueror</b> Sessions sind nun Anonym. <br> <b>Amarok, Akregator, " "KTorrent sollten mit Vorsicht behandelt werden! </b><br> Sie könnten " "Javascript/Java/Plugins/Flash verwenden." --- 5408,5412 ---- "is because they may have javascript/java/plugins/flash enabled." msgstr "" ! "Alle <b>Koqueror</b> Sitzungen sind nun Anonym. <br> <b>Amarok, Akregator, " "KTorrent sollten mit Vorsicht behandelt werden! </b><br> Sie könnten " "Javascript/Java/Plugins/Flash verwenden." *************** *** 5444,5448 **** msgstr "" "- Konqueror verwendet Privoxy zusammen mit Tor um das Surfen zu " ! "anonymisieren.<br>- Auch ihre anderen Konqueror-Sessions sind dann anonym." "<br>- <b>Teilweise</b> werden dadurch auch Ihre anderen Anwendungen wie " "<b>KTorrent (tracker/search only)</b> und <b>Amarok</b> anonymisiert. " --- 5439,5443 ---- msgstr "" "- Konqueror verwendet Privoxy zusammen mit Tor um das Surfen zu " ! "anonymisieren.<br>- Auch ihre anderen Konqueror-Sitzungen sind dann anonym." "<br>- <b>Teilweise</b> werden dadurch auch Ihre anderen Anwendungen wie " "<b>KTorrent (tracker/search only)</b> und <b>Amarok</b> anonymisiert. " *************** *** 5518,5522 **** "may therefore not be fully anonymous." msgstr "" ! "Kurz bevor der Verkehr nach %1 durch Tor geleitet wurde, hat das Progarmm <b>" "%2</b> Tor umgangen um einen Domainnamen in eine IP-Adesse aufzulösen. Der " "Verkehr mit <b>%3</b> ist deshalb nicht mehr vollständig anonym." --- 5513,5517 ---- "may therefore not be fully anonymous." msgstr "" ! "Kurz bevor der Verkehr nach %1 durch Tor geleitet wurde, hat das Programm <b>" "%2</b> Tor umgangen um einen Domainnamen in eine IP-Adesse aufzulösen. Der " "Verkehr mit <b>%3</b> ist deshalb nicht mehr vollständig anonym." *************** *** 5528,5532 **** msgstr "" "Der Verkehr auf Port %1 ist nicht verschlüsselt. <b> Passwörter </b> können " ! "vom Besitzer dieses Exit-Servers gesammelt werden." #: tork.cpp:3928 --- 5523,5527 ---- msgstr "" "Der Verkehr auf Port %1 ist nicht verschlüsselt. <b> Passwörter </b> können " ! "vom Besitzer dieses Ausgangs-Servers gesammelt werden." #: tork.cpp:3928 *************** *** 5538,5542 **** "Wo ich gerade Ihre Aufmerksamkeit habe: Der Verkehr auf Port %1 ist nicht " "verschlüsselt und enthält oft Passwörter. <b> Passwörter </b> die auf diesem " ! "Kanal übermittelt werden, können durch den Besitzer des Exit-Server " "gesammelt werden." --- 5533,5537 ---- "Wo ich gerade Ihre Aufmerksamkeit habe: Der Verkehr auf Port %1 ist nicht " "verschlüsselt und enthält oft Passwörter. <b> Passwörter </b> die auf diesem " ! "Kanal übermittelt werden, können durch den Besitzer des Ausgangs-Server " "gesammelt werden." *************** *** 5685,5689 **** "network.<br>" msgstr "" ! "- Anonyme Webseiten / Web-Dienste nennt man 'versteckte Dienste'.<br> - Ihr " "Standort und Ihr Besitzer werden durch die Verwendung von Tor versteckt.<br>" --- 5680,5684 ---- "network.<br>" msgstr "" ! "- Anonyme Webseiten / Web-Dienste nennt man 'Versteckte Dienste'.<br> - Ihr " "Standort und Ihr Besitzer werden durch die Verwendung von Tor versteckt.<br>" *************** *** 5719,5723 **** "- TorK macht eine Kopie Ihrer normalen Firefox-Einstellungen und modifiziert " "sie fürs anonyme Surfen. <br>- Firefox wird Privoxy in Verbindung mit Tor " ! "verwenden. <br>- Die anderen Firefox Sessions sind nicht anonym." #: torkview.cpp:1525 --- 5714,5718 ---- "- TorK macht eine Kopie Ihrer normalen Firefox-Einstellungen und modifiziert " "sie fürs anonyme Surfen. <br>- Firefox wird Privoxy in Verbindung mit Tor " ! "verwenden. <br>- Keine anderen Firefox Sitzungen werden anonym sein!" #: torkview.cpp:1525 *************** *** 5762,5766 **** "Konqueror icon in the toolbar or the miniview.<br>" msgstr "" ! "- Diese Einstellung macht auch alle anderen Konqueror Sessions anonym. <br>- " "Konqueror Fenster, die das anonyme Surfen eingeschaltet haben, sind grün " "eignefärbt.<br>- Konqueror verwendet Privoxy in Kombination mit Tor um das " --- 5757,5761 ---- "Konqueror icon in the toolbar or the miniview.<br>" msgstr "" ! "- Diese Einstellung macht auch alle anderen Konqueror Sitzungen anonym. <br>- " "Konqueror Fenster, die das anonyme Surfen eingeschaltet haben, sind grün " "eignefärbt.<br>- Konqueror verwendet Privoxy in Kombination mit Tor um das " *************** *** 5770,5774 **** #: torkview.cpp:1621 msgid "Configure Anonymous Konqueror" ! msgstr "Konfiguriere den anonymisierten Konqueror" #: torkview.cpp:1631 --- 5765,5769 ---- #: torkview.cpp:1621 msgid "Configure Anonymous Konqueror" ! msgstr "Konfiguriere einen anonymisierten Konqueror" #: torkview.cpp:1631 *************** *** 5791,5796 **** msgstr "" "- TorK macht eine Kopie Ihrer normalen Opera-Einstellungen und modifiziert " ! "sie fürs anonyme Surfen. <br>- Opera wird Privoxy in Verbindung mit Tor " ! "verwenden. <br>- Die anderen Opera Sessions sind nicht anonym." #: torkview.cpp:1677 --- 5786,5791 ---- msgstr "" "- TorK macht eine Kopie Ihrer normalen Opera-Einstellungen und modifiziert " ! "sie für das anonyme Surfen. <br>- Opera wird Privoxy in Verbindung mit Tor " ! "verwenden. <br>- Die anderen Opera Sitzungen sind nicht anonym." #: torkview.cpp:1677 *************** *** 5882,5886 **** #: torkview.cpp:1877 msgid "How can I be sure this is working?" ! msgstr "Wie kann ich sicher sein, dass alles funktioniert?" #: torkview.cpp:1907 --- 5877,5881 ---- #: torkview.cpp:1877 msgid "How can I be sure this is working?" ! msgstr "Wie kann ich sicher sein, daà alles funktioniert?" #: torkview.cpp:1907 *************** *** 5940,5944 **** "<br>" msgstr "" ! "- Ihre http(s) Anforderung wird durch einen Privaxy Proxy und Tor geleitet." "<br>- Praktisch für Programme wie <b>wget</b>,<b>slapt-get</b> und <b>lynx</" "b>.<br>" --- 5935,5939 ---- "<br>" msgstr "" ! "- Ihre http(s) Anforderung wird durch einen Privoxy-Proxy und Tor geleitet." "<br>- Praktisch für Programme wie <b>wget</b>,<b>slapt-get</b> und <b>lynx</" "b>.<br>" *************** *** 6025,6029 **** "subkeys.pgp.net --recv-keys 0x165733EA</b><br><br><b>Schritt 2</b> Um das " "Quellpaket zu überprüfen, das wir gerade heruntergeladen haben:<br><b>gpg --" ! "verify %1 %2</b><br><br>Für weiter Infos darüber wie die Ausgabe aussehen " "sollte, besuchen Sie: <b>http://wiki.noreply.org/noreply/TheOnionRouter/" "VerifyingSignatures</b><br><br> Sind Sie sicher, dass die Quellpakete " --- 6020,6024 ---- "subkeys.pgp.net --recv-keys 0x165733EA</b><br><br><b>Schritt 2</b> Um das " "Quellpaket zu überprüfen, das wir gerade heruntergeladen haben:<br><b>gpg --" ! "verify %1 %2</b><br><br>Für weitere Infos darüber wie die Ausgabe aussehen " "sollte, besuchen Sie: <b>http://wiki.noreply.org/noreply/TheOnionRouter/" "VerifyingSignatures</b><br><br> Sind Sie sicher, dass die Quellpakete " *************** *** 6075,6080 **** msgstr "" "<p><b>Wenn Sie zum ersten Mal Software kompiliert haben, habe ich ein paar " ! "nützliche Tips:</b><br>1. Fehler, die die Worte'KDE', 'Qt','curl' oder 'X' " ! "enthalten, bedeuten, dass Sie die entprechenden Libraries installieren müssen." "<br>2. Alle Pakete mit 'lib' oder 'dev' im Namen (z.B. qt-dev, libkde) sind " "solche Libraries.<br></p>" --- 6070,6075 ---- msgstr "" "<p><b>Wenn Sie zum ersten Mal Software kompiliert haben, habe ich ein paar " ! "nützliche Tips:</b><br>1. Fehler, die die Worte'KDE', 'Qt', 'curl' oder 'X' " ! "enthalten, bedeuten, daà Sie die entprechenden Libraries installieren müssen." "<br>2. Alle Pakete mit 'lib' oder 'dev' im Namen (z.B. qt-dev, libkde) sind " "solche Libraries.<br></p>" |
From: Robert H. <hog...@us...> - 2009-06-30 18:23:54
|
Update of /cvsroot/tork/tork In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2252 Modified Files: configure.in.in Log Message: replace gnutls autoconf macro Index: configure.in.in =================================================================== RCS file: /cvsroot/tork/tork/configure.in.in,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** configure.in.in 27 Jun 2009 07:43:48 -0000 1.27 --- configure.in.in 30 Jun 2009 18:23:32 -0000 1.28 *************** *** 256,260 **** # gnu tls ! AM_PATH_LIBGNUTLS(1.0.0, , [ AC_DEFINE(USE_OPENSSL, 1, [use openssl for ssl session decryption instead of gnutls]) AC_SUBST(USE_OPENSSL) --- 256,261 ---- # gnu tls ! #AM_PATH_LIBGNUTLS(1.0.0, , [ ! PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.0], , [ AC_DEFINE(USE_OPENSSL, 1, [use openssl for ssl session decryption instead of gnutls]) AC_SUBST(USE_OPENSSL) |