git: 2a09e5b4da7c - main - cleanup: remove support for FreeBSD 13.0 which expired today.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 01 Sep 2022 14:05:52 UTC
The branch main has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2a09e5b4da7cfa9288c56e94791cc371a31b914d
commit 2a09e5b4da7cfa9288c56e94791cc371a31b914d
Author: Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2022-08-09 21:14:22 +0000
Commit: Rene Ladan <rene@FreeBSD.org>
CommitDate: 2022-09-01 13:52:16 +0000
cleanup: remove support for FreeBSD 13.0 which expired today.
- Mk/bsd.port.mk: mark 13.0 as unsupported
- Tools/scripts/portsearch: Drop support for FreeBSD <= 4
- archivers/zstd: revert "Fix build on FreeBSD 13.0"
- deskutils/xdg-desktop-portal: remove check for 13.0
- devel/libpeas: remove outdated comment
- editors/imhex: remove compatibility for 13.0
- editors/libreoffice: remove compatibility for 13.0
- editors/openoffice-4: remove compatibility for 13.0
- editors/openoffice-devel: remove compatibility for 13.0
- emulators/linux_base-c7: remove compatiblity for 13.0
- graphics/drm-kmod: remove detection for 13.0
- graphics/gpu-firmware-amd-kmod: do not check 13.0 anymore
- graphics/linux-c7-libdrm: remove support for 13.0
- math/igraph: remove support for 13.0
- net/asterisk16: drop support for ancient FreeBSD versions
- net/asterisk18: drop support for ancient FreeBSD versions
- security/openssl*: drop now obsolete patches
- sysutils/bhyve+: drop support for FreeBSD 13.0
- sysutils/ebsnvme-id: drop support for FreeBSD 13.0
- sysutils/openzfs: remove detection of FreeBSD 13.0
- sysutils/openzfs-kmod: drop detection of FreeBSD 13.0
- www/firefox: generalize pkg-message a bit regarding hgame(4)
- x11/xorg-cf-files: remove support for FreeBSD < 6 (yes, pre-2008)
While here, regenerate patches for:
- x11/xorg-cf-files
- net/asterisk16
- net/asterisk18
While here, remove a stale $Id$ from Tools/scripts/portsearch
Differential Revision: https://reviews.freebsd.org/D36233
Reviewed by: office (fluffy), x11 (manu), arrowd, brnrd, cperciva, freqlabs, imp, jbeich, madpilot, nobutaka
---
Mk/bsd.port.mk | 2 +-
Tools/scripts/portsearch | 4 +-
archivers/zstd/Makefile | 3 +-
deskutils/xdg-desktop-portal/Makefile | 1 -
devel/libpeas/Makefile | 1 -
editors/imhex/Makefile | 1 -
editors/libreoffice/Makefile | 1 -
editors/openoffice-4/Makefile | 1 -
editors/openoffice-devel/Makefile | 1 -
emulators/linux_base-c7/Makefile | 19 +-
emulators/linux_base-c7/pkg-plist.aarch64 | 4 +-
emulators/linux_base-c7/pkg-plist.amd64 | 6 +-
emulators/linux_base-c7/pkg-plist.i386 | 4 +-
graphics/drm-kmod/Makefile | 2 -
graphics/gpu-firmware-amd-kmod/Makefile | 2 -
graphics/linux-c7-libdrm/Makefile | 13 -
math/igraph/Makefile | 7 +-
.../files/extra-patch-etc_cmake_compilers.cmake | 10 -
net/asterisk16/files/patch-Makefile | 34 +--
.../patch-build__tools_make__xml__documentation | 4 +-
net/asterisk16/files/patch-channels_chan__dahdi.c | 8 +-
.../files/patch-channels_sip_include_sip.h | 4 +-
net/asterisk16/files/patch-configure | 22 +-
net/asterisk16/files/patch-main_Makefile | 16 +-
net/asterisk16/files/patch-main_term.c | 4 +-
net/asterisk16/files/patch-menuselect_configure | 4 +-
net/asterisk18/files/patch-Makefile | 36 +--
.../patch-build__tools_make__xml__documentation | 4 +-
net/asterisk18/files/patch-channels_chan__dahdi.c | 8 +-
.../files/patch-channels_sip_include_sip.h | 4 +-
net/asterisk18/files/patch-configure | 22 +-
net/asterisk18/files/patch-main_Makefile | 16 +-
net/asterisk18/files/patch-main_term.c | 4 +-
net/asterisk18/files/patch-menuselect_configure | 4 +-
.../files/patch-crypto_threads__pthread.c | 20 --
.../files/patch-crypto_threads__pthread.c | 20 --
sysutils/bhyve+/Makefile | 2 -
.../bhyve+/files/freebsd-13/0/patch-custom-libs | 21 --
sysutils/bhyve+/files/freebsd-13/0/patch-lib9p | 12 -
sysutils/bhyve+/files/freebsd-13/0/patch-libvmmapi | 33 ---
.../bhyve+/files/freebsd-13/0/patch-msi-x-mappings | 132 ----------
sysutils/ebsnvme-id/Makefile | 8 +-
sysutils/openzfs-kmod/Makefile | 8 +-
sysutils/openzfs/Makefile | 8 +-
www/firefox/pkg-message | 2 +-
x11/xorg-cf-files/files/patch-FreeBSD.cf | 273 +++++++++++++++++++--
x11/xorg-cf-files/files/patch-Imake.rules | 14 +-
x11/xorg-cf-files/files/patch-Imake.tmpl | 8 +-
x11/xorg-cf-files/files/patch-Library.tmpl | 6 +-
49 files changed, 397 insertions(+), 446 deletions(-)
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 9fbf900609d2..a68ace6f5fdb 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1169,7 +1169,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC
. endif
_EXPORTED_VARS+= OSVERSION
-. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1203000
+. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1203000 || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1301000))
_UNSUPPORTED_SYSTEM_MESSAGE= Ports Collection support for your ${OPSYS} version has ended, and no ports\
are guaranteed to build on this system. Please upgrade to a supported release.
. if defined(ALLOW_UNSUPPORTED_SYSTEM)
diff --git a/Tools/scripts/portsearch b/Tools/scripts/portsearch
index ee394ab58325..5c153aae9b73 100755
--- a/Tools/scripts/portsearch
+++ b/Tools/scripts/portsearch
@@ -24,8 +24,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $Id$
-#
# Each port record in INDEX contains 10 fields, delimited by ``|'', some
@@ -50,7 +48,7 @@ my $portsdir = "/usr/ports";
$portsdir = $ENV{PORTSDIR} if ( defined $ENV{'PORTSDIR'} );
my $VERSION = "1.0";
-my $file = "$portsdir/INDEX" . ($osrel <= 4 ? "" : "-$osrel");
+my $file = "$portsdir/INDEX-$osrel";
my $match = 1;
my $count = 0;
my $fulldesc = 0;
diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile
index 0f444ca11498..09d83608ef6c 100644
--- a/archivers/zstd/Makefile
+++ b/archivers/zstd/Makefile
@@ -13,12 +13,11 @@ LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE
LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
LIB_DEPENDS= liblz4.so:archivers/liblz4
-TEST_DEPENDS= gmd5sum:sysutils/coreutils # required by FreeBSD 13.0
USES= gmake localbase:ldflags tar:zst
ALL_TARGET= default
-#BINARY_ALIAS= gmd5sum=md5sum
+BINARY_ALIAS= gmd5sum=md5sum
TEST_TARGET= test
MAKE_ENV= INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_MAN="${INSTALL_MAN}" \
diff --git a/deskutils/xdg-desktop-portal/Makefile b/deskutils/xdg-desktop-portal/Makefile
index c4f3f03aabeb..878c44767f98 100644
--- a/deskutils/xdg-desktop-portal/Makefile
+++ b/deskutils/xdg-desktop-portal/Makefile
@@ -28,7 +28,6 @@ GH_ACCOUNT= flatpak
.include <bsd.port.pre.mk>
.if (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400008) \
- || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300501) \
|| ${OSVERSION} < 1300000
IGNORE= requires O_PATH support in open(2)
.endif
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 91c70dfd2ce8..be54a5b9309a 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -34,7 +34,6 @@ DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc
DOCS_MESON_TRUE= gtk_doc
pre-build:
-# XXX DISABLE_MAKE_JOBS build fails on 12.2/13.0 i386
${DO_MAKE_BUILD} -C ${BUILD_WRKSRC} \
tests/libpeas/plugins/embedded/embedded-resources.h
diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile
index 53cfed07ab71..57aa9030bbac 100644
--- a/editors/imhex/Makefile
+++ b/editors/imhex/Makefile
@@ -70,7 +70,6 @@ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}
# Before LLVM13 import to the base system
.if (${OSMAJOR} == 12 && ${OSVERSION} < 1203505) \
- || (${OSMAJOR} == 13 && ${OSVERSION} < 1300523) \
|| (${OSMAJOR} == 14 && ${OSVERSION} < 1400042)
IGNORE= will not build due to C++20 API functions unavailable in old libc++
.endif
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 64923cbdcc90..0712aec63964 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -317,7 +317,6 @@ MAKE_ENV+= verbose=1
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ( \
- (${OSVERSION} >= 1300525 && ${OSVERSION} < 1301000) || \
(${OSVERSION} >= 1301500 && ${OSVERSION} < 1301502) || \
(${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057))
BROKEN= please update FreeBSD base system first to fix an ABI incompatibility
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index daf12635d808..cca3158ab424 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -200,7 +200,6 @@ WITH= SDK
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ( \
- (${OSVERSION} >= 1300525 && ${OSVERSION} < 1301000) || \
(${OSVERSION} >= 1301500 && ${OSVERSION} < 1301502) || \
(${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057))
BROKEN= please update FreeBSD base system first to fix an ABI incompatibility
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index df5024310fb2..e87faea07bb5 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -231,7 +231,6 @@ WITH= SDK
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ( \
- (${OSVERSION} >= 1300525 && ${OSVERSION} < 1301000) || \
(${OSVERSION} >= 1301500 && ${OSVERSION} < 1301502) || \
(${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057))
BROKEN= please update FreeBSD base system first to fix an ABI incompatibility
diff --git a/emulators/linux_base-c7/Makefile b/emulators/linux_base-c7/Makefile
index 84162813f2a5..142e4e9267d3 100644
--- a/emulators/linux_base-c7/Makefile
+++ b/emulators/linux_base-c7/Makefile
@@ -136,23 +136,10 @@ REMOVE_FILES= bin/chfn bin/chsh bin/findmnt bin/login bin/lsblk bin/lscpu \
etc/passwd etc/printcap etc/protocols etc/services etc/shadow \
sbin/clock sbin/debugfs sbin/hwclock sbin/runuser sbin/zramctl
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300077)
-GLIBC_VER= 2.17-292.el7
-MASTER_SITE_SUBDIR+= altarch/7.7.1908/os/aarch64/Packages/:DEFAULT,aarch64 \
- altarch/7.7.1908/updates/aarch64/Packages/:DEFAULT,aarch64 \
- centos/7.7.1908/os/x86_64/Packages/:DEFAULT,amd64 \
- centos/7.7.1908/updates/x86_64/Packages/:DEFAULT,amd64 \
- altarch/7.7.1908/os/i386/Packages/:DEFAULT,i386 \
- altarch/7.7.1908/updates/i386/Packages/:DEFAULT,i386 \
- centos/7.7.1908/os/Source/SPackages/:SOURCE \
- centos/7.7.1908/updates/Source/SPackages/:SOURCE
-PLIST_SUB+= NEWGLIBC="@comment "
-.else
+.include <bsd.port.options.mk>
+
GLIBC_VER= 2.17-323.el7_9
PLIST_SUB+= NEWGLIBC=""
-.endif
.if ${ARCH} == aarch64 || ${ARCH} == amd64
SYSCTLMIB= kern.features.linux64
@@ -200,4 +187,4 @@ post-install:
${LN} -sf /var/run ${STAGEDIR}${PREFIX}/run
${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/linux_base-c7/pkg-plist.aarch64 b/emulators/linux_base-c7/pkg-plist.aarch64
index d71dfbdcbe7a..ef37229011a8 100644
--- a/emulators/linux_base-c7/pkg-plist.aarch64
+++ b/emulators/linux_base-c7/pkg-plist.aarch64
@@ -496,7 +496,7 @@ usr/lib64/gconv/IBM852.so
usr/lib64/gconv/IBM855.so
usr/lib64/gconv/IBM856.so
usr/lib64/gconv/IBM857.so
-%%NEWGLIBC%%usr/lib64/gconv/IBM858.so
+usr/lib64/gconv/IBM858.so
usr/lib64/gconv/IBM860.so
usr/lib64/gconv/IBM861.so
usr/lib64/gconv/IBM862.so
@@ -1316,7 +1316,7 @@ usr/share/i18n/charmaps/IBM852.gz
usr/share/i18n/charmaps/IBM855.gz
usr/share/i18n/charmaps/IBM856.gz
usr/share/i18n/charmaps/IBM857.gz
-%%NEWGLIBC%%usr/share/i18n/charmaps/IBM858.gz
+usr/share/i18n/charmaps/IBM858.gz
usr/share/i18n/charmaps/IBM860.gz
usr/share/i18n/charmaps/IBM861.gz
usr/share/i18n/charmaps/IBM862.gz
diff --git a/emulators/linux_base-c7/pkg-plist.amd64 b/emulators/linux_base-c7/pkg-plist.amd64
index c60438999751..75a02780477a 100644
--- a/emulators/linux_base-c7/pkg-plist.amd64
+++ b/emulators/linux_base-c7/pkg-plist.amd64
@@ -486,7 +486,7 @@ usr/lib/gconv/IBM852.so
usr/lib/gconv/IBM855.so
usr/lib/gconv/IBM856.so
usr/lib/gconv/IBM857.so
-%%NEWGLIBC%%usr/lib/gconv/IBM858.so
+usr/lib/gconv/IBM858.so
usr/lib/gconv/IBM860.so
usr/lib/gconv/IBM861.so
usr/lib/gconv/IBM862.so
@@ -969,7 +969,7 @@ usr/lib64/gconv/IBM852.so
usr/lib64/gconv/IBM855.so
usr/lib64/gconv/IBM856.so
usr/lib64/gconv/IBM857.so
-%%NEWGLIBC%%usr/lib64/gconv/IBM858.so
+usr/lib64/gconv/IBM858.so
usr/lib64/gconv/IBM860.so
usr/lib64/gconv/IBM861.so
usr/lib64/gconv/IBM862.so
@@ -1806,7 +1806,7 @@ usr/share/i18n/charmaps/IBM852.gz
usr/share/i18n/charmaps/IBM855.gz
usr/share/i18n/charmaps/IBM856.gz
usr/share/i18n/charmaps/IBM857.gz
-%%NEWGLIBC%%usr/share/i18n/charmaps/IBM858.gz
+usr/share/i18n/charmaps/IBM858.gz
usr/share/i18n/charmaps/IBM860.gz
usr/share/i18n/charmaps/IBM861.gz
usr/share/i18n/charmaps/IBM862.gz
diff --git a/emulators/linux_base-c7/pkg-plist.i386 b/emulators/linux_base-c7/pkg-plist.i386
index 3e2485e05cb9..0e193adafb56 100644
--- a/emulators/linux_base-c7/pkg-plist.i386
+++ b/emulators/linux_base-c7/pkg-plist.i386
@@ -482,7 +482,7 @@ usr/lib/gconv/IBM852.so
usr/lib/gconv/IBM855.so
usr/lib/gconv/IBM856.so
usr/lib/gconv/IBM857.so
-%%NEWGLIBC%%usr/lib/gconv/IBM858.so
+usr/lib/gconv/IBM858.so
usr/lib/gconv/IBM860.so
usr/lib/gconv/IBM861.so
usr/lib/gconv/IBM862.so
@@ -1339,7 +1339,7 @@ usr/share/i18n/charmaps/IBM852.gz
usr/share/i18n/charmaps/IBM855.gz
usr/share/i18n/charmaps/IBM856.gz
usr/share/i18n/charmaps/IBM857.gz
-%%NEWGLIBC%%usr/share/i18n/charmaps/IBM858.gz
+usr/share/i18n/charmaps/IBM858.gz
usr/share/i18n/charmaps/IBM860.gz
usr/share/i18n/charmaps/IBM861.gz
usr/share/i18n/charmaps/IBM862.gz
diff --git a/graphics/drm-kmod/Makefile b/graphics/drm-kmod/Makefile
index 3925a8fa6dc9..4b3547f53b58 100644
--- a/graphics/drm-kmod/Makefile
+++ b/graphics/drm-kmod/Makefile
@@ -17,8 +17,6 @@ IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality)
.if ${ARCH} == "amd64"
.if ${OSVERSION} < 1300000
RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod
-.elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300136
-IGNORE= not supported on older 13, no kernel support
.elif ${OSVERSION} >= 1300136 && ${OSVERSION} < 1400000
RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd13-kmod
.elif ${OSVERSION} >= 1400000
diff --git a/graphics/gpu-firmware-amd-kmod/Makefile b/graphics/gpu-firmware-amd-kmod/Makefile
index af67aff4627a..15a928c45d44 100644
--- a/graphics/gpu-firmware-amd-kmod/Makefile
+++ b/graphics/gpu-firmware-amd-kmod/Makefile
@@ -49,9 +49,7 @@ FLAVORS= banks \
sienna_cichlid
green_sardine_IGNORE_FreeBSD_12= "Not supported on < 13.1"
-green_sardine_IGNORE_FreeBSD_13.0= "Not supported on < 13.1"
sienna_cichlid_IGNORE_FreeBSD_12= "Not supported on < 13.1"
-sienna_cichlid_IGNORE_FreeBSD_13.0= "Not supported on < 13.1"
USES= kmod uidfix
diff --git a/graphics/linux-c7-libdrm/Makefile b/graphics/linux-c7-libdrm/Makefile
index 3b5185de9526..030244e4c949 100644
--- a/graphics/linux-c7-libdrm/Makefile
+++ b/graphics/linux-c7-libdrm/Makefile
@@ -15,17 +15,4 @@ DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && \
- (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300048)
-PORTVERSION= 2.4.91
-DISTVERSIONSUFFIX= -3.el7
-
-LINUX_DIST_VER= 7.6.1810
-
-post-install:
- ${MV} ${STAGEDIR}${DOCSDIR}/README ${STAGEDIR}${DOCSDIR}/README.rst
-.endif
-
.include <bsd.port.mk>
diff --git a/math/igraph/Makefile b/math/igraph/Makefile
index c656133cd918..1fda7f463987 100644
--- a/math/igraph/Makefile
+++ b/math/igraph/Makefile
@@ -26,9 +26,4 @@ BINARY_ALIAS= git=false
pre-configure:
@${ECHO} ${DISTVERSION} > ${WRKSRC}/IGRAPH_VERSION
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300523
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-etc_cmake_compilers.cmake
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/igraph/files/extra-patch-etc_cmake_compilers.cmake b/math/igraph/files/extra-patch-etc_cmake_compilers.cmake
deleted file mode 100644
index 84b1f3c4b264..000000000000
--- a/math/igraph/files/extra-patch-etc_cmake_compilers.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
---- etc/cmake/compilers.cmake.orig 2022-01-04 06:55:25 UTC
-+++ etc/cmake/compilers.cmake
-@@ -31,7 +31,6 @@ macro(use_all_warnings TARGET_NAME)
- target_compile_options(${TARGET_NAME} PRIVATE
- # GCC-style compilers:
- $<$<C_COMPILER_ID:GCC,Clang,AppleClang,Intel>:
-- $<$<BOOL:${IGRAPH_WARNINGS_AS_ERRORS}>:-Werror>
- -Wall -Wextra -pedantic
- -Wno-unused-function -Wno-unused-parameter -Wno-sign-compare
- >
diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile
index cb32070eebc7..d9e5c55c759c 100644
--- a/net/asterisk16/files/patch-Makefile
+++ b/net/asterisk16/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2022-07-28 15:44:36 UTC
+--- Makefile.orig 2022-08-18 15:13:55 UTC
+++ Makefile
-@@ -144,7 +144,7 @@ OVERWRITE=y
+@@ -144,7 +144,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
OVERWRITE=y
# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
@@ -18,16 +18,20 @@
# If the file .asterisk.makeopts is present in your home directory, you can
# include all of your favorite menuselect options so that every time you download
-@@ -228,7 +228,7 @@ ifeq ($(OSARCH),FreeBSD)
+@@ -226,12 +226,6 @@ else ifneq ($(findstring BSD,$(OSARCH)),)
+ _ASTCFLAGS+=-isystem /usr/local/include
+ endif
- ifeq ($(OSARCH),FreeBSD)
- # -V is understood by BSD Make, not by GNU make.
+-ifeq ($(OSARCH),FreeBSD)
+- # -V is understood by BSD Make, not by GNU make.
- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-+ BSDVERSION=$(OSVERSION)
- _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+- _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+-endif
+-
+ ifeq ($(OSARCH),NetBSD)
+ _ASTCFLAGS+=-pthread -D__LIBPTHREAD_SOURCE__ -I/usr/pkg/include
endif
-
-@@ -475,8 +475,12 @@ endif
+@@ -475,8 +469,12 @@ endif
$(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
done \
fi
@@ -41,7 +45,7 @@
done
$(MAKE) -C sounds install
find rest-api -name "*.json" | while read x; do \
-@@ -545,7 +549,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
+@@ -545,7 +543,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \
"$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \
@@ -50,7 +54,7 @@
installdirs:
@for i in $(INSTALLDIRS); do \
-@@ -578,10 +582,10 @@ endif
+@@ -578,10 +576,10 @@ endif
if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
fi
@@ -65,7 +69,7 @@
$(SUBDIRS_INSTALL):
+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install
-@@ -706,7 +710,7 @@ endif
+@@ -706,7 +704,7 @@ ifeq ($(ASTERISKVERSION),UNKNOWN__git_check_fail)
endif
@@ -74,7 +78,7 @@
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
fi
-@@ -751,23 +755,10 @@ define INSTALL_CONFIGS
+@@ -751,23 +749,10 @@ upgrade: bininstall
# (2) the extension to strip off
define INSTALL_CONFIGS
@for x in $(1)/*$(2); do \
@@ -100,7 +104,7 @@
echo "Updating asterisk.conf" ; \
sed -e 's|^astcachedir.*$$|astcachedir => $(ASTCACHEDIR)|' \
-e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
-@@ -781,8 +772,8 @@ define INSTALL_CONFIGS
+@@ -781,8 +766,8 @@ define INSTALL_CONFIGS
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
@@ -111,7 +115,7 @@
rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
fi
endef
-@@ -816,7 +807,7 @@ adsi:
+@@ -816,7 +801,7 @@ adsi:
else \
echo "Installing $$x" ; \
fi ; \
diff --git a/net/asterisk16/files/patch-build__tools_make__xml__documentation b/net/asterisk16/files/patch-build__tools_make__xml__documentation
index 9b6dec995449..05202d303aee 100644
--- a/net/asterisk16/files/patch-build__tools_make__xml__documentation
+++ b/net/asterisk16/files/patch-build__tools_make__xml__documentation
@@ -1,6 +1,6 @@
---- build_tools/make_xml_documentation.orig 2022-03-17 15:34:42 UTC
+--- build_tools/make_xml_documentation.orig 2022-06-23 15:21:01 UTC
+++ build_tools/make_xml_documentation
-@@ -228,7 +228,7 @@ for subdir in ${mod_subdirs} ; do
+@@ -214,7 +214,7 @@ for subdir in ${mod_subdirs} ; do
${XMLSTARLET} val -e -d "${source_tree}/doc/appdocsxml.dtd" "${i}" || { echo "" ; exit 1 ; }
fi
fi
diff --git a/net/asterisk16/files/patch-channels_chan__dahdi.c b/net/asterisk16/files/patch-channels_chan__dahdi.c
index cc294c5ba840..69d226ee9b37 100644
--- a/net/asterisk16/files/patch-channels_chan__dahdi.c
+++ b/net/asterisk16/files/patch-channels_chan__dahdi.c
@@ -1,6 +1,6 @@
---- channels/chan_dahdi.c.orig 2020-07-09 15:39:17 UTC
+--- channels/chan_dahdi.c.orig 2022-08-18 15:13:55 UTC
+++ channels/chan_dahdi.c
-@@ -4649,6 +4649,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4803,6 +4803,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
return;
}
if (p->echocancel.head.tap_length) {
@@ -9,7 +9,7 @@
#if defined(HAVE_PRI) || defined(HAVE_SS7)
switch (p->sig) {
#if defined(HAVE_PRI)
-@@ -4679,7 +4681,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4833,7 +4835,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
break;
}
#endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */
@@ -20,7 +20,7 @@
if (res) {
ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
} else {
-@@ -4713,8 +4717,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
+@@ -4867,8 +4871,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
if (p->echocanon) {
struct dahdi_echocanparams ecp = { .tap_length = 0 };
diff --git a/net/asterisk16/files/patch-channels_sip_include_sip.h b/net/asterisk16/files/patch-channels_sip_include_sip.h
index d1668bf70598..7b1c3c6d7325 100644
--- a/net/asterisk16/files/patch-channels_sip_include_sip.h
+++ b/net/asterisk16/files/patch-channels_sip_include_sip.h
@@ -1,6 +1,6 @@
---- channels/sip/include/sip.h.orig 2020-07-09 15:39:17 UTC
+--- channels/sip/include/sip.h.orig 2022-06-23 15:21:01 UTC
+++ channels/sip/include/sip.h
-@@ -192,7 +192,7 @@
+@@ -193,7 +193,7 @@
#define DEFAULT_MOHINTERPRET "default" /*!< The default music class */
#define DEFAULT_MOHSUGGEST ""
#define DEFAULT_VMEXTEN "asterisk" /*!< Default voicemail extension */
diff --git a/net/asterisk16/files/patch-configure b/net/asterisk16/files/patch-configure
index 035ad3df2fe0..5435e3fd970e 100644
--- a/net/asterisk16/files/patch-configure
+++ b/net/asterisk16/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig 2022-05-05 14:21:18 UTC
+--- configure.orig 2022-06-23 15:21:01 UTC
+++ configure
@@ -5148,8 +5148,6 @@ case "${host_os}" in
;;
@@ -9,7 +9,15 @@
;;
openbsd*)
ac_default_prefix=/usr/local
-@@ -22951,6 +22949,8 @@ printf %s "checking for getifaddrs() support... " >&6;
+@@ -21309,7 +21307,6 @@ then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ printf "%s\n" "yes" >&6; }
+
+-printf "%s\n" "#define HAVE_SYSINFO 1" >>confdefs.h
+
+ else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+@@ -22951,6 +22948,8 @@ printf %s "checking for getifaddrs() support... " >&6;
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -18,7 +26,7 @@
#include <ifaddrs.h>
int
main (void)
-@@ -32266,6 +32266,8 @@ for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
+@@ -32266,6 +32265,8 @@ fi
for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
@@ -27,7 +35,7 @@
if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir=""
# if --with-LUA=DIR has been specified, use it.
-@@ -32280,14 +32282,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+@@ -32280,14 +32281,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua${ver}""_luaL_newstate" | $as_tr_sh`
@@ -45,7 +53,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -32328,7 +32330,7 @@ fi
+@@ -32328,7 +32329,7 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@@ -54,7 +62,7 @@
# if --with-LUA=DIR has been specified, use it.
if test "x${LUA_DIR}" != "x"; then
LUA_INCLUDE="-I${LUA_DIR}/include"
-@@ -32338,8 +32340,8 @@ fi
+@@ -32338,8 +32339,8 @@ fi
# check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
@@ -65,7 +73,7 @@
if eval test \"x\$"$as_ac_Header"\" = x"yes"
then :
LUA_HEADER_FOUND=1
-@@ -32366,9 +32368,9 @@ fi
+@@ -32366,9 +32367,9 @@ fi
if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then
diff --git a/net/asterisk16/files/patch-main_Makefile b/net/asterisk16/files/patch-main_Makefile
index dd0dcda5ce7f..00e93713ba49 100644
--- a/net/asterisk16/files/patch-main_Makefile
+++ b/net/asterisk16/files/patch-main_Makefile
@@ -1,16 +1,14 @@
---- main/Makefile.orig 2020-07-09 15:39:17 UTC
+--- main/Makefile.orig 2022-08-18 15:13:55 UTC
+++ main/Makefile
-@@ -80,9 +80,12 @@ endif
+@@ -79,9 +79,8 @@ else
+ endif
ifeq ($(OSARCH),FreeBSD)
- # -V is understood by BSD Make, not by GNU make.
+- # -V is understood by BSD Make, not by GNU make.
- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-+ BSDVERSION=$(OSVERSION)
-+ BSDVERSION?=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
- AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
-+ CRYPT_LIB=$(shell if test $(BSDVERSION) -ge 1200001 ; then echo "-lcrypt"; fi)
+- AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
++ AST_LIBS+=-pthread
++ CRYPT_LIB=-lcrypt
AST_LIBS+=-lcrypto
-+ AST_LIBS+=%%LIBSYSINFO%%
endif
- ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
diff --git a/net/asterisk16/files/patch-main_term.c b/net/asterisk16/files/patch-main_term.c
index dc7ede7d4e12..3594c04dcd0f 100644
--- a/net/asterisk16/files/patch-main_term.c
+++ b/net/asterisk16/files/patch-main_term.c
@@ -1,6 +1,6 @@
---- main/term.c.orig 2022-04-14 21:53:34 UTC
+--- main/term.c.orig 2022-06-23 15:21:01 UTC
+++ main/term.c
-@@ -46,6 +46,7 @@ static const char * const termpath[] = {
+@@ -46,6 +46,7 @@ static char enddata[80] = "";
static char quitdata[80] = "";
static const char * const termpath[] = {
diff --git a/net/asterisk16/files/patch-menuselect_configure b/net/asterisk16/files/patch-menuselect_configure
index 30b3d50d7a34..20a2f48603da 100644
--- a/net/asterisk16/files/patch-menuselect_configure
+++ b/net/asterisk16/files/patch-menuselect_configure
@@ -1,6 +1,6 @@
---- menuselect/configure.orig 2022-05-12 11:47:40 UTC
+--- menuselect/configure.orig 2022-06-23 15:21:01 UTC
+++ menuselect/configure
-@@ -5024,7 +5024,7 @@ printf "%s\n" "yes" >&6; }
+@@ -5099,7 +5099,7 @@ else
printf "%s\n" "yes" >&6; }
PBX_LIBXML2=1
diff --git a/net/asterisk18/files/patch-Makefile b/net/asterisk18/files/patch-Makefile
index b63c2c5294a0..051f9509b8ab 100644
--- a/net/asterisk18/files/patch-Makefile
+++ b/net/asterisk18/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2022-07-28 15:51:18 UTC
+--- Makefile.orig 2022-08-18 15:18:29 UTC
+++ Makefile
-@@ -144,7 +144,7 @@ OVERWRITE=y
+@@ -144,7 +144,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
OVERWRITE=y
# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
@@ -18,16 +18,20 @@
# If the file .asterisk.makeopts is present in your home directory, you can
# include all of your favorite menuselect options so that every time you download
-@@ -228,7 +228,7 @@ ifeq ($(OSARCH),FreeBSD)
+@@ -226,12 +226,6 @@ else ifneq ($(findstring BSD,$(OSARCH)),)
+ _ASTCFLAGS+=-isystem /usr/local/include
+ endif
- ifeq ($(OSARCH),FreeBSD)
- # -V is understood by BSD Make, not by GNU make.
+-ifeq ($(OSARCH),FreeBSD)
+- # -V is understood by BSD Make, not by GNU make.
- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-+ BSDVERSION=$(OSVERSION)
- _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+- _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+-endif
+-
+ ifeq ($(OSARCH),NetBSD)
+ _ASTCFLAGS+=-pthread -D__LIBPTHREAD_SOURCE__ -I/usr/pkg/include
endif
-
-@@ -475,8 +475,12 @@ endif
+@@ -475,8 +469,12 @@ endif
$(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
done \
fi
@@ -41,7 +45,7 @@
done
$(MAKE) -C sounds install
find rest-api -name "*.json" | while read x; do \
-@@ -545,7 +549,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
+@@ -545,7 +543,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \
"$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \
@@ -50,7 +54,7 @@
installdirs:
@for i in $(INSTALLDIRS); do \
-@@ -557,7 +561,7 @@ main-bininstall:
+@@ -557,7 +555,7 @@ installdirs:
main-bininstall:
+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main bininstall
@@ -59,7 +63,7 @@
$(INSTALL) -m 755 contrib/scripts/astversion "$(DESTDIR)$(ASTSBINDIR)/"
$(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
$(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/"
-@@ -578,10 +582,10 @@ endif
+@@ -578,10 +576,10 @@ endif
if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
fi
@@ -74,7 +78,7 @@
$(SUBDIRS_INSTALL):
+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install
-@@ -706,7 +710,7 @@ endif
+@@ -706,7 +704,7 @@ ifeq ($(ASTERISKVERSION),UNKNOWN__git_check_fail)
endif
@@ -83,7 +87,7 @@
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
fi
-@@ -751,23 +755,10 @@ define INSTALL_CONFIGS
+@@ -751,23 +749,10 @@ upgrade: bininstall
# (2) the extension to strip off
define INSTALL_CONFIGS
@for x in $(1)/*$(2); do \
@@ -109,7 +113,7 @@
echo "Updating asterisk.conf" ; \
sed -e 's|^astcachedir.*$$|astcachedir => $(ASTCACHEDIR)|' \
-e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
-@@ -781,8 +772,8 @@ define INSTALL_CONFIGS
+@@ -781,8 +766,8 @@ define INSTALL_CONFIGS
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
@@ -120,7 +124,7 @@
rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
fi
endef
-@@ -816,7 +807,7 @@ adsi:
+@@ -816,7 +801,7 @@ adsi:
else \
echo "Installing $$x" ; \
fi ; \
diff --git a/net/asterisk18/files/patch-build__tools_make__xml__documentation b/net/asterisk18/files/patch-build__tools_make__xml__documentation
index c11eac024b64..5306b95775b7 100644
--- a/net/asterisk18/files/patch-build__tools_make__xml__documentation
+++ b/net/asterisk18/files/patch-build__tools_make__xml__documentation
@@ -1,6 +1,6 @@
---- build_tools/make_xml_documentation.orig 2022-03-17 15:40:57 UTC
+--- build_tools/make_xml_documentation.orig 2022-06-23 15:26:13 UTC
+++ build_tools/make_xml_documentation
-@@ -228,7 +228,7 @@ for subdir in ${mod_subdirs} ; do
+@@ -214,7 +214,7 @@ for subdir in ${mod_subdirs} ; do
${XMLSTARLET} val -e -d "${source_tree}/doc/appdocsxml.dtd" "${i}" || { echo "" ; exit 1 ; }
fi
fi
diff --git a/net/asterisk18/files/patch-channels_chan__dahdi.c b/net/asterisk18/files/patch-channels_chan__dahdi.c
index cc294c5ba840..47ab406401f5 100644
--- a/net/asterisk18/files/patch-channels_chan__dahdi.c
+++ b/net/asterisk18/files/patch-channels_chan__dahdi.c
@@ -1,6 +1,6 @@
---- channels/chan_dahdi.c.orig 2020-07-09 15:39:17 UTC
+--- channels/chan_dahdi.c.orig 2022-08-18 15:18:29 UTC
+++ channels/chan_dahdi.c
-@@ -4649,6 +4649,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4803,6 +4803,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
return;
}
if (p->echocancel.head.tap_length) {
@@ -9,7 +9,7 @@
#if defined(HAVE_PRI) || defined(HAVE_SS7)
switch (p->sig) {
#if defined(HAVE_PRI)
-@@ -4679,7 +4681,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4833,7 +4835,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
break;
}
#endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */
@@ -20,7 +20,7 @@
if (res) {
ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
} else {
-@@ -4713,8 +4717,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
+@@ -4867,8 +4871,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
if (p->echocanon) {
struct dahdi_echocanparams ecp = { .tap_length = 0 };
diff --git a/net/asterisk18/files/patch-channels_sip_include_sip.h b/net/asterisk18/files/patch-channels_sip_include_sip.h
index d1668bf70598..68d93f730e4f 100644
--- a/net/asterisk18/files/patch-channels_sip_include_sip.h
+++ b/net/asterisk18/files/patch-channels_sip_include_sip.h
@@ -1,6 +1,6 @@
---- channels/sip/include/sip.h.orig 2020-07-09 15:39:17 UTC
+--- channels/sip/include/sip.h.orig 2022-06-23 15:26:13 UTC
+++ channels/sip/include/sip.h
-@@ -192,7 +192,7 @@
+@@ -193,7 +193,7 @@
#define DEFAULT_MOHINTERPRET "default" /*!< The default music class */
#define DEFAULT_MOHSUGGEST ""
#define DEFAULT_VMEXTEN "asterisk" /*!< Default voicemail extension */
diff --git a/net/asterisk18/files/patch-configure b/net/asterisk18/files/patch-configure
index a66863381c74..d8a559d1d32d 100644
--- a/net/asterisk18/files/patch-configure
+++ b/net/asterisk18/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig 2022-05-05 17:09:31 UTC
+--- configure.orig 2022-06-23 15:26:13 UTC
+++ configure
@@ -5156,8 +5156,6 @@ case "${host_os}" in
;;
@@ -9,7 +9,15 @@
;;
openbsd*)
ac_default_prefix=/usr/local
-@@ -22983,6 +22981,8 @@ printf %s "checking for getifaddrs() support... " >&6;
+@@ -21341,7 +21339,6 @@ then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ printf "%s\n" "yes" >&6; }
+
+-printf "%s\n" "#define HAVE_SYSINFO 1" >>confdefs.h
+
+ else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+@@ -22983,6 +22980,8 @@ printf %s "checking for getifaddrs() support... " >&6;
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -18,7 +26,7 @@
#include <ifaddrs.h>
int
main (void)
-@@ -32380,6 +32380,8 @@ for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
+@@ -32380,6 +32379,8 @@ fi
for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
@@ -27,7 +35,7 @@
if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir=""
# if --with-LUA=DIR has been specified, use it.
-@@ -32394,14 +32396,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+@@ -32394,14 +32395,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua${ver}""_luaL_newstate" | $as_tr_sh`
@@ -45,7 +53,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -32442,7 +32444,7 @@ fi
+@@ -32442,7 +32443,7 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@@ -54,7 +62,7 @@
# if --with-LUA=DIR has been specified, use it.
if test "x${LUA_DIR}" != "x"; then
LUA_INCLUDE="-I${LUA_DIR}/include"
-@@ -32452,8 +32454,8 @@ fi
+@@ -32452,8 +32453,8 @@ fi
# check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
@@ -65,7 +73,7 @@
if eval test \"x\$"$as_ac_Header"\" = x"yes"
then :
LUA_HEADER_FOUND=1
-@@ -32480,9 +32482,9 @@ fi
+@@ -32480,9 +32481,9 @@ fi
if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then
diff --git a/net/asterisk18/files/patch-main_Makefile b/net/asterisk18/files/patch-main_Makefile
index dd0dcda5ce7f..62f7a4504a4e 100644
--- a/net/asterisk18/files/patch-main_Makefile
+++ b/net/asterisk18/files/patch-main_Makefile
@@ -1,16 +1,14 @@
---- main/Makefile.orig 2020-07-09 15:39:17 UTC
+--- main/Makefile.orig 2022-08-18 15:18:29 UTC
+++ main/Makefile
-@@ -80,9 +80,12 @@ endif
+@@ -79,9 +79,8 @@ else
+ endif
ifeq ($(OSARCH),FreeBSD)
- # -V is understood by BSD Make, not by GNU make.
+- # -V is understood by BSD Make, not by GNU make.
- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-+ BSDVERSION=$(OSVERSION)
-+ BSDVERSION?=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
- AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
-+ CRYPT_LIB=$(shell if test $(BSDVERSION) -ge 1200001 ; then echo "-lcrypt"; fi)
+- AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
++ AST_LIBS+=-pthread
++ CRYPT_LIB=-lcrypt
AST_LIBS+=-lcrypto
-+ AST_LIBS+=%%LIBSYSINFO%%
endif
- ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
diff --git a/net/asterisk18/files/patch-main_term.c b/net/asterisk18/files/patch-main_term.c
index dc7ede7d4e12..37ead1579249 100644
--- a/net/asterisk18/files/patch-main_term.c
+++ b/net/asterisk18/files/patch-main_term.c
@@ -1,6 +1,6 @@
---- main/term.c.orig 2022-04-14 21:53:34 UTC
+--- main/term.c.orig 2022-06-23 15:26:13 UTC
+++ main/term.c
-@@ -46,6 +46,7 @@ static const char * const termpath[] = {
+@@ -46,6 +46,7 @@ static char enddata[80] = "";
static char quitdata[80] = "";
static const char * const termpath[] = {
diff --git a/net/asterisk18/files/patch-menuselect_configure b/net/asterisk18/files/patch-menuselect_configure
index 0447a4c09766..0bba133d6749 100644
--- a/net/asterisk18/files/patch-menuselect_configure
+++ b/net/asterisk18/files/patch-menuselect_configure
@@ -1,6 +1,6 @@
---- menuselect/configure.orig 2022-05-12 11:50:59 UTC
+--- menuselect/configure.orig 2022-06-23 15:26:13 UTC
+++ menuselect/configure
-@@ -5024,7 +5024,7 @@ printf "%s\n" "yes" >&6; }
+@@ -5099,7 +5099,7 @@ else
printf "%s\n" "yes" >&6; }
PBX_LIBXML2=1
diff --git a/security/openssl-devel/files/patch-crypto_threads__pthread.c b/security/openssl-devel/files/patch-crypto_threads__pthread.c
deleted file mode 100644
index fbc67e3e8393..000000000000
--- a/security/openssl-devel/files/patch-crypto_threads__pthread.c
+++ /dev/null
@@ -1,20 +0,0 @@
-Drop after FreeBSD 13.0/12.2 EOL around 2022-05-30
-
*** 763 LINES SKIPPED ***