diff options
| author | TBK <tbk@jjtc.dk> | 2017-11-01 01:02:01 +0100 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-11-01 09:57:54 +0000 |
| commit | 7462a561ae1233eafe409d9e5bf996457df28b37 (patch) | |
| tree | db463b5415141772c07048bb44c2155bb7f36ea3 | |
| parent | 844e10ec45007b8e8d1f3e686f197ba98e08546e (diff) | |
| download | aports-7462a561ae1233eafe409d9e5bf996457df28b37.tar.bz2 aports-7462a561ae1233eafe409d9e5bf996457df28b37.tar.xz | |
main/rsyslog: upgrade to 8.30.0; modernize
| -rw-r--r-- | main/rsyslog/APKBUILD | 27 | ||||
| -rw-r--r-- | main/rsyslog/musl-fix.patch | 8 |
2 files changed, 17 insertions, 18 deletions
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD index 71e49a8008..6456d64499 100644 --- a/main/rsyslog/APKBUILD +++ b/main/rsyslog/APKBUILD @@ -4,16 +4,16 @@ # Contributor: Ashley Sommer <ashleysommer@gmail.com> # Maintainer: Cameron Banta <cbanta@gmail.com> pkgname=rsyslog -pkgver=8.27.0 +pkgver=8.30.0 pkgrel=0 pkgdesc="Enhanced multi-threaded syslogd with database support and more." url="http://www.rsyslog.com/" arch="all" license="GPLv3 LGPL3" -depends="" +options="!check" makedepends="zlib-dev gnutls-dev mariadb-dev postgresql-dev net-snmp-dev libnet-dev libgcrypt-dev libee-dev libestr-dev liblogging-dev - libfastjson-dev util-linux-dev py-docutils hiredis-dev" + libfastjson-dev util-linux-dev py-docutils hiredis-dev linux-headers" subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-tls $pkgname-snmp $pkgname-hiredis $pkgname-dbg" source="http://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz @@ -49,15 +49,14 @@ build() { --enable-omhiredis \ --prefix=/usr \ --sysconfdir=/etc \ - --mandir=/usr/share/man \ - || return 1 - make || return 1 + --mandir=/usr/share/man + make } package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname @@ -70,7 +69,7 @@ mysql() { mkdir -p "$subpkgdir"/usr/lib/rsyslog/ mv "$pkgdir"/usr/lib/rsyslog/ommysql.so \ - "$subpkgdir"/usr/lib/rsyslog/ || return 1 + "$subpkgdir"/usr/lib/rsyslog/ } hiredis(){ @@ -78,7 +77,7 @@ hiredis(){ mkdir -p "$subpkgdir"/usr/lib/rsyslog/ mv "$pkgdir"/usr/lib/rsyslog/omhiredis.so \ - "$subpkgdir"/usr/lib/rsyslog/ || return 1 + "$subpkgdir"/usr/lib/rsyslog/ } pgsql() { @@ -86,7 +85,7 @@ pgsql() { mkdir -p "$subpkgdir"/usr/lib/rsyslog/ mv "$pkgdir"/usr/lib/rsyslog/ompgsql.so \ - "$subpkgdir"/usr/lib/rsyslog/ || return 1 + "$subpkgdir"/usr/lib/rsyslog/ } tls() { @@ -94,7 +93,7 @@ tls() { mkdir -p "$subpkgdir"/usr/lib/rsyslog/ mv "$pkgdir"/usr/lib/rsyslog/lmnsd_gtls.so \ - "$subpkgdir"/usr/lib/rsyslog/ || return 1 + "$subpkgdir"/usr/lib/rsyslog/ } snmp() { @@ -102,13 +101,13 @@ snmp() { mkdir -p "$subpkgdir"/usr/lib/rsyslog/ mv "$pkgdir"/usr/lib/rsyslog/omsnmp.so \ - "$subpkgdir"/usr/lib/rsyslog/ || return 1 + "$subpkgdir"/usr/lib/rsyslog/ } -sha512sums="dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753 rsyslog-8.27.0.tar.gz +sha512sums="90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0 rsyslog-8.30.0.tar.gz 9a4b184076a82e0899da79ab3749e1c67eac03f36c4460d34ed0385f4a3ffad53681a1cc25dd514e835c9399a9abd01c235743535ad549d5be7f66d9e127b9dc rsyslog.initd a4d969671800227129be870b0318961b79d16365663754111a136734bbf7005abd4da24853dfdc07b3b6691ab5a7b215f0ac6c19022b4c5c8dab06165a42431b rsyslog.confd d54377ddf39197656811a84272568ea761f984e19dd04fc54f372dd04a9244e66d02b26ab33073d0344d054f031660ec611f3c7a18c266e7b68cef5e2c47f06f rsyslog.logrotate 3bcd58b222eb7f4d8a42a0643cacb6ab44790f90c9bd550678e002bc19863d5d6a7341e5e5ba0b9292f85c6c04cd5cc42d174acdc63e8ba22022620db10f2b9b rsyslog.conf -20967235e8233588210071a7157a81fe02a1e88d7c7f55855fcc2fe34295269a6e3e3bfccb3d4dd83a6a48da28948c92d6ce47a0c5d817f6b6a4030635f4f896 musl-fix.patch +ebadfaf50a889530fc5106d9c4b0d5791dfd727f29b9f36de3b9233a463c5b55e5e899de359f592fb98ad6910be1dcc9d7c40ff79f641bdd1ca43498ea960e39 musl-fix.patch 7be105f9a30d23b48ee46e19d31ba37ec30477935a9f7ba3929666a9abe175313dbb7caf55fbb1c6579dd5d25fe037eea84cae9065fe3f765f23569344bce5d7 queue.patch" diff --git a/main/rsyslog/musl-fix.patch b/main/rsyslog/musl-fix.patch index bfd20b56ef..c4d4f0f13f 100644 --- a/main/rsyslog/musl-fix.patch +++ b/main/rsyslog/musl-fix.patch @@ -1,8 +1,8 @@ ---- rsyslog-8.16.0/runtime/rsyslog.h -+++ rsyslog-8.16.0-musl/runtime/rsyslog.h -@@ -643,3 +643,10 @@ +--- a/runtime/rsyslog.h ++++ b/runtime/rsyslog.h +@@ -683,3 +683,10 @@ #endif - + #endif /* multi-include protection */ + +/* musl patches for alpine */ |