[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#554717: Bug#529908: Upstream Fix



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Okay here is another patch, I attached again both.

Patrick Matthäi schrieb:
> Robert Hogan schrieb:
>> Hi there,
> 
>> After upgrading to Karmic Koala I'm now getting this same error.
> 
>> However, I can build with --with-external-torsocks.
> 
>> Short of developing a magic wand to fix whatever it is libtool is doing 
>> wrong, I don't see a way of fixing this.
> 
>> One way out of this is to package torsocks separately 
>> (http://code.google.com/p/torsocks) and I can update tork to rely on its 
>> presence (rather than including it in the source).
> 
>> If this is satisfactory I can make the appropriate changes.
> 
>> Thanks,
>> Robert
> 
> I don't know if I will find the time for it before squeeze will release.
> 
> Better would be a fix for tork, but I will try to package it.
> 
> I have attached a little patchset for torsocks, please apply it and a
> new release would be nice.
> 
> Also a question:
> 
> gnu:~/pbuilder# dpkg-deb -c result/torsocks_1.0-gamma-1_i386.deb
> drwxr-xr-x root/root         0 2009-11-06 09:32 ./
> drwxr-xr-x root/root         0 2009-11-06 09:32 ./usr/
> drwxr-xr-x root/root         0 2009-11-06 09:32 ./usr/lib/
> drwxr-xr-x root/root         0 2009-11-06 09:32 ./usr/lib/torsocks/
> -rw-r--r-- root/root       841 2009-11-06 09:32
> ./usr/lib/torsocks/libtorsocks.la
> -rw-r--r-- root/root     45428 2009-11-06 09:32
> ./usr/lib/torsocks/libtorsocks.so.1.0.0
> -rw-r--r-- root/root     53442 2009-11-06 09:32
> ./usr/lib/torsocks/libtorsocks.a
> drwxr-xr-x root/root         0 2009-11-06 09:32 ./usr/bin/
> -rwxr-xr-x root/root      3222 2009-11-06 09:32 ./usr/bin/usewithtor
> -rwxr-xr-x root/root      4488 2009-11-06 09:32 ./usr/bin/torsocks
> drwxr-xr-x root/root         0 2009-11-06 09:32 ./usr/share/
> drwxr-xr-x root/root         0 2009-11-06 09:32 ./usr/share/doc/
> drwxr-xr-x root/root         0 2009-11-06 09:32 ./usr/share/doc/torsocks/
> -rw-r--r-- root/root       152 2009-11-06 09:26
> ./usr/share/doc/torsocks/changelog.Debian.gz
> -rw-r--r-- root/root      2727 2009-11-06 09:26
> ./usr/share/doc/torsocks/changelog.gz
> -rw-r--r-- root/root      2110 2009-11-06 09:26
> ./usr/share/doc/torsocks/copyright
> drwxr-xr-x root/root         0 2009-11-06 09:32 ./usr/share/man/
> drwxr-xr-x root/root         0 2009-11-06 09:32 ./usr/share/man/man1/
> -rw-r--r-- root/root       505 2009-11-06 09:32
> ./usr/share/man/man1/usewithtor.1.gz
> -rw-r--r-- root/root       743 2009-11-06 09:32
> ./usr/share/man/man1/torsocks.1.gz
> drwxr-xr-x root/root         0 2009-11-06 09:32 ./usr/share/man/man8/
> -rw-r--r-- root/root      3085 2009-11-06 09:32
> ./usr/share/man/man8/torsocks.8.gz
> drwxr-xr-x root/root         0 2009-11-06 09:32 ./usr/share/man/man5/
> -rw-r--r-- root/root      3131 2009-11-06 09:32
> ./usr/share/man/man5/torsocks.conf.5.gz
> drwxr-xr-x root/root         0 2009-11-06 09:32 ./etc/
> -rw-r--r-- root/root      2044 2009-11-06 09:32 ./etc/torsocks.conf
> lrwxrwxrwx root/root         0 2009-11-06 09:32
> ./usr/lib/torsocks/libtorsocks.so -> libtorsocks.so.1.0.0
> lrwxrwxrwx root/root         0 2009-11-06 09:32
> ./usr/lib/torsocks/libtorsocks.so.1 -> libtorsocks.so.1.0.0
> 
> 
> Aren't there any headers which should be installed to build packages
> against torsocks?
> 

- --
/*
Mit freundlichem Gruß / With kind regards,
 Patrick Matthäi
 GNU/Linux Debian Developer

E-Mail: pmatthaei@debian.org
        patrick@linux-dev.org

Comment:
Always if we think we are right,
we were maybe wrong.
*/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkrz6LIACgkQ2XA5inpabMcZZgCbBerMDfrQzedANrRAFR7lCGYi
kWkAnAnSFvmO9zq1jp3yqBq3b2vl+LNh
=Yo5e
-----END PGP SIGNATURE-----
diff -Naur torsocks-1.0-gamma.orig/src/torsocks.conf.5 torsocks-1.0-gamma/src/torsocks.conf.5
--- torsocks-1.0-gamma.orig/src/torsocks.conf.5	2009-11-06 09:26:26.000000000 +0100
+++ torsocks-1.0-gamma/src/torsocks.conf.5	2009-11-06 09:29:03.000000000 +0100
@@ -22,7 +22,7 @@
 to be proxied over a SOCKS server. However, many installations have several
 different SOCKS servers to be used to access different internal (and external)
 networks. For this reason the configuration file allows the definition of 
-'paths' as well as a default SOCKS server. 
+`paths' as well as a default SOCKS server. 
 
 Paths are declared as blocks in the configuration file. That is, they begin
 with a 'path {' line in the configuration file and end with a '}' line. Inside
@@ -66,7 +66,7 @@
 .I server
 The IP address of the SOCKS server (e.g "server = 10.1.4.253"). Only one
 server may be specified per path block, or one outside a path
-block (to define the default server). Unless --disable-hostnames was 
+block (to define the default server). Unless \-\-disable-hostnames was 
 specified to configure at compile time the server can be specified as 
 a hostname (e.g "server = socks.nec.com") 
 
@@ -118,7 +118,7 @@
 .TP
 .I reaches
 This directive is only valid inside a path block. Its parameter is formed
-as IP[:startport[-endport]]/Subnet and it specifies a network (and a range
+as IP[:startport[\-endport]]/Subnet and it specifies a network (and a range
 of ports on that network) that can be accessed by the SOCKS server specified
 in this path block. For example, in a path block "reaches =
 150.0.0.0:80-1024/255.0.0.0" indicates to tsocks that the SOCKS server 
@@ -169,12 +169,12 @@
 extremely useful in debugging problems.
 
 validateconf can read a configuration file from a location other than the 
-location specified at compile time with the -f <filename> command line 
+location specified at compile time with the \-f <filename> command line 
 option.
 
 Normally validateconf simply dumps the configuration read to the screen (in
 a nicely readable format), however it also has a useful 'test' mode. When
-passed a hostname/ip on the command line like -t <hostname/ip>, validateconf 
+passed a hostname/ip on the command line like \-t <hostname/ip>, validateconf 
 determines which of the SOCKS servers specified in the configuration file 
 would be used by tsocks to access the specified host. 
 
diff -Naur torsocks-1.0-gamma.orig/src/usewithtor.in torsocks-1.0-gamma/src/usewithtor.in
--- torsocks-1.0-gamma.orig/src/usewithtor.in	2009-11-06 09:26:26.000000000 +0100
+++ torsocks-1.0-gamma/src/usewithtor.in	2009-11-06 09:29:37.000000000 +0100
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 # ***************************************************************************
 # *                                                                         *
 # * $Id: usewithtor.in,v 1.3 2008-07-06 15:17:35 hoganrobert Exp $*
@@ -26,8 +28,6 @@
 # ***************************************************************************
 
 
-#! /bin/sh
-
 # Wrapper script for use of the torsocks(8) transparent socksification library
 # See the torsocks(1) and usewithtor(1) manpages.
 
diff -Naur torsocks-1.0-gamma.orig/src/torsocks.conf.5 torsocks-1.0-gamma/src/torsocks.conf.5
--- torsocks-1.0-gamma.orig/src/torsocks.conf.5	2009-11-06 10:08:16.000000000 +0100
+++ torsocks-1.0-gamma/src/torsocks.conf.5	2009-11-06 10:08:46.000000000 +0100
@@ -130,7 +130,7 @@
 .I tordns_enable
 This enables the use of the 'tordns' feature in tsocks, which overrides the
 standard C library name resolution calls to use SOCKS.    The default value is 
-'true'. 
+`true'. 
 
 .TP
 .I tordns_deadpool_range

Attachment: patchset1.diff.sig
Description: Binary data

Attachment: patchset2.diff.sig
Description: Binary data


Reply to: