Merge remote-tracking branch 'internal/freebsd/main' into hardenedbsd…

…/main Conflicts: emulators/qemu7/Makefile (deleted) graphics/wdune/Makefile (deleted) graphics/zphoto/Makefile (unresolved) lang/gcc9/Makefile (deleted) lang/perl5.34/Makefile (deleted) security/sks/Makefile (deleted) www/node21/Makefile (deleted)
HardenedBSD · Jun 30, 2024 · 3cfa94c · 3cfa94c
2 parents 9c9d016 + c999b14
commit 3cfa94c
Show file tree

Hide file tree

Showing 339 changed files with 3,301 additions and 25,357 deletions.
diff --git a/GIDs b/GIDs
@@ -824,7 +824,7 @@ _encrypted-dns:*:879:
 pyspf-milter:*:880:
 ultimaker:*:881:
 midpoint:*:882:
-ipfs-go:*:883:
+kubo-go:*:883:
 telegraf:*:884:
 tcpdump:*:885:
 miniflux:*:886:

diff --git a/MOVED b/MOVED
@@ -3347,3 +3347,29 @@ chinese/oicq||2024-06-27|ICQ Service closed in 2024-06-24
 security/p5-Crypt-OICQ||2024-06-27|ICQ Service closed in 2024-06-24
 net-im/climm||2024-06-27|ICQ Service closed in 2024-06-24
 multimedia/emby-server-devel|multimedia/emby-server|2024-06-28|Beta port removed: please use the release port multimedia/emby-server
+devel/go-protobuf||2024-06-30|Has expired: Upstream officially deprecated this project
+www/py-django-ldapdb||2024-06-30|Has expired: not compatible with Django >= 4.x, upstream no longer maintained
+www/adzap||2024-06-30|Has expired: Obsolete, no longer provides reasonable amount of filtering
+www/bolt||2024-06-30|Has expired: Outdated and unsupported, current version is several years old and unsupported upstream
+www/interchange||2024-06-30|Has expired: Outdated, current version was released in 2010 is unsupported upstream
+www/itop||2024-06-30|Has expired: Outdated, current version is 5 years old and unsupported upstream
+sysutils/container-diff||2024-06-30|Has expired: The repository has been archived by the owner on 2024-03-28. Upstream suggests diffoci as alternative
+emulators/qemu7|emulators/qemu|2024-06-30|Has expired: qemu 9.X.X is out, so time to retire this one
+lang/perl5.34||2024-06-30|Has expired: Support end three years after .0 release, please upgrade to a more recent version of Perl
+www/httest||2024-06-30|Has expired: Abandonware, no activity from upstream for years and depends on deprecated library devel/pcre
+security/sks||2024-06-30|Has expired: Depends on deprecated port databases/db5
+audio/asunder||2024-06-30|Has expired: Depends on deprecated library libcddb, consider using audio/cyanrip instead
+www/py-cookies||2024-06-30|Has expired: Upstream is inactive for many years
+www/node21||2024-06-30|Has expired: Node.js 21.* will reach its EoL on 2024-06-01. Use Node.js 22.* (www/node22) instead
+graphics/py-ming||2024-06-30|Has expired: Depends on deprecated graphics/ming
+graphics/p5-ming||2024-06-30|Has expired: Depends on deprecated graphics/ming
+print/panda||2024-06-30|Has expired: Depends on deprecated Oracle Berkeley DB 5.3 and upstream is dead
+mail/avenger||2024-06-30|Has expired: Depends on deprecated Oracle Berkeley DB 5.3 and upstream is dead
+www/py-django-bootstrap-pagination||2024-06-30|Has expired: not compatible with Django 4.2, upstream no longer maintained
+www/py-django32||2024-06-30|Has expired: Django 3.2 is now in Extended Support, receives security fixes only and will reach End-Of-Life in April 2024. Upgrade to a later Django version. See https://www.djangoproject.com/download/
+net/haproxy20||2024-06-30|Has expired: Upstream EOL reaches on 2024-06-30
+lang/gcc9||2024-06-30|Has expired: Unsupported by upstream. Use GCC 10 or newer instead
+security/p5-Protocol-ACME||2024-06-30|Has expired: upstream maintainer indicated that it is no longer suitable for use
+graphics/wdune||2024-06-30|Has expired: upstream no longer maintained
+www/zend-framework||2024-06-30|Has expired: Deprecated by upstream, and moved to Laminas Project
+sysutils/torque||2024-06-30|Has expired: unfetchable, upstream no longer open source
diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk
@@ -7,13 +7,13 @@
 #   - build     use node as build-time dependency
 #   - run       use node as runtime dependency
 #   - env       set the environment (NODEJS_VERSION and NODEJS_SUFFIX)
