From nobody Wed May 29 13:25:28 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vq99h540tz5MWVg; Wed, 29 May 2024 13:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vq99h2sMWz4KS9; Wed, 29 May 2024 13:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716989128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ql27zfvLX20kc8Tt/AHz8pZKuYDbJA8poYF2FXQLe9Q=; b=D2Wvzq7S3MaYzmrKRKjHyLeuE6MXWrUKd9tTvpecVZaFUvncxB/y6Vv6r+ue4AULlhufWx NTgPirVdTFYATTgQpmG/79kMAYvUgVwp9eYNMzW8EELZ4S0qDAznNSmC0E9WMZR43X0jcn 9T9Z/y0nztnBqxoggHmbRNBMAEzPZxJNJadoPXCOOW56BjZvsE3P6CWC5tX5JwzpOdhQBr 9di3uwi9sc/cYGzUdgNCQ2e6R2/QJUBqmM+cs396ZJ+LEIS42isBLArUW/xkmGV4NUen6M aJRjBup3isnrjS66E1vayQ1+iSYF+K1uK7PlMXS8UglNeLxopV3AKj78gHJbEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716989128; a=rsa-sha256; cv=none; b=ONU9KatcZMfhli06AnB9NbEhF0cs9ZUaPK2PW0B8pXHzxC7NjlX//wn6HWA4eHoeWvWknH 32HrVquIoGqzNYzsaJr24Amyv/TiV/fJGeQmZtzfFmhBjl7EfYTtzxxacZiBAF8g5/ztyN byhnkyEUbd2WfJEz0vgftvv6xFOG1aLn3ebExksR14WD+rqT9IBormhim5zQfkFpjqlj6k Kpcg8yT3HY4sqKB8F7qbKBtnBFMRTns8Pqzjv39XHH5s1LIzDNFZdLUgoJdsZeSW00s/jd NNBTYog3nRkrqPCMYB4QNgcLWChxIZXxxEc92r2SJ1xrup/zh/Wk49Dc6i8yFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716989128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ql27zfvLX20kc8Tt/AHz8pZKuYDbJA8poYF2FXQLe9Q=; b=eQeRvm68tP1zxEnsZc0aAmJBGsSJddcOSesSLatYEQg+q0Z7xKurhzJtDbOmavDDUCNCjh ZnGO6IDZVBJrWJSK1Z9pWGzvcq+6Xw5AvqlwB/vjFcDN99abcYhWN9wj+FHhnTZ2KyYx6V HrGNulfA7Q4Bk+FvbEc3sqDxURObTHD9iyDeOB7CEwPO701YXwbIJu6QeIJLCrr+4hDdHw xi3Mdhy+3eb3ckPrv6CAfIfV8nCmYXCFZYhs9Vgn4KjB9K9g55/2Xl8kRfoI9rrDfIXgob oP8fVo8hxMBJynSpyCpETSdPAk/BdR8vYRklB7nVJwQzoCZieJgTPBuj/1330A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vq99h2T1MzyDs; Wed, 29 May 2024 13:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44TDPS8Y079072; Wed, 29 May 2024 13:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TDPSjK079069; Wed, 29 May 2024 13:25:28 GMT (envelope-from git) Date: Wed, 29 May 2024 13:25:28 GMT Message-Id: <202405291325.44TDPSjK079069@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 91b0e9abd6cb - main - www/ufdbguard: update to 1.35.7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91b0e9abd6cb634795571c33b8c888be9df343ae Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=91b0e9abd6cb634795571c33b8c888be9df343ae commit 91b0e9abd6cb634795571c33b8c888be9df343ae Author: Rodrigo Osorio AuthorDate: 2024-05-29 09:37:37 +0000 Commit: Rodrigo Osorio CommitDate: 2024-05-29 13:24:35 +0000 www/ufdbguard: update to 1.35.7 Changelog: https://www.urlfilterdb.com/products/releases.html Major changes: * Fix: potential buffer overrun with clientid * ufdbgclient has new option to choose between UNIX and TCP socket Port changes: * remove unix socket compile option. It's no longer a compile option, there is 'socket-type' configuration option instead. * minor adjustments for configure PR: 278258 Reported by: Pavel Timofeev (maintainer) --- www/ufdbguard/Makefile | 40 ++++++++++------------ www/ufdbguard/distinfo | 6 ++-- www/ufdbguard/files/patch-configure | 18 ++++++++++ www/ufdbguard/files/patch-src_Makefile.in | 14 ++++++-- .../files/patch-src_install__etcfiles.sh.in | 4 +-- www/ufdbguard/files/patch-src_mtserver_Makefile.in | 10 +++--- www/ufdbguard/files/pkg-message.in | 4 --- www/ufdbguard/files/ufdbguardd.in | 14 +------- 8 files changed, 58 insertions(+), 52 deletions(-) diff --git a/www/ufdbguard/Makefile b/www/ufdbguard/Makefile index 7101df5a4ffb..9cb76966c5f2 100644 --- a/www/ufdbguard/Makefile +++ b/www/ufdbguard/Makefile @@ -1,6 +1,5 @@ PORTNAME= ufdbGuard -PORTVERSION= 1.35.3 -PORTREVISION= 1 +PORTVERSION= 1.35.7 CATEGORIES= www MASTER_SITES= SF/${PORTNAME:tl}/1.35 @@ -17,43 +16,40 @@ USE_RC_SUBR= ufdbguardd SHEBANG_FILES= samples/URLblocked.cgi GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} \ - --with-ssl-lib=${OPENSSLLIB} \ - --with-ssl-inc=${OPENSSLINC} \ - --with-bz2=/usr \ +CONFIGURE_ARGS= --with-bz2-inc=/usr/include \ --with-bz2-lib=/usr/lib \ - --with-bz2-inc=/usr/include \ - --with-ufdb-user=root \ - --with-ufdb-mandir=${PREFIX}/share/man \ + --with-bz2=/usr \ + --with-ssl-inc=${OPENSSLINC} \ + --with-ssl-lib=${OPENSSLLIB} \ + --with-ssl=${OPENSSLBASE} \ + --with-ufdb-config=${ETCDIR} \ + --with-ufdb-dbhome=${DBDIR} \ + --with-ufdb-imagesdir=${EXAMPLESDIR}/images \ --with-ufdb-logdir=${LOGDIR} \ + --with-ufdb-mandir=${PREFIX}/share/man \ --with-ufdb-piddir=${RUNDIR} \ --with-ufdb-samplesdir=${EXAMPLESDIR} \ - --with-ufdb-config=${ETCDIR} \ - --with-ufdb-dbhome=${DBDIR} \ - --with-ufdb-imagesdir=${EXAMPLESDIR}/images + --with-ufdb-user=root MAKE_JOBS_UNSAFE= yes SUB_FILES= pkg-message -SUB_LIST= PORTNAME=${PORTNAME} \ - USERS=${USERS} \ +SUB_LIST= DBDIR=${DBDIR} \ + PORTNAME=${PORTNAME} \ RUNDIR=${RUNDIR} \ - DBDIR=${DBDIR} + USERS=${USERS} USERS= ufdb GROUPS= ${USERS} -PLIST_SUB= USERS=${USERS} \ +PLIST_SUB= DBDIR=${DBDIR} \ GROUPS=${GROUPS} \ + LOGDIR=${LOGDIR} \ RUNDIR=${RUNDIR} \ - DBDIR=${DBDIR} \ - LOGDIR=${LOGDIR} - -OPTIONS_DEFINE= UNIXSOCKETS EXAMPLES + USERS=${USERS} -UNIXSOCKETS_DESC= Unix sockets support -UNIXSOCKETS_CONFIGURE_WITH= unix-sockets +OPTIONS_DEFINE= EXAMPLES DBDIR= /var/db/${PORTNAME} LOGDIR= /var/log/${PORTNAME} diff --git a/www/ufdbguard/distinfo b/www/ufdbguard/distinfo index c2e6f20fdff3..901500a810ab 100644 --- a/www/ufdbguard/distinfo +++ b/www/ufdbguard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1604849332 -SHA256 (ufdbGuard-1.35.3.tar.gz) = eb6134b2b5430da3006cd28a0977034f3ff8df9d5a72058e2e9d956f2d57c449 -SIZE (ufdbGuard-1.35.3.tar.gz) = 1738159 +TIMESTAMP = 1712588046 +SHA256 (ufdbGuard-1.35.7.tar.gz) = 2707c6786fe3cf0b1199f0f970883838e8dd529741db7c4a728788824fcec8a4 +SIZE (ufdbGuard-1.35.7.tar.gz) = 1711624 diff --git a/www/ufdbguard/files/patch-configure b/www/ufdbguard/files/patch-configure new file mode 100644 index 000000000000..38d7189990fc --- /dev/null +++ b/www/ufdbguard/files/patch-configure @@ -0,0 +1,18 @@ +--- configure.orig 2024-03-20 15:31:17 UTC ++++ configure +@@ -7847,7 +7847,6 @@ then + echo " The bash package is most likely on your UNIX distribution media." + echo " It is required to install the bash package and rerun configure." + echo +- exit 1 + fi + + # Extract the first word of "wget", so it can be a program name with args. +@@ -7905,7 +7904,6 @@ then + echo " The wget package is most likely on your UNIX distribution media." + echo " It is required to install the wget package and rerun configure." + echo +- exit 1 + fi + + # Extract the first word of "curl", so it can be a program name with args. diff --git a/www/ufdbguard/files/patch-src_Makefile.in b/www/ufdbguard/files/patch-src_Makefile.in index e2e5372afed4..ed838ade98a4 100644 --- a/www/ufdbguard/files/patch-src_Makefile.in +++ b/www/ufdbguard/files/patch-src_Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig 2019-02-04 19:45:45 UTC +--- src/Makefile.in.orig 2024-03-21 13:58:11 UTC +++ src/Makefile.in -@@ -227,7 +227,7 @@ install.bin: ufdbGenTable ufdbAnalyse ufdbhttpd create +@@ -237,7 +237,7 @@ install.bin: ufdbGenTable ufdbAnalyse ufdbhttpd create $(INSTALL_PROGRAM) ufdb_top_urls.pl $(DESTDIR)$(bindir)/ufdb_top_urls $(INSTALL_PROGRAM) ufdb_top_users.pl $(DESTDIR)$(bindir)/ufdb_top_users @if [ -f ufdbpeek ] ; then $(INSTALL_PROGRAM) ufdbpeek $(DESTDIR)$(bindir)/ufdbpeek ; fi @@ -9,7 +9,7 @@ install.pid:: if [ $(piddir) != /var/tmp ] ; then $(INSTALL) -d $(DESTDIR)$(piddir) ; fi -@@ -239,10 +239,10 @@ install.update:: +@@ -249,10 +249,10 @@ install.update:: install.security:: echo "Installing SSL root certificates" @@ -22,3 +22,11 @@ install.debug:: -if [ -x /usr/bin/debuginfo-install ] ; then /usr/bin/debuginfo-install glibc ; fi +@@ -269,7 +269,6 @@ install.log:: + + createdirs:: + echo "Creating directories ..." +- $(INSTALL) -d $(DESTDIR)/usr/lib/systemd/system + $(INSTALL) -d $(DESTDIR)$(bindir) + $(INSTALL) -o $(RUNAS) -d $(DESTDIR)$(logdir) + $(INSTALL) -d $(DESTDIR)$(cfgdir) diff --git a/www/ufdbguard/files/patch-src_install__etcfiles.sh.in b/www/ufdbguard/files/patch-src_install__etcfiles.sh.in index 5fa9195cd556..6a4e7f76e729 100644 --- a/www/ufdbguard/files/patch-src_install__etcfiles.sh.in +++ b/www/ufdbguard/files/patch-src_install__etcfiles.sh.in @@ -1,4 +1,4 @@ ---- src/install_etcfiles.sh.in.orig 2019-02-27 23:03:09 UTC +--- src/install_etcfiles.sh.in.orig 2024-03-22 12:30:31 UTC +++ src/install_etcfiles.sh.in @@ -22,19 +22,6 @@ else DESTDIR="" @@ -20,7 +20,7 @@ OS="@ufdb_os_type@" INITDIR="@ufdb_initdir@" -@@ -281,12 +268,10 @@ fix_piddir_permissions () { +@@ -293,12 +280,10 @@ fix_piddir_permissions () { case $OS in diff --git a/www/ufdbguard/files/patch-src_mtserver_Makefile.in b/www/ufdbguard/files/patch-src_mtserver_Makefile.in index 37ac2487116b..ac158fced37c 100644 --- a/www/ufdbguard/files/patch-src_mtserver_Makefile.in +++ b/www/ufdbguard/files/patch-src_mtserver_Makefile.in @@ -1,11 +1,11 @@ ---- src/mtserver/Makefile.in.orig 2020-11-01 13:42:44 UTC +--- src/mtserver/Makefile.in.orig 2024-03-21 13:58:11 UTC +++ src/mtserver/Makefile.in @@ -16,7 +16,7 @@ CC = @CC@ CXX = @CXX@ --CFLAGS = @CFLAGS@ -I. -I.. # -DUFDB_TEST_PROXY -+CFLAGS = @CFLAGS@ -D__BSD_VISIBLE=1 -I. -I.. - CXXFLAGS= @CXXFLAGS@ -I. -I.. +-CFLAGS = @CFLAGS@ -I. -I.. -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wold-style-definition ++CFLAGS = @CFLAGS@ -D__BSD_VISIBLE=1 -I. -I.. -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wold-style-definition + CXXFLAGS= @CXXFLAGS@ -I. -I.. -Wall -Wextra -Wmissing-declarations CPPFLAGS= @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ + LDFLAGS = @LDFLAGS@ # -Wl,-z,relro -Wl,-z,now diff --git a/www/ufdbguard/files/pkg-message.in b/www/ufdbguard/files/pkg-message.in index fa4f167cd4db..32510a1d6d67 100644 --- a/www/ufdbguard/files/pkg-message.in +++ b/www/ufdbguard/files/pkg-message.in @@ -3,10 +3,6 @@ message: <