CVS commit: pkgsrc/www/e2guardian

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Thu Sep 12 13:58:15 UTC 2024

Modified Files:
        pkgsrc/www/e2guardian: Makefile PLIST distinfo options.mk

Log Message:
e2guardian: update to 5.5.6, fix PLIST and config path

Remove duplicates and sort PLIST
Remove ssl option as no longer supported
Fix path to read config files from

Changes since 5.5.5:
    Add addECHtoFlags option for monitoring purposes
    Rewrite of SNI extraction code and addition of checkme.hasECH variable
    Fix for #810 - intermitant garbled SNI extraction with THTTPS
    Fix #816 - unused variable in trickle.cpp
    Fix #817 RegExp::match() issue
    Fix #819 ICAP send time-out but does not close connection
    Impliment #818 multiple domains/ips in tlsproxycn
    Update expire artifacts ttl
    Update armdebian.yml
    Update debianlatest.yml
    Update ubuntujammy.yml
    Fix #815 - Change to invoke pthreads_sigmask before creating any threads to
    fix occational issue of logging stopping
    Fix #814 adjustments for LibreSSL and bug fix DEBUG_debug call.
    Add -funsigned-char to CXXFLAGS to ensure char is unsigned
       If this is not set causes stack and other issues in some platforms.
    More robust regular expressions in bannedregexpurl list


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/e2guardian/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/e2guardian/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/e2guardian/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/e2guardian/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/e2guardian/Makefile
diff -u pkgsrc/www/e2guardian/Makefile:1.17 pkgsrc/www/e2guardian/Makefile:1.18
--- pkgsrc/www/e2guardian/Makefile:1.17 Tue Jul  2 08:24:08 2024
+++ pkgsrc/www/e2guardian/Makefile      Thu Sep 12 13:58:14 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2024/07/02 08:24:08 prlw1 Exp $
+# $NetBSD: Makefile,v 1.18 2024/09/12 13:58:14 sborrill Exp $
 
-DISTNAME=      e2guardian-5.5.5r
+DISTNAME=      e2guardian-5.5.6r
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=e2guardian/}
 GITHUB_PROJECT=        e2guardian
@@ -11,11 +11,10 @@ HOMEPAGE=   http://www.e2guardian.org/
 COMMENT=       Web content filtering proxy
 LICENSE=       gnu-gpl-v2
 
-GNU_CONFIGURE=         yes
-USE_LANGUAGES=         c c++
-USE_CXX_FEATURES=      c++11
-USE_TOOLS=             autoconf automake perl pkg-config
-RCD_SCRIPTS+=          e2guardian
+GNU_CONFIGURE= yes
+USE_LANGUAGES= c c++
+USE_TOOLS=     autoconf automake perl pkg-config
+RCD_SCRIPTS+=  e2guardian
 
 # Fix bug in configure.ac: the paths are expanded too soon
 SUBST_CLASSES+=                pathfix
@@ -43,6 +42,8 @@ BUILD_DEFS+=          VARBASE
 OWN_DIRS_PERMS+=       ${VARBASE}/log/e2guardian \
                        ${E2G_USER} ${E2G_GROUP} 0755
 
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --with-sysconfsubdir=
 CONFIGURE_ARGS+=       --with-proxyuser=${E2G_USER}
 CONFIGURE_ARGS+=       --with-proxygroup=${E2G_GROUP}
 CONFIGURE_ARGS+=       --with-piddir=${VARBASE}/run
@@ -76,4 +77,5 @@ pre-configure:
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/e2guardian/PLIST
diff -u pkgsrc/www/e2guardian/PLIST:1.6 pkgsrc/www/e2guardian/PLIST:1.7
--- pkgsrc/www/e2guardian/PLIST:1.6     Thu Jun 27 15:26:23 2024
+++ pkgsrc/www/e2guardian/PLIST Thu Sep 12 13:58:15 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2024/06/27 15:26:23 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.7 2024/09/12 13:58:15 sborrill Exp $
 man/man8/e2guardian.8
 sbin/e2guardian
 share/doc/e2guardian/AuthPlugins
