diff options
| author | Łukasz Jendrysik <scadu@yandex.com> | 2015-01-26 11:57:11 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-01-26 14:21:30 +0000 |
| commit | 0429d2b57c4ba88c139233a3730bc71163cd0239 (patch) | |
| tree | f036d97b6d61b912c9706f1aa2b004ae9cd043f2 /main/rsyslog | |
| parent | 36dcb0a4da0b8096c369a230bd2b0e5f43dc30c9 (diff) | |
| download | aports-0429d2b57c4ba88c139233a3730bc71163cd0239.tar.bz2 aports-0429d2b57c4ba88c139233a3730bc71163cd0239.tar.xz | |
main/rsyslog: upgrade to 8.7.0, rebuild against mariadb
Diffstat (limited to 'main/rsyslog')
| -rw-r--r-- | main/rsyslog/APKBUILD | 24 | ||||
| -rw-r--r-- | main/rsyslog/musl-fix-headers.patch | 26 | ||||
| -rw-r--r-- | main/rsyslog/musl-fix.patch | 12 |
3 files changed, 23 insertions, 39 deletions
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD index 6d9c5e85de..2eb382976b 100644 --- a/main/rsyslog/APKBUILD +++ b/main/rsyslog/APKBUILD @@ -1,13 +1,14 @@ +# Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: Cameron Banta <cbanta@gmail.com> # Contributor: cbanta@gmail.com pkgname=rsyslog -pkgver=8.4.2 -pkgrel=1 +pkgver=8.7.0 +pkgrel=0 pkgdesc="Enhanced multi-threaded syslogd with database support and more." url="http://www.rsyslog.com/" arch="all" license="GPLv3 LGPL-3" -makedepends="zlib-dev gnutls-dev mysql-dev postgresql-dev net-snmp-dev +makedepends="zlib-dev gnutls-dev mariadb-dev postgresql-dev net-snmp-dev libnet-dev libgcrypt-dev libee-dev libestr-dev liblogging-dev json-c-dev util-linux-dev py-docutils" subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-tls $pkgname-snmp @@ -17,8 +18,7 @@ source="http://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.confd $pkgname.logrotate $pkgname.conf - musl-fix-headers.patch - " + musl-fix.patch" _builddir="$srcdir"/$pkgname-$pkgver @@ -30,12 +30,10 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - update_config_sub || return 1 } build() { cd "$_builddir" - export LDFLAGS="-lestr" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -96,21 +94,21 @@ snmp() { mv "$pkgdir"/usr/lib/rsyslog/omsnmp.so "$subpkgdir"/usr/lib/rsyslog/ } -md5sums="5d0f39d5a4fdd4b3b91d80450f17f22e rsyslog-8.4.2.tar.gz +md5sums="f0706b07444b2d5e238486e10ec1a821 rsyslog-8.7.0.tar.gz 6b63d774eb718bc1ab91f3fb5471ade3 rsyslog.initd 0a0aef98f677364e6178c34274df7723 rsyslog.confd bc43debc9ffdf66bc1409025fd3d1176 rsyslog.logrotate 65fbf5a7a81a53a70974e3085e96cb41 rsyslog.conf -30c454c237739a51cf0aedcd8f9b1a3d musl-fix-headers.patch" -sha256sums="71c3c6dac74fba2692f9fefb092cd3d22e2bd71eb702e0da06648de51b8b7b9a rsyslog-8.4.2.tar.gz +05a0995f5cbe241720aaf6b149860286 musl-fix.patch" +sha256sums="c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c rsyslog-8.7.0.tar.gz dfe1c50766df7bf862507f8f0819e01f78c3054e57e8c4db1f16b3874a04094c rsyslog.initd c476c2180fcceaf581d26d2da6201fbe7a2b9fc89c58456fdb3bdaf18a4cbb56 rsyslog.confd f0effc19bd1f1bfa367d65d6516c73509cb34545157b9e91cf6e437685dd3fe5 rsyslog.logrotate 559a8221d2ef9376a77e08de05206f3d2214a81fa88649f5bca2a1207f8918c5 rsyslog.conf -cb08b2b823fbd38d2bb72e5a3702b5f80f2652fe8d0b04401580bc04fcfcd7e8 musl-fix-headers.patch" -sha512sums="f3a8af9c859fac4f490d8836f2083125c2daddf0647df06318628ad92cb63538612ecdc78f725bd3e3725a3c79f0c06a67fafe6a2fd5c9194fa18020de6d3847 rsyslog-8.4.2.tar.gz +feda2d9ca6c788e375116b6c43b6c4ac5debe83dab0efcfc9a47216c9af36599 musl-fix.patch" +sha512sums="53feac42c14134d76f5592ee491bb56fb2c4c33822a7a5609a5267b6911a5c5c4e73c5d66a913a666967d8826ee3077b91d8d2a1d1b60bcb3d425b35ec4677b0 rsyslog-8.7.0.tar.gz e35f07e9ce499b874bcc441cb3fa1f7a1c545bc72fec24f96debfbe00dff4d0a27d987c7cc70fd160c718bd25d9a0d291c241fc527aeef897842b7c8a48b35d3 rsyslog.initd c216674e6867d655c2c09b6205071591ae2b1611ad5dd0346e682733abafa8a1be261fdd9bb985bb5d05d5bfa708a68262b1a94e654a2c18d352fd02d6f950a3 rsyslog.confd d54377ddf39197656811a84272568ea761f984e19dd04fc54f372dd04a9244e66d02b26ab33073d0344d054f031660ec611f3c7a18c266e7b68cef5e2c47f06f rsyslog.logrotate 032ccce1850bc89fb37b4b23f1607ce73086ff2b057838a1b83e36751ee0412c537fc0c9cbc2c6e8098311e6a04569c7fc7f7dea80111e8c8623b3b0cc3cccd1 rsyslog.conf -46795d203ede87ce313bd34e0cad6c116904ae3bb4b5b46449e7f49ba1f20d4d43e54e88f77d730277d3117f93fc250c1c93cfe2f03fdfc7f3c880adcf5629ad musl-fix-headers.patch" +d5f16d624b40fcd68f689bb65cfad8f537b35f3d7f9c4453c472b21437964442baf0846b3658a6cdd2e0d44b60085140deffc68cf9e3c460bcc5db40cf142ee1 musl-fix.patch" diff --git a/main/rsyslog/musl-fix-headers.patch b/main/rsyslog/musl-fix-headers.patch deleted file mode 100644 index a6dafc428a..0000000000 --- a/main/rsyslog/musl-fix-headers.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- ./tools/omfile.c.orig -+++ ./tools/omfile.c -@@ -47,10 +47,7 @@ - #include <ctype.h> - #include <libgen.h> - #include <unistd.h> --#include <sys/file.h> --#ifdef OS_SOLARIS --# include <fcntl.h> --#endif -+#include <fcntl.h> - #ifdef HAVE_ATOMIC_BUILTINS - # include <pthread.h> - #endif ---- ./tools/pidfile.c.orig -+++ ./tools/pidfile.c -@@ -36,9 +36,7 @@ - #include <string.h> - #include <errno.h> - #include <signal.h> --#ifdef __sun - #include <fcntl.h> --#endif - - #include "srUtils.h" - diff --git a/main/rsyslog/musl-fix.patch b/main/rsyslog/musl-fix.patch new file mode 100644 index 0000000000..698443c003 --- /dev/null +++ b/main/rsyslog/musl-fix.patch @@ -0,0 +1,12 @@ +diff --git a/tools/omfile.c.orig b/tools/omfile.c +index 015f453..8e0b6f4 100644 +--- a/tools/omfile.c.orig ++++ b/tools/omfile.c +@@ -48,6 +48,7 @@ + #include <libgen.h> + #include <unistd.h> + #include <sys/file.h> ++#include <fcntl.h> + #ifdef OS_SOLARIS + # include <fcntl.h> + #endif |