Merge branch 'hotfix/syslog-ng-patch-rebase' into hbl

patches/packages/to-upstream/0014-syslog-ng-rotate-default-log-with-logrotate.patch

-From 99a7c9abe4a1b23acccf364b4cc65d105dfc7946 Mon Sep 17 00:00:00 2001
+From 99bcb109a6813c53023e5b334db8081ed612e987 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
 Date: Mon, 15 Apr 2019 15:31:04 +0200
 Subject: [PATCH] syslog-ng: rotate default log with logrotate
@@ -14,13 +14,13 @@ preserved.
 
 Signed-off-by: Karel Kočí <karel.koci@nic.cz>
 ---
- admin/syslog-ng/Makefile             | 4 +++-
+ admin/syslog-ng/Makefile             | 5 ++++-
  admin/syslog-ng/files/logrotate.conf | 8 ++++++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
+ 2 files changed, 12 insertions(+), 1 deletion(-)
  create mode 100644 admin/syslog-ng/files/logrotate.conf
 
 diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
-index b47151e46..082c1dc05 100644
+index c167d3b..2d11f6f 100644
 --- a/admin/syslog-ng/Makefile
 +++ b/admin/syslog-ng/Makefile
 @@ -27,7 +27,7 @@ define Package/syslog-ng
@@ -32,18 +32,19 @@ index b47151e46..082c1dc05 100644
  endef
  
  define Package/syslog-ng/description
-@@ -87,6 +87,8 @@ define Package/syslog-ng/install
- 
+@@ -88,6 +88,9 @@ define Package/syslog-ng/install
  	$(INSTALL_DIR) $(1)/sbin
  	$(INSTALL_BIN) ./files/logread $(1)/sbin
+ 
 +	$(INSTALL_DIR) $(1)/etc/logrotate.d
 +	$(INSTALL_DATA) ./files/logrotate.conf $(1)/etc/logrotate.d/syslog-ng.conf
++
+ 	$(INSTALL_DIR) $(1)/usr/share/syslog-ng/include/
+ 	$(CP) -r ./files/scl $(1)/usr/share/syslog-ng/include/
  endef
- 
- define Package/syslog-ng/postinst
 diff --git a/admin/syslog-ng/files/logrotate.conf b/admin/syslog-ng/files/logrotate.conf
 new file mode 100644
-index 000000000..ce1e087c4
+index 0000000..ce1e087
 --- /dev/null
 +++ b/admin/syslog-ng/files/logrotate.conf
 @@ -0,0 +1,8 @@
@@ -56,5 +57,5 @@ index 000000000..ce1e087c4
 +	endscript
 +}
 -- 
-2.25.1
+2.27.0