@@ -36,32 +36,26 @@ share/e2guardian/languages/danish/templa
 share/e2guardian/languages/dutch/fancydmtemplate.html
 share/e2guardian/languages/dutch/messages
 share/e2guardian/languages/dutch/neterr_template.html
-share/e2guardian/languages/dutch/neterr_template.html
 share/e2guardian/languages/dutch/template.html
 share/e2guardian/languages/french/fancydmtemplate.html
 share/e2guardian/languages/french/messages
 share/e2guardian/languages/french/neterr_template.html
-share/e2guardian/languages/french/neterr_template.html
 share/e2guardian/languages/french/template.html
 share/e2guardian/languages/german/fancydmtemplate.html
 share/e2guardian/languages/german/messages
 share/e2guardian/languages/german/neterr_template.html
-share/e2guardian/languages/german/neterr_template.html
 share/e2guardian/languages/german/template.html
 share/e2guardian/languages/hebrew/fancydmtemplate.html
 share/e2guardian/languages/hebrew/messages
 share/e2guardian/languages/hebrew/neterr_template.html
-share/e2guardian/languages/hebrew/neterr_template.html
 share/e2guardian/languages/hebrew/template.html
 share/e2guardian/languages/hungarian/fancydmtemplate.html
 share/e2guardian/languages/hungarian/messages
 share/e2guardian/languages/hungarian/neterr_template.html
-share/e2guardian/languages/hungarian/neterr_template.html
 share/e2guardian/languages/hungarian/template.html
 share/e2guardian/languages/indonesian/fancydmtemplate.html
 share/e2guardian/languages/indonesian/messages
 share/e2guardian/languages/indonesian/neterr_template.html
-share/e2guardian/languages/indonesian/neterr_template.html
 share/e2guardian/languages/indonesian/template.html
 share/e2guardian/languages/italian/fancydmtemplate.html
 share/e2guardian/languages/italian/messages
@@ -70,7 +64,6 @@ share/e2guardian/languages/italian/templ
 share/e2guardian/languages/japanese/fancydmtemplate.html
 share/e2guardian/languages/japanese/messages
 share/e2guardian/languages/japanese/neterr_template.html
-share/e2guardian/languages/japanese/neterr_template.html
 share/e2guardian/languages/japanese/template.html
 share/e2guardian/languages/lithuanian/fancydmtemplate.html
 share/e2guardian/languages/lithuanian/messages
@@ -79,22 +72,18 @@ share/e2guardian/languages/lithuanian/te
 share/e2guardian/languages/malay/fancydmtemplate.html
 share/e2guardian/languages/malay/messages
 share/e2guardian/languages/malay/neterr_template.html
-share/e2guardian/languages/malay/neterr_template.html
 share/e2guardian/languages/malay/template.html
 share/e2guardian/languages/mxspanish/fancydmtemplate.html
 share/e2guardian/languages/mxspanish/messages
 share/e2guardian/languages/mxspanish/neterr_template.html
-share/e2guardian/languages/mxspanish/neterr_template.html
 share/e2guardian/languages/mxspanish/template.html
 share/e2guardian/languages/polish/fancydmtemplate.html
 share/e2guardian/languages/polish/messages
 share/e2guardian/languages/polish/neterr_template.html
-share/e2guardian/languages/polish/neterr_template.html
 share/e2guardian/languages/polish/template.html
 share/e2guardian/languages/portuguese/fancydmtemplate.html
 share/e2guardian/languages/portuguese/messages
 share/e2guardian/languages/portuguese/neterr_template.html
-share/e2guardian/languages/portuguese/neterr_template.html
 share/e2guardian/languages/portuguese/template.html
 share/e2guardian/languages/ptbrazilian/fancydmtemplate.html
 share/e2guardian/languages/ptbrazilian/messages
