Remove unused grok dependencies and improve PPA upload script

- Removed `libgrok-dev` and `libgrok1` dependencies from `debian/control` files in both `focal/master` and `focal/v8-stable` branches. - Commented out unused `rsyslog-mmgrok` package references, streamlining dependency management and package definitions. - Enhanced `uploadppa.sh` script with improvements: - Added Debian branch selection based on available directories. - Automatically generates a changelog entry when opted for. - Refined PPA upload handling, utilizing `$UPLOAD_PPA` variable. closes: #175
rsyslog · Oct 29, 2024 · 99b5bbd · 99b5bbd
1 parent b1fc2aa
commit 99b5bbd
Show file tree

Hide file tree

Showing 9 changed files with 120 additions and 92 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
       # When set to true, cancel all in-progress jobs if any matrix job fails.
       fail-fast: false
       matrix:
-        release: [18.04, 20.04] # , 22.04]
+        release: [22.04] # , 22.04]
 
     steps:
       - name: git checkout packging project
@@ -99,45 +99,45 @@ jobs:
           ls -l
 
       - name: save ${{ matrix.release }} DEBs
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: debs-${{ matrix.release }}
           path: debs-${{ matrix.release }}
 
-  check_20_04:
+  check_22_04:
     runs-on: ubuntu-22.04
     needs: build
     timeout-minutes: 30
 
     steps:
-      - name: Download 20.04 debs
+      - name: Download 22.04 debs
         uses: actions/download-artifact@v1
         with:
-          name: debs-20.04
+          name: debs-22.04
 
       - name: merge support libraries from OBS
         run: |
           mkdir tt
           cd tt
-          wget -q http://download.opensuse.org/repositories/home:/rgerhards/xUbuntu_20.04/Packages
+          wget -q http://download.opensuse.org/repositories/home:/rgerhards/xUbuntu_22.04/Packages
           grep Filename: Packages | grep amd64 | grep -v rsyslog \
-             | sed 's/Filename: /wget -q http:\/\/download.opensuse.org\/repositories\/home:\/rgerhards\/xUbuntu_20.04\//' \
+             | sed 's/Filename: /wget -q http:\/\/download.opensuse.org\/repositories\/home:\/rgerhards\/xUbuntu_22.04\//' \
              > tmp
           source tmp # get .deb files
           ls -l
-          mv *deb $GITHUB_WORKSPACE/debs-20.04
+          mv *deb $GITHUB_WORKSPACE/debs-22.04
           cd ..
           rm -rf tt
 
       - name: prepare local repository
         run: |
-          cd debs-20.04
+          cd debs-22.04
           dpkg-scanpackages . /dev/null >Packages
           cd $GITHUB_WORKSPACE
 
       - name: check package install
         run: |
-          docker run --rm -v $GITHUB_WORKSPACE/debs-20.04:/debs ubuntu:20.04 bash -c \
+          docker run --rm -v $GITHUB_WORKSPACE/debs-22.04:/debs ubuntu:22.04 bash -c \
           '
           echo "deb [trusted=yes] file:///debs ./" >> /etc/apt/sources.list
           apt-get update
@@ -152,7 +152,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        release: [20.04] #22.04
+        release: [22.04] #22.04
 
     steps:
       - name: Download ${{ matrix.release }} debs
@@ -174,7 +174,7 @@ jobs:
       - name: get support libraries from OBS
         run: |
           cd /var/www/html/repo
-          wget -q -r -np -l2  -A "dsc,l*.deb" --no-host --cut-dirs 4 http://download.opensuse.org/repositories/home:/rgerhards/xUbuntu_18.04/
+          wget -q -r -np -l2  -A "dsc,l*.deb" --no-host --cut-dirs 4 http://download.opensuse.org/repositories/home:/rgerhards/xUbuntu_22.04/
           ls -l
           find .
 
@@ -246,7 +246,7 @@ jobs:
           cd $GITHUB_WORKSPACE
 
       - name: save ${{ matrix.release }} DEB Repo
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: repo-${{ matrix.release }}
           path: /var/www/html/repo

diff --git a/.github/workflows/install-rsyslog-packages-from-obs.yml b/.github/workflows/install-rsyslog-packages-from-obs.yml
@@ -59,7 +59,7 @@ jobs:
         # Explicitly list supported LTS versions
         # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
         # Note: As of 2020-06 ubuntu-latest' maps to 'ubuntu-18.04', not ubuntu-20.04
-        os: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-22.04, ubuntu-24.04]
 
     steps:
       - name: Install stock Ubuntu-provided rsyslog

diff --git a/.github/workflows/install-rsyslog-packages-from-ppa.yml b/.github/workflows/install-rsyslog-packages-from-ppa.yml
@@ -60,7 +60,7 @@ jobs:
         # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
         # Note: 'ubuntu-latest' currently maps to 'ubuntu-18.04'
         #os: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, ubuntu-latest]
-        os: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-22.04, ubuntu-24.04]
 
     steps:
       - name: Install stock Ubuntu-provided rsyslog
@@ -217,7 +217,7 @@ jobs:
         # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
         # Note: 'ubuntu-latest' currently maps to 'ubuntu-18.04'
         #os: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, ubuntu-latest]
-        os: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-22.04, ubuntu-24.04]
 
     steps:
       - name: Install stock Ubuntu-provided rsyslog