-#   - version   available version: lts, current, 18, 20, 21, 22
+#   - version   available version: lts, current, 18, 20, 22
 #
 # Note:
 # - The supported versions follow upstream release schedule
 #   https://github.com/nodejs/Release/blob/main/README.md#release-schedule
 #   - lts is 20 now
-#   - current is 21 now
+#   - current is 22 now
 # - USES=nodejs means USES=nodejs:build,run
 # - If you define a version, you must provide run and/or build
 #
@@ -22,13 +22,13 @@
 .if !defined(_INCLUDE_USES_NODEJS_MK)
 _INCLUDE_USES_NODEJS_MK=	yes
 
-_VALID_NODEJS_VERSIONS=	18 20 21 22 current lts
+_VALID_NODEJS_VERSIONS=	18 20 22 current lts
 
 .  if ! ${_VALID_NODEJS_VERSIONS:M${NODEJS_DEFAULT}}
 IGNORE=	Invalid default nodejs version ${NODEJS_DEFAULT}; valid versions are ${_VALID_NODEJS_VERSIONS}
 .  endif
 
-.  if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N18:N20:N21:N22)
+.  if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N18:N20:N22)
 IGNORE=		USES=nodejs has invalid arguments ${nodejs_ARGS}
 .  endif
 

diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
@@ -42,9 +42,7 @@ USE_PERL5?=	run build
 
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-.  if ${PERL5_DEFAULT} == 5.34
-.include "${PORTSDIR}/lang/perl5.34/version.mk"
-.  elif ${PERL5_DEFAULT} == 5.36
+.  if ${PERL5_DEFAULT} == 5.36
 .include "${PORTSDIR}/lang/perl5.36/version.mk"
 .  elif ${PERL5_DEFAULT} == 5.38
 .include "${PORTSDIR}/lang/perl5.38/version.mk"
@@ -87,10 +85,8 @@ PERL_ARCH?=	mach
 PERL_PORT?=	perl5.40
 .  elif   ${PERL_LEVEL} >= 503800
 PERL_PORT?=	perl5.38
-.  elif   ${PERL_LEVEL} >= 503600
+.  else # ${PERL_LEVEL} < 503800
 PERL_PORT?=	perl5.36
-.  else # ${PERL_LEVEL} < 503600
-PERL_PORT?=	perl5.34
 .  endif
 
 SITE_PERL_REL?=	lib/perl5/site_perl

diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
@@ -56,7 +56,7 @@ FPC_DEFAULT?=		3.2.3
 .  else
 FPC_DEFAULT?=		3.3.1
 .  endif
-# Possible values: 9, 10, 11, 12, 13, 14, 15
+# Possible values: 10, 11, 12, 13, 14, 15
 # (Any other version is completely unsupported and not meant for general use.)
 GCC_DEFAULT?=		13
 # Possible values: 10
@@ -105,11 +105,11 @@ MONO_DEFAULT?=		5.20
 MYSQL_DEFAULT?=		8.0
 # Possible values: ninja, samurai
 NINJA_DEFAULT?=		ninja
-# Possible value: 18, 20, 21, 22, current, lts (Note: current = 22 and lts = 20)
+# Possible value: 18, 20, 22, current, lts (Note: current = 22 and lts = 20)
 NODEJS_DEFAULT?=	lts
 # Possible value: 25, 26
 OPENLDAP_DEFAULT?=	26
