Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: freeze-exception
Please unblock package opendkim
The opendkim upstream just did a new release primarily to fix #679548 through
a combination of improved documentation and a small code fix.
The release also addresses a few other minor issues. The FFR_RESIGN fix
doesn't affect Debian since neither of the options affected by the fix are
enabled. The opendkim-genrates fix doesn't affect Debian since that script is
not included in any of the binaries. The only change that affects Debian that
isn't in the scope of #679548 is a hyphen/minus sign fix in a man page.
Upstream has been very cooperative on #679548, putting out a release
specifically because of it. I think it's both technically and socially better
at this point in the freeze process to update to the new version than to
extract most of the update into a patch.
I have the package ready to upload if this is approved. This problem exists
in both Squeeze and Wheezy and came to light due to increased IPv6 usage.
This is not a case of fixing a regression.
The full diff (upstream and packaging) is attached.
unblock opendkim/2.6.2-1
diff -Nru opendkim-2.6.1/configure opendkim-2.6.2/configure
--- opendkim-2.6.1/configure 2012-06-24 23:34:56.000000000 -0400
+++ opendkim-2.6.2/configure 2012-07-02 13:59:41.000000000 -0400
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for OpenDKIM 2.6.1.
+# Generated by GNU Autoconf 2.68 for OpenDKIM 2.6.2.
#
# Report bugs to <b...@opendkim.org>.
#
@@ -570,8 +570,8 @@
# Identity of this package.
PACKAGE_NAME='OpenDKIM'
PACKAGE_TARNAME='opendkim'
-PACKAGE_VERSION='2.6.1'
-PACKAGE_STRING='OpenDKIM 2.6.1'
+PACKAGE_VERSION='2.6.2'
+PACKAGE_STRING='OpenDKIM 2.6.2'
PACKAGE_BUGREPORT='b...@opendkim.org'
PACKAGE_URL=''
@@ -1545,7 +1545,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures OpenDKIM 2.6.1 to adapt to many kinds of systems.
+\`configure' configures OpenDKIM 2.6.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1615,7 +1615,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenDKIM 2.6.1:";;
+ short | recursive ) echo "Configuration of OpenDKIM 2.6.2:";;
esac
cat <<\_ACEOF
@@ -1824,7 +1824,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenDKIM configure 2.6.1
+OpenDKIM configure 2.6.2
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2403,7 +2403,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by OpenDKIM $as_me 2.6.1, which was
+It was created by OpenDKIM $as_me 2.6.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3222,7 +3222,7 @@
# Define the identity of the package.
PACKAGE='opendkim'
- VERSION='2.6.1'
+ VERSION='2.6.2'
cat >>confdefs.h <<_ACEOF
@@ -3271,7 +3271,7 @@
#
# Hexadecimal version, for use in generating dkim.h
#
-HEX_VERSION=$(printf %08x $(( ((2 << 8 | 6) << 8 | 1) << 8| 0 )))
+HEX_VERSION=$(printf %08x $(( ((2 << 8 | 6) << 8 | 2) << 8| 0 )))
#
@@ -20528,7 +20528,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by OpenDKIM $as_me 2.6.1, which was
+This file was extended by OpenDKIM $as_me 2.6.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20594,7 +20594,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-OpenDKIM config.status 2.6.1
+OpenDKIM config.status 2.6.2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -Nru opendkim-2.6.1/configure.ac opendkim-2.6.2/configure.ac
--- opendkim-2.6.1/configure.ac 2012-06-24 23:33:43.000000000 -0400
+++ opendkim-2.6.2/configure.ac 2012-07-02 13:58:53.000000000 -0400
@@ -15,7 +15,7 @@
#
m4_define([VERSION_RELEASE], 2)
m4_define([VERSION_MAJOR_REV], 6)
-m4_define([VERSION_MINOR_REV], 1)
+m4_define([VERSION_MINOR_REV], 2)
m4_define([VERSION_PATCH], 0)
#
diff -Nru opendkim-2.6.1/contrib/spec/opendkim.spec opendkim-2.6.2/contrib/spec/opendkim.spec
--- opendkim-2.6.1/contrib/spec/opendkim.spec 2012-06-24 23:35:13.000000000 -0400
+++ opendkim-2.6.2/contrib/spec/opendkim.spec 2012-07-02 14:00:30.000000000 -0400
@@ -4,7 +4,7 @@
Summary: An open source library and milter for providing DKIM service
Name: opendkim
-Version: 2.6.1
+Version: 2.6.2
Release: 1
License: BSD
Group: System Environment/Daemons
diff -Nru opendkim-2.6.1/debian/changelog opendkim-2.6.2/debian/changelog
--- opendkim-2.6.1/debian/changelog 2012-07-02 15:25:43.000000000 -0400
+++ opendkim-2.6.2/debian/changelog 2012-07-02 15:25:43.000000000 -0400
@@ -1,3 +1,14 @@
+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)
+
+ -- Scott Kitterman <sc...@kitterman.com> Mon, 02 Jul 2012 14:44:38 -0400
+
opendkim (2.6.1-1) unstable; urgency=low
* New upstream release
diff -Nru opendkim-2.6.1/libopendkim/dkim.h opendkim-2.6.2/libopendkim/dkim.h
--- opendkim-2.6.1/libopendkim/dkim.h 2012-06-24 23:37:15.000000000 -0400
+++ opendkim-2.6.2/libopendkim/dkim.h 2012-07-02 14:12:01.000000000 -0400
@@ -34,7 +34,7 @@
** pp == patch number
*/
-#define OPENDKIM_LIB_VERSION 0x02060100
+#define OPENDKIM_LIB_VERSION 0x02060200
#ifdef __STDC__
# ifndef __P
diff -Nru opendkim-2.6.1/opendkim/opendkim.8.in opendkim-2.6.2/opendkim/opendkim.8.in
--- opendkim-2.6.1/opendkim/opendkim.8.in 2012-06-24 23:33:43.000000000 -0400
+++ opendkim-2.6.2/opendkim/opendkim.8.in 2012-07-02 13:58:53.000000000 -0400
@@ -4,7 +4,6 @@
\- DKIM signing and verifying filter for MTAs
.SH SYNOPSIS
.B opendkim
-\-p socketspec
[\-A]
[\-b modes]
[\-c canon]
@@ -18,6 +17,7 @@
[\-L min]
[\-n]
[\-o hdrlist]
+[\-p socketspec]
[\-P pidfile]
[\-q]
[\-Q]
@@ -337,15 +337,19 @@
.I path,
or
.I inet:port[@host]
+or
+.I inet6:port[@host]
which creates a TCP socket on the specified
-.I port.
-If the
+.I port
+using the requested protocol family. If the
.I host
is not given as either a hostname or an IP address, the socket will be
-listening on all interfaces. If neither socket type is specified,
+listening on all interfaces. A literal IP address must be enclosed in
+square brackets. If neither socket type is specified,
.I local
is assumed, meaning the parameter is interpreted as a path at which
-the socket should be created. This parameter is mandatory.
+the socket should be created. This parameter is mandatory either here or
+in the configuration file.
.TP
.I \-P pidfile
Specifies a file into which the filter should write its process ID at startup.
@@ -496,7 +500,7 @@
StrictTestMode,
TestPublicKeys,
UMask,
-UserID (-u). The filter does not automatically check the configuration
+UserID (\-u). The filter does not automatically check the configuration
file for changes and reload.
.SH MTA MACROS
.B opendkim
diff -Nru opendkim-2.6.1/opendkim/opendkim.c opendkim-2.6.2/opendkim/opendkim.c
--- opendkim-2.6.1/opendkim/opendkim.c 2012-06-24 23:33:43.000000000 -0400
+++ opendkim-2.6.2/opendkim/opendkim.c 2012-07-02 13:58:53.000000000 -0400
@@ -5768,12 +5768,12 @@
dkimf_db_close(conf->conf_resigndb);
#endif /* _FFR_RESIGN */
-#ifdef _FFR_RESIGN
+#ifdef _FFR_RATE_LIMIT
if (conf->conf_ratelimitdb != NULL)
dkimf_db_close(conf->conf_ratelimitdb);
if (conf->conf_flowdatadb != NULL)
dkimf_db_close(conf->conf_flowdatadb);
-#endif /* _FFR_RESIGN */
+#endif /* _FFR_RATE_LIMIT */
#ifdef _FFR_REPUTATION
if (conf->conf_repratiosdb != NULL)
diff -Nru opendkim-2.6.1/opendkim/opendkim.conf.5.in opendkim-2.6.2/opendkim/opendkim.conf.5.in
--- opendkim-2.6.1/opendkim/opendkim.conf.5.in 2012-06-24 23:33:43.000000000 -0400
+++ opendkim-2.6.2/opendkim/opendkim.conf.5.in 2012-07-02 13:58:53.000000000 -0400
@@ -1117,14 +1117,17 @@
which creates a UNIX domain socket at the specified
.I path,
or
-.I inet:port[@host],
+.I inet:port[@host]
+or
+.I inet6:port[@host]
which creates a TCP socket on the specified
-.I port.
-If the
+.I port
+and in the specified protocol family. If the
.I host
is not given as either a hostname or an IP address, the socket will be
-listening on all interfaces. This option is mandatory either in the
-configuration file or on the command line.
+listening on all interfaces. A literal IP address must be enclosed in
+square brackets. This option is mandatory either in the configuration file or
+on the command line.
.TP
.I Statistics (filename)
diff -Nru opendkim-2.6.1/opendkim/opendkim-db.c opendkim-2.6.2/opendkim/opendkim-db.c
--- opendkim-2.6.1/opendkim/opendkim-db.c 2012-06-18 10:20:09.000000000 -0400
+++ opendkim-2.6.2/opendkim/opendkim-db.c 2012-07-02 13:58:53.000000000 -0400
@@ -1767,6 +1767,7 @@
char **err)
{
DKIMF_DB new;
+ char *comma;
char *p;
assert(db != NULL);
@@ -1786,6 +1787,12 @@
new->db_type = DKIMF_DB_TYPE_UNKNOWN;
p = strchr(name, ':');
+ comma = strchr(name, ',');
+
+ /* catch a CSL that contains colons not in the first entry */
+ if (comma != NULL && p != NULL && comma < p)
+ p = NULL;
+
if (p == NULL)
{
# ifdef USE_DB
diff -Nru opendkim-2.6.1/RELEASE_NOTES opendkim-2.6.2/RELEASE_NOTES
--- opendkim-2.6.1/RELEASE_NOTES 2012-06-24 23:37:15.000000000 -0400
+++ opendkim-2.6.2/RELEASE_NOTES 2012-07-02 14:12:01.000000000 -0400
@@ -5,6 +5,17 @@
This listing shows the versions of the OpenDKIM package, the date of
release, and a summary of the changes in that release.
+2.6.2 2012/07/02
+ Fix build confusion between _FFR_RATE_LIMIT and _FFR_RESIGN.
+ Problem noted by Rolf Sonneveld.
+ Fix bug #SF3538639: Fix error when --domain is not provided to
+ opendkim-genrates. Problem noted by Andreas Schulze.
+ 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.
+
2.6.1 2012/06/25
Restore and activate _FFR_SELECT_CANONICALIZATION. Also adds a
SelectCanonicalizationHeader configuration option.
diff -Nru opendkim-2.6.1/reputation/opendkim-genrates opendkim-2.6.2/reputation/opendkim-genrates
--- opendkim-2.6.1/reputation/opendkim-genrates 2012-06-24 23:35:15.000000000 -0400
+++ opendkim-2.6.2/reputation/opendkim-genrates 2012-07-02 14:00:32.000000000 -0400
@@ -24,7 +24,7 @@
# general
my $progname = basename($0);
-my $version = "2.6.1";
+my $version = "2.6.2";
my $verbose = 0;
my $helponly = 0;
my $showversion = 0;
@@ -647,9 +647,8 @@
print $out " <td>Volume Limit (high)</td>\n";
print $out " </tr>\n";
- $tmpsql = "SELECT domain, name, reporter, rate_avg, rate_max, rate_stddev, rate_high, ratio_avg, ratio_max, ratio_stddev, ratio_high, daily_limit_low, daily_limit_high FROM predictions WHERE domain IN (";
+ $tmpsql = "SELECT domain, name, reporter, rate_avg, rate_max, rate_stddev, rate_high, ratio_avg, ratio_max, ratio_stddev, ratio_high, daily_limit_low, daily_limit_high FROM predictions WHERE domain IN (0, -1";
- $idx = 0;
foreach (@$tmpin)
{
$id = $_->[0];
@@ -659,16 +658,10 @@
next;
}
- if ($idx != 0)
- {
- $tmpsql = $tmpsql . ", ";
- }
-
- $tmpsql = $tmpsql . $id;
-
- $idx++;
+ $tmpsql = $tmpsql . ", ". $id;
}
- $tmpsql = $tmpsql . ", 0, -1)";
+
+ $tmpsql = $tmpsql . ")";
$dbi_s = $dbi_h->prepare($tmpsql);
if (!$dbi_s->execute)
diff -Nru opendkim-2.6.1/reputation/opendkim-genrates.8 opendkim-2.6.2/reputation/opendkim-genrates.8
--- opendkim-2.6.1/reputation/opendkim-genrates.8 2012-06-24 23:35:15.000000000 -0400
+++ opendkim-2.6.2/reputation/opendkim-genrates.8 2012-07-02 14:00:32.000000000 -0400
@@ -73,7 +73,7 @@
.SH VERSION
This man page covers the version of
.I opendkim-genrates
-that shipped with version 2.6.1 of
+that shipped with version 2.6.2 of
.I OpenDKIM.
.SH COPYRIGHT
Copyright (c) 2011, 2012, The OpenDKIM Project. All rights reserved.
diff -Nru opendkim-2.6.1/reputation/opendkim-genrates.in opendkim-2.6.2/reputation/opendkim-genrates.in
--- opendkim-2.6.1/reputation/opendkim-genrates.in 2012-06-18 10:20:09.000000000 -0400
+++ opendkim-2.6.2/reputation/opendkim-genrates.in 2012-07-02 13:58:53.000000000 -0400
@@ -647,9 +647,8 @@
print $out " <td>Volume Limit (high)</td>\n";
print $out " </tr>\n";
- $tmpsql = "SELECT domain, name, reporter, rate_avg, rate_max, rate_stddev, rate_high, ratio_avg, ratio_max, ratio_stddev, ratio_high, daily_limit_low, daily_limit_high FROM predictions WHERE domain IN (";
+ $tmpsql = "SELECT domain, name, reporter, rate_avg, rate_max, rate_stddev, rate_high, ratio_avg, ratio_max, ratio_stddev, ratio_high, daily_limit_low, daily_limit_high FROM predictions WHERE domain IN (0, -1";
- $idx = 0;
foreach (@$tmpin)
{
$id = $_->[0];
@@ -659,16 +658,10 @@
next;
}
- if ($idx != 0)
- {
- $tmpsql = $tmpsql . ", ";
- }
-
- $tmpsql = $tmpsql . $id;
-
- $idx++;
+ $tmpsql = $tmpsql . ", ". $id;
}
- $tmpsql = $tmpsql . ", 0, -1)";
+
+ $tmpsql = $tmpsql . ")";
$dbi_s = $dbi_h->prepare($tmpsql);
if (!$dbi_s->execute)
diff -Nru opendkim-2.6.1/reputation/opendkim-modtotals opendkim-2.6.2/reputation/opendkim-modtotals
--- opendkim-2.6.1/reputation/opendkim-modtotals 2012-06-24 23:35:15.000000000 -0400
+++ opendkim-2.6.2/reputation/opendkim-modtotals 2012-07-02 14:00:32.000000000 -0400
@@ -24,7 +24,7 @@
# general
my $progname = basename($0);
-my $version = "\2.6.1";
+my $version = "\2.6.2";
my $verbose = 0;
my $helponly = 0;
my $showversion = 0;
diff -Nru opendkim-2.6.1/reputation/opendkim-modtotals.8 opendkim-2.6.2/reputation/opendkim-modtotals.8
--- opendkim-2.6.1/reputation/opendkim-modtotals.8 2012-06-24 23:35:15.000000000 -0400
+++ opendkim-2.6.2/reputation/opendkim-modtotals.8 2012-07-02 14:00:32.000000000 -0400
@@ -57,7 +57,7 @@
.SH VERSION
This man page covers the version of
.I opendkim-modtotals
-that shipped with version 2.6.1 of
+that shipped with version 2.6.2 of
.I OpenDKIM.
.SH COPYRIGHT
Copyright (c) 2011, 2012, The OpenDKIM Project. All rights reserved.
diff -Nru opendkim-2.6.1/stats/opendkim-expire opendkim-2.6.2/stats/opendkim-expire
--- opendkim-2.6.1/stats/opendkim-expire 2012-06-24 23:35:15.000000000 -0400
+++ opendkim-2.6.2/stats/opendkim-expire 2012-07-02 14:00:31.000000000 -0400
@@ -23,7 +23,7 @@
# general
my $progname = basename($0);
-my $version = "2.6.1";
+my $version = "2.6.2";
my $verbose = 0;
my $helponly = 0;
my $showversion = 0;
diff -Nru opendkim-2.6.1/stats/opendkim-gengraphs opendkim-2.6.2/stats/opendkim-gengraphs
--- opendkim-2.6.1/stats/opendkim-gengraphs 2012-06-24 23:35:15.000000000 -0400
+++ opendkim-2.6.2/stats/opendkim-gengraphs 2012-07-02 14:00:32.000000000 -0400
@@ -23,7 +23,7 @@
# general
my $progname = basename($0);
-my $version = "\2.6.1";
+my $version = "\2.6.2";
my $verbose = 0;
my $helponly = 0;
my $showversion = 0;
diff -Nru opendkim-2.6.1/stats/opendkim-genstats opendkim-2.6.2/stats/opendkim-genstats
--- opendkim-2.6.1/stats/opendkim-genstats 2012-06-24 23:35:15.000000000 -0400
+++ opendkim-2.6.2/stats/opendkim-genstats 2012-07-02 14:00:32.000000000 -0400
@@ -23,7 +23,7 @@
# general
my $progname = basename($0);
-my $version = "2.6.1";
+my $version = "2.6.2";
my $verbose = 0;
my $helponly = 0;
my $showversion = 0;
diff -Nru opendkim-2.6.1/stats/opendkim-reportstats opendkim-2.6.2/stats/opendkim-reportstats
--- opendkim-2.6.1/stats/opendkim-reportstats 2012-06-24 23:35:15.000000000 -0400
+++ opendkim-2.6.2/stats/opendkim-reportstats 2012-07-02 14:00:32.000000000 -0400
@@ -59,7 +59,7 @@
ODKGNUPGCERT="${GNUPGDIR}/opendkim_org.pem"
ODKGNUPGMD5="${GNUPGDIR}/stats_opendkim_org.pub.md5"
-OPENDKIMSTATS="2.6.1"
+OPENDKIMSTATS="2.6.2"
#
# VERSION -- output version string
