Diff dovecot-2.4.2 with a dovecot-2.4.2-r2

/usr/portage/net-mail/dovecot/dovecot-2.4.2-r2.ebuild 2026-03-03 11:46:18.670319072 +0300
6 6
LUA_COMPAT=( lua5-{3..4} )
7 7
# do not add a ssl USE flag.  ssl is mandatory
8 8
SSL_DEPS_SKIP=1
9
inherit autotools eapi9-ver flag-o-matic lua-single ssl-cert systemd toolchain-funcs
9
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dovecot.asc
10
inherit autotools dot-a eapi9-ver flag-o-matic lua-single ssl-cert systemd
11
inherit toolchain-funcs verify-sig
10 12

  
11 13
MY_P="${P/_/.}"
12 14
MY_PV="${PV}"
......
17 19
SRC_URI="https://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
18 20
	sieve? (
19 21
	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz
22
		verify-sig? (
23
		https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz.sig
24
		)
20 25
	)
21 26
	managesieve? (
22 27
	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz
28
		verify-sig? (
29
		https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-pigeonhole-${MY_PV}.tar.gz.sig
30
		)
31
	)
32
	verify-sig? (
33
	https://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz.sig
23 34
	) "
24 35
S="${WORKDIR}/${MY_P}"
25 36
PIEGONHOLE_S="../dovecot-pigeonhole-${MY_PV}"
26 37
LICENSE="LGPL-2.1 MIT"
27 38
SLOT="0/${PV}"
28
KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc ~x86"
39
KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
29 40

  
30 41
IUSE_DOVECOT_AUTH_DICT="cdb kerberos ldap lua mysql pam postgres sqlite"
31 42
IUSE_DOVECOT_COMPRESS="lz4 zstd"
......
86 97
			')
87 98
		)
88 99
	)
100
	verify-sig? ( sec-keys/openpgp-keys-dovecot )
89 101
	"
90 102

  
91 103
PATCHES=(
......
101 113
	fi
102 114
}
103 115

  
116
src_unpack() {
117
	if use verify-sig; then
118
		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
119
		use sieve && verify-sig_verify_detached "${DISTDIR}"/${PN}-pigeonhole-${MY_PV}.tar.gz{,.sig}
120
		use managesieve && verify-sig_verify_detached "${DISTDIR}"/${PN}-pigeonhole-${MY_PV}.tar.gz{,.sig}
121
	fi
122

  
123
	default
124
}
125

  
104 126
src_prepare() {
105 127
	default
106 128

  
129
	if use sieve || use managesieve; then
130
		pushd "${PIEGONHOLE_S}" > /dev/null || die
131
		eapply "${FILESDIR}/${PN}-2.4.2-fix-32bit.patch"
132
		popd > /dev/null || die
133
	fi
134

  
107 135
	# rename default cert files
108 136
	sed -i -e "s:ssl-cert.pem:server.pem:" \
109 137
		-e "s:ssl-key.pem:server.key:" \
......
118 146
}
119 147

  
120 148
src_configure() {
149
	use static-libs && lto-guarantee-fat
150

  
121 151
	# --disable-hardening because our toolchain already defaults to
122 152
	# these bits on, and it actually regresses the default _FORTIFY_SOURCE
123 153
	# level for hardened at least from 3 to 2.
......
210 240
	doins "${FILESDIR}/50-misc.conf"
211 241

  
212 242
	dodoc AUTHORS NEWS README.md TODO
213
	docinto stopwords
214
	dodoc src/lib-language/stopwords/stopwords*.txt
215 243

  
216 244
	if use sieve || use managesieve; then
217 245
		pushd "${PIEGONHOLE_S}" > /dev/null || die
......
221 249
		popd > /dev/null || die
222 250
	fi
223 251

  
224
	rm -r "${ED}"/usr/share/dovecot
225
	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
252
	if use static-libs; then
253
		strip-lto-bytecode
254
	else
255
		find "${ED}"/usr/lib* -name '*.la' -delete
256
	fi
226 257
}
227 258

  
228 259
pkg_postinst() {
Thank you!