diff --git a/debian/changelog b/debian/changelog index d1c18a3aa..2fea0a69a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,40 @@ +syslog-ng (3.28.1-1) unstable; urgency=medium + + [ SZALAY Attila ] + * [fb28861] New upstream version 3.28.1 + * [47b589a] Remove patches applied upstream + * [6e316b7] Follow upstream renaming to slogimport to slogencrypt + * [c3e32f7] Added new manpage secure-logging.7 + * [469b9e4] Fix lintian warning about direct maintscript usage + + [ Balazs Scheidler ] + * [d27702d] add azure-auth-header build products into mod-http + * [c66540c] drop pylint3 as a Build-Dependency. + We are not running pylint3 in debian packaging anyway and Ubuntu eoan does + not have this package. + + [ SZALAY Attila ] + * [bea2687] Clean up the packaging a bit. + Fixed the dh_missing exclude magic, so both the rm command can be removed + from the rules file and the related lines can be removed from the + not-installed file. + + [ Balazs Scheidler ] + * [e66c7f0] move the python packages under syslog-ng specific directory + + [ SZALAY Attila ] + * [50e604b] Fix dh_python3 call. + As syslog-ng use a different directory (a sub directory) of what the + dh_python3 expects, after changing the python directory structure in the + previous patch, the dh_python3 call had to be adjusted too. + * [ce93883] Made some other changes suggested by lintian + * Stop using dpkg-parsechangelog to get the package version + * Remove/change entries in the copyright file + * [01dc303] Remove github specific files from upstream archive + * [c85fed1] Factor out syslog-ng-mod-slog + + -- SZALAY Attila Sun, 23 Aug 2020 22:50:55 +0200 + syslog-ng (3.27.1-3) unstable; urgency=medium * Fix sumologic.conf installation. diff --git a/debian/control b/debian/control index ec9d530c9..0672ed9ce 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 10~), libhiredis-dev, libriemann-client-dev (>= 1.6.0~), librabbitmq-dev, - python3, python3-dev, pylint3, dh-python, + python3, python3-dev, dh-python, dh-exec (>= 0.13~), python3-nose, python3-ply, libxml2-utils, geoip-database, @@ -123,10 +123,10 @@ Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>= 2.12-10), lsb-base (>= 3.0-6) Recommends: logrotate Suggests: ${sng:CoreModules}, ${sng:Modules} -Provides: system-log-daemon, linux-kernel-log-daemon, libsyslog-ng-dev, syslog-ng-mod-journal, syslog-ng-mod-pacctformat [linux-any], syslog-ng-mod-tag-parser +Provides: system-log-daemon, linux-kernel-log-daemon, libsyslog-ng-dev, syslog-ng-mod-journal, syslog-ng-mod-pacctformat, syslog-ng-mod-tag-parser, syslog-ng-mod-extra Conflicts: system-log-daemon, linux-kernel-log-daemon -Replaces: syslog-ng (<< 3.3.0~), libsyslog-ng-dev, syslog-ng-mod-json (<< 3.19.1~), syslog-ng-mod-journal (<< 3.25.1~), syslog-ng-mod-pacctformat (<< 3.26.1~), syslog-ng-mod-tag-parser (<< 3.26.1~) -Breaks: syslog-ng (<< 3.3.0~), libsyslog-ng-dev, syslog-ng-mod-json (<< 3.19.1~), syslog-ng-mod-journal (<< 3.25.1~), syslog-ng-mod-pacctformat (<< 3.26.1~), syslog-ng-mod-tag-parser (<< 3.26.1~) +Replaces: syslog-ng (<< 3.3.0~), libsyslog-ng-dev, syslog-ng-mod-json (<< 3.19.1~), syslog-ng-mod-journal (<< 3.25.1~), syslog-ng-mod-pacctformat (<< 3.26.1~), syslog-ng-mod-tag-parser (<< 3.26.1~), syslog-ng-mod-extra (<< 3.26.1-2~) +Breaks: syslog-ng (<< 3.3.0~), libsyslog-ng-dev, syslog-ng-mod-json (<< 3.19.1~), syslog-ng-mod-journal (<< 3.25.1~), syslog-ng-mod-pacctformat (<< 3.26.1~), syslog-ng-mod-tag-parser (<< 3.26.1~), syslog-ng-mod-extra (<< 3.26.1-2~) Description: Enhanced system logging daemon (core) syslog-ng is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, @@ -512,8 +512,8 @@ Description: Enhanced system logging daemon (SNMP plugin) * hand on messages for further processing using message queues (like AMQP), files or databases (like PostgreSQL or MongoDB). . - This package provides the SNMP destination plugin, which allows one - to send messages to an snmp server. + This package provides the SNMP source/destination plugins, which allows one + to send/receive SNMP traps. Package: syslog-ng-mod-xml-parser Architecture: any @@ -586,11 +586,11 @@ Description: Enhanced system logging daemon (Kafka destination, based on librdka This package provides a native Kafka destination, written entirely in the C programming language, based on the librdkafka client library. -Package: syslog-ng-mod-extra -Architecture: all +Package: syslog-ng-mod-examples +Architecture: any Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) -Description: Enhanced system logging daemon (extra plugins) +Description: Enhanced system logging daemon (example plugins) syslog-ng is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. @@ -606,22 +606,15 @@ Description: Enhanced system logging daemon (extra plugins) * hand on messages for further processing using message queues (like AMQP), files or databases (like PostgreSQL or MongoDB). . - This package collects all the small plugins, which does not worth to have - a whole package. This package contains: - . - * windows event log parser - * tag parser - * Graylog2 destination - * default Network source driver - * Load balancer destination - * osquery destination - * ewmm (Enterprise wide messaging model) destination and parser + This package provides a collection of example plugins. -Package: syslog-ng-mod-examples +Package: syslog-ng-mod-slog Architecture: any Multi-Arch: foreign +Replaces: syslog-ng-core (<< 3.28.1~) +Breaks: syslog-ng-core (<< 3.28.1~) Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~) -Description: Enhanced system logging daemon (example plugins) +Description: Enhanced system logging daemon (secure logging plugin) syslog-ng is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, message queues, databases (SQL and NoSQL alike) and more. @@ -637,4 +630,5 @@ Description: Enhanced system logging daemon (example plugins) * hand on messages for further processing using message queues (like AMQP), files or databases (like PostgreSQL or MongoDB). . - This package provides a collection of example plugins. + This package provides the $(slog) template functions and command + line utilities (slogencrypt, slogverify, slogkey). diff --git a/debian/copyright b/debian/copyright index ed543e4fe..41bf230e3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -18,11 +18,11 @@ Copyright: Copyright (C) Balázs Scheidler Copyright (C) BalaBit IT Security Ltd. License: LGPL-2.1+ with OpenSSL exception -Files: lib/ack-tracker.h - lib/bookmark.h - lib/early_ack_tracker.c +Files: lib/ack-tracker/ack_tracker.h + lib/ack-tracker/bookmark.h + lib/ack-tracker/early_ack_tracker.c lib/host-id.* - lib/late_ack_tracker.c + lib/ack-tracker/late_ack_tracker.c lib/ringbuffer.* lib/template/common-template-typedefs.h Copyright: Copyright (C) BalaBit IT Ltd. @@ -31,13 +31,12 @@ License: LGPL-2.1+ with OpenSSL exception Files: lib/compat/time.h lib/filter/filter-in-list.* - lib/logproto-indented-multiline-server.* - lib/logthrdestdrv.* + lib/logproto/logproto-indented-multiline-server.* + lib/logthrdest/logthrdestdrv.* lib/scratch-buffers.* lib/tests/test_cfg_tree.c lib/type-hinting.* - lib/value-pairs.* - lib/vptransform.* + lib/value-pairs/value-pairs.* scl/graphite/* Copyright: Copyright (C) BalaBit IT Security Ltd. Copyright (C) Gergely Nagy @@ -95,7 +94,7 @@ Files: lib/cache.* lib/tests/test_cfg_lexer_subst.c lib/tests/test_hostname.c lib/tests/test_host_resolve.c - lib/tests/test_log_message.c + lib/logmsg/tests/test_log_message.c lib/tests/test_parse_number.c lib/tests/test_reloc.c lib/tests/test_type_hints.c @@ -105,40 +104,6 @@ Files: lib/cache.* Copyright: Copyright (C) BalaBit IT Security Ltd. License: LGPL-2.1+ with OpenSSL exception -Files: lib/ivykis/* -Copyright: Copyright (C) Lennert Buytenhek -License: LGPL-2.1+ - -Files: lib/ivykis/lib/man3/* lib/ivykis/modules/man3/* -Copyright: Copyright (C) Lennert Buytenhek -License: ivykis-man - Permission is granted to distribute possibly modified copies - of this page provided the header is included verbatim, - and in case of nontrivial modification author and date - of the modification is added to the header. - -Files: lib/jsonc/* -Copyright: Copyright (C) Metaparadigm Pte. Ltd - Copyright (C) Eric Haszlakiewicz -License: Expat - -Files: lib/jsonc/debug.h - lib/jsonc/json.h - lib/jsonc/json_object.* - lib/jsonc/json_object_iterator.* - lib/jsonc/linkhash.* -Copyright: Copyright (C) Hewlett-Packard Development Company, L.P - Copyright (C) Metaparadigm Pte. Ltd - Copyright (C) Eric Haszlakiewicz -License: Expat - -Files: lib/jsonc/json_tokener.c - lib/jsonc/printbuf.* -Copyright: Copyright (C) Yahoo! Inc. - Copyright (C) Metaparadigm Pte. Ltd - Copyright (C) Eric Haszlakiewicz -License: Expat - Files: modules/* Copyright: Copyright (C) Balázs Scheidler Copyright (C) BalaBit IT Security Ltd. @@ -150,19 +115,6 @@ Copyright: Copyright (C) BalaBit IT Security Ltd. Copyright (C) Gergely Nagy License: GPL-2+ with OpenSSL exception -Files: modules/afamqp/rabbitmq-c/* -Copyright: Copyright (C) VMWare, Inc. and Tony Garnock-Jones -License: Expat - -Files: modules/afamqp/rabbitmq-c/codegen/* -Copyright: Copyright (C) VMWare, Inc. -License: MPL - -Files: modules/afamqp/rabbitmq-c/librabbitmq/win32/msinttypes/stdint.h - modules/afamqp/rabbitmq-c/tests/win32/msinttypes/inttypes.h -Copyright: Copyright (C) Alexander Chemeris -License: BSD-3-clause - Files: modules/afmongodb/* modules/afsmtp/* modules/afsocket/unix-credentials.* @@ -182,10 +134,6 @@ Copyright: Copyright (c) BalaBit IT Ltd. Copyright (C) Gergely Nagy License: GPL-2+ with OpenSSL exception -Files: modules/afmongodb/libmongo-client/* -Copyright: Copyright (C) Gergely Nagy -License: Apache-2.0 - Files: modules/afsocket/systemd-syslog-source.* Copyright: Copyright (C) BalaBit IT Ltd. Copyright (C) Tibor Benke @@ -231,28 +179,16 @@ Copyright: Copyright (C) Péter Gyöngyösi Copyright (C) BalaBit IT Security Ltd. License: GPL-2+ with OpenSSL exception -Files: modules/geoip/* +Files: modules/geoip2/* scl/* Copyright: Copyright (C) BalaBit IT Security Ltd. License: GPL-2+ with OpenSSL exception -Files: modules/geoip/geoip-parser.* - modules/geoip/geoip-parser-parser.* - modules/geoip/geoip-plugin.c -Copyright: Copyright (C) Gergely Nagy -License: GPL-2+ with OpenSSL exception - Files: modules/graphite/* Copyright: Copyright (C) BalaBit IT Ltd. Copyright (C) Viktor Tusa License: GPL-2+ with OpenSSL exception -Files: modules/java-modules/http/src/main/java/org/syslog_ng/http/HTTPDestinationOptions.java -Copyright: Copyright (C) BalaBit IT Security Ltd. - Copyright (C) Adam Arsenault - Copyright (C) Viktor Juhasz -License: GPL-2+ with OpenSSL exception - Files: modules/json/format-json.c Copyright: Copyright (c) BalaBit IT Ltd. Copyright (C) Balint Kovacs @@ -266,6 +202,12 @@ Copyright: Copyright (C) BalaBit IT Security Ltd. Copyright (C) Viktor Juhasz License: GPL-2+ with OpenSSL exception +Files: modules/java-modules/http/src/main/java/org/syslog_ng/http/HTTPDestinationOptions.java +Copyright: Copyright (C) BalaBit IT Security Ltd. + Copyright (C) Adam Arsenault + Copyright (C) Viktor Juhasz +License: GPL-2+ with OpenSSL exception + Files: modules/kvformat/* Copyright: Copyright (C) BalaBit IT Security Ltd. License: GPL-2+ with OpenSSL exception @@ -360,69 +302,3 @@ License: LGPL-2.1+ with OpenSSL exception . On Debian systems, the complete text of the GNU Lesser General Public License can be found in the file `/usr/share/common-licenses/LGPL-2.1'. - -License: Apache-2.0 - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - . - https://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - On Debian systems, the complete text of the Apache License can be found in - the file `/usr/share/common-licenses/Apache-2.0'. - -License: Expat - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, copy, - modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - -License: MPL - The complete text of the Mozilla Public License can be found in - the `MPL' file in the same directory as this file. - -License: BSD-3-clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - . - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - . - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - . - 3. The name of the author may be used to endorse or promote products - derived from this software without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO - EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/debian/gbp.conf b/debian/gbp.conf index 29285fbce..0887ed2b3 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -10,4 +10,4 @@ export-dir = ../build-area/ tarball-dir = ../ [import-orig] -filter = [".git", "debian/*"] +filter = [".git", "debian/*", ".github"] diff --git a/debian/not-installed b/debian/not-installed index d4241b082..10db814f5 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,11 +1 @@ lib/systemd/system/syslog-ng@.service -usr/lib/syslog-ng/*/libazure-auth-header.so -usr/share/syslog-ng/include/scl/default-network-drivers/plugin.conf -usr/share/syslog-ng/include/scl/ewmm/ewmm.conf -usr/share/syslog-ng/include/scl/graylog2/plugin.conf -usr/share/syslog-ng/include/scl/hdfs/plugin.conf -usr/share/syslog-ng/include/scl/loadbalancer/gen-loadbalancer.sh -usr/share/syslog-ng/include/scl/loadbalancer/plugin.conf -usr/share/syslog-ng/include/scl/osquery/plugin.conf -usr/share/syslog-ng/include/scl/windowseventlog/plugin.conf -usr/share/syslog-ng/include/scl/windowseventlog/windowseventlog.xml diff --git a/debian/rules b/debian/rules index adb7f5926..9327e2e9d 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ ## ## Released under the GPLv2+, see /usr/share/common-licenses/GPL-2 on ## Debian systems. +include /usr/share/dpkg/pkg-info.mk # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -37,7 +38,7 @@ endif # sources are in a submodule, in syslog-ng-*. Since we do not wish to # update the rules for every major version if it can be helped, figure # it out from the changelog instead. -UMAJOR = $(shell dpkg-parsechangelog | sed -n '/^Version:/s/^Version: //p' | cut -d. -f1,2) +UMAJOR = $(shell echo ${DEB_VERSION_UPSTREAM} | cut -d. -f1,2) export DH_OPTIONS += -O-Bdebian/build-tree --dbg-package=syslog-ng-dbg @@ -77,8 +78,7 @@ endif override_dh_auto_configure: install -d debian/build-tree -rm -rf doc/man/*.? - SOURCE_REVISION="$(shell dpkg-parsechangelog | \ - sed -n '/^Version:/s/^Version: //p')"; \ + SOURCE_REVISION="${DEB_VERSION}"; \ dh_auto_configure -- \ --build=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) \ --prefix=/usr \ @@ -127,21 +127,11 @@ override_dh_auto_configure: # the list-missing option override_dh_auto_install: dh_auto_install -- \ - pkgconfigdir=/usr/lib/$(MULTIARCH_PATH)/pkgconfig \ - PYSETUP_OPTIONS="--install-layout=deb \ - --root=$(CURDIR)/debian/tmp/" + pkgconfigdir=/usr/lib/$(MULTIARCH_PATH)/pkgconfig find . -name \*.la | xargs --no-run-if-empty rm [ ! -f $(CURDIR)/debian/tmp/usr/share/syslog-ng/tools/merge-grammar.py ] || \ sed -i 's/ python$$/ python3/' \ $(CURDIR)/debian/tmp/usr/share/syslog-ng/tools/merge-grammar.py - # installed manually - rm -rf debian/tmp/usr/share/syslog-ng/include/scl/checkpoint/ \ - debian/tmp/usr/share/syslog-ng/include/scl/collectd/ \ - debian/tmp/usr/share/syslog-ng/include/scl/elasticsearch/ \ - debian/tmp/usr/share/syslog-ng/include/scl/junos/ \ - debian/tmp/usr/share/syslog-ng/include/scl/netskope/ \ - debian/tmp/usr/share/syslog-ng/include/scl/websense/ \ - debian/tmp/usr/share/syslog-ng/include/scl/sumologic/ # To get better test results, and actually see failing tests, we need # to pass VERBOSE=1 to make when running the tests. Do that here. @@ -195,22 +185,17 @@ override_dh_gencontrol: dh_gencontrol -- -Vsng:Modules=$(shell debian/tools/list-modules.sh optional) \ -Vsng:CoreModules=$(shell debian/tools/list-modules.sh core) -# Sadly, dh_python2 barfs on --dbg-package=, so we work it around by -# clearing DH_OPTIONS here. -override_dh_python2: - DH_OPTIONS="" dh_python2 - # Sadly, dh_python3 barfs on --dbg-package=, so we work it around by # clearing DH_OPTIONS here. override_dh_python3: - DH_OPTIONS="" dh_python3 + DH_OPTIONS="" dh_python3 usr/lib/syslog-ng/${UMAJOR} ## #* Other, non-override targets ## override_dh_missing: - dh_missing $(shell awk '{sub(/.*\//, "", $$1); print "-X"$$2"/"$$1}' debian/syslog-ng-mod-extra.install) --fail-missing + dh_missing --fail-missing # By default, the arch:all syslog-ng package does not need anything # built, so build-indep shall be empty. This avoids triggering another diff --git a/debian/syslog-ng-core.install b/debian/syslog-ng-core.install index d2de4d191..a41d80e3e 100755 --- a/debian/syslog-ng-core.install +++ b/debian/syslog-ng-core.install @@ -1,7 +1,11 @@ #! /usr/bin/dh-exec etc/syslog-ng/* -usr/bin/* +usr/bin/pdbtool +usr/bin/loggen +usr/bin/dqtool +usr/bin/update-patterndb +usr/bin/persist-tool usr/sbin/* usr/lib/syslog-ng/libsyslog-ng-*.so.* usr/lib/syslog-ng/libevtlog-*.so.* @@ -21,7 +25,6 @@ usr/lib/syslog-ng/*/libkvformat.so usr/lib/syslog-ng/*/libtags-parser.so usr/lib/syslog-ng/*/liblinux-kmsg-format.so usr/lib/syslog-ng/*/libpseudofile.so -usr/lib/syslog-ng/*/libsecure-logging.so usr/lib/syslog-ng/*/libsyslogformat.so usr/lib/syslog-ng/*/libsystem-source.so usr/lib/syslog-ng/*/libtimestamp.so @@ -34,22 +37,7 @@ usr/lib/syslog-ng/libloggen_helper.so usr/lib/syslog-ng/libloggen_plugin.so usr/lib/syslog-ng/libloggen_helper-*.so.* usr/lib/syslog-ng/libloggen_plugin-*.so.* -usr/share/syslog-ng/include/scl/system/* -usr/share/syslog-ng/include/scl/syslogconf/* -usr/share/syslog-ng/include/scl/rewrite/* -usr/share/syslog-ng/include/scl/mbox/* -usr/share/syslog-ng/include/scl/nodejs/* -usr/share/syslog-ng/include/scl/apache/* -usr/share/syslog-ng/include/scl/cim/* -usr/share/syslog-ng/include/scl/loggly/* -usr/share/syslog-ng/include/scl/logmatic/* -usr/share/syslog-ng/include/scl/solaris/* -usr/share/syslog-ng/include/scl/cisco/* -usr/share/syslog-ng/include/scl/iptables/* -usr/share/syslog-ng/include/scl/sudo/* -usr/share/syslog-ng/include/scl/linux-audit/* -usr/share/syslog-ng/include/scl/slack/* -usr/share/syslog-ng/include/scl/telegram/* +usr/share/syslog-ng/include/scl/* usr/share/syslog-ng/xsd/* [linux-any] usr/lib/syslog-ng/*/libsdjournal.so [linux-any] usr/lib/syslog-ng/*/libpacctformat.so diff --git a/debian/syslog-ng-core.manpages b/debian/syslog-ng-core.manpages index ec7161063..89f0e220d 100644 --- a/debian/syslog-ng-core.manpages +++ b/debian/syslog-ng-core.manpages @@ -4,10 +4,6 @@ debian/tmp/usr/share/man/man1/dqtool.1 debian/tmp/usr/share/man/man1/syslog-ng-debun.1 debian/tmp/usr/share/man/man1/pdbtool.1 debian/tmp/usr/share/man/man1/persist-tool.1 -debian/tmp/usr/share/man/man1/slogencrypt.1 -debian/tmp/usr/share/man/man1/slogkey.1 -debian/tmp/usr/share/man/man1/slogverify.1 debian/tmp/usr/share/man/man1/syslog-ng-ctl.1 debian/tmp/usr/share/man/man5/syslog-ng.conf.5 -debian/tmp/usr/share/man/man7/secure-logging.7 debian/tmp/usr/share/man/man8/syslog-ng.8 diff --git a/debian/syslog-ng-mod-extra.install b/debian/syslog-ng-mod-extra.install deleted file mode 100644 index 5eb0edbdc..000000000 --- a/debian/syslog-ng-mod-extra.install +++ /dev/null @@ -1,15 +0,0 @@ -scl/default-network-drivers/plugin.conf usr/share/syslog-ng/include/scl/default-network-drivers/ -scl/ewmm/ewmm.conf usr/share/syslog-ng/include/scl/ewmm/ -scl/graylog2/plugin.conf usr/share/syslog-ng/include/scl/graylog2/ -scl/loadbalancer/gen-loadbalancer.sh usr/share/syslog-ng/include/scl/loadbalancer/ -scl/loadbalancer/plugin.conf usr/share/syslog-ng/include/scl/loadbalancer/ -scl/osquery/plugin.conf usr/share/syslog-ng/include/scl/osquery/ -scl/windowseventlog/plugin.conf usr/share/syslog-ng/include/scl/windowseventlog/ -scl/windowseventlog/windowseventlog.xml usr/share/syslog-ng/include/scl/windowseventlog/ -scl/checkpoint/plugin.conf usr/share/syslog-ng/include/scl/checkpoint/ -scl/collectd/plugin.conf usr/share/syslog-ng/include/scl/collectd/ -scl/elasticsearch/elastic-http.conf usr/share/syslog-ng/include/scl/elasticsearch/ -scl/junos/plugin.conf usr/share/syslog-ng/include/scl/junos/ -scl/netskope/plugin.conf usr/share/syslog-ng/include/scl/netskope/ -scl/websense/plugin.conf usr/share/syslog-ng/include/scl/websense/ -scl/sumologic/sumologic.conf usr/share/syslog-ng/include/scl/sumologic/ diff --git a/debian/syslog-ng-mod-http.install b/debian/syslog-ng-mod-http.install index dbc32a858..2f55ac89e 100644 --- a/debian/syslog-ng-mod-http.install +++ b/debian/syslog-ng-mod-http.install @@ -1 +1,2 @@ usr/lib/syslog-ng/*/libhttp.so +usr/lib/syslog-ng/*/libazure-auth-header.so diff --git a/debian/syslog-ng-mod-python.install b/debian/syslog-ng-mod-python.install index 9eefcc717..6812c9c36 100644 --- a/debian/syslog-ng-mod-python.install +++ b/debian/syslog-ng-mod-python.install @@ -1,2 +1,2 @@ usr/lib/syslog-ng/*/libmod-python.so -usr/lib/python* +usr/lib/syslog-ng/*/python/* diff --git a/debian/syslog-ng-mod-rdkafka.install b/debian/syslog-ng-mod-rdkafka.install index fe0e4fdbf..4c2ffb47e 100644 --- a/debian/syslog-ng-mod-rdkafka.install +++ b/debian/syslog-ng-mod-rdkafka.install @@ -1,2 +1 @@ usr/lib/syslog-ng/*/libkafka.so -usr/share/syslog-ng/include/scl/kafka/* diff --git a/debian/syslog-ng-mod-slog.install b/debian/syslog-ng-mod-slog.install new file mode 100644 index 000000000..db19e49b1 --- /dev/null +++ b/debian/syslog-ng-mod-slog.install @@ -0,0 +1,2 @@ +usr/lib/syslog-ng/*/libsecure-logging.so +usr/bin/slog* diff --git a/debian/syslog-ng-mod-slog.manpages b/debian/syslog-ng-mod-slog.manpages new file mode 100644 index 000000000..484b3c9a5 --- /dev/null +++ b/debian/syslog-ng-mod-slog.manpages @@ -0,0 +1,4 @@ +debian/tmp/usr/share/man/man1/slogkey.1 +debian/tmp/usr/share/man/man1/slogencrypt.1 +debian/tmp/usr/share/man/man1/slogverify.1 +debian/tmp/usr/share/man/man7/secure-logging.7