aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2019-01-27 00:34:00 +0100
committerJakub Jirutka <jakub@jirutka.cz>2019-01-28 01:51:37 +0100
commite5d012de60e3e83dd28cd5e592ad3282a55031fe (patch)
treedb5eab2c2683eb7d41c8bcaf963fb76e185909fe
parentc09f399cfd19723402bcf02246f8bc77f521a652 (diff)
downloadalpine_aports-e5d012de60e3e83dd28cd5e592ad3282a55031fe.tar.bz2
alpine_aports-e5d012de60e3e83dd28cd5e592ad3282a55031fe.tar.xz
alpine_aports-e5d012de60e3e83dd28cd5e592ad3282a55031fe.zip
main/rsyslog: move omudpspoof lmcry_gcry fmhttp omtesting to subpkgs
These plugins have some dependencies, except omtesting that is useful only for testing/debugging.
-rw-r--r--main/rsyslog/APKBUILD5
-rw-r--r--main/rsyslog/rsyslog.post-upgrade15
2 files changed, 20 insertions, 0 deletions
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index f4033663f6..636ed0b118 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -28,6 +28,7 @@ makedepends="
28 util-linux-dev 28 util-linux-dev
29 zlib-dev 29 zlib-dev
30 " 30 "
31install="$pkgname.post-upgrade"
31subpackages="$pkgname-doc $pkgname-dbg" 32subpackages="$pkgname-doc $pkgname-dbg"
32source="https://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz 33source="https://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz
33 $pkgname.initd 34 $pkgname.initd
@@ -40,12 +41,16 @@ source="https://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz
40builddir="$srcdir/$pkgname-$pkgver" 41builddir="$srcdir/$pkgname-$pkgver"
41 42
42_plugins=" 43_plugins="
44 crypto:lmcry_gcry
43 elasticsearch:omelasticsearch 45 elasticsearch:omelasticsearch
44 hiredis:omhiredis 46 hiredis:omhiredis
47 http:fmhttp
45 mysql:ommysql 48 mysql:ommysql
46 pgsql:ompgsql 49 pgsql:ompgsql
47 snmp:omsnmp 50 snmp:omsnmp
51 testing:omtesting
48 tls:lmnsd_gtls 52 tls:lmnsd_gtls
53 udpspoof:omudpspoof
49 " 54 "
50for _i in $_plugins; do 55for _i in $_plugins; do
51 subpackages="$subpackages $pkgname-${_i%%:*}:_plugin" 56 subpackages="$subpackages $pkgname-${_i%%:*}:_plugin"
diff --git a/main/rsyslog/rsyslog.post-upgrade b/main/rsyslog/rsyslog.post-upgrade
new file mode 100644
index 0000000000..2654196962
--- /dev/null
+++ b/main/rsyslog/rsyslog.post-upgrade
@@ -0,0 +1,15 @@
1#!/bin/sh
2
3ver_new="$1"
4ver_old="$2"
5
6if [ "$(apk version -t "$ver_old" "8.4.0-r2")" = "<" ]; then
7 cat >&2 <<-EOF
8 *
9 * The following modules has been moved to separate packages:
10 * lmcry_gcry (crypto), fmhttp (http), omudpspoof, omtesting
11 * If you use one of these, install the relevant package(s), e.g.:
12 * apk add rsyslog-crypto
13 *
14 EOF
15fi