--- tcputils-0.6.2.orig/ip/tcp_open.c +++ tcputils-0.6.2/ip/tcp_open.c @@ -65,7 +65,7 @@ /* Check for numerical IP address */ server.sin_addr.s_addr = inet_addr(remote_host); - if (server.sin_addr.s_addr != (unsigned long)-1) + if (server.sin_addr.s_addr != INADDR_NONE) { if (connect(s, (struct sockaddr*)&server, sizeof server) < 0) ERRORRET(-1); --- tcputils-0.6.2.orig/Makefile +++ tcputils-0.6.2/Makefile @@ -1,3 +1,6 @@ +# Edited for Debian GNU/Linux. +DESTDIR = + # Linux RedHat 5.0 has header files that generates warnings when compiling # with -pedantic, so we leave that out per default. CC = gcc -Wall #-pedantic @@ -10,12 +13,12 @@ MKDIR_P = mkdir -p # Solaris 2 needs to link with "-lsocket -lnsl". For other unices you might # need to comment out those libraries. -NETLIBS = -lsocket -lnsl +#NETLIBS = -lsocket -lnsl # Where to install things. -prefix = /usr/local +prefix = ${DESTDIR}/usr bindir = ${prefix}/bin -mandir = ${prefix}/man +mandir = ${prefix}/share/man man1dir = ${mandir}/man1 @@ -54,7 +57,7 @@ ${RM} ${PROGRAMS} *.o *~ core cd ip; ${SUBMAKE} clean -install: install-bin install-man +install: install-bin #install-man install-bin: ${bindir} #${PROGRAMS} ${INSTALL} ${PROGRAMS} ${bindir} --- tcputils-0.6.2.orig/relay.c +++ tcputils-0.6.2/relay.c @@ -4,10 +4,10 @@ #include #include #include -#if defined(__hpux__) || defined(__linux__) -# include -#else -# include +#include +#if defined(__sun__) +# include /* The official way to get FIONREAD in SunOS; + others seem to get it from */ #endif #include --- tcputils-0.6.2.orig/debian/changelog +++ tcputils-0.6.2/debian/changelog @@ -0,0 +1,74 @@ +tcputils (0.6.2-9) unstable; urgency=low + + * Fixed parsing of hostnames on 64-bit architecture. Patch from Will + Day. Closes: bug#456239. + * Standards-Version 3.7.3. + + -- Joel Rosdahl Sat, 29 Dec 2007 11:23:59 +0100 + +tcputils (0.6.2-8) unstable; urgency=low + + * Converted debian/copyright to UTF-8. + + -- Joel Rosdahl Tue, 24 Apr 2007 09:29:30 +0200 + +tcputils (0.6.2-7) unstable; urgency=low + + * Removed DH_COMPAT variable from debian/rules to fix Lintian warning. + * Use debhelper compatibility 5. + * Upgraded to Standards-Version 3.7.2. + * Remove obsolete national encoding in debian/changelog. + + -- Joel Rosdahl Sun, 22 Apr 2007 22:18:55 +0200 + +tcputils (0.6.2-6) unstable; urgency=low + + * Standards-Version 3.5.9. + * Update maintainer field in control file. + + -- Joel Rosdahl Fri, 28 Mar 2003 15:00:21 +0100 + +tcputils (0.6.2-5) unstable; urgency=low + + * New maintainer. + * Standards-Version 3.5.8. + * Debhelper 3 compatibility. + * Don't include upstream installation documentation. + + -- Joel Rosdahl Sat, 25 Jan 2003 22:25:08 +0100 + +tcputils (0.6.2-4) unstable; urgency=low + + * Upgraded to Standards-Version 3.0.1 + * Uses debhelper + + -- Bjorn Brenander Mon, 28 May 2001 22:49:11 +0200 + +tcputils (0.6.2-3) frozen unstable; urgency=low + + * Fixed porting obstacle in relay.c, found by Marcus Brinkmann, with + help from upstream maintainer. (Fixes #55366) + * Distribution now includes .orig.tar.gz source package. (Fixes #44250) + * Documentation and manpages now reside in /usr/share. + + -- Bjorn Brenander Sun, 23 Jan 2000 18:02:46 +0100 + +tcputils (0.6.2-2) unstable; urgency=low + + * Set architecture to "any" again. Thanks to Roman Hodek for pointing + this error out. (Fixes #32111) + + -- Bjorn Brenander Tue, 19 Jan 1999 19:20:33 +0100 + +tcputils (0.6.2-1) unstable; urgency=low + + * New upstream version + * Changed Architecture to i386 + + -- Bjorn Brenander Mon, 4 Jan 1999 14:47:16 +0100 + +tcputils (0.6.1-1) unstable; urgency=low + + * Initial Release. + + -- Bjorn Brenander Tue, 14 Apr 1998 23:36:24 +0200 --- tcputils-0.6.2.orig/debian/rules +++ tcputils-0.6.2/debian/rules @@ -0,0 +1,69 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +build: build-stamp +build-stamp: + dh_testdir + + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + $(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=`pwd`/debian/tcputils + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install +# dh_testversion + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs +# dh_installexamples +# dh_installmenu +# dh_installemacsen +# dh_installpam +# dh_installinit +# dh_installcron + dh_installmanpages +# dh_installinfo +# dh_undocumented + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms +# You may want to make some executables suid here. +# dh_suidregister +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- tcputils-0.6.2.orig/debian/compat +++ tcputils-0.6.2/debian/compat @@ -0,0 +1 @@ +5 --- tcputils-0.6.2.orig/debian/copyright +++ tcputils-0.6.2/debian/copyright @@ -0,0 +1,16 @@ +This package was debianized by Björn Brenander bjorn@debian.org on +Tue, 14 Apr 1998 23:30:00 +0200. + +It was downloaded from ftp://ftp.lysator.liu.se/pub/unix/tcputils/ + +Copyright: + +These programs are released into the public domain. You may do +anything you like with them, including modifying them and selling +the binaries without source for ridiculous amounts of money without +saying who made them originally. + +However, I would be happy if you release your works with complete +source for free use. + +(From original README by Thomas Bellman ) --- tcputils-0.6.2.orig/debian/control +++ tcputils-0.6.2/debian/control @@ -0,0 +1,23 @@ +Source: tcputils +Section: net +Priority: optional +Maintainer: Joel Rosdahl +Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 5.0.49) + +Package: tcputils +Architecture: any +Depends: ${shlibs:Depends} +Description: Utilities for TCP programming in shell-scripts + This is a collection of programs to facilitate TCP programming + in shell-scripts. There is also a small library which makes it + somewhat easier to create TCP/IP sockets. + . + The programs included in this release are: + . + mini-inetd - small TCP/IP connection dispatcher + tcpbug - TCP/IP connection bugging device + tcpconnect - general TCP/IP client + tcplisten - general TCP/IP server + getpeername - get name of connected TCP/IP peer + --- tcputils-0.6.2.orig/debian/dirs +++ tcputils-0.6.2/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/man --- tcputils-0.6.2.orig/debian/docs +++ tcputils-0.6.2/debian/docs @@ -0,0 +1 @@ +README