@@ -103,22 +92,18 @@ share/e2guardian/languages/ptbrazilian/t
 share/e2guardian/languages/russian-1251/fancydmtemplate.html
 share/e2guardian/languages/russian-1251/messages
 share/e2guardian/languages/russian-1251/neterr_template.html
-share/e2guardian/languages/russian-1251/neterr_template.html
 share/e2guardian/languages/russian-1251/template.html
 share/e2guardian/languages/russian-koi8-r/fancydmtemplate.html
 share/e2guardian/languages/russian-koi8-r/messages
 share/e2guardian/languages/russian-koi8-r/neterr_template.html
-share/e2guardian/languages/russian-koi8-r/neterr_template.html
 share/e2guardian/languages/russian-koi8-r/template.html
 share/e2guardian/languages/slovak/fancydmtemplate.html
 share/e2guardian/languages/slovak/messages
 share/e2guardian/languages/slovak/neterr_template.html
-share/e2guardian/languages/slovak/neterr_template.html
 share/e2guardian/languages/slovak/template.html
 share/e2guardian/languages/spanish/fancydmtemplate.html
 share/e2guardian/languages/spanish/messages
 share/e2guardian/languages/spanish/neterr_template.html
-share/e2guardian/languages/spanish/neterr_template.html
 share/e2guardian/languages/spanish/template.html
 share/e2guardian/languages/swedish/fancydmtemplate.html
 share/e2guardian/languages/swedish/messages
@@ -127,12 +112,10 @@ share/e2guardian/languages/swedish/templ
 share/e2guardian/languages/turkish/fancydmtemplate.html
 share/e2guardian/languages/turkish/messages
 share/e2guardian/languages/turkish/neterr_template.html
-share/e2guardian/languages/turkish/neterr_template.html
 share/e2guardian/languages/turkish/template.html
 share/e2guardian/languages/ukenglish/fancydmtemplate.html
 share/e2guardian/languages/ukenglish/messages
 share/e2guardian/languages/ukenglish/neterr_template.html
-share/e2guardian/languages/ukenglish/neterr_template.html
 share/e2guardian/languages/ukenglish/template.html
 share/e2guardian/scripts/bsd-init
 share/e2guardian/scripts/e2guardian
@@ -147,13 +130,13 @@ share/examples/e2guardian/authplugins/ip
 share/examples/e2guardian/authplugins/pf-basic.conf
 share/examples/e2guardian/authplugins/port.conf
 share/examples/e2guardian/common.story
+${PLIST.clamd}share/examples/e2guardian/contentscanners/clamdscan.conf
+${PLIST.cli}share/examples/e2guardian/contentscanners/commandlinescan.conf
+${PLIST.icap}share/examples/e2guardian/contentscanners/icapscan.conf
 share/examples/e2guardian/downloadmanagers/default.conf
 share/examples/e2guardian/e2guardian.conf
 share/examples/e2guardian/e2guardianf1.conf
 share/examples/e2guardian/examplef1.story
-${PLIST.clamd}share/examples/e2guardian/contentscanners/clamdscan.conf
-${PLIST.cli}share/examples/e2guardian/contentscanners/commandlinescan.conf
-${PLIST.icap}share/examples/e2guardian/contentscanners/icapscan.conf
 share/examples/e2guardian/lists/README
 share/examples/e2guardian/lists/authplugins/filtergroupslist
 share/examples/e2guardian/lists/authplugins/ipgroups
@@ -166,15 +149,10 @@ share/examples/e2guardian/lists/common/b
 share/examples/e2guardian/lists/common/bannediplist
 share/examples/e2guardian/lists/common/browserregexplist
 share/examples/e2guardian/lists/common/embededreferersiteiplist
-share/examples/e2guardian/lists/common/embededreferersiteiplist
-share/examples/e2guardian/lists/common/embededreferersitelist
 share/examples/e2guardian/lists/common/embededreferersitelist
 share/examples/e2guardian/lists/common/embededrefererurllist
