Gentoo Archives: gentoo-commits

From: John Helmert III <ajak@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/
Date: Wed, 22 Dec 2021 07:56:53
Message-Id: 1640159676.3daa1de4626fc42656ae9a366581d191007185b6.ajak@gentoo
1 commit: 3daa1de4626fc42656ae9a366581d191007185b6
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Wed Dec 22 07:08:44 2021 +0000
4 Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 22 07:54:36 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3daa1de4
7
8 app-admin/syslog-ng: remove unused patch
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/23465
13 Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
14
15 .../files/syslog-ng-3.30.1-esmtp-pkgconfig.patch | 50 ----------------------
16 1 file changed, 50 deletions(-)
17
18 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
19 deleted file mode 100644
20 index a9c761af98c2..000000000000
21 --- a/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
22 +++ /dev/null
23 @@ -1,50 +0,0 @@
24 -https://bugs.gentoo.org/782643
25 -https://github.com/syslog-ng/syslog-ng/pull/3669/commits/b8284f8ecac588f6a321c779cce06cbe182611a5
26 -
27 -From b8284f8ecac588f6a321c779cce06cbe182611a5 Mon Sep 17 00:00:00 2001
28 -From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?=
29 - <laszlo.varady@××××××××××.com>
30 -Date: Sun, 9 May 2021 03:43:46 +0200
31 -Subject: [PATCH] configure: add pkg-config detection for libesmtp
32 -MIME-Version: 1.0
33 -Content-Type: text/plain; charset=UTF-8
34 -Content-Transfer-Encoding: 8bit
35 -
36 -Signed-off-by: László Várady <laszlo.varady@××××××××××.com>
37 ----
38 - configure.ac | 22 +++++++++++++---------
39 - 1 file changed, 13 insertions(+), 9 deletions(-)
40 -
41 -diff --git a/configure.ac b/configure.ac
42 -index 86b67ba9a2..bd6efa8711 100644
43 ---- a/configure.ac
44 -+++ b/configure.ac
45 -@@ -1278,15 +1278,19 @@ if test "x$enable_smtp" != "xno" && test "x$with_libesmtp" != "xno"; then
46 - CPPFLAGS="$CPPFLAGS_SAVE"
47 - LDFLAGS="$LDFLAGS_SAVE"
48 - else
49 -- AC_MSG_CHECKING(for libESMTP)
50 -- if libesmtp-config --version >/dev/null 2>&1; then
51 -- AC_MSG_RESULT(yes)
52 -- LIBESMTP_CFLAGS="`libesmtp-config --cflags`"
53 -- LIBESMTP_LIBS="`libesmtp-config --libs`"
54 -- else
55 -- AC_MSG_RESULT(no)
56 -- libesmtp=no
57 -- fi
58 -+ PKG_CHECK_MODULES(LIBESMTP, libesmtp-1.0, libesmtp="yes", libesmtp="no")
59 -+ if test "x$libesmtp" = "xno"; then
60 -+ AC_MSG_CHECKING(for libESMTP with libesmtp-config)
61 -+ if libesmtp-config --version >/dev/null 2>&1; then
62 -+ AC_MSG_RESULT(yes)
63 -+ LIBESMTP_CFLAGS="`libesmtp-config --cflags`"
64 -+ LIBESMTP_LIBS="`libesmtp-config --libs`"
65 -+ libesmtp="yes"
66 -+ else
67 -+ AC_MSG_RESULT(no)
68 -+ libesmtp=no
69 -+ fi
70 -+ fi
71 - fi
72 - if test "x$enable_smtp" = "xyes" && test "x$libesmtp" = "xno"; then
73 - AC_MSG_ERROR(libESMTP not found)