mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 13:27:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/syslog-ng: fix build with json-c-0.13

Browse Source
This commit is contained in:
Natanael Copa 2018-04-19 15:02:28 +00:00
parent 6128fdbb8f
commit 9be285bf75
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/syslog-ng/APKBUILD
View File

@ -3,7 +3,7 @@
# Maintainer: jv <jens@eisfair.org> # Maintainer: jv <jens@eisfair.org>
pkgname=syslog-ng pkgname=syslog-ng
pkgver=3.13.2 pkgver=3.13.2
pkgrel=2 pkgrel=3
pkgdesc="Next generation logging daemon" pkgdesc="Next generation logging daemon"
url="http://www.balabit.com" url="http://www.balabit.com"
arch="all !aarch64" arch="all !aarch64"
@ -15,6 +15,7 @@ install="$pkgname.post-install"
subpackages="$pkgname-json" subpackages="$pkgname-json"
source="https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${pkgver}/syslog-ng-${pkgver}.tar.gz source="https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${pkgver}/syslog-ng-${pkgver}.tar.gz
json-c.patch
syslog-ng.logrotate syslog-ng.logrotate
syslog-ng.initd syslog-ng.initd
syslog-ng-destination.std syslog-ng-destination.std
@ -59,7 +60,7 @@ package() {
rm -f ${pkgdir}/usr/lib/libsyslog-ng.so rm -f ${pkgdir}/usr/lib/libsyslog-ng.so
rm -rf ${pkgdir}/usr/lib/$pkgname/libtest rm -rf ${pkgdir}/usr/lib/$pkgname/libtest
# getent module doesn't build properly as musl doesn't support reentrant # getent module doesn't build properly as musl doesn't support reentrant
# getprotoby[number|name] funcs. The provided compat lib only patches # getprotoby[number|name] funcs. The provided compat lib only patches
# solaris, which does provide reentrant versions under a different sig # solaris, which does provide reentrant versions under a different sig
rm -f ${pkgdir}/usr/lib/$pkgname/libtfgetent.so rm -f ${pkgdir}/usr/lib/$pkgname/libtfgetent.so
install -D -m755 "$srcdir"/$pkgname.initd ${pkgdir}/etc/init.d/$pkgname install -D -m755 "$srcdir"/$pkgname.initd ${pkgdir}/etc/init.d/$pkgname
@ -79,6 +80,7 @@ json() {
} }
sha512sums="fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe syslog-ng-3.13.2.tar.gz sha512sums="fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe syslog-ng-3.13.2.tar.gz
8c77a1bcdd5097c20c0f27c1ae9826c1cde1c1c4ad204e1085f138f315daefb1d05a8e00f6d71f77b06b9656f642a6dd8a3b6ba8665bb2f6d2f1bbd6318d17a3 json-c.patch
a062d1601f5215f60e2fc40c6ca498d768aa97af3647a9468731123a28fdd67962421b4412bfbe08a1123141b730cb78f102230ab72befec05ba7f398b39e27a syslog-ng.logrotate a062d1601f5215f60e2fc40c6ca498d768aa97af3647a9468731123a28fdd67962421b4412bfbe08a1123141b730cb78f102230ab72befec05ba7f398b39e27a syslog-ng.logrotate
84fa9b10268edd8cae2ed1fd4b0d8b7078afab050571e1f05ce45c95f97a650511e8dfe30f5815cf2582446ea9f4a45aafcde3a5ae373716cecb6395bc1dd16b syslog-ng.initd 84fa9b10268edd8cae2ed1fd4b0d8b7078afab050571e1f05ce45c95f97a650511e8dfe30f5815cf2582446ea9f4a45aafcde3a5ae373716cecb6395bc1dd16b syslog-ng.initd
b51d8b3da9584b6cb5b5c023b5ca1085d8e4c2cfa56f6ed12fe6feb0f33a390b43825aaaf4dd74eb6b7765485fe42f7f21c74380b72de9ed2c7775787ab1e720 syslog-ng-destination.std b51d8b3da9584b6cb5b5c023b5ca1085d8e4c2cfa56f6ed12fe6feb0f33a390b43825aaaf4dd74eb6b7765485fe42f7f21c74380b72de9ed2c7775787ab1e720 syslog-ng-destination.std

13
main/syslog-ng/json-c.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c
index 0368ed8..c4d1c23 100644
--- a/modules/json/json-parser.c
+++ b/modules/json/json-parser.c
@@ -28,7 +28,7 @@
#include <ctype.h>
#include <json.h>
-#include <json_object_private.h>
+#include <json_object.h>
typedef struct _JSONParser
{