summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/changelog36
-rw-r--r--debian/control6
-rw-r--r--debian/patches/Support-openssl-3.0.patch1
-rw-r--r--debian/patches/Use-_FORTIFY_SOURCE-level-3.patch1
-rw-r--r--debian/patches/auth-Add-a-comment-about-updating-userdb_find.patch1
-rwxr-xr-xdebian/rules4
-rw-r--r--debian/salsa-ci.yml1
7 files changed, 39 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 30e7e2d..4f17eed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+dovecot (1:2.3.21.1+dfsg1-1) unstable; urgency=medium
+
+ [ Noah Meyerhans ]
+ * [452a10b] Move systemd unit files to /usr (Closes: #1071915)
+
+ [ Niels Thykier ]
+ * [a9caf51] Avoid unnecessary implicit requirement for `(fake)root`
+
+ [ Christian Göttsche ]
+ * [8c253d1] salsa-ci: enable build_twice job
+ * [47122cd] Bump to standards version 4.7.0 (no further changes)
+ * [4062094] Replace obsolete build-dependency pkg-config with pkgconf
+ * [f1221b8] Split overlong line in changelog
+ * [dd876aa] Annotate Debian patches
+ * [590287e] Fix typos in changelog
+
+ [ Noah Meyerhans ]
+ * [a212eb8] New upstream version 2.3.21.1+dfsg1
+ - Fix CVE-2024-23185 (Closes: #1078877)
+ - Fix CVE-2024-23185 (Closes: #1078877)
+
+ -- Noah Meyerhans <noahm@debian.org> Sat, 17 Aug 2024 13:26:24 -0400
+
dovecot (1:2.3.21+dfsg1-3~progress7.99u1) graograman-backports; urgency=medium
* Uploading to graograman-backports, remaining changes:
@@ -28,7 +51,8 @@ dovecot (1:2.3.21+dfsg1-2~progress7.99u1) graograman-backports; urgency=medium
dovecot (1:2.3.21+dfsg1-2) unstable; urgency=medium
[ Christian Göttsche ]
- * [a2fbc2f] split-protocols.patch: patch all-settings.c to successfully build twice (Closes: #1044797)
+ * [a2fbc2f] split-protocols.patch: patch all-settings.c to successfully build
+ twice (Closes: #1044797)
[ Noah Meyerhans ]
* [70e4426] Drop arm64 from libunwind builddep arch list
@@ -1042,7 +1066,7 @@ dovecot (1:2.1.7-3) unstable; urgency=high
(Closes: #680035)
* [c0ac3ba] Backport of fix for failure to autocreate mailboxes
(Closes: #623440) This also requires setting the default mail_location.
- * [ba1d3f5] Fix FTBS on Hurd (Closes: #686931) via upstream patch backported
+ * [ba1d3f5] Fix FTBFS on Hurd (Closes: #686931) via upstream patch backported
from mercurial.
* [cfa92b5] Upgrade pigeonhole page to 0.3.1 (Closes: #688407)
* [58f01c2] Generated certificates will now be created in /etc/dovecot
@@ -1562,7 +1586,7 @@ dovecot (1:1.2.1-2) unstable; urgency=low
* Update to use default automake (Closes: #536880) now that current upstream
successfully builds with 1.10 (was previously a problem in bug 473754.
- * Updated Standards-Verson to 3.8.2 (no action required)
+ * Updated Standards-Version to 3.8.2 (no action required)
* Remove ./var/run directories to fix lintian warnings.
* Updated dovecot-libsieve patch to version 0.1.8, removed autogen.sh,
tests, and doc/rfc
@@ -1607,7 +1631,7 @@ dovecot (1:1.1.15-1) unstable; urgency=low
* debian/dovecot-common.init: patched to support ENABLED=0 in
/etc/default/dovecot, useful if dovecot is used as local-only IMAP server
through PREAUTH interface. (Closes: #524302)
- * debian/dovecot-common.README.Debian: simplyfied, we only point the user to
+ * debian/dovecot-common.README.Debian: simplified, we only point the user to
wiki.dovecot.org; added a note about how to regenerate the SSL certificate.
(Closes: #528934)
* debian/dovecot-common.postrm: do not break if /etc/ssl/certs does not
@@ -1927,7 +1951,7 @@ dovecot (1:1.0.7-1) unstable; urgency=low
* debian/rules: remove drac.so in the clean target. (Closes: #442548)
* debian/dovecot-common.init: implemented the reload action.
(Closes: #441032)
- * Update protocoles option in configuration when installing/removing
+ * Update protocols option in configuration when installing/removing
-imapd/-pop3d packages. Thanks to Soren Hansen and Mathias Gug from
Ubuntu for providing a patch. (Closes: #447201)
@@ -2300,7 +2324,7 @@ dovecot (1.0.beta7-1) unstable; urgency=low
dovecot (1.0.beta5-1) unstable; urgency=low
* New upstream version. Also updated dovecot-lda from CVS.
- * debian/control. Added build-depends on flex to prevent FTBS.
+ * debian/control. Added build-depends on flex to prevent FTBFS.
-- Jaldhar H. Vyas <jaldhar@debian.org> Thu, 6 Apr 2006 16:22:46 -0400
diff --git a/debian/control b/debian/control
index 5fae176..0c58273 100644
--- a/debian/control
+++ b/debian/control
@@ -36,10 +36,10 @@ Build-Depends: debhelper-compat (= 13),
libwrap0-dev,
libzstd-dev,
lsb-release,
- pkg-config,
+ pkgconf,
zlib1g-dev
-Standards-Version: 4.6.2
-Rules-Requires-Root: binary-targets
+Standards-Version: 4.7.0
+Rules-Requires-Root: no
Homepage: https://dovecot.org/
Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/dovecot
Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/dovecot
diff --git a/debian/patches/Support-openssl-3.0.patch b/debian/patches/Support-openssl-3.0.patch
index 8f39a7d..2b35978 100644
--- a/debian/patches/Support-openssl-3.0.patch
+++ b/debian/patches/Support-openssl-3.0.patch
@@ -4,6 +4,7 @@ Author: Michal Hlavinka
Origin: https://bugzilla.redhat.com/show_bug.cgi?id=1962035
Subject: Support openssl 3.0
+Forwarded: not-needed
---
src/lib-dcrypt/dcrypt-openssl.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/debian/patches/Use-_FORTIFY_SOURCE-level-3.patch b/debian/patches/Use-_FORTIFY_SOURCE-level-3.patch
index 262de9a..2f648f5 100644
--- a/debian/patches/Use-_FORTIFY_SOURCE-level-3.patch
+++ b/debian/patches/Use-_FORTIFY_SOURCE-level-3.patch
@@ -2,6 +2,7 @@ From: =?utf-8?q?Christian_G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Thu, 22 Dec 2022 17:00:53 +0100
Subject: Use _FORTIFY_SOURCE level 3
+Forwarded: not-needed
---
m4/dovecot.m4 | 6 +++---
pigeonhole/m4/dovecot.m4 | 6 +++---
diff --git a/debian/patches/auth-Add-a-comment-about-updating-userdb_find.patch b/debian/patches/auth-Add-a-comment-about-updating-userdb_find.patch
index 70a405f..a8ddc5c 100644
--- a/debian/patches/auth-Add-a-comment-about-updating-userdb_find.patch
+++ b/debian/patches/auth-Add-a-comment-about-updating-userdb_find.patch
@@ -1,5 +1,6 @@
From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 16 May 2022 14:58:45 +0200
+Applied-Upstream: https://github.com/dovecot/core/commit/a1022072e2ce36f853873d910287f466165b184b
Subject: auth: Add a comment about updating userdb_find()
---
diff --git a/debian/rules b/debian/rules
index 80c87e8..376d262 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,7 +107,7 @@ override_dh_autoreconf:
dh_autoreconf debian/autogen.sh
override_dh_auto_configure:
- KRB5CONFIG=krb5-config.mit systemdsystemunitdir=/lib/systemd/system dh_auto_configure -- \
+ KRB5CONFIG=krb5-config.mit systemdsystemunitdir=/usr/lib/systemd/system dh_auto_configure -- \
--with-ldap=plugin \
--with-ssl=openssl \
--with-sql=plugin \
@@ -171,7 +171,7 @@ override_dh_install:
# or debian/ to the individual packages. NOTE: there is nothing in
# debian/tmp!
dh_install
- install -D -o root -g root -m 0755 $(CORE_DIR)/usr/share/doc/dovecot-core/mkcert.sh \
+ install -D -m 0755 $(CORE_DIR)/usr/share/doc/dovecot-core/mkcert.sh \
$(CORE_DIR)/usr/share/dovecot/mkcert.sh
rm $(CORE_DIR)/usr/share/doc/dovecot-core/mkcert.sh
rm $(CORE_DIR)/usr/share/doc/dovecot-core/dovecot-openssl.cnf
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index 00fbe36..c5ad694 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -6,3 +6,4 @@ include:
variables:
SALSA_CI_DISABLE_REPROTEST: 1
SALSA_CI_DISABLE_CROSSBUILD_ARM64: 1
+ SALSA_CI_DISABLE_BUILD_PACKAGE_TWICE: 0