* [gentoo-commits] repo/gentoo:master commit in: mail-filter/imapfilter/, mail-filter/imapfilter/files/
@ 2020-12-30 3:54 Stefan Strogin
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Strogin @ 2020-12-30 3:54 UTC (permalink / raw
To: gentoo-commits
commit: eb940ff5f354184c7f53eee7eac50fe372976e71
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 03:52:19 2020 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 03:52:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb940ff5
mail-filter/imapfilter: upgrade to 2.7.5
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
mail-filter/imapfilter/Manifest | 1 +
.../files/imapfilter-2.7.5-libressl.patch | 26 +++++++++++
mail-filter/imapfilter/imapfilter-2.7.5.ebuild | 53 ++++++++++++++++++++++
3 files changed, 80 insertions(+)
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index f8949b123a0..b6f33917e91 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1 +1,2 @@
DIST imapfilter-2.6.16.tar.gz 59636 BLAKE2B 9de58800ab88aa6e22ead001fd4e635b1991d23a2345d729a59438d3774148b1478b561c36848af155da7d15e84afdf900b73054ef268243f333843b71417d1e SHA512 0500931143e593eb69357ef6a6a40be971abadd22d7e807685b88927da8db9a928470f5cad460252b95ccd42efcfd39b5c4001a8796fa79cbd35018405a7be19
+DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835 SHA512 a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442
diff --git a/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
new file mode 100644
index 00000000000..fb665f85271
--- /dev/null
+++ b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
@@ -0,0 +1,26 @@
+From 9a1132d8c8616b67156d49bea89d567ed31d42d6 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 30 Dec 2020 06:48:40 +0300
+Subject: [PATCH] Fix build with LibreSSL
+
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/socket.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/socket.c b/src/socket.c
+index aa2ef4f..fa75de4 100644
+--- a/src/socket.c
++++ b/src/socket.c
+@@ -143,7 +143,7 @@ open_secure_connection(session *ssn)
+ goto fail;
+
+ if (get_option_boolean("hostnames")) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_set_hostflags(ssn->sslconn,
+ X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+ if (!SSL_set1_host(ssn->sslconn, ssn->server)) {
+--
+2.30.0
+
diff --git a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
new file mode 100644
index 00000000000..b894e8eda7c
--- /dev/null
+++ b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit lua-single toolchain-funcs
+
+DESCRIPTION="An IMAP mail filtering utility"
+HOMEPAGE="https://github.com/lefcha/imapfilter"
+SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="libressl"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ dev-libs/libpcre
+ ${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README samples/*"
+
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
+src_prepare() {
+ default
+ sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
+ -e "/^MANDIR/s:man:share/man:" \
+ -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
+ -e "/^CFLAGS/s/-O//" \
+ src/Makefile || die
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ LDFLAGS="${LDFLAGS}" \
+ INCDIRS=$(lua_get_CFLAGS) \
+ LIBLUA=$(lua_get_LIBS)
+}
+
+src_install() {
+ default
+ doman doc/imapfilter.1 doc/imapfilter_config.5
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/imapfilter/, mail-filter/imapfilter/files/
@ 2024-01-20 12:23 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-01-20 12:23 UTC (permalink / raw
To: gentoo-commits
commit: d65ea88c5d2de9f8a754569cba86ae68f6415e16
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Tue Dec 26 22:44:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 12:22:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d65ea88c
mail-filter/imapfilter: clean up old
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/34494
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-filter/imapfilter/Manifest | 2 -
.../imapfilter/files/2.7.6-prototypes.patch | 30 -------------
mail-filter/imapfilter/imapfilter-2.7.5-r1.ebuild | 48 --------------------
mail-filter/imapfilter/imapfilter-2.7.5.ebuild | 48 --------------------
mail-filter/imapfilter/imapfilter-2.7.6.ebuild | 52 ----------------------
5 files changed, 180 deletions(-)
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index 0fba819ad26c..df2b34ac72ae 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,4 +1,2 @@
-DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835 SHA512 a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442
-DIST imapfilter-2.7.6.tar.gz 58644 BLAKE2B 6fd5b8400527c3749cdb8a1df0ca0cbab7b77e8fa29e0bc1bd0eee95832aa16c9b3a586b4e4dc9f9632319febdc619ebe6b05e60c46fd8ccf430f6714900588d SHA512 c76a0986d338e2b74ccf38106e05d4c0a25789a6d80f0cb79ed4a165447a4c96cbcffb57e856fdfd465283feebca6445efba52e65289442a7f313d343c519083
DIST imapfilter-2.8.1.tar.gz 58382 BLAKE2B 41a6675e90bd8feb2c440923a6059caee1eecd4490f55704e11fcfbec92c640ebc264b40cd71ee051f66d6d060a1ff21907a48611baa14a2139c2979017d4ca9 SHA512 1da663a36b0c6091c3da84d78c6826f2c8c13fd20e32723ad9647e5bf942c12cbeb327a71cf38ed2076662d65207edb3f1087d5c94565a583b8a583543d4bcd3
DIST imapfilter-2.8.2.tar.gz 58622 BLAKE2B b47e9902fc08be74d2cad622c75093d7771a97db0142373a3fc4fbd03613225b5f1a6fcd1f9354219c27d856450ff2a266d49f5d7f4e1b95b29876ac9594d02f SHA512 b16e684d6af4e8c3f465e22c008b9231209f1336b1f9a27fbd98460cf987f84e81040250ccb657d3986100b3804f1fc130a409cacc3921180920d26193dd5967
diff --git a/mail-filter/imapfilter/files/2.7.6-prototypes.patch b/mail-filter/imapfilter/files/2.7.6-prototypes.patch
deleted file mode 100644
index 33448834fa2f..000000000000
--- a/mail-filter/imapfilter/files/2.7.6-prototypes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-Patch from: https://github.com/lefcha/imapfilter/pull/257
-Bug: https://bugs.gentoo.org/870682
-
-From 9580bfca0d8a1cf92a79a24b9f1b83fd3b778375 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Sat, 17 Sep 2022 13:42:30 +0200
-Subject: [PATCH] Fix compilation failure with -Werror=strict-prototypes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
----
- src/lua.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lua.c b/src/lua.c
-index 868ddb7..02514bb 100644
---- a/src/lua.c
-+++ b/src/lua.c
-@@ -26,7 +26,7 @@ void interactive_mode(void);
- * Lua interface functions, load and execute imapfilter's configuration file.
- */
- void
--start_lua()
-+start_lua(void)
- {
-
- lua = luaL_newstate();
diff --git a/mail-filter/imapfilter/imapfilter-2.7.5-r1.ebuild b/mail-filter/imapfilter/imapfilter-2.7.5-r1.ebuild
deleted file mode 100644
index 7171e97dec6a..000000000000
--- a/mail-filter/imapfilter/imapfilter-2.7.5-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua-single toolchain-funcs
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="https://github.com/lefcha/imapfilter"
-SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
- dev-libs/openssl:0=
- dev-libs/libpcre2
- ${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README samples/*"
-
-src_prepare() {
- default
- sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
- -e "/^MANDIR/s:man:share/man:" \
- -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
- -e "/^CFLAGS/s/-O//" \
- src/Makefile || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- LDFLAGS="${LDFLAGS}" \
- INCDIRS="$(lua_get_CFLAGS)" \
- LIBLUA="$(lua_get_LIBS)"
-}
-
-src_install() {
- default
- doman doc/imapfilter.1 doc/imapfilter_config.5
-}
diff --git a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
deleted file mode 100644
index 8fbfa085aad9..000000000000
--- a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit lua-single toolchain-funcs
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="https://github.com/lefcha/imapfilter"
-SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
- dev-libs/openssl:0=
- dev-libs/libpcre
- ${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README samples/*"
-
-src_prepare() {
- default
- sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
- -e "/^MANDIR/s:man:share/man:" \
- -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
- -e "/^CFLAGS/s/-O//" \
- src/Makefile || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- LDFLAGS="${LDFLAGS}" \
- INCDIRS="$(lua_get_CFLAGS)" \
- LIBLUA="$(lua_get_LIBS)"
-}
-
-src_install() {
- default
- doman doc/imapfilter.1 doc/imapfilter_config.5
-}
diff --git a/mail-filter/imapfilter/imapfilter-2.7.6.ebuild b/mail-filter/imapfilter/imapfilter-2.7.6.ebuild
deleted file mode 100644
index 110ca9f822a7..000000000000
--- a/mail-filter/imapfilter/imapfilter-2.7.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua-single toolchain-funcs
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="https://github.com/lefcha/imapfilter"
-SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
- dev-libs/openssl:=
- dev-libs/libpcre2
- ${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README samples/*"
-
-PATCHES=(
- "${FILESDIR}/${PV}-prototypes.patch"
-)
-
-src_prepare() {
- default
- sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
- -e "/^MANDIR/s:man:share/man:" \
- -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
- -e "/^CFLAGS/s/-O//" \
- src/Makefile || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- LDFLAGS="${LDFLAGS}" \
- INCDIRS="$(lua_get_CFLAGS)" \
- LIBLUA="$(lua_get_LIBS)"
-}
-
-src_install() {
- default
- doman doc/imapfilter.1 doc/imapfilter_config.5
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-20 12:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-30 3:54 [gentoo-commits] repo/gentoo:master commit in: mail-filter/imapfilter/, mail-filter/imapfilter/files/ Stefan Strogin
-- strict thread matches above, loose matches on Subject: below --
2024-01-20 12:23 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox