1 |
commit: 998792c5836911dfcc891ec12bb250cf2a9c5550 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 5 23:34:03 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 5 23:35:38 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998792c5 |
7 |
|
8 |
app-admin/syslog-ng: fix libesmtp pkg-config patch |
9 |
|
10 |
Closes: https://bugs.gentoo.org/782643 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
.../files/syslog-ng-3.30.1-esmtp-pkgconfig.patch | 44 +++++++++++++++++----- |
14 |
...3.30.1-r1.ebuild => syslog-ng-3.30.1-r2.ebuild} | 2 +- |
15 |
app-admin/syslog-ng/syslog-ng-3.30.1.ebuild | 2 +- |
16 |
...ng-3.31.2.ebuild => syslog-ng-3.31.2-r1.ebuild} | 2 +- |
17 |
...ng-3.32.1.ebuild => syslog-ng-3.32.1-r1.ebuild} | 2 +- |
18 |
5 files changed, 38 insertions(+), 14 deletions(-) |
19 |
|
20 |
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 |
21 |
index ef4f72faa31..a9c761af98c 100644 |
22 |
--- a/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch |
23 |
+++ b/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch |
24 |
@@ -1,7 +1,25 @@ |
25 |
https://bugs.gentoo.org/782643 |
26 |
+https://github.com/syslog-ng/syslog-ng/pull/3669/commits/b8284f8ecac588f6a321c779cce06cbe182611a5 |
27 |
+ |
28 |
+From b8284f8ecac588f6a321c779cce06cbe182611a5 Mon Sep 17 00:00:00 2001 |
29 |
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= |
30 |
+ <laszlo.varady@××××××××××.com> |
31 |
+Date: Sun, 9 May 2021 03:43:46 +0200 |
32 |
+Subject: [PATCH] configure: add pkg-config detection for libesmtp |
33 |
+MIME-Version: 1.0 |
34 |
+Content-Type: text/plain; charset=UTF-8 |
35 |
+Content-Transfer-Encoding: 8bit |
36 |
+ |
37 |
+Signed-off-by: László Várady <laszlo.varady@××××××××××.com> |
38 |
+--- |
39 |
+ configure.ac | 22 +++++++++++++--------- |
40 |
+ 1 file changed, 13 insertions(+), 9 deletions(-) |
41 |
+ |
42 |
+diff --git a/configure.ac b/configure.ac |
43 |
+index 86b67ba9a2..bd6efa8711 100644 |
44 |
--- a/configure.ac |
45 |
+++ b/configure.ac |
46 |
-@@ -1270,20 +1270,9 @@ if test "x$enable_smtp" != "xno" && test "x$with_libesmtp" != "xno"; then |
47 |
+@@ -1278,15 +1278,19 @@ if test "x$enable_smtp" != "xno" && test "x$with_libesmtp" != "xno"; then |
48 |
CPPFLAGS="$CPPFLAGS_SAVE" |
49 |
LDFLAGS="$LDFLAGS_SAVE" |
50 |
else |
51 |
@@ -14,13 +32,19 @@ https://bugs.gentoo.org/782643 |
52 |
- AC_MSG_RESULT(no) |
53 |
- libesmtp=no |
54 |
- fi |
55 |
-- fi |
56 |
-- if test "x$enable_smtp" = "xyes" && test "x$libesmtp" = "xno"; then |
57 |
-- AC_MSG_ERROR(libESMTP not found) |
58 |
-+ PKG_CHECK_MODULES(libesmtp, libesmtp-1.0) |
59 |
++ PKG_CHECK_MODULES(LIBESMTP, libesmtp-1.0, libesmtp="yes", libesmtp="no") |
60 |
++ if test "x$libesmtp" = "xno"; then |
61 |
++ AC_MSG_CHECKING(for libESMTP with libesmtp-config) |
62 |
++ if libesmtp-config --version >/dev/null 2>&1; then |
63 |
++ AC_MSG_RESULT(yes) |
64 |
++ LIBESMTP_CFLAGS="`libesmtp-config --cflags`" |
65 |
++ LIBESMTP_LIBS="`libesmtp-config --libs`" |
66 |
++ libesmtp="yes" |
67 |
++ else |
68 |
++ AC_MSG_RESULT(no) |
69 |
++ libesmtp=no |
70 |
++ fi |
71 |
++ fi |
72 |
fi |
73 |
-- enable_smtp=$libesmtp |
74 |
-+ enable_smtp="yes" |
75 |
- fi |
76 |
- |
77 |
- dnl *************************************************************************** |
78 |
+ if test "x$enable_smtp" = "xyes" && test "x$libesmtp" = "xno"; then |
79 |
+ AC_MSG_ERROR(libESMTP not found) |
80 |
|
81 |
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 |
82 |
similarity index 99% |
83 |
rename from app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild |
84 |
rename to app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild |
85 |
index cd6baea156d..ee66ff52830 100644 |
86 |
--- a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild |
87 |
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild |
88 |
@@ -33,7 +33,7 @@ RDEPEND=" |
89 |
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) |
90 |
python? ( ${PYTHON_DEPS} ) |
91 |
redis? ( >=dev-libs/hiredis-0.11.0:= ) |
92 |
- smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) |
93 |
+ smtp? ( net-libs/libesmtp:= ) |
94 |
snmp? ( net-analyzer/net-snmp:0= ) |
95 |
spoof-source? ( net-libs/libnet:1.1= ) |
96 |
systemd? ( sys-apps/systemd:= ) |
97 |
|
98 |
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild |
99 |
index 32c3408b5c8..e4c316ec023 100644 |
100 |
--- a/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild |
101 |
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild |
102 |
@@ -33,7 +33,7 @@ RDEPEND=" |
103 |
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) |
104 |
python? ( ${PYTHON_DEPS} ) |
105 |
redis? ( >=dev-libs/hiredis-0.11.0:= ) |
106 |
- smtp? ( net-libs/libesmtp ) |
107 |
+ smtp? ( net-libs/libesmtp:= ) |
108 |
snmp? ( net-analyzer/net-snmp:0= ) |
109 |
spoof-source? ( net-libs/libnet:1.1= ) |
110 |
systemd? ( sys-apps/systemd:= ) |
111 |
|
112 |
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 |
113 |
similarity index 99% |
114 |
rename from app-admin/syslog-ng/syslog-ng-3.31.2.ebuild |
115 |
rename to app-admin/syslog-ng/syslog-ng-3.31.2-r1.ebuild |
116 |
index 3083efc9810..edfcf0964fb 100644 |
117 |
--- a/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild |
118 |
+++ b/app-admin/syslog-ng/syslog-ng-3.31.2-r1.ebuild |
119 |
@@ -34,7 +34,7 @@ RDEPEND=" |
120 |
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) |
121 |
python? ( ${PYTHON_DEPS} ) |
122 |
redis? ( >=dev-libs/hiredis-0.11.0:= ) |
123 |
- smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) |
124 |
+ smtp? ( net-libs/libesmtp:= ) |
125 |
snmp? ( net-analyzer/net-snmp:0= ) |
126 |
spoof-source? ( net-libs/libnet:1.1= ) |
127 |
systemd? ( sys-apps/systemd:= ) |
128 |
|
129 |
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 |
130 |
similarity index 99% |
131 |
rename from app-admin/syslog-ng/syslog-ng-3.32.1.ebuild |
132 |
rename to app-admin/syslog-ng/syslog-ng-3.32.1-r1.ebuild |
133 |
index a9238b77f77..d5c1a35ee05 100644 |
134 |
--- a/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild |
135 |
+++ b/app-admin/syslog-ng/syslog-ng-3.32.1-r1.ebuild |
136 |
@@ -34,7 +34,7 @@ RDEPEND=" |
137 |
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) |
138 |
python? ( ${PYTHON_DEPS} ) |
139 |
redis? ( >=dev-libs/hiredis-0.11.0:= ) |
140 |
- smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) |
141 |
+ smtp? ( net-libs/libesmtp:= ) |
142 |
snmp? ( net-analyzer/net-snmp:0= ) |
143 |
spoof-source? ( net-libs/libnet:1.1= ) |
144 |
systemd? ( sys-apps/systemd:= ) |