aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-06-03 06:17:21 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-06-03 06:17:21 +0000
commitbeadf77f06d086972b6bd96a69191610ac698f2f (patch)
tree426a5b57b792e25424cb2e2c23a8c71872036806
parentefb895ec4aadba6d76f3679c75e784a19e8422fb (diff)
downloadalpine_aports-beadf77f06d086972b6bd96a69191610ac698f2f.tar.bz2
alpine_aports-beadf77f06d086972b6bd96a69191610ac698f2f.tar.xz
alpine_aports-beadf77f06d086972b6bd96a69191610ac698f2f.zip
main/rsyslog: upgrade to 8.2.1
Diffstat
-rw-r--r--main/rsyslog/APKBUILD31
-rw-r--r--main/rsyslog/musl-fix-headers.patch58
2 files changed, 39 insertions, 50 deletions
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index 0d1a54e09c..233f63756a 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -1,28 +1,29 @@
1# Maintainer: Cameron Banta <cbanta@gmail.com> 1# Maintainer: Cameron Banta <cbanta@gmail.com>
2# Contributor: cbanta@gmail.com 2# Contributor: cbanta@gmail.com
3pkgname=rsyslog 3pkgname=rsyslog
4pkgver=6.4.2 4pkgver=8.2.1
5pkgrel=2 5pkgrel=0
6pkgdesc="Enhanced multi-threaded syslogd with database support and more." 6pkgdesc="Enhanced multi-threaded syslogd with database support and more."
7url="http://www.rsyslog.com/" 7url="http://www.rsyslog.com/"
8arch="all" 8arch="all"
9license="GPLv3 LGPL-3" 9license="GPLv3 LGPL-3"
10makedepends="zlib-dev gnutls-dev mysql-dev postgresql-dev net-snmp-dev 10makedepends="zlib-dev gnutls-dev mysql-dev postgresql-dev net-snmp-dev
11 libnet-dev libgcrypt-dev libee-dev libestr-dev" 11 libnet-dev libgcrypt-dev libee-dev libestr-dev liblogging-dev
12 json-c-dev"
12subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-tls $pkgname-snmp" 13subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-tls $pkgname-snmp"
13source="http://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz 14source="http://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz
14 musl-fix-headers.patch
15 $pkgname.initd 15 $pkgname.initd
16 $pkgname.confd 16 $pkgname.confd
17 $pkgname.logrotate 17 $pkgname.logrotate
18 $pkgname.conf" 18 $pkgname.conf
19 musl-fix-headers.patch
20 "
19 21
20 22
21_builddir="$srcdir"/$pkgname-$pkgver 23_builddir="$srcdir"/$pkgname-$pkgver
22 24
23prepare() { 25prepare() {
24 cd "$_builddir" 26 cd "$_builddir"
25 update_config_sub || return 1
26 for i in $source; do 27 for i in $source; do
27 case $i in 28 case $i in
28 *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; 29 *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -93,21 +94,21 @@ snmp() {
93 mv "$pkgdir"/usr/lib/rsyslog/omsnmp.so "$subpkgdir"/usr/lib/rsyslog/ 94 mv "$pkgdir"/usr/lib/rsyslog/omsnmp.so "$subpkgdir"/usr/lib/rsyslog/
94} 95}
95 96
96md5sums="7de0124ec7d67ce2bfda0009ab1263ee rsyslog-6.4.2.tar.gz 97md5sums="be8c0117e29b6a0313a3b8148f562e07 rsyslog-8.2.1.tar.gz
97a151d938f3cbdc216100ea1751e4df10 musl-fix-headers.patch
986b63d774eb718bc1ab91f3fb5471ade3 rsyslog.initd 986b63d774eb718bc1ab91f3fb5471ade3 rsyslog.initd
990a0aef98f677364e6178c34274df7723 rsyslog.confd 990a0aef98f677364e6178c34274df7723 rsyslog.confd
100bc43debc9ffdf66bc1409025fd3d1176 rsyslog.logrotate 100bc43debc9ffdf66bc1409025fd3d1176 rsyslog.logrotate
10165fbf5a7a81a53a70974e3085e96cb41 rsyslog.conf" 10165fbf5a7a81a53a70974e3085e96cb41 rsyslog.conf
102sha256sums="ca92434c87f7390a5ea7ce6aea94c6cb05474bf778ec5d8ebc0b9a50f321749c rsyslog-6.4.2.tar.gz 10230c454c237739a51cf0aedcd8f9b1a3d musl-fix-headers.patch"
103290aaa384b063b0ac09f4d06ef394dec2606030b87b23bd75625f0bf20106692 musl-fix-headers.patch 103sha256sums="193901c359b8228a85dca7a6a2e715ab2b52c18a66ca9f805d4028bedff98196 rsyslog-8.2.1.tar.gz
104dfe1c50766df7bf862507f8f0819e01f78c3054e57e8c4db1f16b3874a04094c rsyslog.initd 104dfe1c50766df7bf862507f8f0819e01f78c3054e57e8c4db1f16b3874a04094c rsyslog.initd
105c476c2180fcceaf581d26d2da6201fbe7a2b9fc89c58456fdb3bdaf18a4cbb56 rsyslog.confd 105c476c2180fcceaf581d26d2da6201fbe7a2b9fc89c58456fdb3bdaf18a4cbb56 rsyslog.confd
106f0effc19bd1f1bfa367d65d6516c73509cb34545157b9e91cf6e437685dd3fe5 rsyslog.logrotate 106f0effc19bd1f1bfa367d65d6516c73509cb34545157b9e91cf6e437685dd3fe5 rsyslog.logrotate
107559a8221d2ef9376a77e08de05206f3d2214a81fa88649f5bca2a1207f8918c5 rsyslog.conf" 107559a8221d2ef9376a77e08de05206f3d2214a81fa88649f5bca2a1207f8918c5 rsyslog.conf
108sha512sums="7d6d16fd7334f814040878debdca7815bfa00fb8e996052b04dfbe379681dfcbb2213dc779f9407b8fb861b07a829fb0cf3bd9ec697b7affd38e338ca2ab93b8 rsyslog-6.4.2.tar.gz 108cb08b2b823fbd38d2bb72e5a3702b5f80f2652fe8d0b04401580bc04fcfcd7e8 musl-fix-headers.patch"
109a38b7b575f55614e8aae4408d22ad39371174f58ffd1f870510d07cdc3a2c2577a25934746e376c6919e1f2ccfed00f7ea01ab862aa656e7b4c945af7553e3e3 musl-fix-headers.patch 109sha512sums="e4aa4052e4322cd1657c31f72a707c3de559a41d253d104758129670436d58796c34656200765c94d2ad8f46aee3e8c340cc40a57138e810910ce7f019cf04e9 rsyslog-8.2.1.tar.gz
110e35f07e9ce499b874bcc441cb3fa1f7a1c545bc72fec24f96debfbe00dff4d0a27d987c7cc70fd160c718bd25d9a0d291c241fc527aeef897842b7c8a48b35d3 rsyslog.initd 110e35f07e9ce499b874bcc441cb3fa1f7a1c545bc72fec24f96debfbe00dff4d0a27d987c7cc70fd160c718bd25d9a0d291c241fc527aeef897842b7c8a48b35d3 rsyslog.initd
111c216674e6867d655c2c09b6205071591ae2b1611ad5dd0346e682733abafa8a1be261fdd9bb985bb5d05d5bfa708a68262b1a94e654a2c18d352fd02d6f950a3 rsyslog.confd 111c216674e6867d655c2c09b6205071591ae2b1611ad5dd0346e682733abafa8a1be261fdd9bb985bb5d05d5bfa708a68262b1a94e654a2c18d352fd02d6f950a3 rsyslog.confd
112d54377ddf39197656811a84272568ea761f984e19dd04fc54f372dd04a9244e66d02b26ab33073d0344d054f031660ec611f3c7a18c266e7b68cef5e2c47f06f rsyslog.logrotate 112d54377ddf39197656811a84272568ea761f984e19dd04fc54f372dd04a9244e66d02b26ab33073d0344d054f031660ec611f3c7a18c266e7b68cef5e2c47f06f rsyslog.logrotate
113032ccce1850bc89fb37b4b23f1607ce73086ff2b057838a1b83e36751ee0412c537fc0c9cbc2c6e8098311e6a04569c7fc7f7dea80111e8c8623b3b0cc3cccd1 rsyslog.conf" 113032ccce1850bc89fb37b4b23f1607ce73086ff2b057838a1b83e36751ee0412c537fc0c9cbc2c6e8098311e6a04569c7fc7f7dea80111e8c8623b3b0cc3cccd1 rsyslog.conf
11446795d203ede87ce313bd34e0cad6c116904ae3bb4b5b46449e7f49ba1f20d4d43e54e88f77d730277d3117f93fc250c1c93cfe2f03fdfc7f3c880adcf5629ad musl-fix-headers.patch"
diff --git a/main/rsyslog/musl-fix-headers.patch b/main/rsyslog/musl-fix-headers.patch
index c14c94085a..a6dafc428a 100644
--- a/main/rsyslog/musl-fix-headers.patch
+++ b/main/rsyslog/musl-fix-headers.patch
@@ -1,38 +1,26 @@
1--- rsyslog-6.4.2.orig/tools/omfile.c 1--- ./tools/omfile.c.orig
2+++ rsyslog-6.4.2/tools/omfile.c 2+++ ./tools/omfile.c
3@@ -37,6 +37,7 @@ 3@@ -47,10 +47,7 @@
4 */ 4 #include <ctype.h>
5 #include "config.h" 5 #include <libgen.h>
6 #include "rsyslog.h"
7+#include <fcntl.h>
8 #include <stdio.h>
9 #include <stdarg.h>
10 #include <stdlib.h>
11--- rsyslog-6.4.2.orig/tools/pidfile.c
12+++ rsyslog-6.4.2/tools/pidfile.c
13@@ -29,6 +29,7 @@
14 * First version (v0.2) released
15 */
16
17+#include <fcntl.h>
18 #include <stdio.h>
19 #include <unistd.h>
20 #include <sys/stat.h>
21--- rsyslog-6.4.2.orig/tools/syslogd.c
22+++ rsyslog-6.4.2/tools/syslogd.c
23@@ -46,13 +46,14 @@
24 #define DEFUPRI (LOG_USER|LOG_NOTICE)
25 #define TIMERINTVL 30 /* interval for checking flush, mark */
26
27+#define GNU_SOURCE
28 #include <unistd.h> 6 #include <unistd.h>
29 #include <stdlib.h> 7-#include <sys/file.h>
30 #include <stdio.h> 8-#ifdef OS_SOLARIS
9-# include <fcntl.h>
10-#endif
31+#include <fcntl.h> 11+#include <fcntl.h>
32 #include <stddef.h> 12 #ifdef HAVE_ATOMIC_BUILTINS
33 #include <ctype.h> 13 # include <pthread.h>
34 #include <limits.h> 14 #endif
35-#define GNU_SOURCE 15--- ./tools/pidfile.c.orig
16+++ ./tools/pidfile.c
17@@ -36,9 +36,7 @@
36 #include <string.h> 18 #include <string.h>
37 #include <stdarg.h> 19 #include <errno.h>
38 #include <time.h> 20 #include <signal.h>
21-#ifdef __sun
22 #include <fcntl.h>
23-#endif
24
25 #include "srUtils.h"
26
© 2015 Mike Crute