--- simpleproxy-3.4.orig/debian/dirs +++ simpleproxy-3.4/debian/dirs @@ -0,0 +1 @@ +usr/bin --- simpleproxy-3.4.orig/debian/patches/01_199285_fix.dpatch +++ simpleproxy-3.4/debian/patches/01_199285_fix.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh -e +## 01_199285_fix.dpatch by Andrew Pollock +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes byte swap problem on bigendian architectures + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -u simpleproxy-3.2.orig/simpleproxy.c simpleproxy-3.2/simpleproxy.c +--- simpleproxy-3.2.orig/simpleproxy.c Mon Mar 10 05:41:17 2003 ++++ simpleproxy-3.2/simpleproxy.c Sun Nov 9 08:46:58 2003 +@@ -606,7 +606,7 @@ + atoi(tmp): + (((se = getservbyname(tmp, "tcp")) == nil)? + -1: +- se->s_port); ++ ntohs(se->s_port)); + } + } + --- simpleproxy-3.4.orig/debian/patches/fix_CAN-2005-1857.dpatch +++ simpleproxy-3.4/debian/patches/fix_CAN-2005-1857.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix_CAN-2005-1857.dpatch by Andrew Pollock +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes format string vulnerability CAN-2005-1857 + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./simpleproxy.c /tmp/dpep-work.k4Ndhb/simpleproxy-3.2/simpleproxy.c +--- ./simpleproxy.c 2003-11-09 09:30:12.000000000 +1100 ++++ /tmp/dpep-work.k4Ndhb/simpleproxy-3.2/simpleproxy.c 2005-08-23 10:51:56.274961212 +1000 +@@ -994,7 +994,7 @@ + # endif + #endif + #if HAVE_SYSLOG +- syslog(type,buffer); ++ syslog(type, "%s", buffer); + #endif + } else + { --- simpleproxy-3.4.orig/debian/patches/00list +++ simpleproxy-3.4/debian/patches/00list @@ -0,0 +1 @@ +fix_manpage --- simpleproxy-3.4.orig/debian/patches/fix_manpage.dpatch +++ simpleproxy-3.4/debian/patches/fix_manpage.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix_manpage.dpatch by Andrew Pollock +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix a typo in the groff/nroff/whatever it's called codes + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./simpleproxy.man /tmp/dpep-work.hIGQys/simpleproxy-3.2/simpleproxy.man +--- ./simpleproxy.man 2003-03-10 05:30:32.000000000 +1100 ++++ /tmp/dpep-work.hIGQys/simpleproxy-3.2/simpleproxy.man 2005-08-23 10:56:58.939462535 +1000 +@@ -65,7 +65,7 @@ + + .SH BUGS\ \ \ \ + Only \fItcp\fP ports are supported. +-.TP8 ++.TP 8 + + .PP + .SH SEE ALSO --- simpleproxy-3.4.orig/debian/copyright +++ simpleproxy-3.4/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by David Caldwell on +Wed, 24 Apr 2002 20:59:40 -0700. + +It was downloaded from sourceforge. + + + + +Upstream Authors: Vadim Zaliva + Vlad Karpinsky + +Copyright: Copyright (C) 1999 Vadim Zaliva + +License: GPL (/usr/share/common-licenses/GPL) --- simpleproxy-3.4.orig/debian/rules +++ simpleproxy-3.4/debian/rules @@ -0,0 +1,104 @@ +#!/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 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O2 +endif + +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +include /usr/share/dpatch/dpatch.make + +PACKAGE=simpleproxy + +config.status: configure + dh_testdir + # Add here commands to configure the package. + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + + +build: build-stamp + +build-stamp: config.status patch-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #/usr/bin/docbook-to-man debian/simpleproxy.sgml > simpleproxy.1 + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + rm -f config.status + rm -rf debian/simpleproxy || true + + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/simpleproxy. + $(MAKE) install prefix=$(CURDIR)/debian/simpleproxy/usr + + +# 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_testdir + dh_testroot +# dh_installdebconf + dh_installdocs + dh_installexamples + dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit + dh_installcron + dh_installman + dh_installinfo +# dh_undocumented + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms +# 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 --- simpleproxy-3.4.orig/debian/compat +++ simpleproxy-3.4/debian/compat @@ -0,0 +1 @@ +5 --- simpleproxy-3.4.orig/debian/control +++ simpleproxy-3.4/debian/control @@ -0,0 +1,15 @@ +Source: simpleproxy +Section: net +Priority: optional +Maintainer: Andrew Pollock +Build-Depends: debhelper (>> 3.0.0), dpatch +Standards-Version: 3.7.3 +Homepage: http://www.sourceforge.net/projects/simpleproxy + +Package: simpleproxy +Architecture: any +Depends: ${shlibs:Depends} +Description: Simple TCP proxy + simpleproxy acts as a simple TCP proxy. It opens a listening socket on + the local machine and forwards any connection to a remote host. It can be + run as a daemon or through inetd. --- simpleproxy-3.4.orig/debian/README.Debian +++ simpleproxy-3.4/debian/README.Debian @@ -0,0 +1,7 @@ +An example is worth a thousand words, so here is how I use simpleproxy +to get around Earthlink's port 25 block: + +In /etc/inetd.conf (on my smtp host at work): +2525 stream tcp nowait nobody /usr/bin/simpleproxy simpleproxy -i -R localhost:25 + +-David --- simpleproxy-3.4.orig/debian/changelog +++ simpleproxy-3.4/debian/changelog @@ -0,0 +1,80 @@ +simpleproxy (3.4-3) unstable; urgency=low + + * debian/watch: fixed URL (closes: #450112) + * debian/control: bumped Standards-Version (no changes) + * Removed a bunch of cruft from the diff.gz + * debian/rules: stopped copying in /usr/share/misc/config.{sub,guess} as it + seems to be unnecessary + + -- Andrew Pollock Fri, 21 Mar 2008 23:11:22 -0700 + +simpleproxy (3.4-2) unstable; urgency=low + + * debian/control: Moved Homepage: from binary to source + * debian/rules: removed DH_COMPAT in favour of debian/compat + * Bumped debhelper compatibility to 5 + * debian/control: bumped Standards-Version to 3.7.2.2 (no changes) + * debian/rules: rejigger how "make distclean" is called in the clean target + + -- Andrew Pollock Sat, 27 Oct 2007 16:08:28 -0700 + +simpleproxy (3.4-1) unstable; urgency=low + + * New upstream release + * Removed application of patch for CAN-2005-1857 as it is now included + * Removed application of patch to fix #199285 as it is now included + * debian/control: bumped Standards-Version (no changes) + * debian/copyright: updated upstream authors + + -- Andrew Pollock Wed, 31 Aug 2005 12:11:11 +1000 + +simpleproxy (3.2-4) unstable; urgency=low + + * Include patch to fix CAN-2005-1857 + * Patch manpage code typo + + -- Andrew Pollock Tue, 23 Aug 2005 10:59:26 +1000 + +simpleproxy (3.2-3) unstable; urgency=low + + * debian/control: pre-depend on dpatch + * debian/rules: use dpatch + * upstream dragging the chain applying patch, so I have (closes: #199285) + + -- Andrew Pollock Sun, 9 Nov 2003 09:14:14 +1100 + +simpleproxy (3.2-2) unstable; urgency=low + + * debian/control: cosmetic changes to package descriptions + * debian/rules: made compliant with section 10.1 of policy + * debian/control: bumped Standards-Version to 3.6.1 + * debian/watch: switched to version 2 file format + + -- Andrew Pollock Sat, 25 Oct 2003 19:27:18 +1000 + +simpleproxy (3.2-1) unstable; urgency=low + + * New upstream release (closes: #203799) + * debian/copyright: fixed Lintian uncleanliness + + -- Andrew Pollock Wed, 15 Oct 2003 13:58:45 +1000 + +simpleproxy (3.1-3) unstable; urgency=low + + * New maintainer (closes: #215381) + + -- Andrew Pollock Wed, 15 Oct 2003 09:01:19 +1000 + +simpleproxy (3.1-2) unstable; urgency=low + + * Fixed Build-Depends. (Closes: #149486) + * Changed capitalization of TCP in control file. (Closes: #149868) + + -- David Caldwell Thu, 13 Jun 2002 11:13:30 -0700 + +simpleproxy (3.1-1) unstable; urgency=low + + * Initial Release. (Closes: #144795) + + -- David Caldwell Wed, 24 Apr 2002 20:59:40 -0700 + --- simpleproxy-3.4.orig/debian/docs +++ simpleproxy-3.4/debian/docs @@ -0,0 +1,3 @@ +README +TODO +pop3users.txt --- simpleproxy-3.4.orig/debian/watch +++ simpleproxy-3.4/debian/watch @@ -0,0 +1,6 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# Site Directory Pattern Version Script +version=2 +http://sf.net/simpleproxy /simpleproxy/simpleproxy-(.*)\.tar\.gz debian uupdate