From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1299533-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 777AF13933E
for <garchives@archives.gentoo.org>; Mon, 5 Jul 2021 23:36:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C38A0E09C3;
Mon, 5 Jul 2021 23:36:01 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 264EBE09C3
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Jul 2021 23:36:01 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 2D3E433BE65
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Jul 2021 23:36:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D8112174
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Jul 2021 23:35:58 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1625528138.998792c5836911dfcc891ec12bb250cf2a9c5550.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/, app-admin/syslog-ng/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild app-admin/syslog-ng/syslog-ng-3.30.1.ebuild app-admin/syslog-ng/syslog-ng-3.31.2-r1.ebuild app-admin/syslog-ng/syslog-ng-3.31.2.ebuild app-admin/syslog-ng/syslog-ng-3.32.1-r1.ebuild app-admin/syslog-ng/syslog-ng-3.32.1.ebuild
X-VCS-Directories: app-admin/syslog-ng/files/ app-admin/syslog-ng/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 998792c5836911dfcc891ec12bb250cf2a9c5550
X-VCS-Branch: master
Date: Mon, 5 Jul 2021 23:35:58 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 731b6b39-6d54-4ddc-b9bd-7e3007d80d90
X-Archives-Hash: ea0a31144ebd9d0d22a48a57d78218ad
commit: 998792c5836911dfcc891ec12bb250cf2a9c5550
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 5 23:34:03 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 5 23:35:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998792c5
app-admin/syslog-ng: fix libesmtp pkg-config patch
Closes: https://bugs.gentoo.org/782643
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/syslog-ng-3.30.1-esmtp-pkgconfig.patch | 44 +++++++++++++++++-----
...3.30.1-r1.ebuild => syslog-ng-3.30.1-r2.ebuild} | 2 +-
app-admin/syslog-ng/syslog-ng-3.30.1.ebuild | 2 +-
...ng-3.31.2.ebuild => syslog-ng-3.31.2-r1.ebuild} | 2 +-
...ng-3.32.1.ebuild => syslog-ng-3.32.1-r1.ebuild} | 2 +-
5 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch b/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
index ef4f72faa31..a9c761af98c 100644
--- a/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
+++ b/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
@@ -1,7 +1,25 @@
https://bugs.gentoo.org/782643
+https://github.com/syslog-ng/syslog-ng/pull/3669/commits/b8284f8ecac588f6a321c779cce06cbe182611a5
+
+From b8284f8ecac588f6a321c779cce06cbe182611a5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?=
+ <laszlo.varady@protonmail.com>
+Date: Sun, 9 May 2021 03:43:46 +0200
+Subject: [PATCH] configure: add pkg-config detection for libesmtp
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: László Várady <laszlo.varady@protonmail.com>
+---
+ configure.ac | 22 +++++++++++++---------
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 86b67ba9a2..bd6efa8711 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1270,20 +1270,9 @@ if test "x$enable_smtp" != "xno" && test "x$with_libesmtp" != "xno"; then
+@@ -1278,15 +1278,19 @@ if test "x$enable_smtp" != "xno" && test "x$with_libesmtp" != "xno"; then
CPPFLAGS="$CPPFLAGS_SAVE"
LDFLAGS="$LDFLAGS_SAVE"
else
@@ -14,13 +32,19 @@ https://bugs.gentoo.org/782643
- AC_MSG_RESULT(no)
- libesmtp=no
- fi
-- fi
-- if test "x$enable_smtp" = "xyes" && test "x$libesmtp" = "xno"; then
-- AC_MSG_ERROR(libESMTP not found)
-+ PKG_CHECK_MODULES(libesmtp, libesmtp-1.0)
++ PKG_CHECK_MODULES(LIBESMTP, libesmtp-1.0, libesmtp="yes", libesmtp="no")
++ if test "x$libesmtp" = "xno"; then
++ AC_MSG_CHECKING(for libESMTP with libesmtp-config)
++ if libesmtp-config --version >/dev/null 2>&1; then
++ AC_MSG_RESULT(yes)
++ LIBESMTP_CFLAGS="`libesmtp-config --cflags`"
++ LIBESMTP_LIBS="`libesmtp-config --libs`"
++ libesmtp="yes"
++ else
++ AC_MSG_RESULT(no)
++ libesmtp=no
++ fi
++ fi
fi
-- enable_smtp=$libesmtp
-+ enable_smtp="yes"
- fi
-
- dnl ***************************************************************************
+ if test "x$enable_smtp" = "xyes" && test "x$libesmtp" = "xno"; then
+ AC_MSG_ERROR(libESMTP not found)
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild
similarity index 99%
rename from app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
rename to app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild
index cd6baea156d..ee66ff52830 100644
--- a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
python? ( ${PYTHON_DEPS} )
redis? ( >=dev-libs/hiredis-0.11.0:= )
- smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= )
+ smtp? ( net-libs/libesmtp:= )
snmp? ( net-analyzer/net-snmp:0= )
spoof-source? ( net-libs/libnet:1.1= )
systemd? ( sys-apps/systemd:= )
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
index 32c3408b5c8..e4c316ec023 100644
--- a/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
python? ( ${PYTHON_DEPS} )
redis? ( >=dev-libs/hiredis-0.11.0:= )
- smtp? ( net-libs/libesmtp )
+ smtp? ( net-libs/libesmtp:= )
snmp? ( net-analyzer/net-snmp:0= )
spoof-source? ( net-libs/libnet:1.1= )
systemd? ( sys-apps/systemd:= )
diff --git a/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.31.2-r1.ebuild
similarity index 99%
rename from app-admin/syslog-ng/syslog-ng-3.31.2.ebuild
rename to app-admin/syslog-ng/syslog-ng-3.31.2-r1.ebuild
index 3083efc9810..edfcf0964fb 100644
--- a/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.31.2-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
python? ( ${PYTHON_DEPS} )
redis? ( >=dev-libs/hiredis-0.11.0:= )
- smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= )
+ smtp? ( net-libs/libesmtp:= )
snmp? ( net-analyzer/net-snmp:0= )
spoof-source? ( net-libs/libnet:1.1= )
systemd? ( sys-apps/systemd:= )
diff --git a/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.32.1-r1.ebuild
similarity index 99%
rename from app-admin/syslog-ng/syslog-ng-3.32.1.ebuild
rename to app-admin/syslog-ng/syslog-ng-3.32.1-r1.ebuild
index a9238b77f77..d5c1a35ee05 100644
--- a/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.32.1-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
python? ( ${PYTHON_DEPS} )
redis? ( >=dev-libs/hiredis-0.11.0:= )
- smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= )
+ smtp? ( net-libs/libesmtp:= )
snmp? ( net-analyzer/net-snmp:0= )
spoof-source? ( net-libs/libnet:1.1= )
systemd? ( sys-apps/systemd:= )