diff --git a/rsyslog/focal/master/debian/control b/rsyslog/focal/master/debian/control
@@ -11,8 +11,6 @@ Build-Depends: debhelper (>= 12),
                librabbitmq-dev,
                librabbitmq4,
                zlib1g-dev,
-               libgrok-dev,
-               libgrok1,
                libmysqlclient-dev,
                libpq-dev,
 	       libmongoc-dev,
@@ -250,14 +248,14 @@ Depends: ${shlibs:Depends},
          liblognorm5
 Description: Parse all fields of the message into structured data inside the JSON tree.
 
-Package: rsyslog-mmgrok
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libgrok1,
-         rsyslog (= ${binary:Version}),
-Description: Provides the mmgrok rsyslog plugin
+#Package: rsyslog-mmgrok
+#Architecture: any
+#Priority: extra
+#Depends: ${shlibs:Depends},
+#         ${misc:Depends},
+#         libgrok1,
+#         rsyslog (= ${binary:Version}),
+#Description: Provides the mmgrok rsyslog plugin
 
 Package: rsyslog-omrabbitmq
 Architecture: any
@@ -273,9 +271,9 @@ Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgrok1,
          rsyslog (= ${binary:Version}),
 Description: Provides the imdocker rsyslog plugin
+#         libgrok1,
 
 Package: rsyslog-improg
 Architecture: any

diff --git a/rsyslog/focal/v8-stable/debian/control b/rsyslog/focal/v8-stable/debian/control
@@ -11,7 +11,6 @@ Build-Depends: debhelper (>= 12),
                librabbitmq-dev,
                librabbitmq4,
                zlib1g-dev,
-               libgrok-dev,
                libmysqlclient-dev,
                libpq-dev,
                libmongoc-dev,
@@ -251,15 +250,15 @@ Depends: ${shlibs:Depends},
          liblognorm5
 Description: Parse all fields of the message into structured data inside the JSON tree.
 
-Package: rsyslog-mmgrok
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libgrok1,
-         libgrok-dev,
-         rsyslog (= ${binary:Version}),
-Description: Provides the mmgrok rsyslog plugin
+#Package: rsyslog-mmgrok
+#Architecture: any
+#Priority: extra
+#Depends: ${shlibs:Depends},
+#         ${misc:Depends},
+#         libgrok1,
+#         libgrok-dev,
+#         rsyslog (= ${binary:Version}),
+#Description: Provides the mmgrok rsyslog plugin
 
 Package: rsyslog-omrabbitmq
 Architecture: any
@@ -275,9 +274,9 @@ Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgrok1,
          rsyslog (= ${binary:Version}),
 Description: Provides the imdocker rsyslog plugin
+#         libgrok1,
 
 Package: rsyslog-improg
 Architecture: any

diff --git a/rsyslog/focal/v8-stable/debian/rules b/rsyslog/focal/v8-stable/debian/rules
@@ -25,7 +25,6 @@ override_dh_auto_configure:
 		--enable-omrabbitmq \
 		--enable-imczmq \
 		--enable-omczmq \
-		--enable-mmgrok \
 		--enable-omuxsock \
 		--enable-mysql \
 		--enable-pgsql \
@@ -73,6 +72,7 @@ override_dh_auto_configure:
 		--with-systemdsystemunitdir=/lib/systemd/system
 
 #
+#		--enable-mmgrok \
 #		--enable-omkafka \
 #		 --enable-guardtime \
 #		 --enable-gt-ksi \

diff --git a/rsyslog/noble/v8-stable/debian/control b/rsyslog/noble/v8-stable/debian/control
@@ -11,7 +11,6 @@ Build-Depends: debhelper (>= 12),
                librabbitmq-dev,
                librabbitmq4,
                zlib1g-dev,
-               libgrok-dev,
                libtirpc-dev,
                libmysqlclient-dev,
                libpq-dev,
@@ -252,15 +251,15 @@ Depends: ${shlibs:Depends},
          liblognorm5
 Description: Parse all fields of the message into structured data inside the JSON tree.
 
-Package: rsyslog-mmgrok
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libgrok1,
-         libtirpc3,
-         rsyslog (= ${binary:Version}),
-Description: Provides the mmgrok rsyslog plugin
+#Package: rsyslog-mmgrok
+#Architecture: any
+#Priority: extra
+#Depends: ${shlibs:Depends},
+#         ${misc:Depends},
+#         libgrok1,
+#         libtirpc3,
+#         rsyslog (= ${binary:Version}),
+#Description: Provides the mmgrok rsyslog plugin
 
 Package: rsyslog-omrabbitmq
 Architecture: any
@@ -276,9 +275,9 @@ Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgrok1,
          rsyslog (= ${binary:Version}),
 Description: Provides the imdocker rsyslog plugin
+#         libgrok1,
 
 Package: rsyslog-improg
 Architecture: any

diff --git a/rsyslog/noble/v8-stable/debian/rules b/rsyslog/noble/v8-stable/debian/rules
@@ -26,7 +26,6 @@ override_dh_auto_configure:
 		--enable-omrabbitmq \
 		--enable-imczmq \
 		--enable-omczmq \
-		--enable-mmgrok \
 		--enable-omuxsock \
 		--enable-mysql \
 		--enable-pgsql \
@@ -74,6 +73,7 @@ override_dh_auto_configure:
 		--with-systemdsystemunitdir=/lib/systemd/system
 
 #
+#		--enable-mmgrok \
 #		--enable-omkafka \
 #		 --enable-guardtime \
 #		 --enable-gt-ksi \