-share/examples/e2guardian/lists/common/embededrefererurllist
-share/examples/e2guardian/lists/common/exceptionclientlist
 share/examples/e2guardian/lists/common/exceptionclientlist
 share/examples/e2guardian/lists/common/exceptioniplist
-share/examples/e2guardian/lists/common/exceptioniplist
 share/examples/e2guardian/lists/common/nologextensionlist
 share/examples/e2guardian/lists/common/nologregexpurllist
 share/examples/e2guardian/lists/common/nologsiteiplist

Index: pkgsrc/www/e2guardian/distinfo
diff -u pkgsrc/www/e2guardian/distinfo:1.8 pkgsrc/www/e2guardian/distinfo:1.9
--- pkgsrc/www/e2guardian/distinfo:1.8  Thu Jun 27 15:26:23 2024
+++ pkgsrc/www/e2guardian/distinfo      Thu Sep 12 13:58:15 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2024/06/27 15:26:23 sborrill Exp $
+$NetBSD: distinfo,v 1.9 2024/09/12 13:58:15 sborrill Exp $
 
-BLAKE2s (e2guardian-5.5.5r.tar.gz) = 0cca95fda6bba23f8602fc7aadedeecbefde0daa6b8a35e306aae45521248903
-SHA512 (e2guardian-5.5.5r.tar.gz) = 25f902a8387a8d3cb3751bb7ef5e7f7e37aa6f377e7d3e3493faa0ff25d933b3dbdc6cff16a6b3427ae9d385f59342330c5692d933e197f25cd5b381d9c170bc
-Size (e2guardian-5.5.5r.tar.gz) = 2149828 bytes
+BLAKE2s (e2guardian-5.5.6r.tar.gz) = 64cfecfe1552f86d14e7c5cb4e1f5e352cda8523477a5683f0fe0e21e1845571
+SHA512 (e2guardian-5.5.6r.tar.gz) = 3446cfa51ee9f1d6bfb897c5dca639c9cbf25d2a3c03f5722dd6c51a542aa830e504bb03b53fe58cb2d4e8354a393b8668391dd97a626f54a7a7d4bdbc2d6634
+Size (e2guardian-5.5.6r.tar.gz) = 2150775 bytes
 SHA1 (patch-src_Logger.cpp) = b1f00a24f12c504781e9afa4637c888395aa0b57
 SHA1 (patch-src_Logger.hpp) = 7b5ad77b4efec717f758be1b243b697c21dbd3c9

Index: pkgsrc/www/e2guardian/options.mk
diff -u pkgsrc/www/e2guardian/options.mk:1.3 pkgsrc/www/e2guardian/options.mk:1.4
--- pkgsrc/www/e2guardian/options.mk:1.3        Mon Jul 16 14:12:34 2018
+++ pkgsrc/www/e2guardian/options.mk    Thu Sep 12 13:58:15 2024
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2018/07/16 14:12:34 sborrill Exp $
+# $NetBSD: options.mk,v 1.4 2024/09/12 13:58:15 sborrill Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.e2guardian
-PKG_SUPPORTED_OPTIONS= debug email commandline clamd ssl icap
-PKG_SUGGESTED_OPTIONS= email ssl
+PKG_SUPPORTED_OPTIONS= debug email commandline clamd icap
+PKG_SUGGESTED_OPTIONS= email
 
 .include "../../mk/bsd.options.mk"
 
@@ -27,14 +27,6 @@ PLIST.icap=          yes
 EGFILES_EXTRA+=                contentscanners/icap.conf
 .endif
 
-##
-## Enables ssl MITM
-##
-.if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+=       --enable-sslmitm
-.  include "../../security/openssl/buildlink3.mk"
-.endif
-
 # PLIST.avscan is shared between content scanners
 PLIST_VARS+=           avscan
 ##