[gentoo-commits] repo/proj/guru:master commit in: net-mail/dovecot-fts-xapian/, net-mail/dovecot-fts-xapian/files/

[gentoo-commits] repo/proj/guru:master commit in: net-mail/dovecot-fts-xapian/, net-mail/dovecot-fts-xapian/files/

[Viorel Munteanu]

commit:     405b57ede2f5aec3e91b7da8ea88398a9c756440
Author:     Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift <DOT> com>
AuthorDate: Sun Dec 25 18:37:10 2022 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 18:47:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=405b57ed

net-mail/dovecot-fts-xapian: Allow -O2 to be overriden

Closes: https://bugs.gentoo.org/887887
Signed-off-by: Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift.com>

 net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.5.ebuild   |  4 ++++
 net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild    |  4 ++++
 .../files/bug-887887_allow-O2-override.patch                  | 11 +++++++++++
 3 files changed, 19 insertions(+)

diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.5.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.5.ebuild
index 7e7f7c998..b07035152 100644
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.5.ebuild
+++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.5.ebuild
@@ -24,6 +24,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	${FILESDIR}/bug-887887_allow-O2-override.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf

diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild
index ac1085894..1267136e3 100644
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild
+++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild
@@ -36,6 +36,10 @@ if [ "$PV" = 9999 ] ; then
 	"
 fi
 
+PATCHES=(
+	${FILESDIR}/bug-887887_allow-O2-override.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf

diff --git a/net-mail/dovecot-fts-xapian/files/bug-887887_allow-O2-override.patch b/net-mail/dovecot-fts-xapian/files/bug-887887_allow-O2-override.patch
new file mode 100644
index 000000000..5c4b95fb3
--- /dev/null
+++ b/net-mail/dovecot-fts-xapian/files/bug-887887_allow-O2-override.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2022-04-17 07:41:11.000000000 -0400
++++ b/configure.ac	2022-12-25 13:24:02.551681208 -0500
+@@ -21,7 +21,7 @@
+ DC_DOVECOT
+ DC_DOVECOT_MODULEDIR
+ LIBDOVECOT_INCLUDE="$LIBDOVECOT_INCLUDE"
+-CFLAGS="$CFLAGS $EXTRA_CFLAGS $DOVECOT_FLAGS -O2"
++CFLAGS="-O2 $CFLAGS $EXTRA_CFLAGS $DOVECOT_FLAGS"
+ LIBS="$DOVECOT_LIBS"
+ BINARY_LDFLAGS="$PIE_LDFLAGS $RELRO_LDFLAGS"
+ BINARY_CFLAGS="$PIE_CFLAGS"

[gentoo-commits] repo/proj/guru:master commit in: net-mail/dovecot-fts-xapian/, net-mail/dovecot-fts-xapian/files/

[Haelwenn Monnier]

commit:     aca7bd0aeeb579d11334b9360fc791ad9f26275a
Author:     Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift <DOT> com>
AuthorDate: Mon Apr  1 19:40:08 2024 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Mon Apr  1 20:57:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=aca7bd0a

net-mail/dovecot-fts-xapian: Patch Base64 debug verbosity

Signed-off-by: Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift.com>

 net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.10.ebuild   |  1 +
 net-mail/dovecot-fts-xapian/files/20240401_verbosity-fix.patch | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.10.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.10.ebuild
index 5287bc2d25..c3dcbbef8e 100644
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.10.ebuild
+++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.10.ebuild
@@ -26,6 +26,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/bug-887887_allow-O2-override.patch"
+	"${FILESDIR}/20240401_verbosity-fix.patch"
 )
 
 src_prepare() {

diff --git a/net-mail/dovecot-fts-xapian/files/20240401_verbosity-fix.patch b/net-mail/dovecot-fts-xapian/files/20240401_verbosity-fix.patch
new file mode 100644
index 0000000000..7f62757db8
--- /dev/null
+++ b/net-mail/dovecot-fts-xapian/files/20240401_verbosity-fix.patch
@@ -0,0 +1,10 @@
+--- a/src/fts-backend-xapian-functions.cpp
++++ b/src/fts-backend-xapian-functions.cpp
+@@ -383,7 +383,6 @@ class XNGram
+ 		{
+ 			ok=std::regex_match(s, base64Regex);
+ 		}
+-		if(ok) syslog(LOG_INFO,"Testing Base64 (%s) -> %ld",s.c_str(),(long)ok);
+ 		return ok;
+ 	}
+