diff options
| author | Michael Pirogov <vbnet.ru@gmail.com> | 2019-11-13 15:07:25 +0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-12-05 06:30:50 +0100 |
| commit | ece6791454424c829c54b20edb0be413395eaeb3 (patch) | |
| tree | a43f43f4ceed979427ff714efad3d930b299e366 /main | |
| parent | 89a66a3f5d308e4281d40bd34d1e85f950794a73 (diff) | |
| download | aports-ece6791454424c829c54b20edb0be413395eaeb3.tar.bz2 aports-ece6791454424c829c54b20edb0be413395eaeb3.tar.xz | |
main/syslog-ng: config fixes fix config header version fix makedeps disable tests due to lack of criterion enable hw RNG
Diffstat (limited to 'main')
| -rw-r--r-- | main/syslog-ng/APKBUILD | 19 | ||||
| -rw-r--r-- | main/syslog-ng/syslog-ng.conf | 2 | ||||
| -rw-r--r-- | main/syslog-ng/syslog-ng.post-upgrade | 3 |
3 files changed, 14 insertions, 10 deletions
diff --git a/main/syslog-ng/APKBUILD b/main/syslog-ng/APKBUILD index 4d5e848411..e669df6979 100644 --- a/main/syslog-ng/APKBUILD +++ b/main/syslog-ng/APKBUILD @@ -1,18 +1,25 @@ +# Contributor: Michael Pirogov <vbnet.ru@gmail.com> # Contributor: jv <jens@eisfair.org> # Contributor: Adrian Guenter <adrian@gntr.me> # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: jv <jens@eisfair.org> pkgname=syslog-ng pkgver=3.22.1 -pkgrel=1 +pkgrel=2 pkgdesc="Next generation logging daemon" url="http://www.balabit.com" arch="all" license="GPL-2.0-or-later" +options="!check" # unit tests require https://github.com/Snaipe/Criterion with deps makedepends=" curl-dev eventlog-dev file + bison + flex + autoconf + automake + libtool geoip-dev glib-dev hiredis-dev @@ -59,18 +66,16 @@ for _i in $_modules; do done prepare() { - cd "$builddir" default_prepare # Remove bundled libraries rm -rf lib/ivykis rm -rf modules/afamqp/rabbitmq-c rm -rf modules/afmongodb/mongo-c-driver + autoreconf -if } build() { - cd "$builddir" - ./configure \ --prefix=/usr \ --sysconfdir=/etc/syslog-ng \ @@ -96,7 +101,7 @@ build() { --disable-java \ --disable-java-modules \ --enable-native \ - \ + --enable-rdrand \ --with-ivykis=system \ --with-jsonc=system \ --with-librabbitmq-client=system @@ -104,8 +109,6 @@ build() { } package() { - cd "$builddir" - make -j1 DESTDIR="$pkgdir" install cd "$pkgdir" @@ -169,6 +172,6 @@ _submv() { } sha512sums="4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f syslog-ng-3.22.1.tar.gz -2c9d51ece6f7fd8a7654f33c0f340447c2ef1865b0e4134537732576659c947699badbf33c6514995aa0a53fd729d0798e5637b9badc71fddd2f220dd09b99ea syslog-ng.conf +3e844f70564325f7b356e6cb6310c72473aedc14f8be3c3c7eb262184c84523648d3ea1de1aa40489529c97343026481e790ad92dfbcdc410a94e734fd744fc0 syslog-ng.conf 1825b85fb584c5cecf0ad370e81a7473b5c973ce10adce386d1ba5f68432abe4e2f54c937d7d94edb22dbd9031eff483bd113bc3244ce0d0072cf4bf4ab5c2cc syslog-ng.logrotate 873fef8815131f0acc618fa4911cd1eda59e260adc1eaae6eb91034900ce789f05ee48fa8afa4a87763026c18c87aef351e7ea76e0cbb46bcd5297f9ca14d527 syslog-ng.initd" diff --git a/main/syslog-ng/syslog-ng.conf b/main/syslog-ng/syslog-ng.conf index 486a4ab5e7..570d62ea08 100644 --- a/main/syslog-ng/syslog-ng.conf +++ b/main/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version:3.19 +@version:3.22 @include "scl.conf" # syslog-ng configuration file. diff --git a/main/syslog-ng/syslog-ng.post-upgrade b/main/syslog-ng/syslog-ng.post-upgrade index c6308c1b7c..931c09ab23 100644 --- a/main/syslog-ng/syslog-ng.post-upgrade +++ b/main/syslog-ng/syslog-ng.post-upgrade @@ -8,7 +8,8 @@ if [ "$(apk version -t "$ver_old" "3.18.1-r2")" = "<" ]; then * * The following modules has been moved to separate packages: * add-contextual-data, examples, graphite, map-value-pairs, - * python2, redis, stardate, stomp, tags-parser, xml. + * python2, redis, stardate, stomp, tags-parser, xml, geoip, + * http. * If you use one of these, install the relevant package(s), e.g.: * apk add syslog-ng-redis * |