Matthew Vernon wrote... > Your package still depends on the old, obsolete PCRE3[0] libraries > (i.e. libpcre3-dev). (...)
Greetings,
now that syslog-ng has dropped out of testing a few weeks ago, I'd
really like to see this issue resolved.
It seems the latest upstream release 4.3.1 has the necessary changes
included, but with the Debian version (3.38.1) *that* far behind trying
to cherry-pick is not a good idea, I've tried and failed.
Instead I suggest to move forward to 4.3.1. The attached debdiff
contains the changes needed for the debian/ directory to make the build
pass and make at least the syslog-ng-core package work with some
limitations, see below.
Please take this as a suggestion. If I should make this a full NMU, let
me know. It might take a while, though. And frankly, I sadly lack the
ressources to become a co-maintainer.
Issues and open tasks:
* Re-visit all the changes, some were rather wild-guessed.
* Update shipped configuration, currently there are warnings:
| WARNING: Configuration file format is too old, syslog-ng is running in
compatibility mode. Please update it to use the syslog-ng 4.3 format at your
time of convenience. To upgrade the configuration, please review the warnings
about incompatible changes printed by syslog-ng, and once completed change the
@version header at the top of the configuration file; config-version='3.38'
| WARNING: Your configuration file uses an obsoleted keyword, please update
your configuration; keyword='stats_freq', change='Use the stats() block. E.g.
stats(freq(1));', location='/etc/syslog-ng/syslog-ng.conf:10:4'
* autopkgtest fails here
* "basic" possibly just because there's another syslog running.
* "testinitscript" because it assumes a /tmp/autopkgtest-reboot that
does not exist.
* Remove kfreebsd references, it's history (sadly)
Cheers,
Christoph
diff --git a/debian/changelog b/debian/changelog
index 016dea9..2e45d4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+syslog-ng (4.3.1-0.1) unstable; urgency=high
+
+ * Non-maintainer upload
+ * New upstream version 4.3.1
+ * Switch to the pcre2 library. Closes: #999946
+
+ -- Christoph Biedl <debian.a...@manchmal.in-ulm.de> Sun, 30 Jul 2023
12:04:27 +0200
+
syslog-ng (3.38.1-5) unstable; urgency=medium
* Build without Criterion support.
diff --git a/debian/control b/debian/control
index f8a6c90..3bbd4a2 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 10~),
libbson-dev,
libjson-c-dev | libjson0-dev,
libwrap0-dev,
- libpcre3-dev,
+ libpcre2-dev,
libcap-dev [linux-any],
libsystemd-dev [linux-any],
libhiredis-dev,
diff --git a/debian/not-installed b/debian/not-installed
index 801ef60..dbce7c8 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -3,3 +3,4 @@ usr/share/syslog-ng/include/scl/hdfs/plugin.conf
usr/share/syslog-ng/include/scl/elasticsearch/elastic-java.conf
usr/lib/syslog-ng/syslog-ng/libtest/libsyslog-ng-test.a
usr/lib/*/pkgconfig/syslog-ng-test.pc
+usr/bin/syslog-ng-update-virtualenv
diff --git
a/debian/patches/0001-Replace-direct-md5sum-file-access-with-dpkg-verify-c.patch
b/debian/patches/0001-Replace-direct-md5sum-file-access-with-dpkg-verify-c.patch
deleted file mode 100644
index 2fafa27..0000000
---
a/debian/patches/0001-Replace-direct-md5sum-file-access-with-dpkg-verify-c.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Attila Szalay <s...@ubainba.hu>
-Date: Sat, 3 Sep 2022 22:45:40 +0100
-Subject: Replace direct md5sum file access with dpkg --verify calls
-
-Closes: #905680
----
- contrib/syslog-ng-debun | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/syslog-ng-debun b/contrib/syslog-ng-debun
-index 7a7bb2e..49c5f0b 100755
---- a/contrib/syslog-ng-debun
-+++ b/contrib/syslog-ng-debun
-@@ -963,7 +963,10 @@ debun_extra_debian () {
- printf "\nDebian specific checks\n"
- printf "Check package files integrity\n"
- cd /
-- md5sum --quiet -c /var/lib/dpkg/info/syslog-ng*.md5sums && printf
"Package files are intact\n"
-+ for package in $(dpkg -l syslog-ng\* | grep "ii" | awk -F " " '{print
$2}')
-+ do
-+ dpkg --verify ${package} && printf "Package ${package} files
are intact\n"
-+ done
- printf "list syslog-related packages\n"
- dpkg -l |grep syslog > ${tmpdir}/deb.packages
- }
diff --git a/debian/patches/series b/debian/patches/series
index 70fa123..e9fa1bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Replace-direct-md5sum-file-access-with-dpkg-verify-c.patch
0002-Update-control-file-path.patch
diff --git a/debian/rules b/debian/rules
index 4ca7f75..fd4a6d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,6 +114,7 @@ override_dh_auto_configure:
\
--with-module-dir='$${exec_prefix}/lib/syslog-ng/${UMAJOR}' \
--with-systemdsystemunitdir="/lib/systemd/system" \
+ --with-python-packages=none \
\
SOURCE_REVISION="$${SOURCE_REVISION}" \
${SYSTEMD_CONFIGURE_OPTS} \
diff --git a/debian/syslog-ng-core.install b/debian/syslog-ng-core.install
index c76694c..a0768f4 100755
--- a/debian/syslog-ng-core.install
+++ b/debian/syslog-ng-core.install
@@ -16,14 +16,15 @@ usr/lib/syslog-ng/*/libafsocket.so
usr/lib/syslog-ng/*/libafuser.so
usr/lib/syslog-ng/*/libbasicfuncs.so
usr/lib/syslog-ng/*/libconfgen.so
+usr/lib/syslog-ng/*/libcorrelation.so
usr/lib/syslog-ng/*/libcryptofuncs.so
usr/lib/syslog-ng/*/libcsvparser.so
-usr/lib/syslog-ng/*/libdbparser.so
usr/lib/syslog-ng/*/libjson-plugin.so
usr/lib/syslog-ng/*/libhook-commands.so
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/*/libmetrics-probe.so
usr/lib/syslog-ng/*/libpseudofile.so
usr/lib/syslog-ng/*/libsyslogformat.so
usr/lib/syslog-ng/*/libsystem-source.so
@@ -42,6 +43,7 @@ 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/xsd/*
+usr/share/syslog-ng/smart-multi-line.fsm
[linux-any] usr/lib/syslog-ng/*/libsdjournal.so
[linux-any] usr/lib/syslog-ng/*/libpacctformat.so
diff --git a/debian/syslog-ng-scl.install b/debian/syslog-ng-scl.install
index 65a5e31..af94514 100644
--- a/debian/syslog-ng-scl.install
+++ b/debian/syslog-ng-scl.install
@@ -27,7 +27,6 @@ scl/syslogconf/README
usr/share/syslog-ng/include/scl/syslogconf/
scl/syslogconf/plugin.conf usr/share/syslog-ng/include/scl/syslogconf/
scl/syslogconf/convert-syslogconf.awk
usr/share/syslog-ng/include/scl/syslogconf/
scl/ewmm/ewmm.conf usr/share/syslog-ng/include/scl/ewmm/
-scl/kubernetes/kubernetes.conf usr/share/syslog-ng/include/scl/kubernetes/
scl/logmatic/logmatic.conf usr/share/syslog-ng/include/scl/logmatic/
scl/hdfs/plugin.conf usr/share/syslog-ng/include/scl/hdfs/
scl/osquery/plugin.conf usr/share/syslog-ng/include/scl/osquery/
@@ -46,3 +45,8 @@ scl/elasticsearch/elastic-http.conf
usr/share/syslog-ng/include/scl/elasticsearc
scl/graphite/README usr/share/syslog-ng/include/scl/graphite/
scl/graphite/plugin.conf usr/share/syslog-ng/include/scl/graphite/
scl/netskope/plugin.conf usr/share/syslog-ng/include/scl/netskope/
+scl/logscale/logscale.conf usr/share/syslog-ng/include/scl/logscale/
+scl/opensearch/opensearch.conf usr/share/syslog-ng/include/scl/opensearch/
+scl/python/python-modules.conf usr/share/syslog-ng/include/scl/python/
+usr/share/syslog-ng/include/scl.conf etc/syslog-ng/
+usr/share/syslog-ng/include/scl/splunk/splunk.conf
signature.asc
Description: PGP signature
