Bug#1000131: e2guardian: depends on obsolete pcre3 library

Bastian Germann bage at debian.org
Wed Aug 30 10:12:36 BST 2023


I am uploading a NMU to fix this.
-------------- next part --------------
diff -Nru e2guardian-5.3.5/debian/changelog e2guardian-5.3.5/debian/changelog
--- e2guardian-5.3.5/debian/changelog	2022-10-22 22:05:11.000000000 +0200
+++ e2guardian-5.3.5/debian/changelog	2023-08-30 10:40:56.000000000 +0200
@@ -1,3 +1,12 @@
+e2guardian (5.3.5-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix build with GCC 13. (Closes: #1037637)
+  * Disable pcre support. (Closes: #1000131)
+  * d/control: Drop unused quilt.
+
+ -- Bastian Germann <bage at debian.org>  Wed, 30 Aug 2023 08:40:56 +0000
+
 e2guardian (5.3.5-4) unstable; urgency=medium
 
   * debian/watch:
diff -Nru e2guardian-5.3.5/debian/control e2guardian-5.3.5/debian/control
--- e2guardian-5.3.5/debian/control	2022-10-22 22:04:40.000000000 +0200
+++ e2guardian-5.3.5/debian/control	2023-08-30 10:40:56.000000000 +0200
@@ -7,8 +7,6 @@
  Benjamin Schlüter <bschlueter at posteo.de>,
 Build-Depends: debhelper-compat (= 13),
                dpkg-dev (>= 1.16.1.1),
-               quilt,
-               libpcre3-dev,
                libpthread-stubs0-dev,
                libssl-dev (>= 1.1),
                pkg-config,
diff -Nru e2guardian-5.3.5/debian/patches/0002_uint32-ListContainer.cpp.patch e2guardian-5.3.5/debian/patches/0002_uint32-ListContainer.cpp.patch
--- e2guardian-5.3.5/debian/patches/0002_uint32-ListContainer.cpp.patch	1970-01-01 01:00:00.000000000 +0100
+++ e2guardian-5.3.5/debian/patches/0002_uint32-ListContainer.cpp.patch	2023-08-30 10:40:56.000000000 +0200
@@ -0,0 +1,19 @@
+Origin: backport, eab1476ed478f409b11a89c97ad98bc0965d828e
+From: Arjow <arjow at protonmail.com>
+Date: Tue, 9 May 2023 12:45:53 +0200
+Subject: Update ListContainer.cpp
+
+fix uint32_t error
+---
+diff --git a/src/ListContainer.cpp b/src/ListContainer.cpp
+index 087681bc..1107d1fb 100644
+--- a/src/ListContainer.cpp
++++ b/src/ListContainer.cpp
+@@ -9,6 +9,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "dgconfig.h"
+ #endif
++#include <cstdint>
+ #include <syslog.h>
+ #include <algorithm>
+ #include "ListContainer.hpp"
diff -Nru e2guardian-5.3.5/debian/patches/0003_uint32-ListContainer.hpp.patch e2guardian-5.3.5/debian/patches/0003_uint32-ListContainer.hpp.patch
--- e2guardian-5.3.5/debian/patches/0003_uint32-ListContainer.hpp.patch	1970-01-01 01:00:00.000000000 +0100
+++ e2guardian-5.3.5/debian/patches/0003_uint32-ListContainer.hpp.patch	2023-08-30 10:40:56.000000000 +0200
@@ -0,0 +1,19 @@
+Origin: backport, ab1299caf0cb5487e19e165e346d890fdc2e716d
+From: Arjow <arjow at protonmail.com>
+Date: Tue, 9 May 2023 13:03:33 +0200
+Subject: Update ListContainer.hpp
+
+fixing uint32_t errror
+---
+diff --git a/src/ListContainer.hpp b/src/ListContainer.hpp
+index b83a057e..db0d4cb4 100644
+--- a/src/ListContainer.hpp
++++ b/src/ListContainer.hpp
+@@ -9,6 +9,7 @@
+ 
+ // INLCUDES
+ 
++#include <cstdint>
+ #include <vector>
+ #include <deque>
+ #include <map>
diff -Nru e2guardian-5.3.5/debian/patches/series e2guardian-5.3.5/debian/patches/series
--- e2guardian-5.3.5/debian/patches/series	2022-03-12 13:57:01.000000000 +0100
+++ e2guardian-5.3.5/debian/patches/series	2023-08-30 10:40:56.000000000 +0200
@@ -3,3 +3,5 @@
 1002_fix-maxcontentramcachescansize.patch
 1003_AM_INIT_AUTOMAKE-expanded-multiple-times.patch
 0001_CVE-2021-44273_fix-hostname-validation-in-certificates.patch
+0002_uint32-ListContainer.cpp.patch
+0003_uint32-ListContainer.hpp.patch
diff -Nru e2guardian-5.3.5/debian/rules e2guardian-5.3.5/debian/rules
--- e2guardian-5.3.5/debian/rules	2020-02-15 10:53:35.000000000 +0100
+++ e2guardian-5.3.5/debian/rules	2023-08-30 10:40:56.000000000 +0200
@@ -23,7 +23,7 @@
 	    --enable-email=yes \
 	    --enable-ntlm=yes \
 	    --enable-sslmitm=yes \
-	    --enable-pcre=yes \
+	    --enable-pcre=no \
 	    --mandir=\$${prefix}/share/man \
 	    --infodir=\$${prefix}/share/info
 


More information about the Debian-edu-pkg-team mailing list