--- dante-1.1.18.orig/bin/socksify.in +++ dante-1.1.18/bin/socksify.in @@ -52,7 +52,7 @@ LIBDIR="@LIBRARY_PREFIX@" #XXX shared library name should be generated too (possibly including version) -LIBRARY="${SOCKS_LIBRARY-${LIBDIR}/libdsocks.@SOLIB_POSTFIX@}" +LIBRARY="${SOCKS_LIBRARY-${LIBDIR}/libdsocksd.@SOLIB_POSTFIX@}.0" PRELOAD_SEPERATOR="@PRELOAD_SEPERATOR@" PRELOAD_POSTFIX="@PRELOAD_POSTFIX@" --- dante-1.1.18.orig/configure +++ dante-1.1.18/configure @@ -19153,8 +19153,8 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' +# Always use Debian's libtool. +LIBTOOL='/usr/bin/libtool' # Prevent multiple expansion @@ -29830,7 +29830,7 @@ fi ;; *) - LIBRARY_DLOPEN="${base_library_path}libdl.${SOLIB_POSTFIX}" + LIBRARY_DLOPEN="/lib/libdl.so.2" ;; esac SOCKSIFY_PRELOAD_LIBS="${SOCKSIFY_PRELOAD_LIBS}${LIBRARY_DLOPEN:+${PRELOAD_SEPERATOR}}${LIBRARY_DLOPEN}" --- dante-1.1.18.orig/INSTALL +++ dante-1.1.18/INSTALL @@ -264,8 +264,8 @@ No configuration-files are installed, these must be installed manually. -The Dante server expects it's configuration file to be in /etc/sockd.conf. -The client library uses the file /etc/socks.conf. +The Dante server expects it's configuration file to be in /etc/danted.conf. +The client library uses the file /etc/dante.conf. The file bin/socksify.sh contains a shell script that allows one to dynamically socksify a dynamicly linked application at runtime. --- dante-1.1.18.orig/include/common.h +++ dante-1.1.18/include/common.h @@ -68,7 +68,8 @@ #define __attribute__(a) #endif -#if HAVE_LINUX_ECCENTRICITIES +/*#if HAVE_LINUX_ECCENTRICITIES*/ +#if 0 /* * XXX This is a hack. Avoid transparent sockaddr union used in Linux * to avoid the use of the union in the code. Mainly used in --- dante-1.1.18.orig/include/socks.h +++ dante-1.1.18/include/socks.h @@ -237,7 +237,7 @@ __BEGIN_DECLS /* - * libsocks function declarations + * libsocksd function declarations */ void --- dante-1.1.18.orig/dlib/Makefile.in +++ dante-1.1.18/dlib/Makefile.in @@ -217,7 +217,7 @@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -lib_LTLIBRARIES = libdsocks.la +lib_LTLIBRARIES = libdsocksd.la libdsocks_la_SOURCES = interposition.c int_osf1.c int_osf2.c int_osf3.c \ ../lib/config_parse.y ../lib/io.c ../lib/debug.c ../lib/udp.c \ ../lib/Rgetpeername.c ../lib/Rgetsockname.c \ @@ -307,7 +307,7 @@ rm -f config_parse.c; \ $(MAKE) config_parse.c; \ else :; fi -libdsocks.la: $(libdsocks_la_OBJECTS) $(libdsocks_la_DEPENDENCIES) +libdsocksd.la: $(libdsocks_la_OBJECTS) $(libdsocks_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libdsocks_la_LDFLAGS) $(libdsocks_la_OBJECTS) $(libdsocks_la_LIBADD) $(LIBS) mostlyclean-compile: --- dante-1.1.18.orig/dlib/int_osf3.c +++ dante-1.1.18/dlib/int_osf3.c @@ -81,7 +81,7 @@ #undef sendto /* XXX Attempt to support old library calls, which use old version of - sockaddr and msghdr struct. Other parts of libdsocks are compiled + sockaddr and msghdr struct. Other parts of libdsocksd are compiled using the new versions. */ /* sockaddr struct, with sa_len */ --- dante-1.1.18.orig/lib/Rconnect.c +++ dante-1.1.18/lib/Rconnect.c @@ -75,6 +75,10 @@ return connect(s, name, namelen); } +#if SOCKS_CLIENT /* may be called before normal init, log to right place */ + clientinit(); +#endif + slog(LOG_DEBUG, "%s: %s", function, sockaddr2string(name, namestring, sizeof(namestring))); --- dante-1.1.18.orig/lib/Makefile.in +++ dante-1.1.18/lib/Makefile.in @@ -216,7 +216,7 @@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -lib_LTLIBRARIES = libsocks.la +lib_LTLIBRARIES = libsocksd.la libsocks_la_SOURCES = config_parse.y config_scan.l Raccept.c Rbind.c \ Rgetpeername.c Rgetsockname.c Rrresvport.c io.c \ address.c authneg.c client.c clientconfig.c clientprotocol.c \ @@ -305,7 +305,7 @@ rm -f config_parse.c; \ $(MAKE) config_parse.c; \ else :; fi -libsocks.la: $(libsocks_la_OBJECTS) $(libsocks_la_DEPENDENCIES) +libsocksd.la: $(libsocks_la_OBJECTS) $(libsocks_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libsocks_la_LDFLAGS) $(libsocks_la_OBJECTS) $(libsocks_la_LIBADD) $(LIBS) mostlyclean-compile: --- dante-1.1.18.orig/sockd/serverconfig.c +++ dante-1.1.18/sockd/serverconfig.c @@ -45,7 +45,7 @@ #include "config_parse.h" static const char rcsid[] = -"$Id: serverconfig.c,v 1.200 2005/07/12 13:06:09 michaels Exp $"; +"$Id: serverconfig.c,v 1.201 2005/09/14 10:37:24 michaels Exp $"; __BEGIN_DECLS @@ -932,33 +932,32 @@ switch (state->auth.method) { case AUTHMETHOD_UNAME: { - /* - * Got uname/passowrd, which is similar enough. - * Just need to copy name/password from the - * uname object into the pam object. - */ - - memmove(state->auth.mdata.pam.name, - state->auth.mdata.uname.name, - strlen(state->auth.mdata.uname.name) + 1); - - memmove(state->auth.mdata.pam.password, - state->auth.mdata.uname.password, - strlen(state->auth.mdata.uname.password) + 1); + /* it's a union, make a copy first. */ + const struct authmethod_uname_t uname + = state->auth.mdata.uname; + + /* similar enough, just copy name/password. */ + strcpy((char *)state->auth.mdata.pam.name, + (const char *)uname.name); + strcpy((char *)state->auth.mdata.pam.password, + (const char *)uname.password); methodischeckable = 1; break; } case AUTHMETHOD_RFC931: { + /* it's a union, make a copy first. */ + const struct authmethod_rfc931_t rfc931 + = state->auth.mdata.rfc931; + /* * no password, but we can check for the username * we got from ident, with an empty password. */ - memmove(state->auth.mdata.pam.name, - state->auth.mdata.rfc931.name, - strlen(state->auth.mdata.rfc931.name) + 1); + strcpy((char *)state->auth.mdata.pam.name, + (const char *)rfc931.name); *state->auth.mdata.pam.password = NUL; --- dante-1.1.18.orig/sockd/getifa.c +++ dante-1.1.18/sockd/getifa.c @@ -120,8 +120,7 @@ if (rtnetlink_sk == -1) { swarn("%s: socket(NETLINK_ROUTE)", function); - close(rtnetlink_sk); - return inaddr_none; + return getdefaultexternal(); } /*=================================================================== --- dante-1.1.18.orig/example/sockd.conf +++ dante-1.1.18/example/sockd.conf @@ -73,15 +73,15 @@ # # when doing something that can require privilege, it will use the -# userid "sockd". -#user.privileged: sockd +# userid: +user.privileged: proxy -# when running as usual, it will use the unprivileged userid of "sockd". -#user.notprivileged: sockd +# when running as usual, it will use the unprivileged userid of: +user.notprivileged: nobody # If you compiled with libwrap support, what userid should it use # when executing your libwrap commands? "libwrap". -#user.libwrap: libwrap +user.libwrap: nobody # --- dante-1.1.18.orig/doc/sockd.8 +++ dante-1.1.18/doc/sockd.8 @@ -40,11 +40,11 @@ .\" any improvements or extensions that they make and grant Inferno Nettverk A/S .\" the rights to redistribute these changes. .\" -.TH SOCKD 8 "Feb 17, 2001" +.TH DANTED 8 "Feb 17, 2001" .SH NAME -sockd \- network proxyserver +danted \- network proxyserver .SH SYNOPSIS -.B sockd +.B danted .RB [ \-DLVdhnv ] .RB [ \-N .IR number ] @@ -112,7 +112,7 @@ be set to a (local) filesystem with low latency. .SH FILES .TP -/etc/sockd.conf +/etc/danted.conf .B Dante server configuration file. .SH AUTHORS @@ -120,7 +120,7 @@ Michael Shuldman : Design and implementation. Karl-Andre' Skevik : Autoconf and porting. .SH SEE ALSO -socks.conf(5) sockd.conf(5) +dante.conf(5) danted.conf(5) .PP Information about new releases and other related issues can be found on the --- dante-1.1.18.orig/doc/sockd.conf.5 +++ dante-1.1.18/doc/sockd.conf.5 @@ -40,9 +40,9 @@ .\" any improvements or extensions that they make and grant Inferno Nettverk A/S .\" the rights to redistribute these changes. .\" -.TH SOCKD.CONF 5 "May 11, 2001" +.TH DANTED.CONF 5 "May 11, 2001" .SH NAME -sockd.conf \- \fBDante\fP server configuration file syntax +danted.conf \- \fBDante\fP server configuration file syntax .SH DESCRIPTION The configuration file for the \fBDante\fP server controls both access controls and logging. It is divided into two parts, server settings @@ -308,7 +308,7 @@ .SH FILES .nf .ta \w 1 -/etc/sockd.conf \fBDante\fP server configuration file. +/etc/danted.conf \fBDante\fP server configuration file. /etc/passwd file used when checking username/passwords. .fi .SH AUTHORS @@ -316,7 +316,7 @@ Michael Shuldman : Design and implementation. Karl-Andre' Skevik : Autoconf and porting. .SH SEE ALSO -sockd(8), hosts_access(5) +danted(8), hosts_access(5) .Pp Information about new releases and other related issues can be found on the --- dante-1.1.18.orig/doc/socks.conf.5 +++ dante-1.1.18/doc/socks.conf.5 @@ -40,9 +40,9 @@ .\" any improvements or extensions that they make and grant Inferno Nettverk A/S .\" the rights to redistribute these changes. .\" -.TH SOCKS.CONF 5 "February 17, 2001" +.TH DANTE.CONF 5 "February 17, 2001" .SH NAME -socks.conf \- socks client configuration file syntax +dante.conf \- socks client configuration file syntax .SH DESCRIPTION The configuration file for the socks client library allow control over logging and server selection. It is divided into two parts, @@ -113,13 +113,13 @@ Use \fBSOCKS_USERNAME\fP as the username when doing username authentication. .SH FILES -.I /etc/socks.conf +.I /etc/dante.conf .SH AUTHORS For Inferno Nettverk A/S, Norway: Michael Shuldman : Design and implementation. Karl-Andre' Skevik : Autoconf and porting. .SH SEE ALSO -sockd(8) sockd.conf(5) +danted(8) danted.conf(5) .Pp Information about new releases and other related issues can be found on the --- dante-1.1.18.orig/doc/faq.tex +++ dante-1.1.18/doc/faq.tex @@ -475,9 +475,12 @@ edit the file /etc/ld.so.preload and add two lines saying: libdl.so - libdsocks.so + libdsocksd.so \end{verbatim} - \emph{Thanks to: Dag Wieers .} + \emph{Thanks to: Dag Wieers .} However I \emph{strongly} + suggest that you do not do it as if things go wrong you may need to use a + rescue disk to recover. Please use the method below instead. + Dag Wieers also has a (RedHat) SPEC file which contains scripts for doing this automatically. It can be found at: @@ -489,7 +492,7 @@ you could add \begin{verbatim} - LD_PRELOAD="libdl.so libdsocks.so" + LD_PRELOAD="libdl.so libdsocksd.so.0" export LD_PRELOAD \end{verbatim} to the environment. (/etc/profile ~/.profile ~/.bashrc) @@ -528,7 +531,7 @@ the result becomes the the same as not using socksify on them. Solution: strip off the suid bit if possible or recompile the binary - (rsh, ssh, etc) with explicit socks support (adding "-ldsocks" + (rsh, ssh, etc) with explicit socks support (adding "-ldsocksd" to the linkoptions is usually enough.) \subsection{Why doesn't socksify work on HP-UX 11.00?} --- dante-1.1.18.orig/doc/README.socksify +++ dante-1.1.18/doc/README.socksify @@ -2,7 +2,7 @@ The shell script socksify in the bin directory is meant to aid in using socks with already compiled dynamic binaries. This works by -setting the LD_PRELOAD environment variable to libdsocks. It will +setting the LD_PRELOAD environment variable to libdsocksd. It will then wrap all networking-related system calls. When used the script can socksify a program by simply giving it as a --- dante-1.1.18.orig/doc/README.usage +++ dante-1.1.18/doc/README.usage @@ -7,15 +7,15 @@ The simplest way to add socks support to an already (dynamically) complied application is to use the LD_PRELOAD facility to replace the standard library functions with socksified ones. The -libdsocks library is provided for this purpose. See the +libdsocksd library is provided for this purpose. See the README.socksify file for more information. This will probably only work with non-setuid applications since LD_PRELOAD is usually ignored otherwise. If setting LD_PRELOAD is not possible, compilation is another possibility. If the application can be compiled dynamically socks support -can be added explicitly by linking with libdsocks (usually done by adding -'-ldsocks'). This will automagically give the application socks +can be added explicitly by linking with libdsocksd (usually done by adding +'-ldsocksd'). This will automagically give the application socks support without making any code changes. Static Compilation @@ -24,32 +24,11 @@ changed to use socks, even if it is not linked dynamically. Several systemcalls and librarycalls must be changed to use the socksified versions instead of the standard ones. The application -is then linked with the libsocks library in the distribution (-lsocks, -not -ldsocks). +is then linked with the libsocks library in the distribution (-lsocksd, +not -ldsocksd). -These function calls can be found in the socks library: -Raccept -Rbind -Rbindresvport -Rconnect -Rgetaddrinfo() -Rgethostbyname -Rgethostbyname2 -Rgetipnodebyname() -Rgetpeername -Rgetsockname -Rread -Rreadv -Rrecv -Rrecvfrom -Rrecvfrom -Rrecvmsg -Rrresvport -Rsend -Rsendmsg -Rsendto -Rwrite -Rwritev +These system calls can be found in the socks include file "socks.h" +which should be added to all relevant source files. These calls currently does nothing and are only provided for compatibility with programs which use them: @@ -57,20 +36,10 @@ Rselect SOCKSinit -The source can either be modified directly, or by using defines to -change the source during compilation, as following: - -Either add this line to the command compilation line (e.g. CFLAGS): --Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname -Dgetpeername=Rgetpeername -Daccept=Raccept -Drresvport=Rrresvport -Dbindresvport=Rbindresvport -Dgethostbyname=Rgethostbyname -Dgethostbyname2=Rgethostbyname2 -Dsendto=Rsendto -Drecvfrom=Rrecvfrom -Drecvfrom=Rrecvfrom -Dwrite=Rwrite -Dwritev=Rwritev -Dsend=Rsend -Dsendmsg=Rsendmsg -Dread=Rread -Dreadv=Rreadv -Drecv=Rrecv -Drecvmsg=Rrecvmsg -Dgetaddrinfo=Rgetaddrinfo -Dgetipnodebyname=Rgetipnodebyname - -or add "include " to every C file in the program you are -compiling. - - Libraries In total there are three libraries distributed with this package: - libsocks.so - standard shared library, contains Rfoo type functions. - libsocks.a - static version of the above. - libdsocks.so - shared library which does "on the fly" socksification. + libsocksd.so - standard shared library, contains Rfoo type functions. + libsocksd.a - static version of the above. + libdsocksd.so - shared library which does "on the fly" socksification. --- dante-1.1.18.orig/doc/socksify.1 +++ dante-1.1.18/doc/socksify.1 @@ -0,0 +1,35 @@ +.TH SOCKSIFY 1 +.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection +.\" other parms are allowed: see man(7), man(1) +.SH NAME +socksify \- dynamically SOCKSifies a program +.SH SYNOPSIS +.B socksify +.I program +[ +.I arguments +] + +.SH "DESCRIPTION" +.B socksify +is Dante's equivalent of the NEC SOCKS' +.BR runsocks . +sockisfy uses +.B LD_PRELOAD +environment variable to wrap all networking-related system calls +so that programs can go thought a SOCKS server that was installed as part of +a firewall. +.SH "SEE ALSO" +.\" Always quote multiple words for .SH +.BR dante.conf(5) +.SH NOTES +A more permanent solution would be to add the +.I LD_PRELOAD +environment +value to the shell startup files. Then all non-set[ug]id applications +that are linked dynamically would be socksified. However this can have bad +side-effects. +.SH AUTHOR +Dante was developed for Inferno Nettverk A/S, Norway by: + - Michael Shuldman : Design and implementation. + - Karl-André Skevik : Autoconf and porting. --- dante-1.1.18.orig/debian/changelog +++ dante-1.1.18/debian/changelog @@ -0,0 +1,274 @@ +dante (1.1.18-2) unstable; urgency=low + + * applied patch from upstream (same as patch sent by Nicolas Leonard) + to fix PAM authentication failures. Many thanks to Nicolas for + his work! (closes: #331538) + + -- Adrian Bridgett Sun, 9 Oct 2005 11:24:13 +0100 + +dante (1.1.18-1) unstable; urgency=low + + * new upstream (fixes logging to syslog) + + -- Adrian Bridgett Sat, 17 Sep 2005 15:50:50 +0100 + +dante (1.1.17-1) unstable; urgency=low + + * new upstream release (closes: #304037) + + -- Adrian Bridgett Mon, 29 Aug 2005 15:51:20 +0100 + +dante (1.1.14-2) unstable; urgency=low + + * improve extended descriptions (closes: #209510, #210116) + + -- Adrian Bridgett Sat, 15 Nov 2003 18:59:33 +0000 + +dante (1.1.14-1) unstable; urgency=low + + * new upstream + * removed SO_BSDCOMPAT call as it's pointless and causes annoying + messages in 2.6.x (closes: #206487) + * set libwrap uid to nobody (default was root) + + -- Adrian Bridgett Sun, 24 Aug 2003 16:20:28 +0100 + +dante (1.1.13-1) unstable; urgency=low + + * new upstream (closes: #168434) + * this fixes the Bad file descriptor errors (closes: #135275) + * build issues dissappeared (new libc/gcc?) + applied previous workaround anyway (closes: #167092) + + -- Adrian Bridgett Sat, 4 Jan 2003 22:11:38 +0000 + +dante (1.1.12-2) unstable; urgency=low + + * hopefully work around the case when netlink isn't compiled into + the kernel. This isn't the ideal fix, but one step at a time (closes: + #139434) + + -- Adrian Bridgett Sun, 14 Apr 2002 18:09:14 +0100 + +dante (1.1.12-1) unstable; urgency=low + + * new upstream + + -- Adrian Bridgett Sun, 14 Apr 2002 16:00:22 +0100 + +dante (1.1.11.12p1-4) unstable; urgency=low + + * use Andreas Voegele's init.d script so that dante can write its pidfile + (closes: #72215, #121672). Thanks Andreas! + + -- Adrian Bridgett Sun, 7 Apr 2002 12:45:55 +0100 + +dante (1.1.11.12p1-3) unstable; urgency=low + + * apply fix for dynamic port forwarding - thanks to Peter Amstutz + (closes: 140730) + * improve libsocksd package description (closes: #135755) + + -- Adrian Bridgett Mon, 1 Apr 2002 10:29:31 +0100 + +dante (1.1.11.12p1-2) unstable; urgency=low + + * socksify should use /usr/lib/libdsocksd.so.0 - thanks to Matt Taggart + (closes: #135417) + + -- Adrian Bridgett Mon, 25 Feb 2002 18:38:51 +0000 + +dante (1.1.11.12p1-1) unstable; urgency=low + + * updated to 1.1.12-pre1 + * fixed references to socks and sockd in manpages (and I grepped for others) + (closes: #126428, #130070) + + -- Adrian Bridgett Wed, 20 Feb 2002 20:08:46 +0000 + +dante (1.1.10-4) unstable; urgency=low + + * (1.1.10-3 not released) + * add libpam0g-dev adn libwrap0-dev to build-depends so we link against + them (closes: #106655, #86100) + * Add pt_BR translations (thanks to Fernando Carreira, Luis Alberto Garcia + Cipriano + + -- Adrian Bridgett Wed, 26 Sep 2001 20:48:55 +0100 + +dante (1.1.10-3) unstable; urgency=low + + * better fix for 100375 from Philip Kendall + - run clientinit() before log message so it goes to the right place + + -- Adrian Bridgett Sun, 12 Aug 2001 21:44:42 +0100 + +dante (1.1.10-2) unstable; urgency=low + + * patch from dme@dme.org for memory overrun + * kill off debug message since I think it's confusing ssh (see #100375) + + -- Adrian Bridgett Wed, 25 Jul 2001 23:46:41 +0100 + +dante (1.1.10-1) unstable; urgency=low + + * new upstream + * always use config.{sub,guess} provided by autotools-dev (closes: #94953) + + -- Adrian Bridgett Sun, 3 Jun 2001 23:19:19 +0100 + +dante (1.1.9-1) unstable; urgency=low + + * new upstream + + -- Adrian Bridgett Sun, 22 Apr 2001 23:14:18 +0100 + +dante (1.1.8-1) unstable; urgency=low + + * new upstream + + -- Adrian Bridgett Sun, 4 Mar 2001 22:23:31 +0000 + +dante (1.1.6-1) unstable; urgency=low + + * new upstream + + -- Adrian Bridgett Sat, 23 Dec 2000 19:39:38 +0000 + +dante (1.1.5-1) unstable; urgency=low + + * new upstream + + -- Adrian Bridgett Wed, 18 Oct 2000 11:42:27 +0100 + +dante (1.1.4-1) unstable; urgency=low + + * new upstream + * fix faq's reference to libdsocksd.so (should be libdsocksd.so.0) and add + a BIG warning that this is dangerous and not the way to do it + (closes: #69017) + + -- Adrian Bridgett Thu, 12 Oct 2000 15:09:27 +0100 + +dante (1.1.2-2) unstable; urgency=low + + * added two builddeps (closes: #66782, #66865) + + -- Adrian Bridgett Tue, 11 Jul 2000 18:44:44 +0100 + +dante (1.1.2-1) unstable; urgency=low + + * new upstream + * fix typo in description (closes: #66250) + + -- Adrian Bridgett Mon, 26 Jun 2000 20:56:21 +0100 + +dante (1.1.1-4) frozen unstable; urgency=low + + * hard code libdl.so to /lib/libdl.so.2 to prevent it from finding + /usr/lib/libdl.so (which is from libc6-dev) + RM: this effectively fixes a dependancy problem (by fixing the real cause) + + -- Adrian Bridgett Thu, 10 Feb 2000 22:34:32 +0000 + +dante (1.1.1-3) frozen unstable; urgency=low + + * call library libsocksd rather than libsocks to avoid conlict + with libsocks4 (for 52475) + * added Build-Depends and updated Standards-Version + * I'm on holiday for a week (back 24th Jan) + + -- Adrian Bridgett Sat, 15 Jan 2000 14:07:00 +0000 + +dante (1.1.1-2) frozen unstable; urgency=low + + * add socksify manpage + + -- Adrian Bridgett Mon, 10 Jan 2000 14:37:39 +0000 + +dante (1.1.1-1) frozen unstable; urgency=low + + * new upstream version + + -- Adrian Bridgett Wed, 5 Jan 2000 20:56:12 +0000 + +dante (1.1.0-2) unstable; urgency=low + + * fix init.d script fully [closes: #50056] + + -- Adrian Bridgett Tue, 30 Nov 1999 20:38:44 +0000 + +dante (1.1.0-1) unstable; urgency=low + + * new upstream version + * FHS + + -- Adrian Bridgett Mon, 27 Sep 1999 22:41:16 +0100 + +dante (1.0.9-pre2-2) unstable; urgency=low + + * fix init.d script [closes: #42801] + + -- Adrian Bridgett Sun, 15 Aug 1999 20:16:45 +0100 + +dante (1.0.9-pre2-1) unstable; urgency=low + + * new upstream (actually 1.1.0-pre2) + * AFAIK the removed patches aren't needed + * /etc/init.d/danted now calls danted with -D [closes #41719] + + -- Adrian Bridgett Thu, 22 Jul 1999 21:41:31 +0100 + +dante (1.0.1-1) unstable; urgency=low + + * new upstream + * patch from Christopher C Chimelis for Alpha + [closes #40132, #39193, #37447] + * force off SO_{SND/RCV}LOWAT options since Linux doesn't support them + * fix some setuid/seteuid problems + + -- Adrian Bridgett Sun, 4 Jul 1999 14:48:07 +0100 + +dante (1.0.0-1) unstable; urgency=low + + * new upstream + * renamed sockd to danted for consistency and to avoid conflicts + * fix dante-server install [close #37653] + + -- Adrian Bridgett Mon, 31 May 1999 21:50:29 +0100 + +dante (1.0.0-pre1-1) unstable; urgency=low + + * new upstream version + * fix references to /etc/sock* + * (unreleased) + + -- Adrian Bridgett Sun, 16 May 1999 15:13:06 +0100 + +dante (0.92.0-pre3-4) unstable; urgency=low + + * I forgot to upload that last one :-( I've already fixed the libs (closes + #37076) + + -- Adrian Bridgett Mon, 3 May 1999 20:00:57 +0100 + +dante (0.92.0-pre3-3) unstable; urgency=low + + * /etc/init.d/dante now used --oknodo on "stop" + * use /etc/dante* rather than /etc/socks* due to conflicts [closes #35187] + * fix library locations (libsocks.a is in libsocks-dev, not libsocks; + libdsocks is in dante-clients, not dante-server) + + -- Adrian Bridgett Mon, 29 Mar 1999 21:16:17 +0100 + +dante (0.92.0-pre3-2) unstable; urgency=low + + * fixed locations of libsocks and libsocks-dev + + -- Adrian Bridgett Thu, 25 Mar 1999 22:58:52 +0000 + +dante (0.92.0-pre3-1) unstable; urgency=low + + * Initial release. + + -- Adrian Bridgett Sun, 21 Mar 1999 16:45:45 +0000 --- dante-1.1.18.orig/debian/control +++ dante-1.1.18/debian/control @@ -0,0 +1,43 @@ +Source: dante +Section: net +Priority: optional +Maintainer: Adrian Bridgett +Build-Depends: flex,debhelper(>=4),libtool,autotools-dev,libwrap0-dev,libpam0g-dev +Standards-Version: 3.6.2.1 + +Package: libsocksd +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: SOCKS library for packages built using libsocksd-dev + This library is used for running programs built using libsocksd-dev + and will generally be automatically selected if you require it. + + +Package: libsocksd-dev +Architecture: any +Section: devel +Depends: libsocksd +Description: Development files for compiling programs with SOCKS support + Provides header files and instructions for compiling programs with SOCKS + support. + +Package: dante-client +Architecture: any +Depends: ${shlibs:Depends} +Description: SOCKS wrapper for users behind a firewall + Dante provides "socksify" - a program which forwards network requests from + any program to a SOCKS server (v4 or v5) which then performs them on your + behalf. + +Package: dante-server +Architecture: any +Depends: ${shlibs:Depends} +Description: SOCKS (v4 and v5) proxy daemon (danted) + Dante is a circuit-level firewall/proxy that can be used to provide + convenient and secure network connectivity to a wide range of hosts + while requiring only the server Dante runs on to have external network + connectivity. + . + This package contains the socks proxy daemon (danted). The server part + of Dante allows socks clients to connect through it to the network. \ No newline at end of file --- dante-1.1.18.orig/debian/rules +++ dante-1.1.18/debian/rules @@ -0,0 +1,122 @@ +#!/usr/bin/make -f + +# This script uses debhelper by Joey Hess +export DH_VERBOSE=1 +export DH_COMPAT=4 +DEB=`pwd`/debian/libsocksd +DEV=debian/libsocksd-dev +CLIENT=debian/dante-client +SERVER=debian/dante-server + + +build: build-stamp + +build-stamp: + dh_testdir + # build package here + cp /usr/share/misc/config.guess /usr/share/misc/config.sub . + CFLAGS="-O2 -D_REENTRANT" ./configure --prefix=/usr \ + --with-socks-conf=/etc/dante.conf \ + --with-sockd-conf=/etc/danted.conf \ + --with-pidfile=/var/run/danted.pid + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + -$(MAKE) -i distclean + -rm debian/copyright + dh_clean + for d in sockd dlib; do \ + cd $$d; \ + for i in *; do \ + if [ -L "$$i" ]; then rm $$i; cp -a ../lib/$$i . ; fi \ + done; \ + cd ..; \ + done + find . -name Makefile |xargs -r rm + -rm example/dante.conf example/danted.conf + -rm config.log config.status config.cache libtool \ + include/autoconf.h include/stamp-h bin/socksify confdefs.h \ + dlib/util.c sockd/util.c config.guess config.sub + +binary-indep: build + + +# is it arch or indep? +binary-arch: build + dh_testdir -a + dh_testroot -a + dh_clean -a + dh_installdirs -A usr/share/doc + # move files into $(DEB) + $(MAKE) DESTDIR=$(DEB) install + ## remove any libraries we don't want + rm $(DEB)/usr/lib/*.la + cd $(DEB)/usr/lib; for i in *; do \ + if [ -L $$i ]; then rm $$i; fi \ + done + exit + ## we call these different names +# documented feature! +# dh_installdirs -pdante-server -pdante-client usr/share/man/man5 + mkdir -p $(SERVER)/usr/share/man/man5 $(CLIENT)/usr/share/man/man5 $(CLIENT)/usr/share/man/man1 + mv $(DEB)/usr/man/man5/socks.conf.5 $(CLIENT)/usr/share/man/man5/dante.conf.5 + mv $(DEB)/usr/man/man5/sockd.conf.5 $(SERVER)/usr/share/man/man5/danted.conf.5 + dh_installdirs -pdante-server usr/sbin usr/share/man/man8 + dh_installdirs -pdante-client usr/bin usr/lib + dh_installdirs -plibsocksd-dev usr/include usr/lib + mv $(DEB)/usr/man/man8/sockd.8 $(SERVER)/usr/share/man/man8/danted.8 + mv $(DEB)/usr/sbin/sockd $(SERVER)/usr/sbin/danted + cp doc/socksify.1 $(CLIENT)/usr/share/man/man1/socksify.1 + cp example/socks.conf example/dante.conf + cp example/sockd.conf example/danted.conf + dh_installexamples -pdante-client example/dante.conf + dh_installexamples -pdante-server example/danted.conf contrib/sockd-stat.awk + -mkdir -p $(CLIENT)/etc $(SERVER)/etc + install -D -m0664 example/socks.conf $(CLIENT)/etc/dante.conf + install -D -m0664 example/sockd.conf $(SERVER)/etc/danted.conf + ## move files around + mv $(DEB)/usr/bin/socksify $(CLIENT)/usr/bin/ + mv $(DEB)/usr/lib/libdsocksd* $(CLIENT)/usr/lib/ + mv $(DEB)/usr/lib/libsocksd.a $(DEV)/usr/lib/ + mv $(DEB)/usr/include/socks.h $(DEV)/usr/include/ +# install -D -m0644 debian/socks.h $(DEV)/usr/include/socks.h + cat debian/copyright.top LICENSE > debian/copyright + dh_installdocs -A README doc/faq.tex doc/README.usage doc/README.survey BUGS CREDITS TODO SUPPORT + dh_installdocs -pdante-client doc/README.socksify + dh_installdocs -pdante-client -pdante-server doc/README.msproxy + dh_installdocs -pdante-server doc/SOCKS4.protocol + dh_installchangelogs -plibsocksd -pdante-server -pdante-client NEWS + rmdir $(DEB)/usr/bin $(DEB)/usr/sbin $(DEB)/usr/man/man? $(DEB)/usr/man $(DEB)/usr/include + ## now make the library symlinks + # destroy and remake directory (and contents) + mv $(DEB)/usr/lib/libsocksd.so* $(DEB)/usr + rmdir $(DEB)/usr/lib + mkdir $(DEB)/usr/lib + mv $(DEB)/usr/libsocksd.so* $(DEB)/usr/lib + # I know we remove them above, but the symlinks _must_ be made after + # the library (see that packaging manual) + ln -sf libsocksd.so.0.1.0 $(DEB)/usr/lib/libsocksd.so.0 + mkdir -p $(DEV)/usr/lib + ln -sf libsocksd.so.0.1.0 $(DEV)/usr/lib/libsocksd.so + ln -sf libdsocksd.so.0.1.0 $(CLIENT)/usr/lib/libdsocksd.so.0 + rm $(CLIENT)/usr/lib/libdsocksd.a + # done messing with libraries + dh_installinit -pdante-server -r --init-script=danted +# dh_installcron -a +# dh_installmanpages -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_makeshlibs -plibsocksd -pdante-client + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary --- dante-1.1.18.orig/debian/TODO +++ dante-1.1.18/debian/TODO @@ -0,0 +1 @@ +something to convert NEC socks (v4 and v5) client/server files to Dante --- dante-1.1.18.orig/debian/copyright.top +++ dante-1.1.18/debian/copyright.top @@ -0,0 +1,3 @@ +Packaged by Adrian Bridgett from sources obtained +at http://www.inet.no/dante. + --- dante-1.1.18.orig/debian/dante-server.init +++ dante-1.1.18/debian/dante-server.init @@ -0,0 +1,77 @@ +#! /bin/sh +# +# dante SOCKS server init.d file. Based on /etc/init.d/skeleton: +# Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/danted +NAME=danted +DESC="Dante SOCKS daemon" +PIDFILE=/var/run/$NAME.pid +CONFFILE=/etc/$NAME.conf + +test -f $DAEMON || exit 0 + +set -e + +# This function makes sure that the Dante server can write to the pid-file. +touch_pidfile () +{ + if [ -r $CONFFILE ]; then + uid="`sed -n -e 's/[[:space:]]//g' -e 's/#.*//' -e '/^user\.privileged/{s/[^:]*://p;q;}' $CONFFILE`" + if [ -n "$uid" ]; then + touch $PIDFILE + chown $uid $PIDFILE + fi + fi +} + +case "$1" in + start) + echo -n "Starting $DESC: " + touch_pidfile + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --exec $DAEMON -- -D + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \ + --exec $DAEMON + echo "$NAME." + ;; + reload|force-reload) + # + # If the daemon can reload its config files on the fly + # for example by sending it SIGHUP, do it here. + # + # If the daemon responds to changes in its config file + # directly anyway, make this a do-nothing entry. + # + echo "Reloading $DESC configuration files." + start-stop-daemon --stop --signal 1 --quiet --pidfile \ + $PIDFILE --exec $DAEMON -- -D + ;; + restart) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + echo -n "Restarting $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON + sleep 1 + touch_pidfile + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --exec $DAEMON -- -D + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- dante-1.1.18.orig/debian/dante-server.conffiles +++ dante-1.1.18/debian/dante-server.conffiles @@ -0,0 +1,2 @@ +/etc/init.d/danted +/etc/danted.conf --- dante-1.1.18.orig/debian/dante-server.preinst +++ dante-1.1.18/debian/dante-server.preinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# copy across old configuration before rename +if [ "$1" = "upgrade" ] && [ "$2" = "0.92.0-pre3-2" ] ; then + cp /etc/sockd.conf /etc/danted.conf +fi + +#DEBHELPER# --- dante-1.1.18.orig/debian/socks.h +++ dante-1.1.18/debian/socks.h @@ -0,0 +1,22 @@ +/* renamed functions for SOCKS wrappers */ + +#define connect Rconnect +#define bind Rbind +#define getsockname Rgetsockname +#define getpeername Rgetpeername +#define accept Raccept +#define rresvport Rrresvport +#define bindresvport Rbindresvport +#define gethostbyname Rgethostbyname +#define gethostbyname2 Rgethostbyname2 +#define sendto Rsendto +#define recvfrom Rrecvfrom +#define recvfrom Rrecvfrom +#define write Rwrite +#define writev Rwritev +#define send Rsend +#define sendmsg Rsendmsg +#define read Rread +#define readv Rreadv +#define recv Rrecv +#define recvmsg Rrecvmsg --- dante-1.1.18.orig/debian/libsocksd.postinst +++ dante-1.1.18/debian/libsocksd.postinst @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + ldconfig +fi + +#DEBHELPER# --- dante-1.1.18.orig/debian/dante-server.postinst +++ dante-1.1.18/debian/dante-server.postinst @@ -0,0 +1,7 @@ +#!/bin/sh + +#DEBHELPER# + +# The default configuration file fails, however the installation +# was succesfull so exit 0 +exit 0 --- dante-1.1.18.orig/debian/dante-client.preinst +++ dante-1.1.18/debian/dante-client.preinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# copy across old configuration before rename +if [ "$1" = "upgrade" ] && [ "$2" = "0.92.0-pre3-2" ] ; then + cp /etc/socks.conf /etc/dante.conf +fi + +#DEBHELPER# --- dante-1.1.18.orig/debian/dante-client.conffiles +++ dante-1.1.18/debian/dante-client.conffiles @@ -0,0 +1 @@ +/etc/dante.conf --- dante-1.1.18.orig/debian/dante-client.postinst +++ dante-1.1.18/debian/dante-client.postinst @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + ldconfig +fi + +#DEBHELPER#