--- opendkim-2.6.8.orig/debian/rules
+++ opendkim-2.6.8/debian/rules
@@ -0,0 +1,114 @@
+#!/usr/bin/make -f
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        CFLAGS = -Wall -g -O0 -g
+	CPPFLAGS = 
+	LDFLAGS = "-Wl,-z,defs -L/usr/lib/libmilter"
+else
+        CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+        CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+        LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+endif
+
+
+# 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)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+config.status: configure
+	dh_testdir
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub build-aux/config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess build-aux/config.guess
+endif
+	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+		--sysconfdir=/etc \
+		CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
+		LDFLAGS="$(LDFLAGS) -Wl,-z,defs -L/usr/lib/libmilter" \
+		--enable-vbr \
+		--enable-atps \
+		--enable-oversign \
+		--enable-stats \
+		--enable-replace_rules \
+		--with-unbound \
+		--with-openldap \
+		--with-db \
+		--with-lua
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp: config.status
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs -s
+
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/opendkim
+	# Install default config file
+	cp -f $(CURDIR)/debian/opendkim.conf $(CURDIR)/debian/opendkim/etc/
+	
+	dh_install -s --sourcedir=$(CURDIR)/debian/opendkim
+	-rm -r $(CURDIR)/debian/opendkim/usr/lib/
+	-rm -r $(CURDIR)/debian/opendkim/usr/include/
+	# Upstream ships way more docs here than we want in the opendkim binary package; clean up.
+	-rm -r $(CURDIR)/debian/opendkim/usr/share/doc/opendkim/
+	# Install keylist converter in more useful place
+	cp contrib/convert/convert_keylist.sh $(CURDIR)/debian/opendkim-tools/usr/bin/opendkim-convert-keylist
+
+	# usr/bin tools are now in opendkim-tools
+	rm -rf $(CURDIR)/debian/opendkim/usr/bin
+	# Move man pages for tools to opendkim-tools
+	mv $(CURDIR)/debian/opendkim/usr/share/man/man8/opendkim-* $(CURDIR)/debian/opendkim-tools/usr/share/man/man8
+	mv $(CURDIR)/debian/opendkim/usr/share/man/man8/miltertest.8 $(CURDIR)/debian/opendkim-tools/usr/share/man/man8
+	mv $(CURDIR)/debian/opendkim/usr/share/man/man1/opendkim-spam.1 $(CURDIR)/debian/opendkim-tools/usr/share/man/man1
+	rm -rf $(CURDIR)/debian/opendkim/usr/share/man/man1
+
+	# Move man page for libvbr development documentation to libvbr-dev
+	mv $(CURDIR)/debian/opendkim/usr/share/man/man3/vbr.3 $(CURDIR)/debian/libvbr-dev/usr/share/man/man3
+
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs RELEASE_NOTES RELEASE_NOTES.Sendmail
+	dh_installdocs
+	cp opendkim/README $(CURDIR)/debian/opendkim/usr/share/doc/opendkim/
+	dh_installexamples
+	dh_installinit
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- opendkim-2.6.8.orig/debian/libopendkim-dev.install
+++ opendkim-2.6.8/debian/libopendkim-dev.install
@@ -0,0 +1,3 @@
+usr/include/opendkim
+usr/lib/libopendkim*.a
+usr/lib/libopendkim*.so
--- opendkim-2.6.8.orig/debian/libopendkim-dev.docs
+++ opendkim-2.6.8/debian/libopendkim-dev.docs
@@ -0,0 +1 @@
+libopendkim/docs
--- opendkim-2.6.8.orig/debian/libvbr2.docs
+++ opendkim-2.6.8/debian/libvbr2.docs
@@ -0,0 +1 @@
+KNOWNBUGS
--- opendkim-2.6.8.orig/debian/watch
+++ opendkim-2.6.8/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://sf.net/opendkim/opendkim-(.*).tar.gz debian uupdate
+
--- opendkim-2.6.8.orig/debian/opendkim.conf
+++ opendkim-2.6.8/debian/opendkim.conf
@@ -0,0 +1,33 @@
+# This is a basic configuration that can easily be adapted to suit a standard
+# installation. For more advanced options, see opendkim.conf(5) and/or
+# /usr/share/doc/opendkim/examples/opendkim.conf.sample.
+
+# Log to syslog
+Syslog			yes
+# Required to use local socket with MTAs that access the socket as a non-
+# privileged user (e.g. Postfix)
+UMask			002
+
+# Sign for example.com with key in /etc/mail/dkim.key using
+# selector '2007' (e.g. 2007._domainkey.example.com)
+#Domain			example.com
+#KeyFile		/etc/mail/dkim.key
+#Selector		2007
+
+# Commonly-used options; the commented-out versions show the defaults.
+#Canonicalization	simple
+#Mode			sv
+#SubDomains		no
+#ADSPDiscard		no
+
+# Always oversign From (sign using actual From and a null From to prevent
+# malicious signatures header fields (From and/or others) between the signer
+# and the verifier.  From is oversigned by default in the Debian pacakge
+# because it is often the identity key used by reputation systems and thus
+# somewhat security sensitive.
+OversignHeaders		From
+
+# List domains to use for RFC 6541 DKIM Authorized Third-Party Signatures
+# (ATPS) (experimental)
+
+#ATPSDomains		example.com
--- opendkim-2.6.8.orig/debian/opendkim.NEWS
+++ opendkim-2.6.8/debian/opendkim.NEWS
@@ -0,0 +1,33 @@
+opendkim (2.5.2+dfsg-2) unstable; urgency=low
+
+    There are a number of optional features newly enabled in this revision.
+    Except for OversignHeaders, none of them are active by default.
+
+    Enable support for optional oversigning of header fields to prevent
+    malicious parties from adding additional instances of the field.  By
+    By default, always oversign From (sign using actual From and a null From
+    to prevent malicious signatures header fields (From and/or others)
+    between the signer and the verifier.  From is oversigned by default in the
+    Debian package because it is often the identity key used by reputation
+    systems and thus somewhat security sensitive.
+
+    Support for RFC 5518 Vouch By Reference (VBR) is available.  See
+    opendkim.conf.5 for information about how to enable VBR in opendkim
+
+    Support for the experimental RFC 6541 DKIM Authorized Third-Party
+    Signatures (ATPS) protocol is also enabled.  No signing is performed
+    unless ATPSDomains is set in /etc/opendkim.conf.  Verification is always
+    performed
+
+    Command line tools for various utilty functions are now split out into a
+    new opendkim-tools package
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 10 Apr 2012 00:16:02 -0400
+
+opendkim (2.5.0.1+dfsg-1) unstable; urgency=low
+
+    There is one backward compatibility issue, referring to the "BodyLengths"
+    setting which has been removed.  Instead, see the documentation for
+    "BodyLengthDB".
+
+ -- Scott Kitterman <scott@kitterman.com>  Wed, 14 Mar 2012 22:34:48 -0400
--- opendkim-2.6.8.orig/debian/opendkim-tools.dirs
+++ opendkim-2.6.8/debian/opendkim-tools.dirs
@@ -0,0 +1,2 @@
+usr/share/man/man1
+usr/share/man/man8
--- opendkim-2.6.8.orig/debian/opendkim.init
+++ opendkim-2.6.8/debian/opendkim.init
@@ -0,0 +1,162 @@
+#! /bin/sh
+#
+### BEGIN INIT INFO
+# Provides:		opendkim
+# Required-Start:	$syslog $time $local_fs $remote_fs $named $network
+# Required-Stop:	$syslog $time $local_fs $remote_fs
+# Default-Start:	2 3 4 5
+# Default-Stop:		0 1 6
+# Short-Description:	Start the OpenDKIM service
+# Description:		Enable DKIM signing and verification provided by OpenDKIM
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/opendkim
+NAME=opendkim
+DESC="OpenDKIM"
+RUNDIR=/var/run/$NAME
+USER=opendkim
+GROUP=opendkim
+SOCKET=local:$RUNDIR/$NAME.sock
+PIDFILE=$RUNDIR/$NAME.pid
+
+# How long to wait for the process to die on stop/restart
+stoptimeout=5
+
+test -x $DAEMON || exit 0
+
+# Include LSB provided init functions
+. /lib/lsb/init-functions
+
+# Include opendkim defaults if available
+if [ -f /etc/default/opendkim ] ; then
+	. /etc/default/opendkim
+fi
+
+if [ -f /etc/opendkim.conf ]; then
+	CONFIG_SOCKET=`awk '$1 == "Socket" { print $2 }' /etc/opendkim.conf`
+fi
+
+# This can be set via Socket option in config file, so it's not required
+if [ -n "$SOCKET" -a -z "$CONFIG_SOCKET" ]; then
+	DAEMON_OPTS="-p $SOCKET $DAEMON_OPTS"
+fi
+
+DAEMON_OPTS="-x /etc/opendkim.conf -u $USER -P $PIDFILE $DAEMON_OPTS"
+
+start() {
+	# Create the run directory if it doesn't exist
+	if [ ! -d "$RUNDIR" ]; then
+		install -o "$USER" -g "$GROUP" -m 755 -d "$RUNDIR" || return 2
+		[ -x /sbin/restorecon ] && /sbin/restorecon "$RUNDIR"
+	fi
+	# Clean up stale sockets
+	if [ -f "$PIDFILE" ]; then
+		pid=`cat $PIDFILE`
+		if ! ps -C "$DAEMON" -s "$pid" >/dev/null; then
+			rm "$PIDFILE"
+			TMPSOCKET=""
+			if [ -n "$SOCKET" ]; then
+				TMPSOCKET="$SOCKET"
+			elif [ -n "$CONFIG_SOCKET" ]; then
+				TMPSOCKET="$CONFIG_SOCKET"
+			fi
+			if [ -n "$TMPSOCKET" ]; then
+				# UNIX sockets may be specified with or without the
+				# local: prefix; handle both
+				t=`echo $SOCKET | cut -d: -f1`
+				s=`echo $SOCKET | cut -d: -f2`
+				if [ -e "$s" -a -S "$s" ]; then
+					if [ "$t" = "$s" -o "$t" = "local" ]; then
+						rm "$s"
+					fi
+				fi
+			fi
+		fi
+	fi
+	start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" --test -- $DAEMON_OPTS || return 1
+	start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" -- $DAEMON_OPTS || return 2
+	# Detect exit status 78 (configuration error)
+	ret=$?
+	if [ $ret -eq 78 ]; then
+		echo "See /usr/share/doc/opendkim/README.Debian for help"
+		echo "Starting for DKIM verification only"
+		DAEMON_OPTS="-b v $DAEMON_OPTS"
+		start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" -- $DAEMON_OPTS
+		exit 0
+	elif [ $ret -ne 0 ]; then
+		exit $ret
+	fi
+}
+
+stop() {
+	start-stop-daemon --stop --retry "$stoptimeout" --exec "$DAEMON"
+	[ "$?" = 2 ] && return 2
+}
+
+reload() {
+	start-stop-daemon --stop --signal USR1 --exec "$DAEMON"
+}
+
+status() {
+    local pidfile daemon name status
+
+    pidfile=
+    OPTIND=1
+    while getopts p: opt ; do
+        case "$opt" in
+            p)  pidfile="$OPTARG";;
+        esac
+    done
+    shift $(($OPTIND - 1))
+
+    if [ -n "$pidfile" ]; then
+        pidfile="-p $pidfile"
+    fi
+    daemon="$1"
+    name="$2"
+
+    status="0"
+    pidofproc $pidfile $daemon >/dev/null || status="$?"
+    if [ "$status" = 0 ]; then
+        log_success_msg "$name is running"
+        return 0
+    else
+        log_failure_msg "$name is not running"
+        return $status
+    fi
+}
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	stop
+	echo "$NAME."
+	;;
+  restart)
+	echo -n "Restarting $DESC: "
+	stop
+	start
+	echo "$NAME."
+	;;
+  reload|force-reload)
+	echo -n "Restarting $DESC: "
+	reload
+	echo "$NAME."
+	;;
+  status)
+	status $DAEMON $NAME
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|reload|force-reload|status}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- opendkim-2.6.8.orig/debian/compat
+++ opendkim-2.6.8/debian/compat
@@ -0,0 +1 @@
+7
--- opendkim-2.6.8.orig/debian/libopendkim7.install
+++ opendkim-2.6.8/debian/libopendkim7.install
@@ -0,0 +1 @@
+usr/lib/libopendkim*.so.*
--- opendkim-2.6.8.orig/debian/control
+++ opendkim-2.6.8/debian/control
@@ -0,0 +1,104 @@
+Source: opendkim
+Section: mail
+Priority: extra
+Maintainer: Mike Markley <mike@markley.org>
+Uploaders: Scott Kitterman <scott@kitterman.com>
+Build-Depends: debhelper (>= 7), libmilter-dev, libssl-dev, libdb-dev, libunbound-dev, libldap2-dev, liblua5.1-0-dev, autotools-dev
+Standards-Version: 3.9.3
+Homepage: http://www.opendkim.org/
+
+Package: opendkim
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base
+Suggests: opendkim-tools
+Description: Milter implementation of DomainKeys Identified Mail
+ The OpenDKIM Project is a community effort to develop and maintain a C library
+ for producing DKIM-aware applications and an open source milter for providing
+ DomainKeys Identified Mail (DKIM) service.
+ .
+ DKIM provides a way for senders to confirm their identity when sending email
+ by adding a cryptographic signature to the headers of the message.
+ .
+ This package contains the OpenDKIM mail filter (Milter) for plugging into
+ Milter-aware MTAs. It implements both signing and verification.
+
+Package: opendkim-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: opendkim (<< 2.5.2+dfsg-2~)
+Replaces: opendkim (<< 2.5.2+dfsg-2~)
+Description: Set of command line tools for OpenDKIM
+ The OpenDKIM Project is a community effort to develop and maintain a C library
+ for producing DKIM-aware applications and an open source milter for providing
+ DomainKeys Identified Mail (DKIM) service.
+ .
+ This package contains command line tools for the OpenDKIM mail filter
+ (Milter).  The following tools are included:
+   - opendkim-genkey
+   - miltertest
+   - opendkim-testadsp
+   - opendkim-stats
+   - opendkim-genzone
+   - opendkim-spam
+   - opendkim-testkey
+   - opendkim-atpszone
+   - opendkim-convert-keylist
+   - opendkim-testmsg
+
+Package: libopendkim7
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Library for signing and verifying DomainKeys Identified Mail signatures
+ The OpenDKIM Project is a community effort to develop and maintain a C library
+ for producing DKIM-aware applications and an open source milter for providing
+ DomainKeys Identified Mail (DKIM) service.
+ .
+ This package provides library for implementing signing and verification of the
+ DomainKeys Identified Mail (DKIM) standard. This library provides support for
+ signing and verifying signatures according to RFC 4871, and supports both
+ DomainKeys signing policy and DKIM ADSP.  
+
+Package: libopendkim-dev
+Section: libdevel
+Architecture: any
+Depends: libopendkim7 (= ${binary:Version}), ${misc:Depends}
+Description: Headers and development libraries for the OpenDKIM library
+ The OpenDKIM Project is a community effort to develop and maintain a C library
+ for producing DKIM-aware applications and an open source milter for providing
+ DomainKeys Identified Mail (DKIM) service.
+ .
+ This package provides the required header files and development libraries for
+ developing against the OpenDKIM library.
+
+Package: libvbr2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Library for RFC 5518 Vouch By Reference (VBR)
+ The OpenDKIM Project is a community effort to develop and maintain a C library
+ for producing DKIM-aware applications and an open source milter for providing
+ DomainKeys Identified Mail (DKIM) service.
+ .
+ This package provides library for implementing RFC 5518 Vouch By Reference
+ (VBR), a peer-to-peer domain reputation service protocol based on DKIM signed
+ domains.
+ .
+ Vouch By Reference, or VBR, is a protocol for adding third-party
+ certification to email.  Specifically, VBR permits independent third parties
+ to certify the owner of a domain name that is associated with received mail.
+ VBR may be performed anywhere along the email transit path, by any capable
+ receiving module, either within the handling service or by end-user software.
+
+Package: libvbr-dev
+Section: libdevel
+Architecture: any
+Depends: libvbr2 (= ${binary:Version}), ${misc:Depends}
+Description: Headers and development libraries for the OpenDKIM VBR library
+ The OpenDKIM Project is a community effort to develop and maintain a C library
+ for producing DKIM-aware applications and an open source milter for providing
+ DomainKeys Identified Mail (DKIM) service.
+ .
+ This package provides the required header files and development libraries for
+ developing against the OpenDKIM project VBR library.
+
--- opendkim-2.6.8.orig/debian/changelog
+++ opendkim-2.6.8/debian/changelog
@@ -0,0 +1,202 @@
+opendkim (2.6.8-0ubuntu1) quantal-proposed; urgency=low
+
+  * New upstream security release to add capability to exclude use of
+    insecure keys (Closes: #691394, LP: #1071139)
+
+ -- Scott Kitterman <scott@kitterman.com>  Thu, 25 Oct 2012 01:04:27 -0400
+
+opendkim (2.6.7-1) experimental; urgency=low
+
+  * New upstream release
+    - Drop obsolete configure option enable-selector_header
+
+ -- Scott Kitterman <scott@kitterman.com>  Mon, 23 Jul 2012 18:17:11 -0400
+
+opendkim (2.6.6-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Scott Kitterman <scott@kitterman.com>  Mon, 23 Jul 2012 08:28:16 -0400
+
+opendkim (2.6.4-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Scott Kitterman <scott@kitterman.com>  Sun, 15 Jul 2012 00:04:24 -0400
+
+opendkim (2.6.2-1) unstable; urgency=low
+
+  * New upstream release (addresses three bugs that affect the Debian package)
+    - Fix bug #SF3539449: Clarify legal "Socket" values.  Requested by Scott
+      Kitterman.
+    - Fix bug #SF3539493: Handle certain cases of data set names that appear
+      to be comma-separated lists which include IPv6 addresses.  Reported by
+      Scott Kitterman. (Closes: #679548)
+  * Use restorecon to apply a SE Linux label after creating a run dir
+    (Closes: #679852)
+
+ -- Scott Kitterman <scott@kitterman.com>  Mon, 02 Jul 2012 14:44:38 -0400
+
+opendkim (2.6.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Use CFLAGS, CPPFLAGS, and LDFLAGS from dpkg-buildflags
+
+ -- Scott Kitterman <scott@kitterman.com>  Sun, 24 Jun 2012 23:58:40 -0400
+
+opendkim (2.6.0-1) unstable; urgency=low
+
+  * New upstream release (now DFSG free so tarball repacking no longer
+    required)
+    - Rename libopendkim6 to libopendkim7 to match new soname
+      - Update package and dependencies in debian/control
+      - Rename .install and .doc files
+    - Drop --enable-xtags from configure in debian/rules since it is now on by
+      default
+    - Update debian/copyright
+    - Remove dversionmangle from debian/watch
+    - Update README.Debian to reflect documentation no longer being stripped
+  * Correct copyright/license information in libar/ar-strl.h based on feedback
+    from upstream (correction already implemented upstream for the next
+    relese)
+  * Set --sysconfdir=/etc in configure so that generated man pages refer to
+    the correct configuration file locations
+
+ -- Scott Kitterman <scott@kitterman.com>  Fri, 08 Jun 2012 14:38:25 -0400
+
+opendkim (2.5.2+dfsg-3) unstable; urgency=low
+
+  * Re-add missing --with-db flag for configure
+
+ -- Scott Kitterman <scott@kitterman.com>  Fri, 13 Apr 2012 10:41:37 -0400
+
+opendkim (2.5.2+dfsg-2) unstable; urgency=low
+
+  * Add patch from upstream to fix stray debug code left in opendkim-genstats
+  * Split opendkim into opendkim and opendkim-tools since the command line
+    support tools are now bigger than the application
+  * Add status option to /etc/init.d/opendkim
+    - Add depends on lsb-base
+  * Add Description to /etc/init.d/opendkim header
+  * Enable Vouch By Reference support:
+    - Add --enable-vbr in debian/rules
+    - Update libopendkim install files to be more specific and not install
+      libvbr related files
+    - Add libvbr2 and libvbr-dev to debian/control
+    - Add debian/libvbr2.docs, libvbr2.install, and libvbr-dev.install
+  * Enable extensions for adding arbitrary experimental signature tags and
+    values in libopendkim (neeeded for ATPS support)
+    - Add --enable-xtags in debian/rules
+  * Enable support for RFC 6541 DKIM Authorized Third-Party Signatures (ATPS)
+    - Add --enable-atps in debian/rules
+  * Enable support for optional oversigning of header fields to prevent
+    malicious parties from adding additional instances of the field
+    - Add --enable-oversign to debian/rules 
+    - Modify debian/opendkim.conf to use OversignHeaders for From by default
+  * Add required build-arch and build-indep targets to debian/rules
+  * Fixed formating and versioning of existing opendkim.NEWS entry
+  * Added new opendkim.NEWS entry to describe changed defaults with this
+    revision
+  * Update debian/copyright (Closes: #664132)
+  * Add debian/watch
+  * Remove unneeded shlibs:Depends for libdkim-dev
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 10 Apr 2012 23:58:52 -0400
+
+opendkim (2.5.2+dfsg-1) unstable; urgency=low
+
+  * New upstream release
+    - Repacked tarball to remove non-free IETF drafts and RFCs
+    - Updated docs/Makefile.in/am, and README to remove references removed
+      non-free documentation
+  * Add Homepage: to debian/control
+
+ -- Scott Kitterman <scott@kitterman.com>  Mon, 09 Apr 2012 20:03:48 -0400
+
+opendkim (2.5.0.1+dfsg-1) unstable; urgency=low
+
+  * Add myself to uploaders
+  * Merge package updates back from Ubuntu
+  * New upstream release
+    - Repacked tarball to remove non-free IETF drafts and RFCs
+    - Updated docs/Makefile.in/am, and README to remove references removed
+      non-free documentation
+    - Add opendkim.NEWS to include note about incompatible change between
+      BodyLengths setting and BodyLengthDB
+    - Drop no longer recognized configure options, --enable-ztags,
+      --enable-dnsupgrade, --enable-report_intervals, and
+      --enable-bodylength_db
+    - Drop local changes to libar/Makefile.in/am, incorporated upstream
+    - Remove debian/rules to rename opendkim-genkey and opendkim-importstats,
+      incorporated upstream
+    - Install opendkim-convert-keylist in /usr/bin instead of /usr/sbin with
+      other scripts
+  * Update libopendkim to libopendkim6 for new so version
+    - Change package name in debian/control
+    - Update libopendkim-dev depends
+    - Rename .install and .docs files
+    - Update dh_shlibdeps call in debian/rules
+  * Bump standards version to 3.9.3 without further change
+
+ -- Scott Kitterman <scott@kitterman.com>  Wed, 14 Mar 2012 22:34:48 -0400
+
+opendkim (2.1.3+dfsg-1) unstable; urgency=low
+
+  * New upstream version.
+  * opendkim is now under the 3-clause BSD license, although the Sendmail-
+    owned components remain under the Sendmail license. The copyright file
+    has been updated to reflect this change.
+  * Debian-specific patch to include libresolv in libar to work around -z defs
+    as a linker flag. This library isn't meant for consumption by other source
+    packages, but using -z defs does cause a build failure, and I'd rather
+    keep the error in than risk missing a dependency because it's gone.
+  * libopendkim's major version number has changed; rename to libopendkim2
+
+ -- Mike Markley <mike@markley.org>  Fri,  6 Aug 2010 10:58:54 -0700
+
+opendkim (2.0.1+dfsg-1) unstable; urgency=low
+
+   * New upstream version.
+   * Put config.sub/guess in build-aux/ instead of top-level. Closes: #575296
+   * Include dir in opendkim.pc has been corrected to what will ship from
+     upstream in future releases (<includedir>/opendkim).
+
+ -- Mike Markley <mike@markley.org>  Wed, 31 Mar 2010 12:55:26 -0700 
+
+opendkim (2.0.0+dfsg-1) unstable; urgency=low
+
+  * New upstream version.
+  * The libopendkim ABI has changed, resulting in an soname change.
+    - libopendkim0 package renamed to libopendkim1.
+  * New LDAP and Lua support have been enabled.
+  * Wrote clearer package descriptions. Closes: #572725
+  * Added build-dependency on autotools-dev. For now, the package ships with
+    very old config.sub and config.guess files, but this will be resolved
+    upstream in the near future.
+    - Also removed extraneous top-level config.{sub,guess} files.
+  * Applied two upstream patches for off-by-one errors, including one that can
+    cause crashes when signing.
+  * debian/copyright file was not accurate; it has been updated to reflect the
+    fork from the dkim-milter project. The dkim-milter license should be fully
+    compatible with the BSD license of this fork.
+
+ -- Mike Markley <mike@markley.org>  Wed, 17 Mar 2010 13:04:28 -0700
+
+opendkim (1.1.0+dfsg-1) unstable; urgency=low
+
+  * New upstream version.
+  * Look for __res_mkquery() instead of res_mkquery in configure to solve build
+    issues on multiple platforms. Closes: #544802
+  * Removed --enable-commaize (it has been removed upstream as
+    unnecessary)
+
+ -- Mike Markley <mike@markley.org>  Sat, 19 Sep 2009 16:25:10 -0700
+
+opendkim (1.0.0+dfsg-1) unstable; urgency=low
+
+  * Initial upload. Closes: #543426, #542948
+  * Patched configure to support libunbound correctly.
+  * Patched libopendkim/Makefile.am and Makefile.in to support libunbound &
+    libar correctly.
+
+ -- Mike Markley <mike@markley.org>  Mon, 24 Aug 2009 18:47:41 -0700
--- opendkim-2.6.8.orig/debian/opendkim.default
+++ opendkim-2.6.8/debian/opendkim.default
@@ -0,0 +1,10 @@
+# Command-line options specified here will override the contents of
+# /etc/opendkim.conf. See opendkim(8) for a complete list of options.
+#DAEMON_OPTS=""
+#
+# Uncomment to specify an alternate socket
+# Note that setting this will override any Socket value in opendkim.conf
+#SOCKET="local:/var/run/opendkim/opendkim.sock" # default
+#SOCKET="inet:54321" # listen on all interfaces on port 54321
+#SOCKET="inet:12345@localhost" # listen on loopback on port 12345
+#SOCKET="inet:12345@192.0.2.1" # listen on 192.0.2.1 on port 12345
--- opendkim-2.6.8.orig/debian/opendkim.docs
+++ opendkim-2.6.8/debian/opendkim.docs
@@ -0,0 +1,3 @@
+FEATURES
+KNOWNBUGS
+README
--- opendkim-2.6.8.orig/debian/libvbr-dev.dirs
+++ opendkim-2.6.8/debian/libvbr-dev.dirs
@@ -0,0 +1 @@
+usr/share/man/man3
--- opendkim-2.6.8.orig/debian/opendkim.dirs
+++ opendkim-2.6.8/debian/opendkim.dirs
@@ -0,0 +1,7 @@
+etc
+usr/sbin
+usr/include
+usr/lib
+usr/sbin
+usr/share/man/man5
+usr/share/man/man8
--- opendkim-2.6.8.orig/debian/libvbr-dev.install
+++ opendkim-2.6.8/debian/libvbr-dev.install
@@ -0,0 +1,3 @@
+usr/include/vbr
+usr/lib/libvbr*.a
+usr/lib/libvbr*.so
--- opendkim-2.6.8.orig/debian/opendkim.examples
+++ opendkim-2.6.8/debian/opendkim.examples
@@ -0,0 +1 @@
+opendkim/*.sample
--- opendkim-2.6.8.orig/debian/opendkim-convert-keylist.8
+++ opendkim-2.6.8/debian/opendkim-convert-keylist.8
@@ -0,0 +1,25 @@
+.TH opendkim-convert-keylist 8 "2010-03-05"
+.SH NAME
+opendkim-convert-keylist \- convert an OpenDKIM KeyList
+.SH SYNOPSIS
+.B opendkim-convert-keylist
+.RI [ -f ]
+.RI [ filename ] 
+.SH DESCRIPTION
+Consumes an OpenDKIM 1.x KeyList file and produces OpenDKIM 2.0+ SigningTable and KeyTable files.
+.PP
+.I filename
+should be either an OpenDKIM configuration file or a KeyList file. If it's not supplied on the command line, you will be prompted.
+.PP
+You will be prompted for the output KeyTable and SigningTable files. If you provide files that already exist, they will not be overwritten (see below).
+.SH OPTIONS
+.TP
+.B \-f
+Overwrites existing KeyTable and SigningTable files.
+.SH SEE ALSO
+.BR opendkim.conf(5),
+.BR /usr/share/doc/opendkim/README.opendkim.
+.SH AUTHOR
+opendkim-convert-keylist was written by Mike Markley for the OpenDKIM project.
+.PP
+This manual page was written by Mike Markley for the Debian project, but may be used by others.
--- opendkim-2.6.8.orig/debian/opendkim-tools.manpages
+++ opendkim-2.6.8/debian/opendkim-tools.manpages
@@ -0,0 +1 @@
+debian/opendkim-convert-keylist.8
--- opendkim-2.6.8.orig/debian/copyright
+++ opendkim-2.6.8/debian/copyright
@@ -0,0 +1,144 @@
+This package was debianized by Mike Markley <mike@markley.org> on
+Wed,  2 Nov 2005 15:52:53 -0800.
+
+It was downloaded from http://sourceforge.net/projects/opendkim
+
+Copyright Holder: The OpenDKIM Project.
+
+Based on code from DKIM Milter, copyright Sendmail Inc.
+
+Copyright:
+Copyright (c) 2009-2012, The OpenDKIM Project
+All rights reserved.
+
+Licenses:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * 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.
+    * Neither the name of The OpenDKIM Project nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+Portions of this project are also covered by the Sendmail Open Source
+License, available in this distribution in the file "LICENSE.Sendmail".
+See the copyright notice(s) in each file to determine whether or not it is
+covered by both licenses.
+
+Copyright (c) 2004-2009 Sendmail, Inc. and its suppliers.
+
+THIS SOFTWARE IS PROVIDED BY THE OPENDKIM PROJECT ''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 OPENDKIM PROJECT 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.
+
+                   SENDMAIL OPEN SOURCE LICENSE
+
+The following license terms and conditions apply to this open source
+software ("Software"), unless a different license is obtained directly
+from Sendmail, Inc. ("Sendmail") located at 6425 Christie Ave, Fourth
+Floor, Emeryville, CA 94608, USA.
+
+Use, modification and redistribution (including distribution of any
+modified or derived work) of the Software in source and binary forms is
+permitted only if each of the following conditions of 1-6 are met:
+
+1. Redistributions of the Software qualify as "freeware" or "open
+   source software" under one of the following terms:
+
+   (a) Redistributions are made at no charge beyond the reasonable
+       cost of materials and delivery; or
+
+   (b) Redistributions are accompanied by a copy of the modified
+       Source Code (on an acceptable machine-readable medium) or by an
+       irrevocable offer to provide a copy of the modified Source Code
+       (on an acceptable machine-readable medium) for up to three years
+       at the cost of materials and delivery. Such redistributions must
+       allow further use, modification, and redistribution of the Source
+       Code under substantially the same terms as this license. For
+       the purposes of redistribution "Source Code" means the complete
+       human-readable, compilable, linkable, and operational source
+       code of the redistributed module(s) including all modifications.
+
+2. Redistributions of the Software Source Code must retain the
+   copyright notices as they appear in each Source Code file, these
+   license terms and conditions, and the disclaimer/limitation of
+   liability set forth in paragraph 6 below. Redistributions of the
+   Software Source Code must also comply with the copyright notices
+   and/or license terms and conditions imposed by contributors on
+   embedded code. The contributors' license terms and conditions
+   and/or copyright notices are contained in the Source Code
+   distribution.
+
+3. Redistributions of the Software in binary form must reproduce the
+   Copyright Notice described below, these license terms and conditions,
+   and the disclaimer/limitation of liability set forth in paragraph
+   6 below, in the documentation and/or other materials provided with
+   the binary distribution.  For the purposes of binary distribution,
+   "Copyright Notice" refers to the following language: "Copyright (c)
+   1998-2004 Sendmail, Inc. All rights reserved."
+
+4. Neither the name, trademark or logo of Sendmail, Inc. (including
+   without limitation its subsidiaries or affiliates) or its contributors
+   may be used to endorse or promote products, or software or services
+   derived from this Software without specific prior written permission.
+   The name "sendmail" is a registered trademark and service mark of
+   Sendmail, Inc.
+
+5. We reserve the right to cancel this license if you do not comply with 
+   the terms.  This license is governed by California law and both of us 
+   agree that for any dispute arising out of or relating to this Software, 
+   that jurisdiction and venue is proper in San Francisco or Alameda 
+   counties.  These license terms and conditions reflect the complete 
+   agreement for the license of the Software (which means this supercedes 
+   prior or contemporaneous agreements or representations).  If any term
+   or condition under this license is found to be invalid, the remaining
+   terms and conditions still apply.
+
+6. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY
+   SENDMAIL AND ITS CONTRIBUTORS "AS IS" WITHOUT WARRANTY OF ANY KIND
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE EXPRESSLY DISCLAIMED. IN NO EVENT SHALL SENDMAIL
+   OR ITS CONTRIBUTORS 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
+   WITHOUT LIMITATION NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+License and copyright for libopendkim/base32.c is:
+
+/*
+** Copyright (c) 2006-2009 Bjorn Andersson <flex@kryo.se>,
+** Erik Ekman <yarrick@kryo.se>
+** Mostly rewritten 2009 J.A.Bezemer@opensourcepartners.nl
+**
+** Permission to use, copy, modify, and distribute this software for any
+** purpose with or without fee is hereby granted, provided that the above
+** copyright notice and this permission notice appear in all copies.
+**
+** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+** WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+** MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+** ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+** WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+** ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+** OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+**
+** Portions Copyright (c) 2010, 2011, The OpenDKIM Project.
+** All rights reserved.
+*/
+
+$Revision: 1.4 $ $Date: 2010-08-06 17:42:19 $
--- opendkim-2.6.8.orig/debian/opendkim.postinst
+++ opendkim-2.6.8/debian/opendkim.postinst
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	if ! id -u opendkim >/dev/null 2>&1; then
+		adduser --quiet --system --group --home /var/run/opendkim opendkim
+	fi
+
+	# Set ownership if the admin has not overriden it.
+	if ! dpkg-statoverride --list /var/run/opendkim >/dev/null; then
+		chown opendkim:opendkim /var/run/opendkim
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0
--- opendkim-2.6.8.orig/debian/libopendkim7.docs
+++ opendkim-2.6.8/debian/libopendkim7.docs
@@ -0,0 +1 @@
+KNOWNBUGS
--- opendkim-2.6.8.orig/debian/opendkim.postrm
+++ opendkim-2.6.8/debian/opendkim.postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "purge" ]; then
+	if [ -x /usr/sbin/deluser ] && id -u opendkim >/dev/null 2>&1; then
+		deluser --quiet opendkim
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0
--- opendkim-2.6.8.orig/debian/libvbr2.install
+++ opendkim-2.6.8/debian/libvbr2.install
@@ -0,0 +1 @@
+usr/lib/libvbr*.so.*
--- opendkim-2.6.8.orig/debian/opendkim-tools.install
+++ opendkim-2.6.8/debian/opendkim-tools.install
@@ -0,0 +1 @@
+/usr/bin/*
--- opendkim-2.6.8.orig/debian/README.Debian
+++ opendkim-2.6.8/debian/README.Debian
@@ -0,0 +1,100 @@
+opendkim for Debian
+-------------------
+
+Generating a key and publishing a TXT record
+--------------------------------------------
+
+The DKIM spec requires an RSA key between 512 and 2048 bits in length.
+It also requires 1024 for keys that are "long-lived", so 1024 is a
+good safe starting point. 
+
+The easiest way to generate a key is with the opendkim-genkey(8) utility.
+For example:
+
+$ opendkim-genkey -b 1024 -d example.com -s selector1 
+
+This will create two files: selector1.private, containing the private
+RSA key, and selector1.txt, containing the appropriate DNS record for
+this key.
+
+Alternately, keys may be generated by hand:
+
+$ openssl genrsa -out selector1.private 1024
+
+Note that this private key should be installed such that it's readable
+only by the filter itself and any other software requiring access to
+it. Anyone who is able to access it will be able to sign mail as your
+domain. The maintainer's recommendation: Change the key file's ownership
+to opendkim and its permissions to 400 (read-only by owner).
+
+The public value may then be retrieved with:
+
+$ openssl rsa -in selector1.private -pubout -outform pem
+
+The public key will go into your DNS TXT record under the name
+<selector>._domainkey. The TXT record contains a number of tag/value
+pairs as described in the DKIM specification. The required p= tag
+contains the PEM-formatted (that is, base64-encoded DER) public key,
+no header, footer, newlines or spaces. This can be obtained using
+a command line like this:
+
+$ openssl rsa -in selector1.private -pubout -outform pem 2>/dev/null | \
+grep -v "^-"  | tr -d '\n'
+
+Other useful but optional flags include k= (the key type, "rsa"
+by default) and t= (which can have any of the flags "t" and "s",
+indicating, respectively, testing mode and scope). Testing mode
+instructs recipients to treat signed and unsigned email the same,
+allowing the generation and verification of signatures without
+any action (yet) being taken.
+
+For example: example.com wishes to sign all of their mail with DKIM.
+They choose the selector "mail" and decide, for now, to indicate that
+they are in testing mode", until they've verified their configuration.
+They might put the following in their DNS:
+
+mail._domainkey.example.com TXT "v=DKIM1; k=rsa; t=y; p=<public key>"
+
+In addition, some receivers may support DomainKeys-style sender policy
+as described in the DomainKeys specification at:
+http://tools.ietf.org/html/rfc4870#section-3.6
+
+Note that this is not an exhaustive list of features or tags; see below
+for a link to the DKIM specifications.
+
+Notes for Postfix users
+-----------------------
+
+Postfix users who wish to access the opendkim service via UNIX socket
+(the default) may need to add the postfix user to the opendkim
+group and ensure that UMask is set to 002 in /etc/opendkim.conf, in
+order to make the socket readable by Posfix.
+
+Users may also need to move the socket into a directory accessible by the
+Postfix chroot; this can be accomplished by setting the SOCKET variable
+in /etc/default/opendkim.
+
+As an alternative, you may opt to connect to the filter over TCP. The
+filter can be bound to localhost to prevent other hosts from accessing it.
+For example, to bind to port 8891, specify "inet:8891@localhost".
+
+Changing group ownership of socket
+----------------------------------
+
+The group ID of the UNIX socket created by opendkim can be changed by
+changing the primary GID of the opendkim user, e.g.:
+$ usermod -g mail opendkim
+
+Changes to key specifications
+-----------------------------
+
+The KeyList functionality in versions of OpenDKIM prior to 2.0.0 has been
+replaced with two features called SigningTable and KeyTable. More information
+on these can be found in opendkim.conf(5). If you use these features, the
+script /usr/share/doc/opendkim/contrib/convert_keylist.sh can be used to read a
+KeyList file and create appropriate SigningTable and KeyTable files.
+
+More detailed information about the new data sets (including LDAP and other
+data set types) can be found in README.opendkim.
+
+ -- Scott Kitterman <scott@kitterman.com>  Fri, 08 Jun 2012 14:37:05 -0400
