Merge pull request #167 from alorbach/pr-issue-163-2

Add support for custom ppa repopsitory and custom debian branch
rsyslog · May 24, 2024 · e2faf62 · e2faf62
2 parents 403ae73 + f3ce3b6
commit e2faf62
Show file tree

Hide file tree

Showing 8 changed files with 175 additions and 129 deletions.
diff --git a/rsyslog/focal/v8-stable/debian/control b/rsyslog/focal/v8-stable/debian/control
@@ -7,37 +7,38 @@ Build-Depends: debhelper (>= 12),
                dpkg-dev (>= 1.6.1),
                autotools-dev (>= 20100122.1),
                libczmq-dev (>= 4.0.0),
-	       dh-autoreconf,
+               dh-autoreconf,
                librabbitmq-dev,
                librabbitmq4,
                zlib1g-dev,
                libgrok-dev,
-               libgrok1,
                libmysqlclient-dev,
                libpq-dev,
-	       libmongoc-dev,
+               libmongoc-dev,
                librelp-dev (>= 1.2.17),
                libestr-dev (>= 0.1.2),
                liblognorm-dev (>= 1.0.0),
-	       libfastjson-dev (>= 0.99.7),
-	       libglib2.0-dev,
-	       libpcap-dev,
+               libfastjson-dev (>= 0.99.7),
+               libglib2.0-dev,
+               libpcap-dev,
                uuid-dev,
                libkrb5-dev,
                libgnutls28-dev,
                pkg-config,
                dh-apparmor,
-	       libcurl4-gnutls-dev,
-	       bison,
-	       libgcrypt-dev,
-	       python3-docutils,
-	       libsystemd-dev  (>= 209) [linux-any],
-	       librdkafka-dev,
-	       liblz4-dev,
-	       libsasl2-dev,
-	       libssl-dev,
-	       libhiredis-dev,
-	       libnet-dev
+               libcurl4-gnutls-dev,
+               bison,
+               libgcrypt-dev,
+               python3-docutils,
+               libsystemd-dev  (>= 209) [linux-any],
+               librdkafka-dev,
+               liblz4-dev,
+               libsasl2-dev,
+               libssl-dev,
+               libhiredis-dev,
+               util-linux,
+               libnet-dev,
+               libmaxminddb-dev
 Standards-Version: 3.9.2
 XSBC-Original-Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git
 XSBC-Original-Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary
@@ -55,7 +56,7 @@ Depends: ${shlibs:Depends},
          lsb-base (>= 3.2-14),
          adduser,
          ucf,
-	 libfastjson4 (>= 0.99.7)
+         libfastjson4 (>= 0.99.7)
 Recommends: logrotate
 Suggests: rsyslog-mysql | rsyslog-pgsql,
           rsyslog-doc,
@@ -65,12 +66,12 @@ Suggests: rsyslog-mysql | rsyslog-pgsql,
           rsyslog-mmjsonparse,
           rsyslog-imptcp,
           rsyslog-gnutls,