-# Possible values: 5.34, 5.36, 5.38, 5.40, devel
+# Possible values: 5.36, 5.38, 5.40, devel
 .  if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
     defined(PACKAGE_BUILDING))
 # When changing the default here, make sure the DEPRECATED/EXPIRATION lines in

diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk
@@ -35,7 +35,7 @@ GCC_Include_MAINTAINER=		gerald@FreeBSD.org
 # All GCC versions supported by this framework.
 #
 # When updating this, keep Mk/bsd.default-versions.mk in sync.
-GCCVERSIONS=	9 10 11 12 13 14 15
+GCCVERSIONS=	10 11 12 13 14 15
 
 # No configurable parts below this. ####################################
 #

diff --git a/UIDs b/UIDs
@@ -829,7 +829,7 @@ _encrypted-dns:*:879:879::0:0:encrypted-dns user:/var/empty:/usr/sbin/nologin
 pyspf-milter:*:880:880::0:0:pyspf-milter:/nonexistent:/usr/sbin/nologin
 ultimaker:*:881:881::0:0:Ultimaker user:/nonexistent:/usr/sbin/nologin
 midpoint:*:882:882::0:0:midPoint user:/var/db/midpoint:/usr/sbin/nologin
-ipfs-go:*:883:883::0:0:ipfs-go user:/var/db/ipfs-go:/bin/sh
+kubo-go:*:883:883::0:0:kubo-go user:/var/db/kubo-go:/bin/sh
 telegraf:*:884:884::0:0:telegraf user:/nonexistent:/usr/sbin/nologin
 tcpdump:*:885:885::0:0:tcpdump user:/nonexistent:/usr/sbin/nologin
 miniflux:*:886:886::0:0:Miniflux:/nonexistent:/usr/sbin/nologin

diff --git a/audio/Makefile b/audio/Makefile
@@ -35,7 +35,6 @@
     SUBDIR += asmixer
     SUBDIR += asterisk-espeak
     SUBDIR += asterisk-flite
-    SUBDIR += asunder
     SUBDIR += atracdenc
     SUBDIR += atunes
     SUBDIR += aubio

diff --git a/audio/asunder/Makefile b/audio/asunder/Makefile
diff --git a/audio/asunder/distinfo b/audio/asunder/distinfo
diff --git a/audio/asunder/files/patch-Makefile.in b/audio/asunder/files/patch-Makefile.in
diff --git a/audio/asunder/pkg-descr b/audio/asunder/pkg-descr
diff --git a/audio/asunder/pkg-plist b/audio/asunder/pkg-plist
diff --git a/audio/mumble-server/Makefile b/audio/mumble-server/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mumble-server
 DISTVERSION=	1.5.634
+PORTREVISION=	1
 CATEGORIES=	audio net
 MASTER_SITES=	https://github.com/${PORTNAME:S/-server//}-voip/${PORTNAME:S/-server//}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME:S/-server//}-${DISTVERSION}
@@ -42,7 +43,7 @@ ICE_DESC=		Ice Support
 AVAHI_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
 AVAHI_CMAKE_BOOL=	zeroconf
 
-ICE_LIB_DEPENDS=	libIce.so:devel/ice
+ICE_LIB_DEPENDS=	libIce.so:devel/ice37
 ICE_CMAKE_BOOL=		ice
 
 LTO_CMAKE_BOOL=		lto

diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	murmur
-PORTVERSION=	1.3.4
+DISTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	audio net
 
 MAINTAINER=	vvd@FreeBSD.org
@@ -47,7 +48,7 @@ BONJOUR_VARS_OFF=	CONFIG+=no-bonjour
 DBUS_USE=		QT=dbus
 DBUS_VARS_OFF=		CONFIG+=no-dbus
 
-ICE_LIB_DEPENDS=	libIce.so:devel/ice
+ICE_LIB_DEPENDS=	libIce.so:devel/ice37
 ICE_VARS_OFF=		CONFIG+=no-ice
 
 MYSQL_USE=		QT=sql-mysql