Skip to content
Snippets Groups Projects
Commit c8ebd894 authored by Thermi's avatar Thermi Committed by omni
Browse files

community/e2guardian: upgrade to 5.5.4r

parent 8ce2f3aa
No related branches found
No related tags found
1 merge request!58935community/e2guardian: upgrade to 5.5.4r
Pipeline #217023 skipped
diff -urp a/src/Logger.hpp b/src/Logger.hpp
--- a/src/Logger.hpp 2024-02-19 17:02:33.774879053 +0100
+++ b/src/Logger.hpp 2024-02-19 17:04:47.334832260 +0100
@@ -22,6 +22,11 @@
#include "String.hpp"
#include "UdpSocket.hpp"
+// Musl uses "#define stdin (stdin)", so the enum declaration fails with a syntax error
+#undef stdin
+#undef stdout
+#undef stderr
+
// only C++14 : using namespace std::string_literals;
class FileRec {
diff -urp a/src/ListContainer.cpp b/src/ListContainer.cpp
--- a/src/ListContainer.cpp 2024-02-19 17:17:59.304562545 +0100
+++ b/src/ListContainer.cpp 2024-02-19 17:18:15.114557160 +0100
@@ -833,7 +833,7 @@ bool ListContainer::findEndsWith(const c
}
}
}
- return NULL;
+ return false;
}
// For phrase lists - grab the text, score and type of a given phrase, based on item number within list
# Contributor: Noel Kuntze <noel.kuntze@thermi.consulting>
# Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
pkgname=e2guardian
pkgver=5.4.5r
pkgver=5.5.4r
pkgrel=1
pkgdesc="fork of dansguardian, an open source web content filter"
url="http://e2guardian.org/"
......@@ -16,6 +16,8 @@ pkggroups="e2guard"
source="$pkgname-$pkgver.tar.gz::https://github.com/e2guardian/e2guardian/archive/v$pkgver.tar.gz
e2guardian.initd
e2guardian.logrotate
0001-musl-stdio-fix.patch
0002-fix-bool-nullpointer.patch
"
# secfixes:
......@@ -62,7 +64,9 @@ package() {
}
sha512sums="
95a35c26335344c5e6a6350a6123a72d5b0221161e238a269a967be08c2bae4191d9ab398660a4760414f433ec3026643248540ff82bc69b8bb551a37bd28e2c e2guardian-5.4.5r.tar.gz
aa3cc5df2533b8fc65e82a1823b64513aa679e060b9f395b603de376d5aa6c7212ee5d11c6550ee8a1874fe2d88415b75bfd286a46ed63d71ca43d54c36db29f e2guardian-5.5.4r.tar.gz
0be16552e4a4b5541d11de50bef1122462bce71a2ad619d9308a8b92afd6bf350acdf1e3a2ccb40442dd5a70d3ca2c40ba70111798f7d356d5c68a0615aebf1a e2guardian.initd
480188f7f94e0a08707d4c79ff259f0514b8071499e6112a61df56e7bea6407c0d7f323dcdf998cff17c7187d7eafbf0da5d29ce2ab6f819bf0ba38774f43da5 e2guardian.logrotate
00dc957a8407fe6c17e91ebd60a472a4da48b7e34d78f9f962c91b5db8157ceabe632dc4ddb468241fa0b7a305a4d86d28ff5c49d0f11bcac4ddd5da1256799e 0001-musl-stdio-fix.patch
bcc55ea05a760b1796ffc66e253d83e02884d3fbe9045cdc87fd7063102375b28928c42b30c2aa454f0cad440fdd6d704d93f37a91fe009089d5ed2c3036c3c8 0002-fix-bool-nullpointer.patch
"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment