--- cvm-0.96.orig/debian/libcvm1.postrm
+++ cvm-0.96/debian/libcvm1.postrm
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+
+test "$1" = 'remove' || exit 0
+exec ldconfig
--- cvm-0.96.orig/debian/cvm-checkpassword.8
+++ cvm-0.96/debian/cvm-checkpassword.8
@@ -0,0 +1,41 @@
+.TH cvm-checkpassword 8
+.SH NAME
+cvm-checkpassword \- checkpassword interface for CVM modules
+.SH SYNOPSIS
+.B cvm-checkpassword
+.I CVM
+.I Command
+[
+.I arguments \fR...
+]
+.SH DESCRIPTION
+ http://cr.yp.to/checkpwd/interface.html
+ http://untroubled.org/cvm/cvm.html
+
+See the above links for details on both the CVM and checkpassword
+interfaces.
+To use this interface with
+.BR qmail-pop3d (8),
+use the following
+command line:
+
+ /var/qmail/bin/qmail-popup \\
+ cvm-checkpassword cvm-unix \\
+ /var/qmail/bin/qmail-pop3d ./Maildir/
+
+.B Note:
+The default mode of operations for this module is to attempt to split a
+domain name from the account name.
+If this is not desirable, set
+$CVM_ACCOUNT_SPLIT_CHARS
+to an empty string.
+.SH SEE ALSO
+cvm-pwfile(8),
+cvm-qmail(8),
+cvm-unix(8),
+cvm-sql(8),
+cvm-vmailmgr(8),
+cvm-benchclient(8),
+cvm-testclient(8)
+
+ http://untroubled.org/cvm/cvm.html
--- cvm-0.96.orig/debian/libcvm1.postinst
+++ cvm-0.96/debian/libcvm1.postinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+
+test "$1" = 'configure' || exit 0
+exec ldconfig
--- cvm-0.96.orig/debian/cvm.README.Debian
+++ cvm-0.96/debian/cvm.README.Debian
@@ -0,0 +1,7 @@
+cvm for Debian
+--------------
+
+The binaries are installed in /usr/bin.  Please install the cvm-dev package
+for technical documentation, and see /usr/share/doc/cvs-dev/.
+
+ -- Gerrit Pape <pape@smarden.org>, Mon, 19 Nov 2001 12:34:09 +0100
--- cvm-0.96.orig/debian/cvm-testclient.8
+++ cvm-0.96/debian/cvm-testclient.8
@@ -0,0 +1,27 @@
+.TH cvm-testclient 8
+.SH NAME
+cvm-testclient \- testing CV modules from the command line
+.SH SYNOPSIS
+.B cvm-testclient
+.I CVM
+.I account
+.I domain
+[
+.I credential
+[
+.I credential \fR...
+] ]
+.SH DESCRIPTION
+.B cvm-testclient
+will invoke the named CV module and provide a verbose report of the results,
+including details on the standard facts reported by the module.
+.SH SEE ALSO
+cvm-pwfile(8),
+cvm-qmail(8),
+cvm-unix(8),
+cvm-sql(8),
+cvm-vmailmgr(8),
+cvm-benchclient(8),
+cvm-checkpassword(8),
+
+ http://untroubled.org/cvm/cvm.html
--- cvm-0.96.orig/debian/cvm-sql.7
+++ cvm-0.96/debian/cvm-sql.7
@@ -0,0 +1,79 @@
+.TH cvm-sql 7
+.SH NAME
+cvm-sql \- CVM SQL Framework
+.SH QUERY SUBSTITUTION
+.I $VAR
+and
+.I ${VAR}
+are replaced with the
+.B quoted
+value of the environment variable named
+.IR VAR .
+Use the second form when
+.I VAR
+contains anything other than alpha-numeric or underscore (_) characters.
+Do not include quotes in the query.
+The variables
+.I account
+and
+.I domain
+contain the account and domain names given by the CVM client.
+.I $$
+is replaced with a single dollar sign.
+.SH QUERY RESULTS
+The query must produce the following fields exactly in order.
+All required fields must not be null or empty.
+.TP
+1.
+Password, encrypted with
+.BR crypt (3)
+(required)
+.TP
+2.
+Actual account name (required)
+.TP
+3.
+User ID (integer) (required)
+.TP
+4.
+Group ID (integer) (required)
+.TP
+5.
+Directory (required)
+.TP
+6.
+Real name (optional)
+.TP
+7.
+Login shell (optional)
+.TP
+8.
+Group name (optional)
+.TP
+9.
+Domain name (optional)
+.TP
+10.
+System account name (optional)
+.TP
+11.
+System account directory (optional)
+.TP
+12.
+Mailbox path (optional)
+.SH DEFAULT QUERY
+SELECT password, username, userid, groupid, directory, realname, shell,
+groupname, domain, sys_username, sys_directory FROM accounts WHERE
+username=$account AND domain=$domain
+.SH SEE ALSO
+cvm-mysql(8),
+cvm-pgsql(8),
+cvm-pwfile(8),
+cvm-qmail(8),
+cvm-unix(8),
+cvm-vmailmgr(8),
+cvm-benchclient(8),
+cvm-checkpassword(8),
+cvm-testclient(8)
+
+ http://untroubled.org/cvm/cvm.html
--- cvm-0.96.orig/debian/copyright
+++ cvm-0.96/debian/copyright
@@ -0,0 +1,15 @@
+This package was debianized by Gerrit Pape <pape@smarden.org> on
+Mon, 19 Nov 2001 12:34:09 +0100.
+
+It was downloaded from http://untroubled.org/cvm/
+
+Upstream Author: Bruce Guenter <bruceg@em.ca>
+
+Copyright:
+
+This program is Copyright(C) 2005 Bruce Guenter, and may be copied
+according to the GNU GENERAL PUBLIC LICENSE (GPL) Version 2 or a later
+version.  A copy of this license is included with this package.  This
+package comes with no warranty of any kind.
+
+The full text of the GPL can be found at /usr/share/common-licenses/GPL-2.
--- cvm-0.96.orig/debian/changelog
+++ cvm-0.96/debian/changelog
@@ -0,0 +1,235 @@
+cvm (0.96-1.9.201403182148) ucs4-0-0-0; urgency=low
+
+  * UCS auto build. No patches were applied to the original source package
+
+ -- Univention builddaemon <buildd@univention.de>  Tue, 18 Mar 2014 21:48:36 +0100
+
+cvm (0.96-1) unstable; urgency=low
+
+  * new upstream version.
+  * debian/diff/0001-tests.sh-fix-variables-in-selftests.diff: remove;
+    fixed upstream.
+  * debian/rules: workaround non-working variable assignment with dash
+    as sh.
+  * debian/control: Build-Depends: libsqlite3-dev, sqlite3.
+  * debian/rules: build the new cvm-sqlite.
+  * debian/diff/0001-Makefile-avoid-rpath-workaround-some-...diff:
+    adapt for cvm-sqlite.
+  * debian/rules: don't install cvm-sqlite for now.
+
+ -- Gerrit Pape <pape@smarden.org>  Thu, 15 Apr 2010 02:27:30 +0000
+
+cvm (0.90-1) unstable; urgency=low
+
+  * new upstream version.
+  * debian/rules: mostly redo; build, install new packages; drop diet
+    libraries for now.
+  * debian/control: change binary package cvm-dev to libcvm1-dev,
+    lib-cvm1, providing shared and static libraries; no longer
+    Build-Depends: dietlibc-dev; Build-Depends: libbg1-dev, libtool
+    Standards-Version: 3.7.3.0.
+  * debian/cvm-*.[78]: add description to NAME.
+  * debian/diff/0001-tests.sh-fix-variables-in-selftests.diff: new;
+    redo tests.diff with git.
+  * debian/diff/0002-Makefile-avoid-rpath-workaround-some...diff: new;
+    Makefile: avoid rpath; workaround some linking issues.
+  * README.Debian.diet, debian/cvm.docs: remove; drop for now.
+  * debian/cvm-dev.README.Debian, debian/cvm-dev.docs: rename to
+    libcvm1-dev.* respectively.
+  * debian/libcvm1-dev.docs: adapt paths.
+  * libcvm1.postinst, libcvm1.postrm: new; run ldconfig on configure,
+    remove.
+  * debian/libcvm1-dev.README.Debian: adapt.
+
+ -- Gerrit Pape <pape@smarden.org>  Fri, 02 May 2008 18:26:33 +0000
+
+cvm (0.76-2) unstable; urgency=low
+
+  * re-build with current dietlibc in sid (fixed build failure on hppa).
+  * debian/control: Build-Depends: libmysqlclient15-dev (closes: #343765).
+
+ -- Gerrit Pape <pape@smarden.org>  Fri, 23 Dec 2005 15:06:49 +0000
+
+cvm (0.76-1) unstable; urgency=low
+
+  * new upstream version.
+  * debian/control: remove version restriction from Build-Depends:
+    dietlibc-dev; add Build-Depends: vim, freecdb (for selftests).
+  * debian/diff/libbg.diff: remove; obsolete.
+  * debian/diff/tests.diff: new; fix variables in selftests.
+  * debian/rules: run selftests.
+
+ -- Gerrit Pape <pape@smarden.org>  Wed,  5 Oct 2005 09:11:31 +0000
+
+cvm (0.71-2) unstable; urgency=low
+
+  * debian/diff/libbg.diff: new; upstream Makefile: add -lbg when linking
+    inst* programs (required by recent bglibs).
+  * debian/rules: apply diffs in debian/diff/ to gnu/ and diet/; query
+    pg_config program for postgresql includes path (thx Martin Pitt).
+  * debian/control: Build-Depends: libpq-dev instead of postgresql-dev;
+    Build-Depends: libmysqlclient12-dev instead of libmysqlclient-dev.
+
+ -- Gerrit Pape <pape@smarden.org>  Thu, 16 Jun 2005 18:37:53 +0000
+
+cvm (0.71-1) unstable; urgency=low
+
+  * new upstream version.
+  * debian/control: Build-Depends: bglibs-dev (>> 1.020-0), dietlibc-dev
+    (>> 0.29-0) [archs].
+  * debian/rules: adapt; use upstream install target.
+  * debian/diff/ld.diff: remove; obsolete.
+
+ -- Gerrit Pape <pape@smarden.org>  Mon,  6 Jun 2005 18:08:48 +0000
+
+cvm (0.50-1) unstable; urgency=low
+
+  * new upstream version.
+  * debian/rules, debian/diff/ld.diff: adapt.
+
+ -- Gerrit Pape <pape@smarden.org>  Tue, 24 May 2005 11:24:51 +0000
+
+cvm (0.33-1) unstable; urgency=low
+
+  * new upstream version.
+  * debian/cvm-pwfile.8: merge changes from upstream cvm-pwfile.html.
+  * debian/diff/ld.diff: adapt.
+
+ -- Gerrit Pape <pape@smarden.org>  Sun,  8 May 2005 20:36:21 +0000
+
+cvm (0.32-2) unstable; urgency=low
+
+  * debian/control: add Build-Depends: dietlibc-dev [ppc64].
+  * debian/rules: add ppc64 to DIET_ARCHS.
+
+ -- Gerrit Pape <pape@smarden.org>  Sun, 13 Mar 2005 14:02:43 +0000
+
+cvm (0.32-1) unstable; urgency=low
+
+  * new upstream version.
+  * debian/copyright: adapt, 2005.
+  * debian/diff/ld.diff: adapt.
+  * debian/rules: strip diet binaries if DEB_BUILD_OPTIONS=diet is set.
+
+ -- Gerrit Pape <pape@smarden.org>  Sat, 15 Jan 2005 11:32:52 +0000
+
+cvm (0.31-3) unstable; urgency=low
+
+  * debian/control: Build-Depends: dietlibc-dev (>= 0.27-7) (works around
+    build failure on ia64 #286840).
+
+ -- Gerrit Pape <pape@smarden.org>  Thu, 23 Dec 2004 22:31:56 +0000
+
+cvm (0.31-2) unstable; urgency=low
+
+  * debian/control: Build-Depends: dietlibc-dev (>= 0.27-6) (fixes build
+    failure on mips/el), bglibs-dev.
+  * debian/diff/ld.diff: new; workaround weird linker problem with stackgap
+    enabled diet libc.
+  * debian/rules: apply diff for diet lib; remove workaround for 0.30.
+
+ -- Gerrit Pape <pape@smarden.org>  Wed, 22 Dec 2004 08:47:24 +0000
+
+cvm (0.31-1) unstable; urgency=low
+
+  * new upstream version.
+  * debian/control: new binary packages cvm-mysql, cvm-pgsql; Build-Depends:
+    libmysqlclient-dev, postgresql-dev.
+  * debian/rules: build cvm-mysql, cvm-pgsql packages.
+  * debian/cvm-benchclient.8, debian/cvm-checkpassword.8, debian/cvm-pwfile.8,
+    debian/cvm-testclient.8, debian/cvm-unix.8: cleanup.
+  * debian/cvm-mysql.8, debian/cvm-pgsql.8, debian/cvm-qmail.8,
+    debian/cvm-sql.7, debian/cvm-vmailmgr.8: new; man pages for new programs.
+
+ -- Gerrit Pape <pape@smarden.org>  Wed, 17 Nov 2004 15:22:10 +0000
+
+cvm (0.20-2) unstable; urgency=low
+
+  * debian/control: Build-Depends: dietlibc-dev [archs it is available for].
+
+ -- Gerrit Pape <pape@smarden.org>  Sat,  6 Nov 2004 14:17:15 +0000
+
+cvm (0.20-1) unstable; urgency=low
+
+  * new upstream version.
+  * orig.tar.gz contains upstream tar.gz.
+  * debian/rules: reorganize; cvm-dev: build additional libraries compiled
+    against diet libc; support DEB_BUILD_OPTIONS=diet for cvm package.
+  * debian/implicit: update to revision 1.10.
+  * debian/README.Debian.diet: new; how to build cvm package with diet libc.
+  * debian/cvm.docs: new; install debian/README.Debian.diet
+  * debian/copyright: minor.
+  * debian/control: Build-Depends: dietlibc-dev.
+  * debian/cvm-dev.docs: adapt.
+
+ -- Gerrit Pape <pape@smarden.org>  Fri,  5 Nov 2004 17:34:17 +0000
+
+cvm (0.18-2) unstable; urgency=low
+
+  * debian/control: no longer Build-Depends: debhelper; Standards-Version:
+    3.6.1.0.
+  * debian/rules: stop using debhelper, use implicit Makefile rules.
+  * debian/implicit: new; implicit rules.
+  * debian/cvm-dev.files, debian/cvm.files, debian/undocumented: remove;
+    obsolete.
+
+ -- Gerrit Pape <pape@smarden.org>  Sun, 28 Dec 2003 15:48:51 +0000
+
+cvm (0.18-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  Thu, 20 Nov 2003 10:34:29 +0000
+
+cvm (0.17-1) unstable; urgency=low
+
+  * new upstream version.
+  * debian/cvm-testclient.8: adapt synopsis.
+  * insthier.c: typo.
+
+ -- Gerrit Pape <pape@smarden.org>  Fri, 23 May 2003 10:42:21 +0200
+
+cvm (0.16-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Gerrit Pape <pape@smarden.org>  Wed, 23 Apr 2003 10:10:35 +0200
+
+cvm (0.15-2) unstable; urgency=low
+
+  * debian/rules: force removal of all dependencies and targets before
+    re-making targets installer and instcheck, to avoid race condition
+    (fixes build failure on alpha; see also #153253 for details).
+
+ -- Gerrit Pape <pape@smarden.org>  Tue, 22 Apr 2003 15:05:39 +0200
+
+cvm (0.15-1) unstable; urgency=low
+
+  * new upstream version.
+  * debian/control: build depend on bglibs-dev; new package cvs-dev:
+    static libraries, header files, and docs; Standards-Version 3.5.9.
+  * debian/copyright: refer to /usr/share/common-licenses/GPL-2.
+  * debian/cvm-testclient.8: adapt synopsis.
+  * debian/rules: adapt to upstream build changes; build and install
+    cvm-dev package.
+  * debian/cvm-dev.docs, debian/cvm-dev.files, debian/cvm.files,
+    debian/cvm.README.Debian, debian/cvm-dev.README.Debian: new.
+  * debian/docs, debian/dirs, debian/README.Debian: remove.
+
+ -- Gerrit Pape <pape@smarden.org>  Thu, 17 Apr 2003 00:06:40 +0200
+
+cvm (0.11-2) unstable; urgency=low
+
+  * debian/control: new description (thx Andrew Pimlott).
+  * debian/cvm-benchclient.8, debian/cvm-checkpassword.8,
+    debian/cvm-pwfile.8, debian/cvm-testclient.8, debian/cvm-unix.8:
+    contribute man pages.
+
+ -- Gerrit Pape <pape@smarden.org>  Tue,  9 Apr 2002 10:21:24 +0200
+
+cvm (0.11-1) unstable; urgency=low
+
+  * Initial Release (closes: #120172).
+
+ -- Gerrit Pape <pape@smarden.org>  Fri, 23 Nov 2001 16:15:12 +0100
+
--- cvm-0.96.orig/debian/cvm-benchclient.8
+++ cvm-0.96/debian/cvm-benchclient.8
@@ -0,0 +1,30 @@
+.TH cvm-benchclient 8
+.SH NAME
+cvm-benchclient \- testing the performance of a CV module
+.SH SYNOPSIS
+.B cvm-benchclient
+.I count
+.I CVM
+.I account
+.I credential
+[
+.I credential \fR...
+]
+.SH DESCRIPTION
+.B cvm-benchclient
+will invoke the named CV module
+.I count
+times without pausing.
+If the module fails to validate the credentials,
+.B cvm-benchclient
+exits immediately with a non-zero exit code, as reported by the module.
+.SH SEE ALSO
+cvm-pwfile(8),
+cvm-qmail(8),
+cvm-unix(8),
+cvm-sql(8),
+cvm-vmailmgr(8),
+cvm-checkpassword(8),
+cvm-testclient(8)
+
+ http://untroubled.org/cvm/cvm.html
--- cvm-0.96.orig/debian/cvm-qmail.8
+++ cvm-0.96/debian/cvm-qmail.8
@@ -0,0 +1,58 @@
+.TH cvm-qmail 8
+.SH NAME
+cvm-qmail \- qmail configuration lookup module
+.SH SYNOPSIS
+cvm-qmail
+.SH CREDENTIALS
+None, only operates as a lookup module.
+.SH DESCRIPTION
+This module uses the standard qmail configuration files to determine if an
+address is valid, using the same lookups that qmail would.
+It first checks
+.I control/locals
+and then
+.I control/virtualdomains
+to determine if the domain is valid, and to determine the prefix to add to
+virtual domain usernames.
+It then looks up the resulting username in
+.I users/cdb
+(or the system password table if the CDB does not exist) to determine the
+correct home directory.
+If the address would require a
+.I .qmail-something
+file, it ensures that that file exists as well, doing
+.I \-default
+checks as necessary.
+.SH CONFIGURATION VARIABLES
+.TP
+.B CVM_QMAIL_MISSINGDOMAIN \fR(optional)
+If this is set and the domain name is not a local or virtual qmail domain,
+this domain name is substituted and the lookup succeeds.
+This allows for setups where domains listed in
+.I control/rcpthosts
+and
+.I control/morercpthosts.cdb
+(which are accepted by the SMTP receiver) are not listed as local or virtual
+domains.
+If this is set to an empty value, "localhost" is substituted.
+.TP
+.B CVM_QMAIL_MISSINGUSER \fR(optional)
+When missing domain substitution is being done, the value of this variable is
+used to replace the username.
+The value must exist as a valid system user.
+Defaults to "alias" which will normally exist on all qmail systems.
+.TP
+.B QMAIL_ROOT \fR(optional)
+The root directory under which all the qmail configuration files are expected
+to be found.
+Defaults to "/var/qmail", which is the normal qmail install path.
+.SH SEE ALSO
+cvm-pwfile(8),
+cvm-unix(8),
+cvm-sql(8),
+cvm-vmailmgr(8),
+cvm-benchclient(8),
+cvm-checkpassword(8),
+cvm-testclient(8)
+
+ http://untroubled.org/cvm/cvm.html
--- cvm-0.96.orig/debian/cvm-pwfile.8
+++ cvm-0.96/debian/cvm-pwfile.8
@@ -0,0 +1,39 @@
+.TH cvm-pwfile 8
+.SH NAME
+cvm-pwfile \- POSIX-style passwd file module
+.SH SYNOPSIS
+cvm-pwfile
+.SH CREDENTIALS
+Pass phrase
+.SH DESCRIPTION
+This module loads entries from an alternate password file using the
+.BR fgetpwent (3)
+API, which requires the file to be formatted the
+same as the UNIX
+.I /etc/passwd
+file.
+No group name lookups are done.
+.SH CONFIGURATION VARIABLES
+.TP
+.B CVM_PWFILE_PATH
+the path to the passwd file containing the credential information.
+.TP
+.B CVM_PWFILE_PWCMP \fR(optional)
+The
+.I password comparison module
+to use.
+If it is not set, the default password comparison mode is plain-text.
+To use UNIX crypt style passwords, like
+.I /etc/passwd
+does, set this to "crypt".
+.SH SEE ALSO
+cvm-qmail(8),
+cvm-unix(8),
+cvm-sql(8),
+cvm-vmailmgr(8),
+cvm-benchclient(8),
+cvm-checkpassword(8),
+cvm-testclient(8)
+
+ http://untroubled.org/pwcmp/pwcmp.html
+ http://untroubled.org/cvm/cvm.html
--- cvm-0.96.orig/debian/libcvm1-dev.docs
+++ cvm-0.96/debian/libcvm1-dev.docs
@@ -0,0 +1,6 @@
+ANNOUNCEMENT
+NEWS
+README
+TODO
+VERSION
+*.html
--- cvm-0.96.orig/debian/implicit
+++ cvm-0.96/debian/implicit
@@ -0,0 +1,85 @@
+# $Id: implicit,v 1.10 2004/07/03 15:20:00 pape Exp $
+
+.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
--- cvm-0.96.orig/debian/cvm-mysql.8
+++ cvm-0.96/debian/cvm-mysql.8
@@ -0,0 +1,70 @@
+.TH cvm-mysql 8
+.SH NAME
+cvm-mysql \- MySQL module
+.SH SYNOPSIS
+cvm-mysql
+.SH CREDENTIALS
+Pass phrase
+.SH DESCRIPTION
+This module queries a MySQL database for the account name, compares
+the stored pass phrase with the given one using
+.BR crypt (3).
+.SH CONFIGURATION VARIABLES
+.TP
+.B CVM_MYSQL_DEFAULT_FILE
+The full path of the defaults file to read if the following variable is set.
+If not set, the file
+.I $HOME/.my.cnf
+will be read (the MySQL default).
+.TP
+.B CVM_MYSQL_DEFAULT_GROUP
+If set, the module will read connection default options from the named group
+in the defaults file as above
+.TP
+.B CVM_MYSQL_HOST
+The hostname or IP of the MySQL server.
+If not set, a connection to the local host is assumed.
+.TP
+.B CVM_MYSQL_USER
+The MySQL login ID to connect as.
+If not set, the invoking user is assumed.
+.TP
+.B CVM_MYSQL_PASS
+The password for the above user.
+.TP
+.B CVM_MYSQL_DB
+The database name, must be set.
+.TP
+.B CVM_MYSQL_PORT
+The port number for the TCP/IP connection (only used if the server is not
+local).
+.TP
+.B CVM_MYSQL_POSTQ \fR(optional)
+The SQL query to execute after the credentials have been validated, see
+.BR cvm-sql (7).
+.TP
+.B CVM_MYSQL_PWCMP \fR(optional)
+The
+.I password comparison module
+to use.
+.TP
+.B CVM_MYSQL_SOCKET
+The path to the socket that should be used for connections to a local server.
+.TP
+.B CVM_MYSQL_QUERY \fR(optional)
+The SQL query to issue to retrieve the row containing the account information
+from the database, see
+.BR cvm-sql (7).
+.SH SEE ALSO
+cvm-sql(7),
+cvm-pgsql(8),
+cvm-pwfile(8),
+cvm-qmail(8),
+cvm-unix(8),
+cvm-vmailmgr(8),
+cvm-benchclient(8),
+cvm-checkpassword(8),
+cvm-testclient(8)
+
+ http://untroubled.org/pwcmp/pwcmp.html
+ http://untroubled.org/cvm/cvm.html
--- cvm-0.96.orig/debian/control
+++ cvm-0.96/debian/control
@@ -0,0 +1,111 @@
+Source: cvm
+Priority: optional
+Maintainer: Gerrit Pape <pape@smarden.org>
+Build-Depends: libbg1-dev, libmysqlclient15-dev, libpq-dev, libsqlite3-dev, libtool, vim, freecdb, sqlite3
+Standards-Version: 3.7.3.0
+
+Package: cvm
+Section: admin
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Credential Validation Modules
+ CVM is a framework for validating a set of credentials against a database
+ using a filter program.  The modules act as a filter, taking a set of
+ credentials as input and writing a set of facts as output if those
+ credentials are valid.  Optional input is given to the module through
+ environment variables.
+ .
+ Some of the ideas for CVM came from experience with PAM (pluggable
+ authentication modules), the checkpassword interface used by qmail-pop3d,
+ and the "authmod" interface used by Courier IMAP and POP3.  This framework
+ places fewer restrictions on the invoking client than checkpassword does,
+ and is much simpler to implement on both sides than PAM and the authmod
+ framework.
+ .
+ See http://untroubled.org/cvm/cvm.html for more information.
+
+Package: cvm-mysql
+Section: admin
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: cvm
+Description: Credential Validation Modules (MySQL)
+ CVM is a framework for validating a set of credentials against a database
+ using a filter program.  The modules act as a filter, taking a set of
+ credentials as input and writing a set of facts as output if those
+ credentials are valid.  Optional input is given to the module through
+ environment variables.
+ .
+ Some of the ideas for CVM came from experience with PAM (pluggable
+ authentication modules), the checkpassword interface used by qmail-pop3d,
+ and the "authmod" interface used by Courier IMAP and POP3.  This framework
+ places fewer restrictions on the invoking client than checkpassword does,
+ and is much simpler to implement on both sides than PAM and the authmod
+ framework.
+ .
+ See http://untroubled.org/cvm/cvm.html for more information.
+
+Package: cvm-pgsql
+Section: admin
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: cvm
+Description: Credential Validation Modules (PostgreSQL)
+ CVM is a framework for validating a set of credentials against a database
+ using a filter program.  The modules act as a filter, taking a set of
+ credentials as input and writing a set of facts as output if those
+ credentials are valid.  Optional input is given to the module through
+ environment variables.
+ .
+ Some of the ideas for CVM came from experience with PAM (pluggable
+ authentication modules), the checkpassword interface used by qmail-pop3d,
+ and the "authmod" interface used by Courier IMAP and POP3.  This framework
+ places fewer restrictions on the invoking client than checkpassword does,
+ and is much simpler to implement on both sides than PAM and the authmod
+ framework.
+ .
+ See http://untroubled.org/cvm/cvm.html for more information.
+
+Package: libcvm1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: libcvm1-dev
+Description: Credential Validation Modules (shared libraries)
+ CVM is a framework for validating a set of credentials against a database
+ using a filter program.  The modules act as a filter, taking a set of
+ credentials as input and writing a set of facts as output if those
+ credentials are valid.  Optional input is given to the module through
+ environment variables.
+ .
+ Some of the ideas for CVM came from experience with PAM (pluggable
+ authentication modules), the checkpassword interface used by qmail-pop3d,
+ and the "authmod" interface used by Courier IMAP and POP3.  This framework
+ places fewer restrictions on the invoking client than checkpassword does,
+ and is much simpler to implement on both sides than PAM and the authmod
+ framework.
+ .
+ See http://untroubled.org/cvm/cvm.html for more information.
+
+Package: libcvm1-dev
+Section: libdevel
+Architecture: any
+Depends: libcvm1 (= ${binary:Version})
+Provides: libcvm-dev, cvm-dev
+Conflicts: libcvm-dev, cvm-dev
+Recommends: cvm
+Description: Credential Validation Modules (development files, documentation)
+ CVM is a framework for validating a set of credentials against a database
+ using a filter program.  The modules act as a filter, taking a set of
+ credentials as input and writing a set of facts as output if those
+ credentials are valid.  Optional input is given to the module through
+ environment variables.
+ .
+ Some of the ideas for CVM came from experience with PAM (pluggable
+ authentication modules), the checkpassword interface used by qmail-pop3d,
+ and the "authmod" interface used by Courier IMAP and POP3.  This framework
+ places fewer restrictions on the invoking client than checkpassword does,
+ and is much simpler to implement on both sides than PAM and the authmod
+ framework.
+ .
+ See http://untroubled.org/cvm/cvm.html for more information.
--- cvm-0.96.orig/debian/cvm-unix.8
+++ cvm-0.96/debian/cvm-unix.8
@@ -0,0 +1,30 @@
+.TH cvm-unix 8
+.SH NAME
+cvm-unix \- UNIX/POSIX-standard module
+.SH SYNOPSIS
+cvm-unix
+.SH CREDENTIALS
+Pass phrase
+.SH DESCRIPTION
+This module uses the POSIX standard
+.BR getpwnam (3)
+and
+.BR crypt (3)
+APIs to validate credentials.
+If the system has either the
+.I getuserpw
+or the
+.I getspnam
+APIs, they will also be used to locate the encrypted password.
+.SH CONFIGURATION VARIABLES
+None
+.SH SEE ALSO
+cvm-pwfile(8),
+cvm-qmail(8),
+cvm-sql(8),
+cvm-vmailmgr(8),
+cvm-benchclient(8),
+cvm-checkpassword(8),
+cvm-testclient(8)
+
+ http://untroubled.org/cvm/cvm.html
--- cvm-0.96.orig/debian/cvm-pgsql.8
+++ cvm-0.96/debian/cvm-pgsql.8
@@ -0,0 +1,48 @@
+.TH cvm-pgsql 8
+.SH NAME
+cvm-pgsql \- PgSQL module
+.SH SYNOPSIS
+cvm-pgsql
+.SH CREDENTIALS
+Pass phrase
+.SH DESCRIPTION
+This module queries a PgSQL database for the account name, compares the
+stored pass phrase with the given one using
+.BR crypt (3).
+.SH CONFIGURATION VARIABLES
+The server hostname, port, database, username, password, and additional
+options can be controlled by setting
+.IR $PGHOST ,
+.IR $PGPORT ,
+.IR $PGDATABASE ,
+.IR $PGUSER ,
+.IR $PGPASSWORD ,
+and
+.I $PGOPTIONS
+respectively, which are parsed by the PgSQL client library.
+.TP
+.B CVM_MYSQL_POSTQ \fR(optional)
+The SQL query to execute after the credentials have been validated, see
+.BR cvm-sql (7).
+.TP
+.B CVM_PGSQL_PWCMP \fR(optional)
+The
+.I password comparison module
+to use.
+.TP
+.B CVM_PGSQL_QUERY \fR(optional)
+The SQL query to issue to retrieve the row containing the account information
+from the database.
+.SH SEE ALSO
+cvm-sql(7),
+cvm-mysql(8),
+cvm-pwfile(8),
+cvm-qmail(8),
+cvm-unix(8),
+cvm-vmailmgr(8),
+cvm-benchclient(8),
+cvm-checkpassword(8),
+cvm-testclient(8)
+
+ http://untroubled.org/pwcmp/pwcmp.html
+ http://untroubled.org/cvm/cvm.html
--- cvm-0.96.orig/debian/cvm-vmailmgr.8
+++ cvm-0.96/debian/cvm-vmailmgr.8
@@ -0,0 +1,37 @@
+.TH cvm-vmailmgr 8
+.SH NAME
+cvm-vmailmgr \- vmailmgr virtual user validation module
+.SH SYNOPSIS
+cvm-vmailmgr
+.SH CREDENTIALS
+Pass phrase
+.SH DESCRIPTION
+This module validates credentials using accounts in a vmailmgr system.
+It does domain lookups the same way qmail would to determine what system
+account and virtual account to use.
+.SH CONFIGURATION VARIABLES
+.TP
+.B QMAIL_ROOT \fR(optional)
+The root directory under which all the qmail configuration files are expected
+to be found.
+Defaults to "/var/qmail", which is the normal qmail install path.
+.TP
+.B VMAILMGR_PWFILE \fR(optional)
+The relative path to the password file located in the virtual domain's home
+directory.
+Defaults to "passwd.cdb".
+.TP
+.B VMAILMGR_DEFAULT \fR(optional)
+The name of the default or "catch-all" account to look up if no match is
+found for the virtual account name.
+Defaults to "+", and is only used in lookup mode.
+.SH SEE ALSO
+cvm-pwfile(8),
+cvm-qmail(8),
+cvm-unix(8),
+cvm-sql(8),
+cvm-benchclient(8),
+cvm-checkpassword(8),
+cvm-testclient(8)
+
+ http://untroubled.org/cvm/cvm.html
--- cvm-0.96.orig/debian/libcvm1-dev.README.Debian
+++ cvm-0.96/debian/libcvm1-dev.README.Debian
@@ -0,0 +1,10 @@
+libcvm-dev for Debian
+---------------------
+
+Static and shared libraries as provided by upstream are installed in
+/usr/lib/.  Header files are available through /usr/include/cvm/, and
+technical documentation can be found in /usr/share/doc/libcvm?-dev/.
+
+See the cvm package for ready-to-use cvm modules.
+
+ -- Gerrit Pape <pape@smarden.org>, Thu, 17 Apr 2003 00:10:12 +0200
--- cvm-0.96.orig/debian/rules
+++ cvm-0.96/debian/rules
@@ -0,0 +1,143 @@
+#!/usr/bin/make -f
+
+CC =gcc
+CFLAGS =-O2 -Wall
+STRIP =strip
+SO =$(shell IFS=:; read v r a <LIBVERSION && echo $$(($$v-$$a)))
+PGINCL =$(shell pg_config --includedir)
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+  CFLAGS +=-g
+endif
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+  STRIP =: nostrip
+endif
+
+DIR =$(shell pwd)/debian/cvm
+LDIR =$(shell pwd)/debian/libcvm$(SO)
+
+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
+	-'$(CC)' -v
+	test -e conf-cc'{orig}' || cp conf-cc conf-cc'{orig}'
+	echo '$(CC) $(CFLAGS)' >conf-cc
+	test -e conf-bglibs'{orig}' || cp conf-bglibs conf-bglibs'{orig}'
+	echo /usr/lib >conf-bglibs
+	test -e conf-bgincs'{orig}' || cp conf-bgincs conf-bgincs'{orig}'
+	echo /usr/include/bglibs >conf-bgincs
+	test -e conf-bin'{orig}' || cp conf-bin conf-bin'{orig}'
+	echo /usr/bin >conf-bin
+	test -e conf-include'{orig}' || cp conf-include conf-include'{orig}'
+	echo /usr/include >conf-include
+	test -e conf-lib'{orig}' || cp conf-lib conf-lib'{orig}'
+	echo /usr/lib >conf-lib
+	$(MAKE)
+	$(MAKE) sqlite
+	sh ./tests.sh
+	$(MAKE) mysql
+	@test -n "$(PGINCL)" || sh -cx '! : postgresql include path unknown.'
+	echo '$(CC) $(CFLAGS) -I$(PGINCL)' >conf-cc
+	$(MAKE) pgsql
+	touch build-stamp
+
+clean: deb-checkdir deb-checkuid
+	$(MAKE) clean
+	rm -rf .libs
+	for i in conf-cc conf-bglibs conf-bgincs conf-bin conf-include conf-lib; do \
+	  test ! -r $$i'{orig}' || mv -f $$i'{orig}' $$i || exit 1; \
+	done
+	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 '$(LDIR)' '$(LDIR)'-dev '$(DIR)' '$(DIR)'-mysql '$(DIR)'-pgsql
+	rm -f debian/libcvm'$(SO)'.shlibs debian/shlibs.local debian/files \
+	  debian/substvars changelog
+
+install: deb-checkdir deb-checkuid build-stamp
+	# libcvm-dev
+	rm -rf '$(LDIR)' '$(LDIR)'-dev '$(DIR)' '$(DIR)'-mysql '$(DIR)'-pgsql
+	$(MAKE) install install_prefix='$(LDIR)'-dev/
+	rm -f '$(LDIR)'-dev/usr/lib/*.la
+	$(STRIP) --strip-debug '$(LDIR)'-dev/usr/lib/*.a
+	# libcvm
+	install -d -m0755 '$(LDIR)'/usr/lib
+	for i in '$(LDIR)'-dev/usr/lib/*.so.*; do \
+	  mv $$i '$(LDIR)'/usr/lib/ || exit 1; \
+	done
+	chmod 0644 '$(LDIR)'/usr/lib/*
+	$(STRIP) -R .note -R .comment --strip-unneeded \
+	  '$(LDIR)'/usr/lib/*.so.?.?.?
+	rm -f debian/libcvm'$(SO)'.shlibs debian/shlibs.local
+	for i in `cd '$(LDIR)'/usr/lib && ls -1 *.so.?`; do \
+	  echo "$${i%%.so.?} 1 libcvm$(SO)" >>debian/libcvm'$(SO)'.shlibs; \
+	done
+	ln -s libcvm'$(SO)'.shlibs debian/shlibs.local
+	# cvm
+	install -d -m0755 '$(DIR)'/usr
+	mv '$(LDIR)'-dev/usr/bin '$(DIR)'/usr/
+	# don't install cvm-sqlite for now
+	rm -f '$(DIR)'/usr/bin/cvm-sqlite
+	$(STRIP) -R .comment -R .note '$(DIR)'/usr/bin/*
+	install -d -m0755 '$(DIR)'/usr/share/man/man8
+	for i in cvm-benchclient.8 cvm-checkpassword.8 cvm-pwfile.8 \
+	 cvm-qmail.8 cvm-testclient.8 cvm-unix.8 cvm-vmailmgr.8; do \
+	  install -m0644 debian/$$i '$(DIR)'/usr/share/man/man8/ || exit 1; \
+	done
+	gzip -9 '$(DIR)'/usr/share/man/man8/*.8
+	install -d -m0755 '$(DIR)'/usr/share/man/man7
+	install -m0644 debian/cvm-sql.7 '$(DIR)'/usr/share/man/man7/
+	gzip -9 '$(DIR)'/usr/share/man/man7/*.7
+	# cvm-mysql
+	install -d -m0755 '$(DIR)'-mysql/usr/bin
+	mv '$(DIR)'/usr/bin/cvm-mysql* '$(DIR)'-mysql/usr/bin/
+	install -d -m0755 '$(DIR)'-mysql/usr/share/man/man8
+	install -m0644 debian/cvm-mysql.8 '$(DIR)'-mysql/usr/share/man/man8/
+	gzip -9 '$(DIR)'-mysql/usr/share/man/man8/*.8
+	# cvm-pgsql
+	install -d -m0755 '$(DIR)'-pgsql/usr/bin
+	mv '$(DIR)'/usr/bin/cvm-pgsql* '$(DIR)'-pgsql/usr/bin/
+	install -d -m0755 '$(DIR)'-pgsql/usr/share/man/man8
+	install -m0644 debian/cvm-pgsql.8 '$(DIR)'-pgsql/usr/share/man/man8/
+	gzip -9 '$(DIR)'-pgsql/usr/share/man/man8/*.8
+	# changelog
+	rm -f changelog && ln -s ChangeLog changelog
+
+binary: binary-indep binary-arch
+binary-indep:
+binary-arch: deb-checkdir deb-checkuid install cvm.deb cvm-mysql.deb \
+	  cvm-pgsql.deb libcvm'$(SO)'.deb libcvm'$(SO)'-dev.deb
+	# cvm
+	rm -f debian/substvars
+	dpkg-shlibdeps '$(DIR)'/usr/bin/*
+	dpkg-gencontrol -isp -pcvm -P'$(DIR)'
+	dpkg -b '$(DIR)' ..
+	# cvm-mysql
+	rm -f debian/substvars
+	dpkg-shlibdeps '$(DIR)'-mysql/usr/bin/*
+	dpkg-gencontrol -isp -pcvm-mysql -P'$(DIR)'-mysql
+	dpkg -b '$(DIR)'-mysql ..
+	# cvm-pgsql
+	rm -f debian/substvars
+	dpkg-shlibdeps '$(DIR)'-pgsql/usr/bin/*
+	dpkg-gencontrol -isp -pcvm-pgsql -P'$(DIR)'-pgsql
+	dpkg -b '$(DIR)'-pgsql ..
+	# libcvm-dev
+	rm -f debian/substvars
+	dpkg-gencontrol -isp -plibcvm'$(SO)'-dev -P'$(LDIR)'-dev
+	dpkg -b '$(LDIR)'-dev ..
+	# libcvm
+	rm -f debian/substvars
+	dpkg-shlibdeps '$(LDIR)'/usr/lib/*.so.?.?.?
+	dpkg-gencontrol -isp -plibcvm'$(SO)' -P'$(LDIR)'
+	dpkg -b '$(LDIR)' ..
+
+.PHONY: patch build clean binary-indep binary-arch binary install
+
+include debian/implicit
--- cvm-0.96.orig/debian/diff/0001-Makefile-avoid-rpath-workaround-some-linking-issues.diff
+++ cvm-0.96/debian/diff/0001-Makefile-avoid-rpath-workaround-some-linking-issues.diff
@@ -0,0 +1,101 @@
+From 5ffe5615fa1b025fc9e18887bf88bf745b084e38 Mon Sep 17 00:00:00 2001
+From: Gerrit Pape <pape@smarden.org>
+Date: Fri, 2 May 2008 17:57:37 +0000
+Subject: [PATCH] Makefile: avoid rpath; workaround some linking issues
+
+---
+ Makefile |   22 +++++++++++-----------
+ 1 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3ab24d5..acf531e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -71,16 +71,16 @@ cvm-checkpassword.o: compile cvm-checkpassword.c v2client.h facts.h errors.h
+ 	./compile cvm-checkpassword.c
+ 
+ cvm-mysql: cvm-mysql.o ltload libcvm-module.la libcvm-sql.la crypt.lib
+-	./ltload cvm-mysql libcvm-module.la libcvm-sql.la -lbg -lpwcmp -L/usr/lib/mysql -lmysqlclient `cat crypt.lib`
++	./ltload cvm-mysql libcvm-module.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -L/usr/lib/mysql -lmysqlclient `cat crypt.lib`
+ 
+ cvm-mysql-local: cvm-mysql-local.o ltload cvm-mysql.o libcvm-local.la libcvm-sql.la crypt.lib
+-	./ltload cvm-mysql-local cvm-mysql.o libcvm-local.la libcvm-sql.la -lbg -lpwcmp -L/usr/lib/mysql -lmysqlclient `cat crypt.lib`
++	./ltload cvm-mysql-local cvm-mysql.o libcvm-local.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -L/usr/lib/mysql -lmysqlclient `cat crypt.lib`
+ 
+ cvm-mysql-local.o: compile cvm-mysql-local.c
+ 	./compile cvm-mysql-local.c
+ 
+ cvm-mysql-udp: cvm-mysql-udp.o ltload cvm-mysql.o libcvm-udp.la libcvm-sql.la crypt.lib
+-	./ltload cvm-mysql-udp cvm-mysql.o libcvm-udp.la libcvm-sql.la -lbg -lpwcmp -L/usr/lib/mysql -lmysqlclient `cat crypt.lib`
++	./ltload cvm-mysql-udp cvm-mysql.o libcvm-udp.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -L/usr/lib/mysql -lmysqlclient `cat crypt.lib`
+ 
+ cvm-mysql-udp.o: compile cvm-mysql-udp.c
+ 	./compile cvm-mysql-udp.c
+@@ -89,16 +89,16 @@ cvm-mysql.o: compile cvm-mysql.c module.h credentials.h errors.h facts.h sql.h
+ 	./compile cvm-mysql.c
+ 
+ cvm-pgsql: cvm-pgsql.o ltload libcvm-module.la libcvm-sql.la crypt.lib
+-	./ltload cvm-pgsql libcvm-module.la libcvm-sql.la -lbg -lpwcmp -lpq `cat crypt.lib`
++	./ltload cvm-pgsql libcvm-module.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -lpq `cat crypt.lib`
+ 
+ cvm-pgsql-local: cvm-pgsql-local.o ltload cvm-pgsql.o libcvm-local.la libcvm-sql.la crypt.lib
+-	./ltload cvm-pgsql-local cvm-pgsql.o libcvm-local.la libcvm-sql.la -lbg -lpwcmp -lpq `cat crypt.lib`
++	./ltload cvm-pgsql-local cvm-pgsql.o libcvm-local.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -lpq `cat crypt.lib`
+ 
+ cvm-pgsql-local.o: compile cvm-pgsql-local.c
+ 	./compile cvm-pgsql-local.c
+ 
+ cvm-pgsql-udp: cvm-pgsql-udp.o ltload cvm-pgsql.o libcvm-udp.la libcvm-sql.la crypt.lib
+-	./ltload cvm-pgsql-udp cvm-pgsql.o libcvm-udp.la libcvm-sql.la -lbg -lpwcmp -lpq `cat crypt.lib`
++	./ltload cvm-pgsql-udp cvm-pgsql.o libcvm-udp.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -lpq `cat crypt.lib`
+ 
+ cvm-pgsql-udp.o: compile cvm-pgsql-udp.c
+ 	./compile cvm-pgsql-udp.c
+@@ -107,7 +107,7 @@ cvm-pgsql.o: compile cvm-pgsql.c module.h credentials.h errors.h facts.h sql.h
+ 	./compile cvm-pgsql.c
+ 
+ cvm-pwfile: cvm-pwfile.o ltload libcvm-module.la crypt.lib socket.lib
+-	./ltload cvm-pwfile libcvm-module.la -lbg -lpwcmp `cat crypt.lib` `cat socket.lib`
++	./ltload cvm-pwfile libcvm-module.la -lbg /usr/lib/bglibs/libpwcmp.a `cat crypt.lib` `cat socket.lib`
+ 
+ cvm-pwfile.o: compile cvm-pwfile.c module.h credentials.h errors.h facts.h
+ 	./compile cvm-pwfile.c
+@@ -119,7 +119,7 @@ cvm-qmail.o: compile cvm-qmail.c module.h credentials.h errors.h facts.h qmail.h
+ 	./compile cvm-qmail.c
+ 
+ cvm-sqlite: cvm-sqlite.o ltload libcvm-module.la libcvm-sql.la crypt.lib
+-	./ltload cvm-sqlite libcvm-module.la libcvm-sql.la -lbg -lpwcmp -L/usr/lib/sqlite -lsqlite3 `cat crypt.lib`
++	./ltload cvm-sqlite libcvm-module.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -L/usr/lib/sqlite -lsqlite3 `cat crypt.lib`
+ 
+ cvm-sqlite.o: compile cvm-sqlite.c cvm/module.h credentials.h errors.h facts.h sql.h
+ 	./compile cvm-sqlite.c
+@@ -226,7 +226,7 @@ load: conf-ld conf-bglibs
+ 	( bglibs=`head -n 1 conf-bglibs`; \
+ 	  echo '#!/bin/sh';\
+ 	  echo 'main="$$1"; shift';\
+-	  echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
++	  echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
+ 	) >load
+ 	chmod 755 load
+ 
+@@ -245,7 +245,7 @@ ltload: conf-ld conf-bglibs
+ 	  if libtool --tag=CC --help >/dev/null 2>&1; then tag='--tag=CC'; fi; \
+ 	  echo '#!/bin/sh';\
+ 	  echo 'main="$$1"; shift';\
+-	  echo exec libtool --mode=link --silent $$tag `head -n 1 conf-ld` -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
++	  echo exec libtool --mode=link --silent $$tag `head -n 1 conf-ld` -L. "-L'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}'; \
+ 	) >ltload
+ 	chmod 755 ltload
+ 
+@@ -254,7 +254,7 @@ makeshlib: conf-ld conf-lib LIBVERSION Makefile
+ 	  echo '#!/bin/sh'; \
+ 	  echo 'lib="$$1"; shift';\
+ 	  echo 'rm -f "$$lib"';\
+-	  echo libtool --mode=link --silent $$tag `head -n 1 conf-ld` '-o "$$lib" -rpath' `head -n 1 conf-lib` -version-info `head -n 1 LIBVERSION` '$${1+"$$@"}';\
++	  echo libtool --mode=link --silent $$tag `head -n 1 conf-ld` '-o "$$lib" -rpath' `head -n 1 conf-lib` -version-info `head -n 1 LIBVERSION` '$${1+"$$@"} -lbg';\
+ 	) >makeshlib
+ 	chmod 755 makeshlib
+ 
+-- 
+1.7.0.3
+
