[arch-commits] Commit in syslog-ng/trunk (PKGBUILD)

[Florian Pritz]

    Date: Sunday, July 11, 2021 @ 06:56:44
  Author: bluewind
Revision: 419515

Revert "libesmtp 1.1 rebuild"

From: Laszlo Varady <laszlo.varady93 at gmail.com>
Date: Tue, 6 Jul 2021 18:28:12 +0200

The new pkgconfig-based libesmtp detection is now part of the official
syslog-ng release: https://github.com/syslog-ng/syslog-ng/pull/3669.

The reverted patch is not needed anymore.

Modified:
  syslog-ng/trunk/PKGBUILD

----------+
 PKGBUILD |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-11 06:20:24 UTC (rev 419514)
+++ PKGBUILD	2021-07-11 06:56:44 UTC (rev 419515)
@@ -29,18 +29,15 @@
         'etc/logrotate.d/syslog-ng'
         'etc/default/syslog-ng at default')
 source=(https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver/$pkgname-$pkgver.tar.gz
-        syslog-ng.conf syslog-ng.logrotate
-        syslog-ng-libesmtp-1.1.patch::https://github.com/syslog-ng/syslog-ng/commit/b8284f8e.patch)
+        syslog-ng.conf syslog-ng.logrotate)
 sha512sums=('c5a72e4815c2791cb609cbb93993cbb2c52f3ac869e062984b6a359f11232f523c5db3555857f0fef0071764a677f1efdb2aa1f24b4abe7cea13590973d09280'
             '29beb12baa60b959d7cbc105545a5334bcee200e49f2b5d12ce51139a7e916fe2afcd505a265ce402e7f88b8cbb42e98a6b06cff1b641368dd9ee459177bf9cc'
-            'cd39f545a6a855c866a466bf846e33940b2c2dd1fc2eaf50cce29c68e1a5753c7c4b56411e4f01c152f32e155104a98dd755a96319767f47c73a8853f720b2cc'
-            'a70e5e2535b16aee2bbb51c1278d6c7c2dd709ce84f3234539543d958559c4972a2053c6781ca8fd391bb9c239c847aba336c8da892724e63c2ab2fbd5063d78')
+            'cd39f545a6a855c866a466bf846e33940b2c2dd1fc2eaf50cce29c68e1a5753c7c4b56411e4f01c152f32e155104a98dd755a96319767f47c73a8853f720b2cc')
 
 prepare() {
   cd $pkgname-$pkgver
   sed -i -e 's,/bin/,/usr/bin/,' -e 's,/sbin/,/bin/,' contrib/systemd/syslog-ng at .service
   sed -i -e 's|/var/run|/run|g' contrib/systemd/syslog-ng at default
-  patch -p1 < ../syslog-ng-libesmtp-1.1.patch # Add pkgconfig based detection for libesmtp 1.1
 }
 
 build() {
@@ -52,7 +49,6 @@
     --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --enable-manpages --enable-all-modules --disable-java --disable-java-modules  \
     --disable-riemann --with-python=3 --with-jsonc=system
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool # Fix overlinking
   make
 }