--- ipsvd-1.0.0.orig/debian/README.Debian.diet
+++ ipsvd-1.0.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 <pape@smarden.org>, Mon, 21 Jun 2004 18:43:19 +0000
--- ipsvd-1.0.0.orig/debian/changelog
+++ ipsvd-1.0.0/debian/changelog
@@ -0,0 +1,262 @@
+ipsvd (1.0.0-1) unstable; urgency=low
+
+  * new upstream release.
+  * debian/control: Standards-Version: 3.8.0.1.
+  * debian/implicit: update to revision a09db2e.
+  * debian/copyright: 2008.
+
+ -- Gerrit Pape <pape@smarden.org>  Sun, 15 Jun 2008 20:38:05 +0000
+
+ipsvd (0.14.0-2) unstable; urgency=low
+
+  * debian/control: Suggests: runit instead of Recommends:.
+  * debian/control: add Vcs-Git: http://smarden.org/git/ipsvd.git/.
+
+ -- Gerrit Pape <pape@smarden.org>  Fri, 15 Feb 2008 01:34:07 +0000
+
+ipsvd (0.14.0-1) unstable; urgency=low
+
+  * new upstream version.
+  * debian/rules: switch from tarball-in-tarball to original upstream
+    tarball.
+  * debian/diff/matrixssl-shared.diff: redo with git as
+    debian/diff/0001-Makefile-build-ssl-programs-with-shared-matrixssl-l.diff.
+  * debian/rules: new target patch: apply patches from debian/diff/;
+    reverse apply in target clean:.
+  * debian/control: Standards-Version: 3.7.3.0.
+
+ -- Gerrit Pape <pape@smarden.org>  Sat, 19 Jan 2008 11:29:54 +0000
+
+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 <pape@smarden.org>  Sun, 26 Aug 2007 13:55:31 +0000
+
+ipsvd (0.12.1-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  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 <pape@smarden.org>  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 <pape@smarden.org>  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 <pape@smarden.org>  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 <pape@smarden.org>  Sun, 20 Feb 2005 16:13:53 +0000
+
+ipsvd (0.10.1-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  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 <pape@smarden.org>  Sat, 15 Jan 2005 11:52:10 +0000
+
+ipsvd (0.9.7-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  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 <pape@smarden.org>  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 <pape@smarden.org>  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 <pape@smarden.org>  Mon, 21 Jun 2004 20:01:19 +0000
+
+ipsvd (0.9.4-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  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 <pape@smarden.org>  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 <pape@smarden.org>  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 <pape@smarden.org>  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 <pape@smarden.org>  Sat,  1 May 2004 14:09:00 +0000
+
+ipsvd (0.8.2-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  Mon, 23 Feb 2004 20:17:26 +0000
+
+ipsvd (0.8.1-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  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 <pape@smarden.org>  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 <pape@smarden.org>  Mon, 22 Dec 2003 09:00:31 +0000
+
+ipsvd (0.7.1-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  Wed, 26 Nov 2003 09:22:01 +0000
+
+ipsvd (0.7.0-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  Tue, 21 Oct 2003 15:59:42 +0000
+
+ipsvd (0.6.1-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  Tue, 14 Oct 2003 11:17:40 +0000
+
+ipsvd (0.6.0-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  Mon, 29 Sep 2003 11:02:29 +0000
+
+ipsvd (0.5.0-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  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 <pape@smarden.org>  Thu, 15 May 2003 10:36:22 +0200
+
+ipsvd (0.4.0-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  Sun,  4 May 2003 12:45:53 +0200
+
+ipsvd (0.3.4-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  Tue, 29 Apr 2003 14:45:41 +0200
+
+ipsvd (0.3.0-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  Sat, 12 Apr 2003 16:40:59 +0200
+
+ipsvd (0.2.0-1) unstable; urgency=low
+
+  * initial release.
+
+ -- Gerrit Pape <pape@smarden.org>  Sat, 22 Mar 2003 00:51:57 +0100
--- ipsvd-1.0.0.orig/debian/control
+++ ipsvd-1.0.0/debian/control
@@ -0,0 +1,26 @@
+Source: ipsvd
+Section: net
+Priority: optional
+Maintainer: Gerrit Pape <pape@smarden.org>
+Build-Depends: libmatrixssl1.8-dev
+Standards-Version: 3.8.0.1
+Vcs-Git: http://smarden.org/git/ipsvd.git/
+
+Package: ipsvd
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: 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-1.0.0.orig/debian/copyright
+++ ipsvd-1.0.0/debian/copyright
@@ -0,0 +1,30 @@
+This package was downloaded from http://smarden.org/ipsvd/install.html
+
+Upstream Author: Gerrit Pape <pape@smarden.org>
+
+Copyright:
+
+Copyright (c) 2003-2008, 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-1.0.0.orig/debian/implicit
+++ ipsvd-1.0.0/debian/implicit
@@ -0,0 +1,93 @@
+# $Id: a09db2e42c8b6a2d820754d741558e5894944746 $
+
+.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: install
+	@test -d debian/$* || sh -cx '! : directory debian/$* missing'
+	@test "`id -u`" -eq 0 || sh -cx '! : need root privileges'
+
+%.deb-docs-base: install
+	: 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: %.deb-docs-base
+	@for i in `cat debian/$*.docs 2>/dev/null || :`; do \
+	  if test -d $$i; then \
+	    sh -cx "install -d -m0755 debian/$*/usr/share/doc/$*/$${i##*/}" && \
+	    for j in $$i/*; do \
+	      sh -cx "install -m0644 $$j \
+	        debian/$*/usr/share/doc/$*/$${i##*/}/" || exit 1; \
+	    done || exit 1; \
+	    continue; \
+	  fi; \
+	  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: %.deb-docs-docs
+	@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: install
+	@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: %.deb-DEBIAN-base
+	@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: %.deb-DEBIAN-base %.deb-docs
+	: 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-1.0.0.orig/debian/ipsvd.docs
+++ ipsvd-1.0.0/debian/ipsvd.docs
@@ -0,0 +1,3 @@
+ipsvd/package/README
+ipsvd/doc/*.html
+debian/README.Debian.diet
--- ipsvd-1.0.0.orig/debian/rules
+++ ipsvd-1.0.0/debian/rules
@@ -0,0 +1,75 @@
+#!/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
+
+patch: deb-checkdir patch-stamp
+patch-stamp:
+	for i in `ls -1 debian/diff/*.diff || :`; do \
+	  patch -p1 <$$i || exit 1; \
+	done
+	touch patch-stamp
+
+build: deb-checkdir build-stamp
+build-stamp: patch-stamp
+	-gcc -v
+	test -e ipsvd || ln -s ipsvd-1.0.0 ipsvd
+	test -r conf-cc'{orig}' || cp -f ipsvd/src/conf-cc conf-cc'{orig}'
+	echo '$(CC) $(CFLAGS)' >ipsvd/src/conf-cc
+	test -r conf-ld'{orig}' || cp -f ipsvd/src/conf-ld conf-ld'{orig}'
+	echo '$(CC) $(LDFLAGS)' >ipsvd/src/conf-ld
+	(cd ipsvd/ && package/compile && package/check)
+	touch build-stamp
+
+clean: deb-checkdir deb-checkuid
+	rm -rf ipsvd/compile ipsvd/command
+	test ! -e patch-stamp || \
+	  for i in `ls -1r debian/diff/*.diff || :`; do patch -p1 -R <$$i; done
+	rm -f patch-stamp build-stamp
+	rm -rf '$(DIR)'
+	rm -f debian/files debian/substvars changelog
+	test ! -r conf-cc'{orig}' || mv -f conf-cc'{orig}' ipsvd/src/conf-cc
+	test ! -r conf-ld'{orig}' || mv -f conf-ld'{orig}' ipsvd/src/conf-ld
+	rm -f ipsvd
+
+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 ipsvd/command/$$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 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 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: patch build clean install binary-indep binary-arch binary
+
+include debian/implicit
--- ipsvd-1.0.0.orig/debian/diff/0001-Makefile-build-ssl-programs-with-shared-matrixssl-l.diff
+++ ipsvd-1.0.0/debian/diff/0001-Makefile-build-ssl-programs-with-shared-matrixssl-l.diff
@@ -0,0 +1,86 @@
+From 31b9f9f8cb7abaee1f43f59258ea53fff89429f4 Mon Sep 17 00:00:00 2001
+From: Gerrit Pape <pape@smarden.org>
+Date: Sat, 19 Jan 2008 11:19:14 +0000
+Subject: [PATCH] Makefile: build ssl* programs with shared matrixssl library.
+
+---
+ ipsvd-1.0.0/src/Makefile |   24 +++++++++++-------------
+ 1 files changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/ipsvd-1.0.0/src/Makefile b/ipsvd-1.0.0/src/Makefile
+index 6a29610..4700567 100644
+--- a/ipsvd-1.0.0/src/Makefile
++++ b/ipsvd-1.0.0/src/Makefile
+@@ -15,10 +15,10 @@ tcpsvd: load tcpsvd.o ipsvd_log.o ipsvd_fmt.o ipsvd_check.o ipsvd_hostname.o \
+ 
+ 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 @@ ipsvd-cdb: load ipsvd-cdb.o ipsvd_fmt.o ipsvd_check.o cdb.a dns.a unix.a \
+ 	./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
+@@ -64,10 +63,10 @@ check-ipsvd-cdb: load check-ipsvd-cdb.o uint32_unpack.o unix.a byte.a
+ 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
+@@ -76,7 +75,7 @@ udpsvd.o: compile sysdeps udpsvd.c ipsvd_log.h
+ 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
+@@ -109,8 +108,8 @@ ipsvd_scan.o: compile ipsvd_scan.c
+ 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
+@@ -122,8 +121,7 @@ socket.lib: compile load trysocketlib.c
+ 
+ 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:
+-- 
+1.5.5.4
+