-	  rsyslog-openssl,
-	  rsyslog-udpspoof,
-	  rsyslog-mmrm1stspace,
-	  rsyslog-mmutf8fix,
-	  rsyslog-kafka,
-	  rsyslog-omstdout,
+          rsyslog-openssl,
+          rsyslog-udpspoof,
+          rsyslog-mmrm1stspace,
+          rsyslog-mmutf8fix,
+          rsyslog-kafka,
+          rsyslog-omstdout,
           apparmor (>= 2.3)
 Description: a rocket-fast system for log processing
  Rsyslog is a multi-threaded implementation of syslogd (a system utility
@@ -137,7 +138,7 @@ Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          rsyslog (= ${binary:Version}),
-	 libmongoc-1.0-0
+         libmongoc-1.0-0
 Recommends: mongodb-server
 Description: MongoDB output plugin for rsyslog
  This plugin allows rsyslog to write the syslog messages to MongoDB, a
@@ -179,7 +180,7 @@ Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          rsyslog (= ${binary:Version}),
-	 librelp0 (>= 1.2.17)
+         librelp0 (>= 1.2.17)
 Description: RELP protocol support for rsyslog
  These plugins allows rsyslog to send and receive syslog messages via the
  RELP protocol. RELP ensures reliable transport over the network even on
@@ -201,8 +202,8 @@ Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          rsyslog (= ${binary:Version}),
-	 liblognorm5, 
-	 libfastjson4 (>= 0.99.7)
+         liblognorm5, 
+         libfastjson4 (>= 0.99.7)
 Description: Parsing/handling of CEE/Lumberjack JSON messages in rsyslog
  This plugin parses the message part of syslog. If there's a CEE cookie
  "@cee:" followed by a valid JSON, you can use properties from that JSON
@@ -256,6 +257,7 @@ Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgrok1,
+         libgrok-dev,
          rsyslog (= ${binary:Version}),
 Description: Provides the mmgrok rsyslog plugin
 
@@ -349,22 +351,10 @@ Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          rsyslog (= ${binary:Version}), 
-#         rsyslog-ksi, 
-	 rsyslog-gnutls
+         rsyslog-gnutls
 Description: rsyslog utilities
  Installs rsyslog tools like logctl, rsgtutil or rscryutil. 
 
-#Package: rsyslog-ksi
-#Architecture: any
-#Priority: extra
-#Depends: ${shlibs:Depends},
-#         ${misc:Depends},
-#         rsyslog (= ${binary:Version}), 
-#         libksi1
-#Suggests: gnutls-bin
-#Description: KSI (Keyless Signature Infrastructure) support for rsyslog
-# Allows signing log records using guardtime Keyless Signature Infrastructure. 
-
 Package: rsyslog-mmrm1stspace
 Architecture: any
 Priority: extra
@@ -380,8 +370,8 @@ Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          rsyslog (= ${binary:Version}),
-	 liblz4-1,
- 	 libsasl2-2	
+         liblz4-1,
+         libsasl2-2	
 Description: This module implements an Apache Kafka producer, permitting rsyslog to write data to Kafka.
 
 Package: rsyslog-impcap
@@ -390,7 +380,7 @@ Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          rsyslog (= ${binary:Version}),
- 	 libpcap
+         libpcap
 Description: This module provides the impcap contributed module.
 
 Package: rsyslog-redis
@@ -434,13 +424,22 @@ Depends: ${shlibs:Depends},
          rsyslog (= ${binary:Version}),
 Description: Message modification module to add Kubernetes metadata to a messages.
 
+Package: rsyslog-mmdblookup
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         rsyslog (= ${binary:Version}),
+         libmaxminddb0
+Description: Fast geoip lookups straight from Rsyslog using libmaxminddb library.
+
 #Package: rsyslog-zmq
 #Architecture: any
 #Priority: extra
 #Depends: ${shlibs:Depends},
 #         ${misc:Depends},
 #         rsyslog (= ${binary:Version}),
-# 	  libzmq1
+#         libzmq1
 #Description: zmq3 support for RSyslog. 
 # These plugins allows you to push data from and into rsyslog from a 
 # zeromq socket.
diff --git a/rsyslog/focal/v8-stable/debian/rsyslog-mmdblookup.install b/rsyslog/focal/v8-stable/debian/rsyslog-mmdblookup.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/rsyslog/mmdblookup.so
diff --git a/rsyslog/focal/v8-stable/debian/rules b/rsyslog/focal/v8-stable/debian/rules
@@ -4,6 +4,9 @@ DPKG_EXPORT_BUILDFLAGS = 1
 export DEB_BUILD_OPTIONS="parallel=4"
 include /usr/share/dpkg/buildflags.mk
 
+# Build Debug Symbols
+export DEB_CFLAGS_MAINT_APPEND ="-g"
+
 # the default LDFLAGS="-Wl,-Bsymbolic-functions" caused rsyslog to
 # segfault on receipt of first message (see LP: #794230)
 unexport LDFLAGS
@@ -63,6 +66,8 @@ override_dh_auto_configure:
 		--enable-omstdout \
 		--enable-openssl \
 		--enable-mmkubernetes \
+		--enable-mmdblookup \
+		--enable-debug-symbols \
 		--disable-testbench \
 		--disable-liblogging-stdlog \
 		--with-systemdsystemunitdir=/lib/systemd/system
@@ -79,6 +84,9 @@ override_dh_auto_configure:
 #                --enable-omzmq3 \
 #		--enable-kafka-static \
 
+#override_dh_strip:
+#	dh_strip --dbg-package=rsyslog-debug
+
 override_dh_auto_install:
 	dh_auto_install
 	install --mode=644 -D plugins/ommysql/createDB.sql debian/rsyslog-mysql/usr/share/dbconfig-common/data/rsyslog-mysql/install/mysql