--- ipsvd-0.13.0.orig/debian/diff/matrixssl-shared.diff +++ ipsvd-0.13.0/debian/diff/matrixssl-shared.diff @@ -0,0 +1,77 @@ +Index: src/Makefile +=================================================================== +RCS file: /var/lib/cvs/ipsvd/src/Makefile,v +retrieving revision 1.29 +diff -u -r1.29 Makefile +--- src/Makefile 4 Feb 2006 19:12:26 -0000 1.29 ++++ src/Makefile 6 Feb 2006 18:40:53 -0000 +@@ -15,10 +15,10 @@ + + sslsvd: load sslsvd.o ssl_io.o sslerror_str.o ipsvd_log.o ipsvd_fmt.o \ + ipsvd_check.o ipsvd_hostname.o ipsvd_phcc.o ipsvd_scan.o uidgid.o \ +- cdb.a dns.a unix.a byte.a time.a socket.lib matrixssl.a ++ cdb.a dns.a unix.a byte.a time.a socket.lib + ./load sslsvd ssl_io.o sslerror_str.o ipsvd_log.o ipsvd_fmt.o \ + ipsvd_check.o ipsvd_hostname.o ipsvd_phcc.o ipsvd_scan.o uidgid.o \ +- cdb.a dns.a unix.a byte.a time.a `cat socket.lib` matrixssl.a ++ cdb.a dns.a unix.a byte.a time.a `cat socket.lib` -lmatrixssl + + udpsvd: load udpsvd.o ipsvd_log.o ipsvd_fmt.o ipsvd_check.o ipsvd_hostname.o \ + ipsvd_scan.o uidgid.o cdb.a dns.a unix.a byte.a time.a socket.lib +@@ -31,10 +31,9 @@ + ./load ipsvd-cdb ipsvd_fmt.o ipsvd_check.o cdb.a dns.a unix.a byte.a \ + time.a `cat socket.lib` + +-sslio: load sslio.o ssl_io.o uidgid.o sslerror_str.o unix.a byte.a time.a \ +- matrixssl.a ++sslio: load sslio.o ssl_io.o uidgid.o sslerror_str.o unix.a byte.a time.a + ./load sslio ssl_io.o uidgid.o sslerror_str.o unix.a byte.a time.a \ +- matrixssl.a ++ -lmatrixssl + + matrixssl.a: makelib matrixssl + install -m0644 Makefile.matrixssl matrixssl/src/Makefile.matrixssl +@@ -60,10 +59,10 @@ + tcpsvd.o: compile sysdeps tcpsvd.c ipsvd_log.h + ./compile tcpsvd.c + +-sslsvd.o: compile sysdeps tcpsvd.c ssl_io.c ipsvd_log.h matrixssl +- ./compile -I./matrixssl sslsvd.c ++sslsvd.o: compile sysdeps tcpsvd.c ssl_io.c ipsvd_log.h ++ ./compile sslsvd.c + +-ssl_io.o: compile sysdeps ssl_io.c matrixssl ++ssl_io.o: compile sysdeps ssl_io.c + ./compile -I./matrixssl ssl_io.c + + udpsvd.o: compile sysdeps udpsvd.c ipsvd_log.h +@@ -72,7 +71,7 @@ + ipsvd-cdb.o: compile sysdeps ipsvd-cdb.c + ./compile ipsvd-cdb.c + +-sslio.o: compile sysdeps sslio.c matrixssl ++sslio.o: compile sysdeps sslio.c + ./compile -I./matrixssl sslio.c + + check-tcpsvd.o: compile check-tcpsvd.c +@@ -105,8 +104,8 @@ + uidgid.o: compile uidgid.c uidgid.h + ./compile uidgid.c + +-sslerror_str.o: compile sslerror_str.c sslerror_str.h matrixssl +- ./compile -I./matrixssl sslerror_str.c ++sslerror_str.o: compile sslerror_str.c sslerror_str.h ++ ./compile sslerror_str.c + + socket.lib: compile load trysocketlib.c + ./compile trysocketlib.c +@@ -118,8 +117,7 @@ + + command.ssl: command.sslcheck + command.sslcheck: +- ( (test ! -r matrixssl.tar.gz && echo nossl) || \ +- echo sslio sslsvd) >command.sslcheck ++ echo sslio sslsvd >command.sslcheck + mv -f command.sslcheck command.ssl + + nossl: --- ipsvd-0.13.0.orig/debian/README.Debian.diet +++ ipsvd-0.13.0/debian/README.Debian.diet @@ -0,0 +1,15 @@ +Building ipsvd with the diet libc +--------------------------------- + +This package optionally can be built with the diet libc instead of the glibc +to provide small statically linked programs. The resulting package has no +dependency on any other package. + +To use the diet libc, make sure the latest versions of the dietlibc-dev and +libmatrixssl-dev packages are installed, and set DEB_BUILD_OPTIONS=diet in +the environment when building the package, e.g.: + + # apt-get install dietlibc-dev libmatrixssl-dev + $ DEB_BUILD_OPTIONS=diet fakeroot apt-get source -b ipsvd + + -- Gerrit Pape , Mon, 21 Jun 2004 18:43:19 +0000 --- ipsvd-0.13.0.orig/debian/changelog +++ ipsvd-0.13.0/debian/changelog @@ -0,0 +1,233 @@ +ipsvd (0.13.0-1) unstable; urgency=low + + * new upstream version. + * debian/control: Build-Depends: libmatrixssl1.8-dev (closes: #434254). + * debian/control: Standards-Version: 3.7.2.2. + + -- Gerrit Pape Sun, 26 Aug 2007 13:55:31 +0000 + +ipsvd (0.12.1-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Mon, 6 Feb 2006 18:41:07 +0000 + +ipsvd (0.12.0-1) unstable; urgency=low + + * new upstream version. + * debian/diff/matrixssl-shared.diff: new; upstream Makefile builds ssl* + programs with shared matrixssl library. + * debian/rules: ssl* programs now build from (patched) upstream Makefile. + * debian/control: minor update to long description. + + -- Gerrit Pape Sat, 4 Feb 2006 09:23:00 +0000 + +ipsvd (0.11.1-1) unstable; urgency=low + + * new upstream version. + * debian/control: Build-Depends: libmatrixssl1.7-dev (closes: #333905). + * debian/diff/sslio.check.diff: remove; applied upstream. + * debian/rules: don't apply diff. + * debian/control: Standards-Version: 3.6.2.1. + + -- Gerrit Pape Tue, 18 Oct 2005 19:05:37 +0000 + +ipsvd (0.11.0-2) unstable; urgency=low + + * debian/diff/sslio.check.diff: new; tweak sslio program check (fixes + testing failure on m68k). + * debian/rules: target unpack: apply diff. + + -- Gerrit Pape Mon, 21 Feb 2005 19:30:18 +0000 + +ipsvd (0.11.0-1) unstable; urgency=low + + * new upstream version. + * fix typo in tcpsvd.8 (thx Bastian Kleineidam, closes: 293363). + * debian/rules: check sslio program. + + -- Gerrit Pape Sun, 20 Feb 2005 16:13:53 +0000 + +ipsvd (0.10.1-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Mon, 17 Jan 2005 10:03:45 +0000 + +ipsvd (0.10.0-1) unstable; urgency=low + + * new upstream version. + * debian/copyright: adapt, 2005. + + -- Gerrit Pape Sat, 15 Jan 2005 11:52:10 +0000 + +ipsvd (0.9.7-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Fri, 3 Dec 2004 10:17:07 +0000 + +ipsvd (0.9.6-1) unstable; urgency=low + + * new upstream version. + * debian/control: Build-Depends: libmatrixssl1.2-dev. + * debian/README.Debian.diet: minor. + * debian/rules: adapt; minor cleanup. + + -- Gerrit Pape Mon, 2 Aug 2004 19:59:42 +0000 + +ipsvd (0.9.5-1) unstable; urgency=low + + * new upstream version. + * diff/sslio-man.diff: remove, applied upstream. + * debian/rules: target unpack: no diff; diet CC=diet -v -Os gcc -nostdinc; + * debian/implicit: update to revision 1.10. + * debian/control: update wording in long description. + + -- Gerrit Pape Sun, 18 Jul 2004 09:55:02 +0000 + +ipsvd (0.9.4-2) unstable; urgency=low + + * debian/control: update description. + * debian/rules: use -g -O2; target unpack: apply diff. + * debian/diff/sslio-man.diff: new; typos. + * debian/ipsvd.docs: add debian/README.Debian.diet. + * debian/README.Debian.diet: new; how to build the package with the diet + libc. + + -- Gerrit Pape Mon, 21 Jun 2004 20:01:19 +0000 + +ipsvd (0.9.4-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Sat, 19 Jun 2004 14:51:13 +0000 + +ipsvd (0.9.3-1) unstable; urgency=low + + * new upstream version. + * Build-Depends: libmatrixssl1.1-dev. + + -- Gerrit Pape Wed, 2 Jun 2004 19:36:17 +0000 + +ipsvd (0.9.2-1) unstable; urgency=low + + * new upstream version. + * debian/control: Build-Depends: libmatrixssl-dev (now all archs). + + -- Gerrit Pape Thu, 27 May 2004 09:32:17 +0000 + +ipsvd (0.9.1-1) unstable; urgency=low + + * new upstream version. + * debian/control: Build-Depends: libmatrixssl-dev [archs _it is available + for_]. + + -- Gerrit Pape Mon, 3 May 2004 17:12:45 +0000 + +ipsvd (0.9.0-1) unstable; urgency=low + + * new upstream version. + * debian/control: Build-Depends: libmatrixssl-dev [archs it is available + for]. + * debian/rules: new target unpack; build, install sslio where matrixssl + is available. + * debian/implicit: update to revision 1.8. + + -- Gerrit Pape Sat, 1 May 2004 14:09:00 +0000 + +ipsvd (0.8.2-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Mon, 23 Feb 2004 20:17:26 +0000 + +ipsvd (0.8.1-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Sun, 22 Feb 2004 14:41:09 +0000 + +ipsvd (0.8.0-1) unstable; urgency=low + + * new upstream version. + * debian/control: no longer Build-Depends: libdjbdns-dev. + * debian/copyright: 2004. + * debian/implicit: update to revision 1.5. + * debian/rules: support 'diet' in DEB_BUILD_OPTIONS to easily build the + package with the diet libc instead of glibc. + + -- Gerrit Pape Sat, 14 Feb 2004 10:34:44 +0000 + +ipsvd (0.7.1-2) unstable; urgency=medium + + * debian/control: no longer Build-Depends: debhelper; Standards-Version: + 3.6.1.0. + * debian/rules: stop using debhelper, use implicit rules; install html + documentation into /usr/share/doc/ipsvd/ (no subdirectory). + * debian/impicit: new; implicit rules. + * debian/ipsvd.docs: new. + * debian/compat, debian/dirs, debian/docs: remove; obsolete. + + -- Gerrit Pape Mon, 22 Dec 2003 09:00:31 +0000 + +ipsvd (0.7.1-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Wed, 26 Nov 2003 09:22:01 +0000 + +ipsvd (0.7.0-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Tue, 21 Oct 2003 15:59:42 +0000 + +ipsvd (0.6.1-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Tue, 14 Oct 2003 11:17:40 +0000 + +ipsvd (0.6.0-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Mon, 29 Sep 2003 11:02:29 +0000 + +ipsvd (0.5.0-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Wed, 6 Aug 2003 15:40:30 +0200 + +ipsvd (0.4.1-1) unstable; urgency=low + + * new upstream version. + * initial official Debian package (closes: #193017). + + -- Gerrit Pape Thu, 15 May 2003 10:36:22 +0200 + +ipsvd (0.4.0-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Sun, 4 May 2003 12:45:53 +0200 + +ipsvd (0.3.4-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Tue, 29 Apr 2003 14:45:41 +0200 + +ipsvd (0.3.0-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape Sat, 12 Apr 2003 16:40:59 +0200 + +ipsvd (0.2.0-1) unstable; urgency=low + + * initial release. + + -- Gerrit Pape Sat, 22 Mar 2003 00:51:57 +0100 --- ipsvd-0.13.0.orig/debian/control +++ ipsvd-0.13.0/debian/control @@ -0,0 +1,25 @@ +Source: ipsvd +Section: net +Priority: optional +Maintainer: Gerrit Pape +Build-Depends: libmatrixssl1.8-dev +Standards-Version: 3.7.2.2 + +Package: ipsvd +Architecture: any +Depends: ${shlibs:Depends} +Recommends: runit +Description: Internet protocol service daemons + ipsvd is a set of Internet protocol service daemons for TCP/IP (optionally + SSLv3) and UDP/IP. A daemon waits for incoming connections on a socket; + for new connections, it conditionally runs an arbitrary program to handle + the connection. The daemons can be told to read and follow pre-defined + instructions on how to handle incoming connections; based on the client's + IP address or hostname, they can run different programs, set a different + environment, deny a connection, or set a per host concurrency limit. + . + ipsvd can be used to run services usually run by inetd or tcpserver. + Normally the daemons are run by a supervisor process, such as runsv from + the runit package. + . + See http://smarden.org/ipsvd/ for more information. --- ipsvd-0.13.0.orig/debian/copyright +++ ipsvd-0.13.0/debian/copyright @@ -0,0 +1,30 @@ +This package was downloaded from http://smarden.org/ipsvd/install.html + +Upstream Author: Gerrit Pape + +Copyright: + +Copyright (c) 2003-2005, Gerrit Pape +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- ipsvd-0.13.0.orig/debian/implicit +++ ipsvd-0.13.0/debian/implicit @@ -0,0 +1,85 @@ +# $Id$ + +.PHONY: deb-checkdir deb-checkuid + +deb-checkdir: + @test -e debian/control || sh -cx '! : wrong directory' +deb-checkuid: + @test "`id -u`" -eq 0 || sh -cx '! : need root privileges' + +%.deb: %.deb-docs %.deb-DEBIAN + @rm -f $*.deb $*.deb-checkdir $*.deb-docs $*.deb-docs-base \ + $*.deb-docs-docs $*.deb-docs-examples $*.deb-DEBIAN \ + $*.deb-DEBIAN-dir $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums + +%.udeb: %.deb-DEBIAN + @rm -f $*.deb $*.deb-checkdir $*.deb-DEBIAN $*.deb-DEBIAN-dir \ + $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums + +%.deb-checkdir: + @test -d debian/$* || sh -cx '! : directory debian/$* missing' + @test "`id -u`" -eq 0 || sh -cx '! : need root privileges' + +%.deb-docs-base: + : implicit + @rm -f debian/$*/usr/share/doc/$*/* || : + @install -d -m0755 debian/$*/usr/share/doc/$* + : debian/$*/usr/share/doc/$*/ + @sh -cx 'install -m0644 debian/copyright debian/$*/usr/share/doc/$*/' + @sh -cx 'install -m0644 debian/changelog \ + debian/$*/usr/share/doc/$*/changelog.Debian' + @test ! -r changelog || \ + sh -cx 'install -m0644 changelog debian/$*/usr/share/doc/$*/' + @test -r debian/$*/usr/share/doc/$*/changelog || \ + sh -cx 'mv debian/$*/usr/share/doc/$*/changelog.Debian \ + debian/$*/usr/share/doc/$*/changelog' + @test -s debian/$*/usr/share/doc/$*/changelog || \ + sh -cx 'rm -f debian/$*/usr/share/doc/$*/changelog' + @gzip -9 debian/$*/usr/share/doc/$*/changelog* +%.deb-docs-docs: + @for i in `cat debian/$*.docs 2>/dev/null || :`; do \ + sh -cx "install -m0644 $$i debian/$*/usr/share/doc/$*/" || exit 1; \ + done + @test ! -r debian/$*.README.Debian || \ + sh -cx 'install -m0644 debian/$*.README.Debian \ + debian/$*/usr/share/doc/$*/README.Debian' + @if test -r debian/$*.NEWS.Debian; then \ + sh -cx 'install -m0644 debian/$*.NEWS.Debian \ + debian/$*/usr/share/doc/$*/NEWS.Debian && \ + gzip -9 debian/$*/usr/share/doc/$*/NEWS.Debian'; \ + fi +%.deb-docs-examples: + @rm -rf debian/$*/usr/share/doc/$*/examples + : debian/$*/usr/share/doc/$*/examples/ + @test ! -r debian/$*.examples || \ + install -d -m0755 debian/$*/usr/share/doc/$*/examples + @for i in `cat debian/$*.examples 2>/dev/null || :`; do \ + sh -cx "install -m0644 $$i debian/$*/usr/share/doc/$*/examples/" \ + || exit 1; \ + done +%.deb-docs: %.deb-checkdir %.deb-docs-base %.deb-docs-docs %.deb-docs-examples + : debian/$*/usr/share/doc/$*/ ok + +%.deb-DEBIAN-base: + @rm -rf debian/$*/DEBIAN + : debian/$*/DEBIAN/ + @install -d -m0755 debian/$*/DEBIAN + @for i in conffiles shlibs templates; do \ + test ! -r debian/$*.$$i || \ + sh -cx "install -m0644 debian/$*.$$i debian/$*/DEBIAN/$$i" \ + || exit 1; \ + done +%.deb-DEBIAN-scripts: + @for i in preinst prerm postinst postrm config; do \ + test ! -r debian/$*.$$i || \ + sh -cx "install -m0755 debian/$*.$$i debian/$*/DEBIAN/$$i" \ + || exit 1; \ + done +%.deb-DEBIAN-md5sums: + : debian/$*/DEBIAN/md5sums + @rm -f debian/$*/DEBIAN/md5sums + @cd debian/$* && find * -path 'DEBIAN' -prune -o \ + -type f -exec md5sum {} >>DEBIAN/md5sums \; +%.deb-DEBIAN: %.deb-checkdir %.deb-DEBIAN-base %.deb-DEBIAN-scripts \ + %.deb-DEBIAN-md5sums + : debian/$*/DEBIAN/ ok --- ipsvd-0.13.0.orig/debian/ipsvd.docs +++ ipsvd-0.13.0/debian/ipsvd.docs @@ -0,0 +1,3 @@ +net/ipsvd/package/README +net/ipsvd/doc/*.html +debian/README.Debian.diet --- ipsvd-0.13.0.orig/debian/rules +++ ipsvd-0.13.0/debian/rules @@ -0,0 +1,67 @@ +#!/usr/bin/make -f + +STRIP =strip +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + STRIP =: nostrip +endif + +CFLAGS =-g -O2 -Wall +LDFLAGS =-Os +CC =gcc +ifneq (,$(findstring diet,$(DEB_BUILD_OPTIONS))) + CC =diet -v -Os gcc -nostdinc +endif + +DIR =$(shell pwd)/debian/ipsvd + +unpack: deb-checkdir unpack-stamp +unpack-stamp: + tar xzf ipsvd-0.13.0.tar.gz + ln -s ipsvd-0.13.0 net/ipsvd + (cd net/ipsvd/ && patch -p0) net/ipsvd/src/conf-cc + echo '$(CC) $(LDFLAGS)' >net/ipsvd/src/conf-ld + touch unpack-stamp + +build: deb-checkdir build-stamp +build-stamp: unpack-stamp + -gcc -v + $(MAKE) -Cnet/ipsvd/src default check + touch build-stamp + +clean: deb-checkdir deb-checkuid + rm -rf net + rm -f unpack-stamp build-stamp + rm -rf '$(DIR)' + rm -f debian/files debian/substvars changelog + +install: deb-checkdir deb-checkuid build-stamp + rm -rf '$(DIR)' + # programs + install -d -m0755 '$(DIR)'/usr/bin + for i in tcpsvd sslsvd udpsvd ipsvd-cdb sslio; do \ + install -m0755 net/ipsvd/src/$$i '$(DIR)'/usr/bin/ || exit 1; \ + done + $(STRIP) -R .comment -R .note '$(DIR)'/usr/bin/* + # man pages + for i in 5 7 8; do \ + install -d -m0755 '$(DIR)'/usr/share/man/man$$i && \ + for j in net/ipsvd/man/*.$$i; do \ + install -m0644 $$j '$(DIR)'/usr/share/man/man$$i/ || exit 1; \ + done || exit 1; \ + done + gzip -9 '$(DIR)'/usr/share/man/man?/*.? + # changelog + rm -f changelog && ln -s net/ipsvd/package/CHANGES changelog + +binary-indep: + +binary-arch: install ipsvd.deb + test '$(CC)' != 'gcc' || dpkg-shlibdeps '$(DIR)'/usr/bin/* + dpkg-gencontrol -isp -pipsvd -P'$(DIR)' + dpkg -b '$(DIR)' .. + +binary: binary-indep binary-arch +.PHONY: unpack build clean install binary-indep binary-arch binary + +include debian/implicit