From nobody Fri Apr 1 15:57:47 2022 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 A89381A58ADB; Fri, 1 Apr 2022 15:57:47 +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 4KVPvb3vJgz3nJF; Fri, 1 Apr 2022 15:57:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648828667; 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=egOJRLRW/pQ9lfhOuRwMscL61rnN2j5TgrWiHFFouwo=; b=g9X+lIdNa+KQPrdg5xRLiuvB7YzBIDY0yenU2nOkcuqLYwdvzCr8d5mjdcPceOPujAg93w ySD4ECfhQdRzp+/fxeUYwOpe+3c6aFrVQXBNEpoJAIS/P5+W0vxOMHah93eS55E0cWbgtJ 9c2BrjSXqF7ECfBe5OLyY19oQFJgMHvIxl9oXnhOuVJe/ryMZwW//XPSC1UgXOksN36Vb2 KwYw89FMam4qI/YvR1OyIb2Njngn6A6ZSRLP3BsDsphYj/g+ha01IrAeJERdHlCN1dJtR+ qHD4waOI38B3PWBaBcVFSmuBepkgb5gtiRKEEmBdbDc9dXJjDa5IljQs3arPqg== 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 5514B172F0; Fri, 1 Apr 2022 15:57:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 231FvlJs031137; Fri, 1 Apr 2022 15:57:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 231Fvlll031136; Fri, 1 Apr 2022 15:57:47 GMT (envelope-from git) Date: Fri, 1 Apr 2022 15:57:47 GMT Message-Id: <202204011557.231Fvlll031136@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 74c02f1ec9c9 - main - all: drop support for EOL FreeBSD 12.2 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74c02f1ec9c9d18845ef12df8d1168974564c667 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648828667; 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=egOJRLRW/pQ9lfhOuRwMscL61rnN2j5TgrWiHFFouwo=; b=Hww9+6Dc8uwlgS4Cooti1/mu45YE8gCpgX/V9BR/QnZ/zTZWckXGQkWCUEypYcz0MvikgQ tcv9vMirU0LzYT685IIC93c1g8mt4FQ9i1VEZ+B0+aVPaRnPV/RNWajyfl8jvUifm9Ucbc Nfi0vWM0jc0h0CRp74TD0cqc1oto9oRL+XhYL1xuma+HAwiOCNnuTlrYIePhweqDrauyiS K4679nCY6d7YXxUiQmqfk/AbJ6fqTQTWbqHn7DzN/EtmZnMdNhe8LXrdkzwOLmi2nTc9Ql njPVLC/YesZ4VDScDnFQKiWidcWQiIf2qfmicB9nUYGGSttmj75LoH5ixZhu2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648828667; a=rsa-sha256; cv=none; b=cgydzyyO1YIrJg6Wns5yXlw7QuAqqMxXH9SQ4sNC/zGTdXFxifez1vb/mcTvzDK/8As4Or GAEdYY5g5PKPy1T7VhLZAKu9fjyWYcbZDkTQe8P0VL/PmwT7uLQgGqFl5xaYsez2X71Og2 jpeUdDQS+Lyu3GPM2u9VbqPXnFsngWP1hrgF9dJHRT+oRZN2Tc/1OSJ45EJI8JaP0qqYqV HATBOv1nsVNMqjbsh+osJLr68rBhDG5PadqR/taGPnPvXCm21hYx0vU5X/scE6TX22lBsG 0THlpK4UaOje3SkoR8kvcosTlobi8sddZ4NzQawkZeawsO77uJj7SY85aj+jHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=74c02f1ec9c9d18845ef12df8d1168974564c667 commit 74c02f1ec9c9d18845ef12df8d1168974564c667 Author: Rene Ladan AuthorDate: 2022-03-01 13:59:16 +0000 Commit: Rene Ladan CommitDate: 2022-04-01 15:53:18 +0000 all: drop support for EOL FreeBSD 12.2 - Mk/bsd.port.mk: bump minimal FreeBSD version to 12.3, update an example - sysutils/lsof: drop support for ancient FreeBSD releases. - multimedia/ustreamer: remove inline patch for 12.2 - x11/wayland-logout: remove support for FreeBSD < 12.3 - sysutils/bhyve+: remove support for FreeBSD 12.2 - databases/clickhouse: remove support for FreeBSD 12.2 - databases/mariadb106-server: remove support for FreeBSD 12.2 - devel/cvsd: no need to test for FreeBSD >=5 anymore - devel/imake: no need to support a.out anymore - japanese/kterm: no need to support FreeBSD <= 9 - math/igraph: remove support for FreeBSD 12.2 - net/onedrive: remove support for FreeBSD 12.2 - security/ipsec-tools: no need to test for FreeBSD >= 11 - emulators/rpcs3: Revert "emulators/rpcs3: unbreak on FreeBSD 12.2 after 49f593b2f77f" Reviewed by: brnrd, fluffy, jbeich, ler, yuri, x11 (zeising) Approved by: portmgr (implicit) Differential Revision: https://reviews.freebsd.org/D34523 --- Mk/bsd.port.mk | 6 +- databases/clickhouse/Makefile | 2 +- databases/mariadb106-server/Makefile | 2 +- devel/cvsd/files/cvsd.in | 5 +- devel/imake/files/patch-imake.c | 39 ++- emulators/rpcs3/Makefile | 5 - japanese/kterm/files/patch-Imakefile | 9 +- math/igraph/Makefile | 3 +- multimedia/ustreamer/Makefile | 8 - net/onedrive/Makefile | 3 +- security/ipsec-tools/Makefile | 2 +- sysutils/bhyve+/Makefile | 7 +- sysutils/bhyve+/files/freebsd-12/2/patch-virtio-9p | 31 -- sysutils/lsof/files/patch-Configure | 8 +- sysutils/lsof/files/patch-dialects-freebsd-dlsof.h | 379 ++++++++++++++++++++- sysutils/lsof/files/patch-dialects_freebsd_dproc.c | 182 +++++++++- x11/wayland-logout/Makefile | 2 +- 17 files changed, 590 insertions(+), 103 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 6710a7cee2df..30f0677660ae 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -40,9 +40,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # makefile is being used on. Automatically set to # "FreeBSD," "NetBSD," or "OpenBSD" as appropriate. # OSREL - The release version of the operating system as a text -# string (e.g., "12.2"). +# string (e.g., "12.3"). # OSVERSION - The operating system version as a comparable integer; -# the value of __FreeBSD_version (e.g., 1202000). +# the value of __FreeBSD_version (e.g., 1203000). # # This is the beginning of the list of all variables that need to be # defined in a port, listed in order that they should be included @@ -1177,7 +1177,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC .endif _EXPORTED_VARS+= OSVERSION -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1202000 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1203000 _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/databases/clickhouse/Makefile b/databases/clickhouse/Makefile index 9808df1c0ec5..2e8b445b105a 100644 --- a/databases/clickhouse/Makefile +++ b/databases/clickhouse/Makefile @@ -238,7 +238,7 @@ CC= clang CXX= clang++ .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +.if ${OPSYS} == FreeBSD SUB_LIST+= LEGACY_LIMITS="@comment " \ MODERN_LIMITS="" .else diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 5308d85a63e2..c7dd9b3629ed 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -199,7 +199,7 @@ CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO .include -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +.if ${OPSYS} == FreeBSD SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " diff --git a/devel/cvsd/files/cvsd.in b/devel/cvsd/files/cvsd.in index 42cb68048148..07c1a5ee4b65 100644 --- a/devel/cvsd/files/cvsd.in +++ b/devel/cvsd/files/cvsd.in @@ -19,7 +19,6 @@ stop_postcmd=${name}_poststop cvsd_config() { - osreldate=`sysctl -n kern.osreldate` chrootjail=`sed -n 's/^ *RootJail *\([^ ]*\) *$/\1/p' < $cvsd_config` if [ -z "$chrootjail" ]; then err 1 "RootJail is not specified in $cvsd_config" @@ -34,7 +33,7 @@ cvsd_config() cvsd_prestart() { cvsd_config - if [ $osreldate -gt 500000 ] && [ "$chrootjail" != "none" ]; then + if [ "$chrootjail" != "none" ]; then mount -t devfs devfs $chrootjail/dev devfs -m $chrootjail/dev rule apply hide devfs -m $chrootjail/dev rule apply path null unhide @@ -45,7 +44,7 @@ cvsd_prestart() cvsd_poststop() { - if [ $osreldate -gt 500000 ] && [ "$chrootjail" != "none" ]; then + if [ "$chrootjail" != "none" ]; then umount -t devfs $chrootjail/dev fi } diff --git a/devel/imake/files/patch-imake.c b/devel/imake/files/patch-imake.c index 9b7d0b8fecc0..ed6c3a3570b1 100644 --- a/devel/imake/files/patch-imake.c +++ b/devel/imake/files/patch-imake.c @@ -1,4 +1,4 @@ ---- imake.c.orig 2013-08-17 10:11:50 UTC +--- imake.c.orig 2019-03-16 23:26:24 UTC +++ imake.c @@ -531,6 +531,14 @@ init(void) AddCppArg(p); @@ -15,36 +15,39 @@ if ((p = getenv("IMAKECPP"))) cpp = p; if ((p = getenv("IMAKEMAKE"))) -@@ -1142,29 +1150,17 @@ get_binary_format(FILE *inFile) - int mib[2]; - size_t len; - int osrel = 0; +@@ -1139,34 +1147,7 @@ get_ld_version(FILE *inFile) + static void + get_binary_format(FILE *inFile) + { +- int mib[2]; +- size_t len; +- int osrel = 0; - FILE *objprog = NULL; - int iself = 0; +- int iself = 0; - char buf[10]; - char cmd[PATH_MAX]; - - mib[0] = CTL_KERN; - mib[1] = KERN_OSRELDATE; - len = sizeof(osrel); - sysctl(mib, 2, &osrel, &len, NULL, 0); +- +- mib[0] = CTL_KERN; +- mib[1] = KERN_OSRELDATE; +- len = sizeof(osrel); +- sysctl(mib, 2, &osrel, &len, NULL, 0); - if (CrossCompiling) { - strcpy (cmd, CrossCompileDir); - strcat (cmd, "/"); - strcat (cmd,"objformat"); - } else - strcpy (cmd, "objformat"); - +- - if (osrel >= 300004 && - (objprog = popen(cmd, "r")) != NULL && - fgets(buf, sizeof(buf), objprog) != NULL && - strncmp(buf, "elf", 3) == 0) -+ if (osrel < 300004) -+ iself = 0; -+ else - iself = 1; +- iself = 1; - if (objprog) - pclose(objprog); - - fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO"); +- +- fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO"); ++ fprintf(inFile, "#define DefaultToElfFormat YES\n"); } + #endif + diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 83d757d458e8..0a07a87ce2bd 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -82,12 +82,7 @@ post-patch: post-install: .if exists(/usr/bin/elfctl) -. if 0 elfctl -e +noaslr ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -. else -# FreeBSD 12.2 lacks https://cgit.freebsd.org/src/commit/?id=f56d7f838f5b - elfctl -e +aslr ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -. endif .endif .include diff --git a/japanese/kterm/files/patch-Imakefile b/japanese/kterm/files/patch-Imakefile index 4ca4e27cb590..f12653a87eeb 100644 --- a/japanese/kterm/files/patch-Imakefile +++ b/japanese/kterm/files/patch-Imakefile @@ -17,7 +17,7 @@ /* * add -DWTMP and -DLASTLOG if you want them. */ -@@ -27,9 +37,12 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan +@@ -27,7 +37,7 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan OSMAJORVERSION = OSMajorVersion OSMINORVERSION = OSMinorVersion @@ -25,13 +25,8 @@ + MAIN_DEFINES = $(TTYGROUPDEF) $(PUCCPTYDDEF) \ -DOSMAJORVERSION=$(OSMAJORVERSION) \ -DOSMINORVERSION=$(OSMINORVERSION) -+#if defined(OSRelVersion) && OSRelVersion < 900007 -+ MAIN_DEFINES+= -DUTMP -+#endif MISC_DEFINES = /* -DALLOWLOGFILEEXEC */ - XKB_DEFINES = XkbClientDefines - DEFINES = $(XKB_DEFINES) $(XPOLL_DEF) -DKTERM -DSTATUSLINE -DKEEPALIVE -DWALLPAPER -@@ -72,7 +85,7 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan +@@ -72,7 +82,7 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan #endif #endif diff --git a/math/igraph/Makefile b/math/igraph/Makefile index c005803d64c4..29553a6bc0d4 100644 --- a/math/igraph/Makefile +++ b/math/igraph/Makefile @@ -30,8 +30,7 @@ pre-configure: @${ECHO} ${DISTVERSION} > ${WRKSRC}/IGRAPH_VERSION .include -.if (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300523) || \ - (${OSVERSION} >= 1200000 && ${OSVERSION} < 1203500) +.if ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300523 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-etc_cmake_compilers.cmake .endif diff --git a/multimedia/ustreamer/Makefile b/multimedia/ustreamer/Makefile index 1df569928d44..d9d9328080ca 100644 --- a/multimedia/ustreamer/Makefile +++ b/multimedia/ustreamer/Makefile @@ -26,12 +26,4 @@ PLIST_FILES= bin/ustreamer \ share/man/man1/ustreamer-dump.1.gz \ share/man/man1/ustreamer.1.gz -.include - -# strerror_l appeared in 12 in r368915 on 2021-01-01, OSVERSION was last changed to 1202505 in r368887 on 2020-12-29 -post-patch: -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} <= 1202505 - @${REINPLACE_CMD} -e 's|strerror_l(error, locale)|strerror(error)|' ${WRKSRC}/src/libs/tools.h -.endif - .include diff --git a/net/onedrive/Makefile b/net/onedrive/Makefile index 42c2a982650c..8b2003033fa4 100644 --- a/net/onedrive/Makefile +++ b/net/onedrive/Makefile @@ -50,8 +50,7 @@ post-install: # llvm 13.0 and above. .if (${OSVERSION} >= 1400042) || \ - (${OSVERSION} < 1400000 && ${OSVERSION} >= 1300522) || \ - (${OSVERSION} < 1300000 && ${OSVERSION} >= 1203505) + (${OSVERSION} < 1400000 && ${OSVERSION} >= 1300522) CONFIGURE_ARGS+= DCFLAGS=-L=-Wl,-z,nostart-stop-gc .endif diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile index 3f4163a68284..edeca2c3439e 100644 --- a/security/ipsec-tools/Makefile +++ b/security/ipsec-tools/Makefile @@ -76,7 +76,7 @@ WCPSKEY_EXTRA_PATCHES= ${FILESDIR}/wildcard-psk.diff ${FILESDIR}/wildcard-psk-oa .include -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100510 +.if ${OPSYS} == FreeBSD REQUIREMOD?= ipsec .endif diff --git a/sysutils/bhyve+/Makefile b/sysutils/bhyve+/Makefile index 4de4b073dbf7..d418e71834f0 100644 --- a/sysutils/bhyve+/Makefile +++ b/sysutils/bhyve+/Makefile @@ -34,12 +34,7 @@ GH_TAGNAME= 7ef466772108856ee3e093735033232a6f1a3f04 USE_LDCONFIG= yes .if 1200000 <= ${OSVERSION} && ${OSVERSION} < 1300000 -EXTRA_PATCHES= ${PATCHDIR}/freebsd-12 -.if ${OSVERSION} < 1203000 -EXTRA_PATCHES+= ${PATCHDIR}/freebsd-12/2 -.else -EXTRA_PATCHES+= ${PATCHDIR}/freebsd-12/3 -.endif +EXTRA_PATCHES= ${PATCHDIR}/freebsd-12 ${PATCHDIR}/freebsd-12/3 .elif 1300000 <= ${OSVERSION} && ${OSVERSION} < 1400000 EXTRA_PATCHES= ${PATCHDIR}/freebsd-13 .elif 1400000 <= ${OSVERSION} && ${OSVERSION} < 1500000 diff --git a/sysutils/bhyve+/files/freebsd-12/2/patch-virtio-9p b/sysutils/bhyve+/files/freebsd-12/2/patch-virtio-9p deleted file mode 100644 index 9ce027d3171a..000000000000 --- a/sysutils/bhyve+/files/freebsd-12/2/patch-virtio-9p +++ /dev/null @@ -1,31 +0,0 @@ ---- usr.sbin/bhyve/bhyve.8.orig 2021-08-19 22:38:50 UTC -+++ usr.sbin/bhyve/bhyve.8 -@@ -242,6 +242,8 @@ Virtio network interface. - Virtio block storage interface. - .It Li virtio-scsi - Virtio SCSI interface. -+.It Li virtio-9p -+Virtio 9p (VirtFS) interface. - .It Li virtio-rnd - Virtio RNG interface. - .It Li virtio-console -@@ -327,6 +329,19 @@ are: - .It Li iid= Ns Ar IID - Initiator ID to use when sending requests to specified CTL port. - The default value is 0. -+.El -+.Pp -+9P devices: -+.Bl -tag -width 10n -+.It Pa sharename=/path/to/share[,9p-device-options] -+.El -+.Pp -+The -+.Ar 9p-device-options -+are: -+.Bl -tag -width 10n -+.It Li ro -+Expose the share in read-only mode. - .El - .Pp - TTY devices: diff --git a/sysutils/lsof/files/patch-Configure b/sysutils/lsof/files/patch-Configure index aedc48ddc6a3..c514e4c8be77 100644 --- a/sysutils/lsof/files/patch-Configure +++ b/sysutils/lsof/files/patch-Configure @@ -1,6 +1,6 @@ ---- Configure.orig 2020-11-10 11:00:21.000000000 -0800 -+++ Configure 2021-01-29 19:04:42.100811000 -0800 -@@ -1628,6 +1628,10 @@ +--- Configure.orig 2020-11-10 19:00:21 UTC ++++ Configure +@@ -1628,6 +1628,10 @@ kernel generation process. LSOF_TSTBIGF=" " LSOF_VERS=13000 ;; @@ -11,7 +11,7 @@ *) echo Unknown FreeBSD release: `uname -r` rm -f $LSOF_HLP -@@ -1639,7 +1643,7 @@ +@@ -1639,7 +1643,7 @@ kernel generation process. # Clear LSOF_UNSUP message for supported versions of FreeBSD. case $LSOF_VERS in # { diff --git a/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h b/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h index 5c8b9aadbdee..08b9d00204ae 100644 --- a/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h +++ b/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h @@ -1,27 +1,388 @@ --- dialects/freebsd/dlsof.h.orig 2020-11-10 19:00:21 UTC +++ dialects/freebsd/dlsof.h -@@ -559,7 +559,7 @@ typedef u_long KA_T; +@@ -52,27 +52,7 @@ + #include + #undef _KERNEL + #endif /* FREEBSDV>=13000 */ +-# if FREEBSDV>=4000 +-# if FREEBSDV>=5000 +-# if FREEBSDV<6020 +-# if defined(__alpha__) +-/* +- * For Alpha below 6.2, #include before #define'ing _KERNEL. +- * Then #define PCPU_MD_FIELDS independently. This hack avoids a compiler +- * complaint about register use. +- */ +- +-#include +-#define PCPU_MD_FIELDS \ +- struct alpha_pcb pc_idlepcb; /* pcb for idling */ \ +- u_int64_t pc_idlepcbphys; /* pa of pc_idlepcb */ \ +- u_int64_t pc_pending_ipis; /* pending IPI's */ \ +- u_int32_t pc_next_asn; /* next ASN to alloc */ \ +- u_int32_t pc_current_asngen /* ASN rollover check */ +-# endif /* defined(__alpha__) */ +-# endif /* FREEBSDV<6020 */ + #define _KERNEL 1 +-# endif /* FREEBSDV>=5000 */ + + # if defined(HAS_VM_MEMATTR_T) + /* +@@ -129,23 +109,17 @@ typedef struct device *device_t; + #include "fbsd_minor.h" + # endif /* defined(HAS_CONF_MINOR) */ + +-# if FREEBSDV>=5000 + #undef _KERNEL +-# endif /* FREEBSDV>=5000 */ +-# endif /* FREEBSDV>=4000 */ + + #include + #include + #define NFS + #define m_stat mnt_stat + +-# if FREEBSDV>=3020 + #define _KERNEL +-# endif /* FREEBSDV>=3020 */ + + #include + +-# if FREEBSDV>=3020 + # if defined(__clang__) + /* + * This definition is needed when clang is used, because must +@@ -156,7 +130,6 @@ int getmntinfo(struct statfs **, int); + # endif /* defined(__clang__) */ + + #undef _KERNEL +-# endif /* FREEBSDV>=3020 */ + + #include + #include +@@ -167,9 +140,7 @@ int getmntinfo(struct statfs **, int); + #define _WANT_UNPCB + #include + +-# if FREEBSDV>=3000 + #undef INADDR_LOOPBACK +-# endif /* FREEBSDV>=3000 */ + + #include + #include +@@ -202,21 +173,9 @@ int getmntinfo(struct statfs **, int); + #include + #undef pmap + +-# if FREEBSDV<2000 +-#include +-#include +-#include +-#include +-# else /* FREEBSDV>=2000 */ + #include + #include + +-# if FREEBSDV>=4000 && FREEBSDV<5000 +-# if defined(__alpha__) || defined(__sparc64__) +-#define dev_t void * +-# endif /* defined(__alpha__) || defined(__sparc64__) */ +-# endif /* FREEBSDV>=4000 && FREEBSDV<5000 */ +- + #include + + # if defined(HAS_UFS1_2) +@@ -250,59 +209,28 @@ struct vop_setextattr_args; + #undef _KERNEL + # endif /* defined(HAS_UFS1_2) */ + +-# if FREEBSDV>=5010 + #undef i_devvp +-# endif /* FREEBSDV>=5010 */ + +-# if FREEBSDV>=4000 && FREEBSDV<5000 +-# if defined(__alpha__) || defined(__sparc64__) +-#undef dev_t +-# endif /* defined(__alpha__) || defined(__sparc64__) */ +-# endif /* FREEBSDV>=4000 && FREEBSDV<5000 */ +- +-# if FREEBSDV<2020 +-#include +-# endif /* FREEBSDV<2020 */ +- +-# endif /* FREEBSDV<2000 */ +- +-# if FREEBSDV<5000 +-#include +-# else /* FREEBSDV>=5000 */ + #include +-# endif /* FREEBSDV<5000 */ + + # if defined(HASRPCV2H) + #include + # endif /* defined(HASRPCV2H) */ + +-# if FREEBSDV>=5000 + #include + #include +-# else /* FREEBSDV<5000 */ +-#include +-#include +-# endif /* FREEBSDV>=5000 */ + + #include + #include + #undef TRUE + #undef FALSE + +-# if FREEBSDV<2000 +-#include +-# else /* FREEBSDV>=2000 */ + #include +-# endif /* FREEBSDV<2000 */ + + # if defined(HASFDESCFS) + #define _KERNEL + #define KERNEL +-# if FREEBSDV>=5000 + #include +-# else /* FREEBSDV<5000 */ +-#include +-# endif /* FREEBSDV>=5000 */ + #undef _KERNEL + #undef KERNEL + # endif /* defined(HASFDESCFS) */ +@@ -311,24 +239,13 @@ struct vop_setextattr_args; + #define _KERNEL + #define KERNEL + struct vop_generic_args; +-# if FREEBSDV>=5000 + #include +-# else /* FREEBSDV<5000 */ +-#include +-# endif /* FREEBSDV>=5000 */ + #undef _KERNEL + #undef KERNEL + # endif /* defined(HASNULLFS) */ + + # if defined(HASPROCFS) +-# if FREEBSDV<2000 +-#include +-# else /* FREEBSDV>=2000 */ +-# if FREEBSDV<5000 +-#include +-# endif /* FREEBSDV<5000 */ + #include +-# endif /* FREEBSDV<2000 */ + + #define PNSIZ 5 + # endif /* defined(HASPROCFS) */ +@@ -342,24 +259,6 @@ struct vop_generic_args; + # endif /* defined(HAS_ZFS) */ + + +-# if FREEBSDV<2000 +-#define P_COMM p_comm +-#define P_FD p_fd +-#define P_PID p_pid +-#define P_PGID p_pgrp +-#define P_STAT p_stat +-#define P_VMSPACE p_vmspace +-# else /* FREEBSDV>=2000 */ +-# if FREEBSDV<5000 +-#define P_ADDR kp_eproc.e_paddr +-#define P_COMM kp_proc.p_comm +-#define P_FD kp_proc.p_fd +-#define P_PID kp_proc.p_pid +-#define P_PGID kp_eproc.e_pgid +-#define P_PPID kp_eproc.e_ppid +-#define P_STAT kp_proc.p_stat +-#define P_VMSPACE kp_proc.p_vmspace +-# else /* FREEBSDV>=5000 */ + #define P_ADDR ki_paddr + #define P_COMM ki_comm + #define P_FD ki_fd +@@ -368,8 +267,6 @@ struct vop_generic_args; + #define P_PPID ki_ppid + #define P_STAT ki_stat + #define P_VMSPACE ki_vmspace +-# endif /* FREEBSDV<5000 */ +-# endif /* FREEBSDV<2000 */ + + #include + +@@ -431,20 +328,12 @@ int open(const char *, int, ...); + + # if defined(DTYPE_KQUEUE) + #define HASKQUEUE /* has the kqueue file type */ +-# if FREEBSDV>=4090 + #define _KERNEL +-# endif /* FREEBSDV>=4090 */ + #include +-# if FREEBSDV>=4090 + #undef _KERNEL +-# endif /* FREEBSDV>=4090 */ + # endif /* defined(DTYPE_KQUEUE) */ + +-# if FREEBSDV<2000 +-#include +-# else /* FREEBSDV>=2000 */ + struct vop_advlock_args { int dummy; }; /* to pacify lf_advlock() prototype */ +-# if FREEBSDV>=5000 + #undef MALLOC_DECLARE + #define MALLOC_DECLARE(type) extern struct malloc_type type[1] + /* to pacify */ +@@ -460,23 +349,15 @@ struct vop_advlock_args { int dummy; }; /* to pacify l + + #include + #undef _KERNEL +-# endif /* FREEBSDV>=5000 */ + #include +-# endif /* FREEBSDV<2000 */ + +-# if FREEBSDV>=2020 +-# if FREEBSDV>=4090 + #define _KERNEL +-# endif /* FREEBSDV>=4090 */ + #include +-# if FREEBSDV>=4090 + #undef _KERNEL +-# endif /* FREEBSDV>=4090 */ + # if defined(HASVMLOCKH) + #include + # endif /* defined(HASVMLOCKH) */ + #include +-# endif /* FREEBSDV>=2020 */ + + #include + +@@ -492,21 +373,13 @@ struct vop_advlock_args { int dummy; }; /* to pacify l + #include + #include + +-# if FREEBSDV>=2020 + #undef B_NEEDCOMMIT + +-# if FREEBSDV>=5000 + #include +-# endif /* FREEBSDV>=5000 */ + + #include + #include + +-# if FREEBSDV<5000 +-#include +-# endif /* FREEBSDV<5000 */ +-# endif /* FREEBSDV>=2020 */ +- + #undef bcmp /* avoid _KERNEL conflict */ + #undef bcopy /* avoid _KERNEL conflict */ + #undef bzero /* avoid _KERNEL conflict */ +@@ -521,11 +394,7 @@ struct vop_advlock_args { int dummy; }; /* to pacify l + #define DEVINCR 1024 /* device table malloc() increment */ + + # if !defined(FREEBSD_KA_T) +-# if FREEBSDV<2000 +-typedef off_t KA_T; +-# else /* FREEBSDV>=2000 */ + typedef u_long KA_T; +-# endif /* FREEBSDV<2000 */ + # endif /* !defined(FREEBSD_KA_T) */ + + #define KMEM "/dev/kmem" +@@ -559,11 +428,9 @@ typedef u_long KA_T; * Global storage definitions (including their structure definitions) */ -struct file * Cfp; +extern struct file * Cfp; - # if FREEBSDV>=2000 +-# if FREEBSDV>=2000 extern kvm_t *Kd; -@@ -663,9 +663,15 @@ struct sfile { +-# endif /* FREEBSDV>=2000 */ + + # if defined(P_ADDR) + extern KA_T Kpa; +@@ -607,9 +474,7 @@ extern KA_T X_bfopsa; + + extern int Np; /* number of kernel processes */ + +-# if FREEBSDV>=2000 + extern struct kinfo_proc *P; /* local process table copy */ +-# endif /* FREEBSDV>=2000 */ + + struct sfile { + char *aname; /* argument file name */ +@@ -626,15 +491,8 @@ struct sfile { + + }; + +-# if FREEBSDV==4100 || FREEBSDV==4110 +-#define XDR_VOID (xdrproc_t)xdr_void +-#define XDR_PMAPLIST (xdrproc_t)xdr_pmaplist +-# endif /* FREEBSDV==4100 || FREEBSDV==4110 */ +- +-# if FREEBSDV>=5000 + #define XDR_VOID (const xdrproc_t)xdr_void + #define XDR_PMAPLIST (const xdrproc_t)xdr_pmaplist +-# endif /* FREEBSDV>=5000 */ + + + /* +@@ -651,9 +509,9 @@ struct sfile { + + # if defined(HASNCACHE) + #include +-# if FREEBSDV<4000 || (FREEBSDV>=4000 && defined(HASNAMECACHE)) ++# if defined(HASNAMECACHE) + #include +-# else /* FREEBSDV>=4000 && !defined(HASNAMECACHE) */ ++# else /* !defined(HASNAMECACHE) */ + /* + * The namecache struct definition should come from a header file that + * can be #include'd, but it has been moved to a kernel source file in +@@ -663,9 +521,9 @@ struct sfile { */ struct namecache { -+# if __FreeBSD_version < 1202000 || (__FreeBSD_version >= 1300000 && __FreeBSD_version < 1300105) - LIST_ENTRY(namecache) nc_hash; /* hash chain */ +- LIST_ENTRY(namecache) nc_hash; /* hash chain */ LIST_ENTRY(namecache) nc_src; /* source vnode list */ TAILQ_ENTRY(namecache) nc_dst; /* destination vnode list */ -+# else -+ LIST_ENTRY(namecache) nc_src; /* source vnode list */ -+ TAILQ_ENTRY(namecache) nc_dst; /* destination vnode list */ + LIST_ENTRY(namecache) nc_hash; /* hash chain */ -+# endif struct vnode *nc_dvp; /* vnode of parent of name */ struct vnode *nc_vp; /* vnode the name refers to */ u_char nc_flag; /* flag bits */ +@@ -682,22 +540,14 @@ struct namecache { + * suggesting the guess is a safe one. + * (VAA, 10 Apr 2002) */ + }; +-# endif /* FREEBSDV<4000 || (FREEBSDV>=4000 && defined(HASNAMECACHE)) */ ++# endif /* defined(HASNAMECACHE) */ + + #define NCACHE namecache /* kernel's structure name */ + #define NCACHE_NM nc_name /* name in NCACHE */ + #define NCACHE_NMLEN nc_nlen /* name length in NCACHE */ + +-# if FREEBSDV<2005 +-#define NCACHE_NXT nc_nxt /* link in NCACHE */ +-# else /* FREEBSDV>=2005 */ +-# if FREEBSDV<2010 +-#define NCACHE_NXT nc_lru.tqe_next /* link in NCACHE */ +-# else /* FREEBSDV>=2010 */ + #include + #define NCACHE_NXT nc_hash.le_next /* link in NCACHE */ +-# endif /* FREEBSDV<2010 */ +-# endif /* FREEBSDV<2005 */ + + #define NCACHE_NODEADDR nc_vp /* node address in NCACHE */ + #define NCACHE_PARADDR nc_dvp /* parent node address in NCACHE */ +@@ -708,9 +558,7 @@ struct namecache { + # endif /* DEFINED(HASNCVPID) */ + # endif /* defined(HASNCACHE) */ + +-# if FREEBSDV>=5000 + #define VNODE_VFLAG v_iflag + #define NCACHE_VROOT VV_ROOT +-# endif /* FREEBSDV>=5000 */ + + #endif /* defined(FREEBSD_LSOF_H) */ diff --git a/sysutils/lsof/files/patch-dialects_freebsd_dproc.c b/sysutils/lsof/files/patch-dialects_freebsd_dproc.c index d54fb390c5c9..28c7290f2298 100644 --- a/sysutils/lsof/files/patch-dialects_freebsd_dproc.c +++ b/sysutils/lsof/files/patch-dialects_freebsd_dproc.c @@ -10,7 +10,94 @@ int i, nf; MALLOC_S nb; -@@ -330,7 +333,11 @@ gather_proc_info() +@@ -157,13 +160,7 @@ gather_proc_info() + int tid; /* thread (task) ID */ + uid_t uid; + +-#if FREEBSDV<2000 +- struct proc *p; +- struct pcred pc; +- struct pgrp pg; +-#else /* FREEBSDV>=2000 */ + struct kinfo_proc *p; +-#endif /* FREEBSDV<2000 */ + + #if defined(HASFSTRUCT) && !defined(HAS_FILEDESCENT) + static char *pof = (char *)NULL; +@@ -223,9 +220,6 @@ gather_proc_info() + * Read the process table. + */ + +-#if FREEBSDV<2000 +- if ((Np = kvm_getprocs(KINFO_PROC_ALL, 0)) < 0) +-#else /* FREEBSDV>=2000 */ + + # if !defined(KERN_PROC_PROC) + #define KERN_PROC_PROC KERN_PROC_ALL +@@ -234,18 +228,11 @@ gather_proc_info() + if ((P = kvm_getprocs(Kd, Ftask ? KERN_PROC_ALL : KERN_PROC_PROC, + 0, &Np)) + == NULL) +-#endif /* FREEBSDV<2000 */ + + { + (void) fprintf(stderr, "%s: can't read process table: %s\n", + Pn, +- +-#if FREEBSDV<2000 +- kvm_geterr() +-#else /* FREEBSDV>=2000 */ + kvm_geterr(Kd) +-#endif /* FREEBSDV<2000 */ +- + ); + Exit(1); + } +@@ -253,43 +240,13 @@ gather_proc_info() + * Examine proc structures and their associated information. + */ + +-#if FREEBSDV<2000 +- for (px = 0; px < Np; px++) +-#else /* FREEBSDV>=2000 */ + for (p = P, px = 0; px < Np; p++, px++) +-#endif /* FREEBSDV<2000 */ +- + { + +-#if FREEBSDV<2000 +- /* +- * Read process information, process group structure (if +- * necessary), and User ID (if necessary). +- */ +- if (!(p = kvm_nextproc())) +- continue; + if (p->P_STAT == 0 || p->P_STAT == SZOMB) + continue; +- pg.pg_id = 0; +- if (Fpgid && p->P_PGID) { +- if (kread((KA_T)p->P_PGID, (char *)&pg, sizeof(pg))) +- continue; +- } +- pgid = pg.pg_id; +- if (!p->p_cred +- || kread((KA_T)p->p_cred, (char *)&pc, sizeof(pc))) +- continue; +- uid = pc.p_ruid; +-#else /* FREEBSDV>=2000 */ +- if (p->P_STAT == 0 || p->P_STAT == SZOMB) +- continue; + pgid = p->P_PGID; +-# if FREEBSDV<5000 +- uid = p->kp_eproc.e_ucred.cr_uid; +-# else /* FREEBSDV>=5000 */ + uid = p->ki_uid; +-# endif /* FREEBSDV<5000 */ +-#endif /* FREEBSDV<2000 */ + + #if defined(HASPPID) + ppid = p->P_PPID; +@@ -330,7 +287,11 @@ gather_proc_info() #if defined(HAS_PWD) cdir = rdir = jdir = NULL; @@ -22,3 +109,96 @@ if (pwd_addr != 0) { if (!kread(pwd_addr, (char *)&pwd, sizeof(pwd))) { cdir = pwd.pwd_cdir; +@@ -397,7 +358,6 @@ gather_proc_info() + link_lfile(); + } + +-#if FREEBSDV>=5000 + /* + * Save jail directory information. + */ +@@ -408,7 +368,6 @@ gather_proc_info() + if (Lf->sf) + link_lfile(); + } +-#endif /* FREEBSDV>=5000 */ + + /* + * Save information on the text file. +@@ -561,23 +520,13 @@ get_kernel_access() + * Open kernel memory access. + */ + +-#if FREEBSDV<2000 +- if (kvm_openfiles(Nmlst, Memory, NULL) == -1) +-#else /* FREEBSDV>=2000 */ + if ((Kd = kvm_open(Nmlst, Memory, NULL, O_RDONLY, NULL)) == NULL) +-#endif /* FREEBSDV<2000 */ + + { + (void) fprintf(stderr, + "%s: kvm_open%s(execfile=%s, corefile=%s): %s\n", + Pn, +- +-#if FREEBSDV<2000 +- "files", +-#else /* FREEBSDV>=2000 */ + "", +-#endif /* FREEBSDV<2000 */ +- + Nmlst ? Nmlst : "default", + Memory ? Memory : + +@@ -678,11 +627,7 @@ kread(addr, buf, len) + { + int br; + +-#if FREEBSDV<2000 +- br = kvm_read((void *)addr, (void *)buf, len); +-#else /* FREEBSDV>=2000 */ + br = kvm_read(Kd, (u_long)addr, buf, len); +-#endif /* FREEBSDV<2000 */ + + return((br == len) ? 0 : 1); + } +@@ -724,9 +669,6 @@ process_text(vm) + struct vm_object vmo; + struct vmspace vmsp; + +-#if FREEBSDV<2020 +- struct pager_struct pg; +-#endif /* FREEBSDV<2020 */ + + /* + * Read the vmspace structure for the process. +@@ -762,30 +704,16 @@ process_text(vm) + j < 2 && ka; + j++, + +-#if FREEBSDV<2020 +- ka = (KA_T)vmo.shadow +-#else /* FREEBSDV>=2020 */ + ka = (KA_T)vmo.backing_object +-#endif /* FREEBSDV<2020 */ + ) + { + if (kread(ka, (char *)&vmo, sizeof(vmo))) + break; + +-#if FREEBSDV<2020 +- if ((ka = (KA_T)vmo.pager) == NULL +- || kread(ka, (char *)&pg, sizeof(pg))) +- continue; +- if (pg.pg_handle == NULL || pg.pg_type != PG_VNODE) +- continue; +- (void) (enter_vn_text((KA_T)pg.pg_handle, &n)); +-#else /* FREEBSDV>=2020 */ + if (vmo.type != OBJT_VNODE + || vmo.handle == (void *)NULL) + continue; + (void) (enter_vn_text((KA_T)vmo.handle, &n)); +-#endif /* FREEBSDV<2020 */ +- + } + } + } diff --git a/x11/wayland-logout/Makefile b/x11/wayland-logout/Makefile index b2997555523a..4348e0509c2f 100644 --- a/x11/wayland-logout/Makefile +++ b/x11/wayland-logout/Makefile @@ -20,7 +20,7 @@ PLIST_FILES= bin/${PORTNAME} \ # Cannot use C implementation without cr_pid .if make(makesum) DISTFILES= ${DISTNAME:S/${DISTVERSION}/1.3/}${EXTRACT_SUFX} *** 5 LINES SKIPPED ***