main/syslog-ng: move some modules to subpackages

2 files changed, 58 insertions, 11 deletions

diff --git a/main/syslog-ng/APKBUILD b/main/syslog-ng/APKBUILD
index 3b3a313b3a..25b4996c48 100644
--- a/main/syslog-ng/APKBUILD
+++ b/main/syslog-ng/APKBUILD
@@ -1,5 +1,6 @@
 # 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.18.1
@@ -19,8 +20,8 @@ makedepends="
         pcre-dev
         python2-dev
         "
-install="$pkgname.post-install"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-json $pkgname-openrc"
+install="$pkgname.post-install $pkgname.post-upgrade"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-python2:_python2"
 source="https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver/syslog-ng-$pkgver.tar.gz
         syslog-ng.logrotate
         syslog-ng.initd
@@ -33,6 +34,22 @@ source="https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver
         "
 builddir="$srcdir/$pkgname-$pkgver"
 
+_modules="
+        add-contextual-data
+        examples
+        graphite
+        json:json-plugin
+        map-value-pairs
+        redis
+        stardate
+        stomp:afstomp
+        tags-parser
+        xml
+        "
+for _i in $_modules; do
+        subpackages="$subpackages $pkgname-${_i%%:*}:_module"
+done
+
 prepare() {
         cd "$builddir"
         default_prepare
@@ -102,19 +119,33 @@ package() {
 
 dev() {
         default_dev
-        cd "$pkgdir"
 
-        mkdir -p "$subpkgdir"/usr/share/syslog-ng
-        mv usr/share/syslog-ng/tools \
-                usr/share/syslog-ng/xsd \
-                "$subpkgdir"/usr/share/syslog-ng/
+        _submv usr/share/syslog-ng/tools \
+                usr/share/syslog-ng/xsd
+}
+
+_python2() {
+        pkgdesc="$pkgdesc (python2 module)"
+
+        _submv usr/lib/syslog-ng/libmod-python.so \
+                usr/lib/python2.7
 }
 
-json() {
-        pkgdesc="JSON plugin for syslog-ng"
+_module() {
+        local name="${subpkgname#$pkgname-}"
+        pkgdesc="$pkgdesc (${name//-/ } module)"
+
+        local libname=$(printf '%s\n' $_modules | grep "^$name:" | cut -d: -f2)
+        local soname="lib${libname:-$name}.so"
+
+        _submv usr/lib/syslog-ng/$soname
+}
 
-        mkdir -p "$subpkgdir"/usr/lib/syslog-ng/
-        mv "$pkgdir"/usr/lib/syslog-ng/libjson*.so "$subpkgdir"/usr/lib/syslog-ng
+_submv() {
+        local path; for path in "$@"; do
+                mkdir -p "$subpkgdir/${path%/*}"
+                mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/
+        done
 }
 
 sha512sums="2e6ea690f8762f3f37885118f023048c4cba59f58002c87fa1c469cb991b2ba707015b3e54c50f17c3d6e6251d798557406925a9159f4fa914331f281dc39e48  syslog-ng-3.18.1.tar.gz
diff --git a/main/syslog-ng/syslog-ng.post-upgrade b/main/syslog-ng/syslog-ng.post-upgrade
new file mode 100644
index 0000000000..0609aceda1
--- /dev/null
+++ b/main/syslog-ng/syslog-ng.post-upgrade
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+ver_new="$1"
+ver_old="$2"
+
+if [ "$(apk version -t "$ver_old" "3.18.1-r2")" = "<" ]; then
+        cat >&2 <<-EOF
+        *
+        * The following modules has been moved to separate packages:
+        *     add-contextual-data, examples, graphite, map-value-pairs,
+        *     python2, redis, stardate, stomp, tags-parser, xml.
+        * If you use one of these, install the relevant package(s), e.g.:
+        *     apk add syslog-ng-redis
+        *
+        EOF
+fi