svn commit: r359522 - head/include
Author: emaste Date: Wed Apr 1 16:38:45 2020 New Revision: 359522 URL: https://svnweb.freebsd.org/changeset/base/359522 Log: Remove redundant development tag from include Makefile Headers are placed in the -development package via install args in rules in share/mk/bsd.incs.mk; there is no need to explicitly modify TAGS in include/Makefile. (Mentioned in review D24139.) Discussed with: manu Modified: head/include/Makefile Modified: head/include/Makefile == --- head/include/Makefile Wed Apr 1 16:22:31 2020(r359521) +++ head/include/Makefile Wed Apr 1 16:38:45 2020(r359522) @@ -6,7 +6,6 @@ .include PACKAGE=runtime -TAGS+= development CLEANFILES= osreldate.h version SUBDIR= arpa protocols rpcsvc rpc xlocale SUBDIR_PARALLEL= ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359503 - in head
On April 1, 2020 5:06:06 AM PDT, Cy Schubert wrote:
>On March 31, 2020 10:53:14 PM PDT, Glen Barber wrote:
>>Author: gjb
>>Date: Wed Apr 1 05:51:46 UTC 2020
>>New Revision: 359503
>>URL: https://svnweb.freebsd.org/changeset/base/359503
>>
>>Log:
>> Update head to 14.0-CURRENT in order to prevent having
>> a 13.0-RELEASE.
>>
>>Modified:
>> Makefile.inc1
>> UPDATING
>> lib/clang/freebsd_cc_version.h
>> lib/clang/llvm.build.mk
>> sys/conf/newvers.sh
>> sys/sys/param.h
>>
>>Index: Makefile.inc1
>>===
>>--- Makefile.inc1 (revision 359501)
>>+++ Makefile.inc1 (working copy)
>>@@ -130,9 +130,9 @@ TARGET_ABI= gnueabi
>> .endif
>> .endif
>> MACHINE_ABI?=unknown
>>-MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.0
>>+MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd14.0
>> TARGET_ABI?= unknown
>>-TARGET_TRIPLE?=
>>${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.0
>>+TARGET_TRIPLE?=
>>${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd14.0
>> KNOWN_ARCHES?= aarch64/arm64 \
>> amd64 \
>> armv6/arm \
>>@@ -2123,7 +2123,7 @@ ${_bt}-lib/libdwarf: ${_bt_m4_depend}
>> .endif
>>
>># flua is required to regenerate syscall files. It first appeared
>>during the
>>-# 13.0-CURRENT cycle, thus needs to be built on -older releases and
>>stable
>>+# 14.0-CURRENT cycle, thus needs to be built on -older releases and
>>stable
>> # branches.
>> .if ${BOOTSTRAPPING} < 1300059
>> ${_bt}-libexec/flua: ${_bt}-lib/liblua
>>Index: UPDATING
>>===
>>--- UPDATING (revision 359501)
>>+++ UPDATING (working copy)
>>@@ -11,8 +11,8 @@ handbook:
>> Items affecting the ports and packages system can be found in
>>/usr/ports/UPDATING. Please read that file before running
>portupgrade.
>>
>>-NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
>>- FreeBSD 13.x has many debugging features turned on, in both the
>>kernel
>>+NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW:
>>+ FreeBSD 14.x has many debugging features turned on, in both the
>>kernel
>> and userland. These features attempt to detect incorrect use of
>> system primitives, and encourage loud failure through extra sanity
>> checking and fail stop semantics. They also substantially impact
>>Index: lib/clang/freebsd_cc_version.h
>>===
>>--- lib/clang/freebsd_cc_version.h(revision 359501)
>>+++ lib/clang/freebsd_cc_version.h(working copy)
>>@@ -1,3 +1,3 @@
>> /* $FreeBSD$ */
>>
>>-#define FREEBSD_CC_VERSION 137
>>+#define FREEBSD_CC_VERSION 147
>>Index: lib/clang/llvm.build.mk
>>===
>>--- lib/clang/llvm.build.mk (revision 359501)
>>+++ lib/clang/llvm.build.mk (working copy)
>>@@ -38,7 +38,7 @@ TARGET_ABI= -gnueabi
>> TARGET_ABI=
>> .endif
>> VENDOR= unknown
>>-OS_VERSION= freebsd13.0
>>+OS_VERSION= freebsd14.0
>>
>>LLVM_TARGET_TRIPLE?=
>>${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI}
>>LLVM_BUILD_TRIPLE?=
>>${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}
>>Index: sys/conf/newvers.sh
>>===
>>--- sys/conf/newvers.sh (revision 359501)
>>+++ sys/conf/newvers.sh (working copy)
>>@@ -53,7 +53,7 @@
>> #
>>
>> TYPE="FreeBSD"
>>-REVISION="13.0"
>>+REVISION="14.0"
>> BRANCH=${BRANCH_OVERRIDE:-CURRENT}
>> RELEASE="${REVISION}-${BRANCH}"
>> VERSION="${TYPE} ${RELEASE}"
>>Index: sys/sys/param.h
>>===
>>--- sys/sys/param.h (revision 359501)
>>+++ sys/sys/param.h (working copy)
>>@@ -60,7 +60,7 @@
>> * in the range 5 to 9.
>> */
>> #undef __FreeBSD_version
>>-#define __FreeBSD_version 1300087/* Master, propagated to newvers */
>>+#define __FreeBSD_version 1400087/* Master, propagated to newvers */
>>
>> /*
>>* __FreeBSD_kernel__ indicates that this system uses the kernel of
>>FreeBSD,
>
>This was discussed at length just before 12 was released. Are you now
>the one to decide naming, disregarding the discussion?
>
>Should we not have also skipped 4?
Ok. I've been had. Woke up at 4 am and half asleep and exceptionally grumpy, as
I have been first thing in the morning the last few months. I didn't clue into
which day it was. Yet. I'm awake now ready to tackle today's insanity.
--
Pardon the typos and autocorrect, small keyboard in use.
Cy Schubert
FreeBSD UNIX: Web: https://www.FreeBSD.org
The need of the many outweighs the greed of the few.
Sent from my
svn commit: r359524 - head/sys/kgssapi/krb5
Author: jhb Date: Wed Apr 1 17:09:21 2020 New Revision: 359524 URL: https://svnweb.freebsd.org/changeset/base/359524 Log: Set crp_ilen for crypto requests. Assertions in crypto_dispatch() depend on this value being set to verify that payload and AAD regions are in bounds. Also, requests that use a single kernel buffer rely on this to know how long the buffer is for bus_dma, etc. Reported by: kp Modified: head/sys/kgssapi/krb5/kcrypto_aes.c Modified: head/sys/kgssapi/krb5/kcrypto_aes.c == --- head/sys/kgssapi/krb5/kcrypto_aes.c Wed Apr 1 17:08:55 2020 (r359523) +++ head/sys/kgssapi/krb5/kcrypto_aes.c Wed Apr 1 17:09:21 2020 (r359524) @@ -158,6 +158,7 @@ aes_encrypt_1(const struct krb5_key_state *ks, int buf crp->crp_buf_type = buftype; crp->crp_buf = buf; + crp->crp_ilen = skip + len; crp->crp_opaque = as; crp->crp_callback = aes_crypto_cb; @@ -329,6 +330,7 @@ aes_checksum(const struct krb5_key_state *ks, int usag crp->crp_flags = CRYPTO_F_CBIFSYNC; crp->crp_buf_type = CRYPTO_BUF_MBUF; crp->crp_mbuf = inout; + crp->crp_ilen = skip + inlen + 12; crp->crp_opaque = as; crp->crp_callback = aes_crypto_cb; ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359519 - head/release/scripts
Author: emaste
Date: Wed Apr 1 16:03:06 2020
New Revision: 359519
URL: https://svnweb.freebsd.org/changeset/base/359519
Log:
pkgbase: remove more profile package leftovers
As of r356797 we don't produce profile packages. r358549 removed one
remnant of profile package support; clean up another now.
Modified:
head/release/scripts/mtree-to-plist.awk
Modified: head/release/scripts/mtree-to-plist.awk
==
--- head/release/scripts/mtree-to-plist.awk Wed Apr 1 16:02:42 2020
(r359518)
+++ head/release/scripts/mtree-to-plist.awk Wed Apr 1 16:03:06 2020
(r359519)
@@ -41,7 +41,7 @@
gsub(/package=/, "", pkgname)
} else if (a[i] == "config") {
type="config"
- } else if (a[i] == "development" || a[i] == "profile"
|| a[i] == "debug" || a[i] == "docs") {
+ } else if (a[i] == "development" || a[i] == "debug" ||
a[i] == "docs") {
pkgend=a[i]
} else {
if (ext != "")
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359512 - in head: contrib/bsnmp/lib contrib/bsnmp/snmp_mibII contrib/bsnmp/snmp_usm contrib/bsnmp/snmp_vacm contrib/bsnmp/snmpd contrib/bsnmp/tests lib/libbsnmp/libbsnmp
Author: harti
Date: Wed Apr 1 15:25:16 2020
New Revision: 359512
URL: https://svnweb.freebsd.org/changeset/base/359512
Log:
Merge release 1.14 of bsnmp.
Added:
head/contrib/bsnmp/tests/
- copied from r359490, vendor/bsnmp/dist/tests/
Replaced:
head/contrib/bsnmp/snmpd/trans_inet.c
- copied unchanged from r359490, vendor/bsnmp/dist/snmpd/trans_inet.c
head/contrib/bsnmp/snmpd/trans_inet.h
- copied unchanged from r359490, vendor/bsnmp/dist/snmpd/trans_inet.h
Modified:
head/contrib/bsnmp/lib/asn1.c
head/contrib/bsnmp/lib/bsnmpclient.3
head/contrib/bsnmp/lib/snmpclient.c
head/contrib/bsnmp/lib/snmpcrypto.c
head/contrib/bsnmp/snmp_mibII/mibII.c
head/contrib/bsnmp/snmp_mibII/mibII.h
head/contrib/bsnmp/snmp_usm/usm_snmp.c
head/contrib/bsnmp/snmp_vacm/vacm_snmp.c
head/contrib/bsnmp/snmpd/snmpd.config
head/lib/libbsnmp/libbsnmp/Makefile
Directory Properties:
head/contrib/bsnmp/ (props changed)
Modified: head/contrib/bsnmp/lib/asn1.c
==
--- head/contrib/bsnmp/lib/asn1.c Wed Apr 1 15:12:51 2020
(r359511)
+++ head/contrib/bsnmp/lib/asn1.c Wed Apr 1 15:25:16 2020
(r359512)
@@ -65,8 +65,8 @@ asn_get_header(struct asn_buf *b, u_char *type, asn_le
return (ASN_ERR_EOBUF);
}
*type = *b->asn_cptr;
- if ((*type & ASN_TYPE_MASK) > 0x30) {
- asn_error(b, "types > 0x30 not supported (%u)",
+ if ((*type & ASN_TYPE_MASK) > 0x1e) {
+ asn_error(b, "tags > 0x1e not supported (%#x)",
*type & ASN_TYPE_MASK);
return (ASN_ERR_FAILED);
}
@@ -100,11 +100,19 @@ asn_get_header(struct asn_buf *b, u_char *type, asn_le
*len = *b->asn_cptr++;
b->asn_len--;
}
+
+#ifdef BOGUS_CVE_2019_5610_FIX
+ /*
+* This is the fix from CVE-2019-5610.
+*
+* This is the wrong place. Each of the asn functions should check
+* that it has enough info for its own work.
+*/
if (*len > b->asn_len) {
- asn_error(b, "len %u exceeding asn_len %u", *len, b->asn_len);
+ asn_error(b, "lenen %u exceeding asn_len %u", *len, b->asn_len);
return (ASN_ERR_EOBUF);
}
-
+#endif
return (ASN_ERR_OK);
}
@@ -147,7 +155,7 @@ asn_put_len(u_char *ptr, asn_len_t len)
/*
* Write a header (tag and length fields).
- * Tags are restricted to one byte tags (value <= 0x30) and the
+ * Tags are restricted to one byte tags (value <= 0x1e) and the
* lenght field to 16-bit. All errors stop the encoding.
*/
enum asn_err
@@ -156,8 +164,8 @@ asn_put_header(struct asn_buf *b, u_char type, asn_len
u_int lenlen;
/* tag field */
- if ((type & ASN_TYPE_MASK) > 0x30) {
- asn_error(NULL, "types > 0x30 not supported (%u)",
+ if ((type & ASN_TYPE_MASK) > 0x1e) {
+ asn_error(NULL, "types > 0x1e not supported (%#x)",
type & ASN_TYPE_MASK);
return (ASN_ERR_FAILED);
}
@@ -251,9 +259,10 @@ asn_get_real_integer(struct asn_buf *b, asn_len_t len,
return (ASN_ERR_BADLEN);
}
err = ASN_ERR_OK;
- if (len > 8)
+ if (len > 8) {
+ asn_error(b, "integer too long");
err = ASN_ERR_RANGE;
- else if (len > 1 &&
+ } else if (len > 1 &&
((*b->asn_cptr == 0x00 && (b->asn_cptr[1] & 0x80) == 0) ||
(*b->asn_cptr == 0xff && (b->asn_cptr[1] & 0x80) == 0x80))) {
asn_error(b, "non-minimal integer");
@@ -331,27 +340,35 @@ asn_put_real_integer(struct asn_buf *b, u_char type, i
static enum asn_err
asn_get_real_unsigned(struct asn_buf *b, asn_len_t len, uint64_t *vp)
{
- enum asn_err err;
-
+ *vp = 0;
if (b->asn_len < len) {
asn_error(b, "truncated integer");
return (ASN_ERR_EOBUF);
}
if (len == 0) {
+ /* X.690: 8.3.1 */
asn_error(b, "zero-length integer");
- *vp = 0;
return (ASN_ERR_BADLEN);
}
- err = ASN_ERR_OK;
- *vp = 0;
- if ((*b->asn_cptr & 0x80) || (len == 9 && *b->asn_cptr != 0)) {
+ if (len > 1 && *b->asn_cptr == 0x00 && (b->asn_cptr[1] & 0x80) == 0) {
+ /* X.690: 8.3.2 */
+ asn_error(b, "non-minimal unsigned");
+ b->asn_cptr += len;
+ b->asn_len -= len;
+ return (ASN_ERR_BADLEN);
+
+ }
+
+ enum asn_err err = ASN_ERR_OK;
+
+ if ((*b->asn_cptr & 0x80) || len > 9 ||
+ (len == 9 && *b->asn_cptr != 0)) {
/* negative integer or too larger */
*vp = 0xULL;
- err = ASN_ERR_RANGE;
- } else if (len > 1 &&
- *b->asn_cptr == 0x00 &&
svn commit: r359513 - head/share/man/man5
Author: emaste Date: Wed Apr 1 15:34:10 2020 New Revision: 359513 URL: https://svnweb.freebsd.org/changeset/base/359513 Log: elf.5: add definitions of FreeBSD notes I hope to extend this with some more detail in the future but it gives a good starting point. Thanks to 0mp for assistance with markup. Reviewed by: jkoshy Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D23982 Modified: head/share/man/man5/elf.5 Modified: head/share/man/man5/elf.5 == --- head/share/man/man5/elf.5 Wed Apr 1 15:25:16 2020(r359512) +++ head/share/man/man5/elf.5 Wed Apr 1 15:34:10 2020(r359513) @@ -1296,6 +1296,32 @@ fields are padded to ensure 4-byte alignemnt. and .Va descsz specify the unpadded length. +.Pp +.Fx +defines the following ELF note types +.Po with corresponding interpretation of +.Va desc Pc : +.Bl -tag -width 4n +.It Dv NT_FREEBSD_ABI_TAG Pq Value: 1 +Indicates the OS ABI version in a form of a 32-bit integer containing expected +ABI version +.Po i.e., +.Dv __FreeBSD_version Pc . +.It Dv NT_FREEBSD_NOINIT_TAG Pq Value: 2 +Indicates that crt does not call init. +.Va desc +is ignored. +.It Dv NT_FREEBSD_ARCH_TAG Pq Value: 3 +.It Dv NT_FREEBSD_FEATURE_CTL Pq Value: 4 +Contains a bitmask of mitigations and features to enable: +.Bl -column "NT_FREEBSD_FCTL_PROTMAX_DISABLE" "0x00" "Disable implicit PROT_MAX" +.Sy Name Ta Sy Value Ta Sy Description +.It NT_FREEBSD_FCTL_ASLR_DISABLETa 0x01 Ta Disable ASLR +.It NT_FREEBSD_FCTL_PROTMAX_DISABLE Ta 0x02 Ta Disable implicit PROT_MAX +.It NT_FREEBSD_FCTL_STKGAP_DISABLE Ta 0x04 Ta Disable stack gap +.It NT_FREEBSD_FCTL_WXNEEDEDTa 0x08 Ta Binary makes W+X mappings +.El +.El .Sh SEE ALSO .Xr as 1 , .Xr gdb 1 , ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359514 - head/tools/test/bsnmp
> On Apr 1, 2020, at 08:56, Hartmut Brandt wrote: > > Author: harti > Date: Wed Apr 1 15:39:02 2020 > New Revision: 359514 > URL: https://svnweb.freebsd.org/changeset/base/359514 > > Log: > Add a makefile to build and run the tests for the bsnmp library. > This is not automatically built or run but must explicitly be built > with 'make' and run with 'make run'. Why was this integrated this way? -Enji ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359521 - in head: share/man/man4 sys/dev/usb/misc
Author: imp
Date: Wed Apr 1 16:22:31 2020
New Revision: 359521
URL: https://svnweb.freebsd.org/changeset/base/359521
Log:
Start the retirement process for ufm
This driver hasn't been relevant in almost 15 years. It was for a product on
the
shelves for about 6 months in 2003/2004. I've not updated the driver since
then,
and have had nobody talk to me about it since maybe 2006 or 2007. It doesn't
implement a standard interface, and can be better done with libusb. All the
action has moved to webcamd for newer, more fully featured hardware. It makes
no
appearances in the nycbug dmesg archive.
Relnotes: yes
MFC After: 3 days
Modified:
head/share/man/man4/ufm.4
head/sys/dev/usb/misc/ufm.c
Modified: head/share/man/man4/ufm.4
==
--- head/share/man/man4/ufm.4 Wed Apr 1 16:21:11 2020(r359520)
+++ head/share/man/man4/ufm.4 Wed Apr 1 16:22:31 2020(r359521)
@@ -43,6 +43,12 @@ module at boot time, place the following line in
.Bd -literal -offset indent
ufm_load="YES"
.Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
.Sh DESCRIPTION
The
.Nm
Modified: head/sys/dev/usb/misc/ufm.c
==
--- head/sys/dev/usb/misc/ufm.c Wed Apr 1 16:21:11 2020(r359520)
+++ head/sys/dev/usb/misc/ufm.c Wed Apr 1 16:22:31 2020(r359521)
@@ -164,6 +164,7 @@ ufm_attach(device_t dev)
if (error) {
goto detach;
}
+ gone_in_dev(dev, 13, "Driver no longer relevant");
return (0); /* success */
detach:
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359520 - head/sys/x86/x86
Author: kib
Date: Wed Apr 1 16:21:11 2020
New Revision: 359520
URL: https://svnweb.freebsd.org/changeset/base/359520
Log:
x86 tsc: fall back to CPUID if calibration results looks unbelievable.
Teested and reviewed by: scottl
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Differential revision:https://reviews.freebsd.org/D24247
Modified:
head/sys/x86/x86/tsc.c
Modified: head/sys/x86/x86/tsc.c
==
--- head/sys/x86/x86/tsc.c Wed Apr 1 16:03:06 2020(r359519)
+++ head/sys/x86/x86/tsc.c Wed Apr 1 16:21:11 2020(r359520)
@@ -143,7 +143,7 @@ tsc_freq_vmware(void)
* tsc_freq_intel(), when available.
*/
static bool
-tsc_freq_cpuid(void)
+tsc_freq_cpuid(uint64_t *res)
{
u_int regs[4];
@@ -151,7 +151,7 @@ tsc_freq_cpuid(void)
return (false);
do_cpuid(0x15, regs);
if (regs[0] != 0 && regs[1] != 0 && regs[2] != 0) {
- tsc_freq = (uint64_t)regs[2] * regs[1] / regs[0];
+ *res = (uint64_t)regs[2] * regs[1] / regs[0];
return (true);
}
@@ -159,7 +159,7 @@ tsc_freq_cpuid(void)
return (false);
do_cpuid(0x16, regs);
if (regs[0] != 0) {
- tsc_freq = (uint64_t)regs[0] * 100;
+ *res = (uint64_t)regs[0] * 100;
return (true);
}
@@ -228,7 +228,8 @@ tsc_freq_intel(void)
static void
probe_tsc_freq(void)
{
- uint64_t tsc1, tsc2;
+ uint64_t tmp_freq, tsc1, tsc2;
+ int no_cpuid_override;
uint16_t bootflags;
if (cpu_power_ecx & CPUID_PERF_STAT) {
@@ -299,15 +300,15 @@ probe_tsc_freq(void)
*/
if (acpi_get_fadt_bootflags() &&
(bootflags & ACPI_FADT_LEGACY_DEVICES) == 0 &&
- tsc_freq_cpuid()) {
+ tsc_freq_cpuid(_freq)) {
printf("Skipping TSC calibration since no legacy "
"devices reported by FADT and CPUID works\n");
tsc_skip_calibration = 1;
}
}
if (tsc_skip_calibration) {
- if (tsc_freq_cpuid())
- ;
+ if (tsc_freq_cpuid(_freq))
+ tsc_freq = tmp_freq;
else if (cpu_vendor_id == CPU_VENDOR_INTEL)
tsc_freq_intel();
} else {
@@ -317,6 +318,32 @@ probe_tsc_freq(void)
DELAY(100);
tsc2 = rdtsc();
tsc_freq = tsc2 - tsc1;
+
+ /*
+* If the difference between calibrated frequency and
+* the frequency reported by CPUID 0x15/0x16 leafs
+* differ significantly, this probably means that
+* calibration is bogus. It happens on machines
+* without 8254 timer and with BIOS not properly
+* reporting it in FADT boot flags.
+*/
+ if (tsc_freq_cpuid(_freq) && qabs(tsc_freq - tmp_freq) >
+ uqmin(tsc_freq, tmp_freq)) {
+ no_cpuid_override = 0;
+ TUNABLE_INT_FETCH("machdep.disable_tsc_cpuid_override",
+ _cpuid_override);
+ if (!no_cpuid_override) {
+ if (bootverbose) {
+ printf(
+ "TSC clock: calibration freq %ju Hz, CPUID freq %ju Hz%s\n",
+ (uintmax_t)tsc_freq,
+ (uintmax_t)tmp_freq,
+ no_cpuid_override ? "" :
+ ", doing CPUID override");
+ }
+ tsc_freq = tmp_freq;
+ }
+ }
}
if (bootverbose)
printf("TSC clock: %ju Hz\n", (intmax_t)tsc_freq);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359514 - head/tools/test/bsnmp
Author: harti
Date: Wed Apr 1 15:39:02 2020
New Revision: 359514
URL: https://svnweb.freebsd.org/changeset/base/359514
Log:
Add a makefile to build and run the tests for the bsnmp library.
This is not automatically built or run but must explicitly be built
with 'make' and run with 'make run'.
Added:
head/tools/test/bsnmp/
head/tools/test/bsnmp/Makefile (contents, props changed)
Added: head/tools/test/bsnmp/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/test/bsnmp/Makefile Wed Apr 1 15:39:02 2020
(r359514)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+CONTRIB=${SRCTOP}/contrib/bsnmp
+.PATH: ${CONTRIB}/tests
+
+PROG_CXX=ctest
+SRCS= main.cc asn1.cc snmp_parse_server.cc
+CFLAGS += -I/${CONTRIB}/lib
+CXXFLAGS+= -std=c++2a
+LIBADD= bsnmp
+
+CFLAGS += -DBOGUS_CVE_2019_5610_FIX
+MK_MAN= no
+
+.include
+
+
+run:
+ ${.OBJDIR}/ctest
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359511 - head/bin/sh
Author: trasz
Date: Wed Apr 1 15:12:51 2020
New Revision: 359511
URL: https://svnweb.freebsd.org/changeset/base/359511
Log:
Bump WARNS for sh(1).
Reviewed by: jilles
MFC after:2 weeks
Sponsored by: DARPA
Differential Revision:https://reviews.freebsd.org/D24181
Modified:
head/bin/sh/Makefile
Modified: head/bin/sh/Makefile
==
--- head/bin/sh/MakefileWed Apr 1 15:10:26 2020(r359510)
+++ head/bin/sh/MakefileWed Apr 1 15:12:51 2020(r359511)
@@ -30,8 +30,6 @@ LIBADD= edit
CFLAGS+=-DSHELL -I. -I${.CURDIR}
# for debug:
# DEBUG_FLAGS+= -g -DDEBUG=2 -fno-inline
-WARNS?=2
-WFORMAT=0
.PATH: ${.CURDIR}/bltin \
${.CURDIR:H}/kill \
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359499 - head/sys/dev/ahci
Hi.
On 01.04.2020 00:28, Ravi Pokala wrote:
> -Original Message-
> From: on behalf of Alexander Motin
>
> Date: 2020-03-31, Tuesday at 20:19
> To: , ,
>
> Subject: svn commit: r359499 - head/sys/dev/ahci
>
> Author: mav
> Date: Wed Apr 1 03:19:42 2020
> New Revision: 359499
> URL: https://svnweb.freebsd.org/changeset/base/359499
>
> Log:
> Add ID for JMicron JMB582/JMB585 AHCI controller.
>
> JMB582 has 2 6Gbps SATA ports and PCIe 3.0 x1.
> JMB585 has 5 6Gbps SATA ports and PCIe 3.0 x2.
>
> Both chips support AHCI v1.31, Port Multiplier with FBS and 8 MSI
> vectors.
>
> Hi Alexander,
>
> The second line of diff seems unrelated...?
It is related, because the check for shared PCI function for SATA and
PATA is no longer applicable to the new generation of HBAs, implementing
only AHCI. And without adding more strict check the driver does not
attach when it should.
>
> MFC after: 2 weeks
>
> Modified:
> head/sys/dev/ahci/ahci_pci.c
>
> Modified: head/sys/dev/ahci/ahci_pci.c
>
> ==
> --- head/sys/dev/ahci/ahci_pci.c Wed Apr 1 02:13:01 2020
> (r359498)
> +++ head/sys/dev/ahci/ahci_pci.c Wed Apr 1 03:19:42 2020
> (r359499)
> @@ -247,6 +247,7 @@ static const struct {
> {0x2365197b, 0x00, "JMicron JMB365",AHCI_Q_NOFORCE},
> {0x2366197b, 0x00, "JMicron JMB366",AHCI_Q_NOFORCE},
> {0x2368197b, 0x00, "JMicron JMB368",AHCI_Q_NOFORCE},
> + {0x0585197b, 0x00, "JMicron JMB58x",0},
> {0x61ab, 0x00, "Marvell 88SE6111", AHCI_Q_NOFORCE | AHCI_Q_NOPMP |
> AHCI_Q_1CH | AHCI_Q_EDGEIS},
> {0x612111ab, 0x00, "Marvell 88SE6121", AHCI_Q_NOFORCE | AHCI_Q_NOPMP |
> @@ -399,6 +400,7 @@ ahci_probe(device_t dev)
>!(ahci_ids[i].quirks & AHCI_Q_NOFORCE {
> /* Do not attach JMicrons with single PCI function. */
> if (pci_get_vendor(dev) == 0x197b &&
> + (ahci_ids[i].quirks & AHCI_Q_NOFORCE) &&
> (pci_read_config(dev, 0xdf, 1) & 0x40) == 0)
> return (ENXIO);
> snprintf(buf, sizeof(buf), "%s AHCI SATA controller",
>
>
>
--
Alexander Motin
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359505 - head/usr.sbin/jail
Author: andrew
Date: Wed Apr 1 09:51:29 2020
New Revision: 359505
URL: https://svnweb.freebsd.org/changeset/base/359505
Log:
Use memmove to copy within a buffer
jail(8) would try to use strcpy to remove the interface from the start of
an IP address. This is undefined, and on arm64 will result in unexpected
IPv6 addresses.
Fix this by using memmove top move the string.
PR: 245102
Reported by: sbruno
MFC after:2 weeks
Sponsored by: Innovate UK
Modified:
head/usr.sbin/jail/config.c
Modified: head/usr.sbin/jail/config.c
==
--- head/usr.sbin/jail/config.c Wed Apr 1 09:01:35 2020(r359504)
+++ head/usr.sbin/jail/config.c Wed Apr 1 09:51:29 2020(r359505)
@@ -596,8 +596,8 @@ check_intparams(struct cfjail *j)
if (cs || defif)
add_param(j, NULL, IP__IP4_IFADDR, s->s);
if (cs) {
- strcpy(s->s, cs + 1);
s->len -= cs + 1 - s->s;
+ memmove(s->s, cs + 1, s->len + 1);
}
if ((cs = strchr(s->s, '/')) != NULL) {
*cs = '\0';
@@ -617,8 +617,8 @@ check_intparams(struct cfjail *j)
if (cs || defif)
add_param(j, NULL, IP__IP6_IFADDR, s->s);
if (cs) {
- strcpy(s->s, cs + 1);
s->len -= cs + 1 - s->s;
+ memmove(s->s, cs + 1, s->len + 1);
}
if ((cs = strchr(s->s, '/')) != NULL) {
*cs = '\0';
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359503 - in head
On March 31, 2020 10:53:14 PM PDT, Glen Barber wrote:
>Author: gjb
>Date: Wed Apr 1 05:51:46 UTC 2020
>New Revision: 359503
>URL: https://svnweb.freebsd.org/changeset/base/359503
>
>Log:
> Update head to 14.0-CURRENT in order to prevent having
> a 13.0-RELEASE.
>
>Modified:
> Makefile.inc1
> UPDATING
> lib/clang/freebsd_cc_version.h
> lib/clang/llvm.build.mk
> sys/conf/newvers.sh
> sys/sys/param.h
>
>Index: Makefile.inc1
>===
>--- Makefile.inc1 (revision 359501)
>+++ Makefile.inc1 (working copy)
>@@ -130,9 +130,9 @@ TARGET_ABI=gnueabi
> .endif
> .endif
> MACHINE_ABI?= unknown
>-MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.0
>+MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd14.0
> TARGET_ABI?= unknown
>-TARGET_TRIPLE?=
>${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.0
>+TARGET_TRIPLE?=
>${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd14.0
> KNOWN_ARCHES?=aarch64/arm64 \
> amd64 \
> armv6/arm \
>@@ -2123,7 +2123,7 @@ ${_bt}-lib/libdwarf: ${_bt_m4_depend}
> .endif
>
># flua is required to regenerate syscall files. It first appeared
>during the
>-# 13.0-CURRENT cycle, thus needs to be built on -older releases and
>stable
>+# 14.0-CURRENT cycle, thus needs to be built on -older releases and
>stable
> # branches.
> .if ${BOOTSTRAPPING} < 1300059
> ${_bt}-libexec/flua: ${_bt}-lib/liblua
>Index: UPDATING
>===
>--- UPDATING (revision 359501)
>+++ UPDATING (working copy)
>@@ -11,8 +11,8 @@ handbook:
> Items affecting the ports and packages system can be found in
>/usr/ports/UPDATING. Please read that file before running portupgrade.
>
>-NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
>- FreeBSD 13.x has many debugging features turned on, in both the
>kernel
>+NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW:
>+ FreeBSD 14.x has many debugging features turned on, in both the
>kernel
> and userland. These features attempt to detect incorrect use of
> system primitives, and encourage loud failure through extra sanity
> checking and fail stop semantics. They also substantially impact
>Index: lib/clang/freebsd_cc_version.h
>===
>--- lib/clang/freebsd_cc_version.h (revision 359501)
>+++ lib/clang/freebsd_cc_version.h (working copy)
>@@ -1,3 +1,3 @@
> /* $FreeBSD$ */
>
>-#define FREEBSD_CC_VERSION 137
>+#define FREEBSD_CC_VERSION 147
>Index: lib/clang/llvm.build.mk
>===
>--- lib/clang/llvm.build.mk(revision 359501)
>+++ lib/clang/llvm.build.mk(working copy)
>@@ -38,7 +38,7 @@ TARGET_ABI= -gnueabi
> TARGET_ABI=
> .endif
> VENDOR= unknown
>-OS_VERSION= freebsd13.0
>+OS_VERSION= freebsd14.0
>
>LLVM_TARGET_TRIPLE?=
>${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI}
>LLVM_BUILD_TRIPLE?=
>${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}
>Index: sys/conf/newvers.sh
>===
>--- sys/conf/newvers.sh(revision 359501)
>+++ sys/conf/newvers.sh(working copy)
>@@ -53,7 +53,7 @@
> #
>
> TYPE="FreeBSD"
>-REVISION="13.0"
>+REVISION="14.0"
> BRANCH=${BRANCH_OVERRIDE:-CURRENT}
> RELEASE="${REVISION}-${BRANCH}"
> VERSION="${TYPE} ${RELEASE}"
>Index: sys/sys/param.h
>===
>--- sys/sys/param.h(revision 359501)
>+++ sys/sys/param.h(working copy)
>@@ -60,7 +60,7 @@
> *in the range 5 to 9.
> */
> #undef __FreeBSD_version
>-#define __FreeBSD_version 1300087 /* Master, propagated to newvers */
>+#define __FreeBSD_version 1400087 /* Master, propagated to newvers */
>
> /*
>* __FreeBSD_kernel__ indicates that this system uses the kernel of
>FreeBSD,
This was discussed at length just before 12 was released. Are you now the one
to decide naming, disregarding the discussion?
Should we not have also skipped 4?
--
Pardon the typos and autocorrect, small keyboard in use.
Cy Schubert
FreeBSD UNIX: Web: https://www.FreeBSD.org
The need of the many outweighs the greed of the few.
Sent from my Android device with K-9 Mail. Please excuse my brevity.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359503 - in head
On Wed, Apr 1, 2020 at 1:53 PM Glen Barber wrote: > > Author: gjb > Date: Wed Apr 1 05:51:46 UTC 2020 > New Revision: 359503 > URL: https://svnweb.freebsd.org/changeset/base/359503 > > Log: > Update head to 14.0-CURRENT in order to prevent having > a 13.0-RELEASE. ... > Index: sys/sys/param.h > === > --- sys/sys/param.h (revision 359501) > +++ sys/sys/param.h (working copy) > @@ -60,7 +60,7 @@ > * in the range 5 to 9. > */ > #undef __FreeBSD_version > -#define __FreeBSD_version 1300087 /* Master, propagated to newvers */ > +#define __FreeBSD_version 1400087 /* Master, propagated to newvers */ I think we want 140 here :-) ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359504 - head/lib/libc/locale
Author: 0mp (doc,ports committer) Date: Wed Apr 1 09:01:35 2020 New Revision: 359504 URL: https://svnweb.freebsd.org/changeset/base/359504 Log: Use proper mdoc(7) macros for literal text and do not use Tn Tn is deprecated and upsets linters. MFC after:3 days Modified: head/lib/libc/locale/big5.5 Modified: head/lib/libc/locale/big5.5 == --- head/lib/libc/locale/big5.5 Wed Apr 1 07:28:31 2020(r359503) +++ head/lib/libc/locale/big5.5 Wed Apr 1 09:01:35 2020(r359504) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 12, 2019 +.Dd April 1, 2020 .Dt BIG5 5 .Os .Sh NAME @@ -39,9 +39,8 @@ encoding for Traditional Chinese text .Dq Big Five is a standard for encoding Traditional Chinese text. Each character is represented by either one or two bytes. -Characters from the -.Tn ASCII -character set are represented as single bytes in the range 0x00 - 0x7F. +Characters from the ASCII character set are represented as +single bytes in the range 0x00 - 0x7F. Traditional Chinese characters are represented by two bytes: the first in the range 0xA1 - 0xFE, the second in the range 0x40 - 0xFE. @@ -51,7 +50,11 @@ the first in the range 0xA1 - 0xFE, the second in the .Xr utf8 5 .Sh BUGS The range of the second byte overlaps some ASCII characters, including -0x5C (`\\') and 0x7C (`|') which may cause problems in program execution or +0x5C +.Pq Ql \e +and 0x7C +.Pq Ql | +which may cause problems in program execution or display. Big5 is considered a legacy standard and only preserved for backward compatibility reason. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359503 - in head
On Wed, Apr 01, 2020 at 02:11:02PM +0800, Li-Wen Hsu wrote: > On Wed, Apr 1, 2020 at 1:53 PM Glen Barber wrote: > > > > Author: gjb > > Date: Wed Apr 1 05:51:46 UTC 2020 > > New Revision: 359503 > > URL: https://svnweb.freebsd.org/changeset/base/359503 > > > > Log: > > Update head to 14.0-CURRENT in order to prevent having > > a 13.0-RELEASE. > ... > > Index: sys/sys/param.h > > === > > --- sys/sys/param.h (revision 359501) > > +++ sys/sys/param.h (working copy) > > @@ -60,7 +60,7 @@ > > * in the range 5 to 9. > > */ > > #undef __FreeBSD_version > > -#define __FreeBSD_version 1300087 /* Master, propagated to newvers */ > > +#define __FreeBSD_version 1400087 /* Master, propagated to newvers */ > > I think we want 140 here :-) > You are correct. I will fix it after dealing with the influx of complaints about this commit. Glen signature.asc Description: PGP signature
svn commit: r359503 - in head
Author: gjb
Date: Wed Apr 1 05:51:46 UTC 2020
New Revision: 359503
URL: https://svnweb.freebsd.org/changeset/base/359503
Log:
Update head to 14.0-CURRENT in order to prevent having
a 13.0-RELEASE.
Modified:
Makefile.inc1
UPDATING
lib/clang/freebsd_cc_version.h
lib/clang/llvm.build.mk
sys/conf/newvers.sh
sys/sys/param.h
Index: Makefile.inc1
===
--- Makefile.inc1 (revision 359501)
+++ Makefile.inc1 (working copy)
@@ -130,9 +130,9 @@ TARGET_ABI= gnueabi
.endif
.endif
MACHINE_ABI?= unknown
-MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.0
+MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd14.0
TARGET_ABI?= unknown
-TARGET_TRIPLE?=
${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.0
+TARGET_TRIPLE?=
${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd14.0
KNOWN_ARCHES?= aarch64/arm64 \
amd64 \
armv6/arm \
@@ -2123,7 +2123,7 @@ ${_bt}-lib/libdwarf: ${_bt_m4_depend}
.endif
# flua is required to regenerate syscall files. It first appeared during the
-# 13.0-CURRENT cycle, thus needs to be built on -older releases and stable
+# 14.0-CURRENT cycle, thus needs to be built on -older releases and stable
# branches.
.if ${BOOTSTRAPPING} < 1300059
${_bt}-libexec/flua: ${_bt}-lib/liblua
Index: UPDATING
===
--- UPDATING(revision 359501)
+++ UPDATING(working copy)
@@ -11,8 +11,8 @@ handbook:
Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running portupgrade.
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
- FreeBSD 13.x has many debugging features turned on, in both the kernel
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW:
+ FreeBSD 14.x has many debugging features turned on, in both the kernel
and userland. These features attempt to detect incorrect use of
system primitives, and encourage loud failure through extra sanity
checking and fail stop semantics. They also substantially impact
Index: lib/clang/freebsd_cc_version.h
===
--- lib/clang/freebsd_cc_version.h (revision 359501)
+++ lib/clang/freebsd_cc_version.h (working copy)
@@ -1,3 +1,3 @@
/* $FreeBSD$ */
-#defineFREEBSD_CC_VERSION 137
+#defineFREEBSD_CC_VERSION 147
Index: lib/clang/llvm.build.mk
===
--- lib/clang/llvm.build.mk (revision 359501)
+++ lib/clang/llvm.build.mk (working copy)
@@ -38,7 +38,7 @@ TARGET_ABI= -gnueabi
TARGET_ABI=
.endif
VENDOR=unknown
-OS_VERSION=freebsd13.0
+OS_VERSION=freebsd14.0
LLVM_TARGET_TRIPLE?=
${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI}
LLVM_BUILD_TRIPLE?=
${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}
Index: sys/conf/newvers.sh
===
--- sys/conf/newvers.sh (revision 359501)
+++ sys/conf/newvers.sh (working copy)
@@ -53,7 +53,7 @@
#
TYPE="FreeBSD"
-REVISION="13.0"
+REVISION="14.0"
BRANCH=${BRANCH_OVERRIDE:-CURRENT}
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"
Index: sys/sys/param.h
===
--- sys/sys/param.h (revision 359501)
+++ sys/sys/param.h (working copy)
@@ -60,7 +60,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1300087 /* Master, propagated to newvers */
+#define __FreeBSD_version 1400087 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359502 - in head: lib/libveriexec share/mk
Author: sjg
Date: Wed Apr 1 05:45:12 2020
New Revision: 359502
URL: https://svnweb.freebsd.org/changeset/base/359502
Log:
Do not claim libbearssl et al are INTERNALLIB
If INTERNALLIB is defined we need PIE and bsd.incs.mk is
not included.
PR: 245189
Reviewed by: emaste
MFC after:1 week
Differential Revision: https://reviews.freebsd.org//D24233
Modified:
head/lib/libveriexec/Makefile
head/share/mk/src.libnames.mk
Modified: head/lib/libveriexec/Makefile
==
--- head/lib/libveriexec/Makefile Wed Apr 1 04:51:39 2020
(r359501)
+++ head/lib/libveriexec/Makefile Wed Apr 1 05:45:12 2020
(r359502)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include
+.include
LIB= veriexec
MAN= veriexec.3
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Wed Apr 1 04:51:39 2020
(r359501)
+++ head/share/mk/src.libnames.mk Wed Apr 1 05:45:12 2020
(r359502)
@@ -222,18 +222,18 @@ _LIBRARIES+= \
.endif
.if ${MK_BEARSSL} == "yes"
-_INTERNALLIBS+= \
+_LIBRARIES+= \
bearssl \
secureboot \
-LIBBEARSSL?= ${LIBBEARSSLDIR}/libbearssl${PIE_SUFFIX}.a
-LIBSECUREBOOT?=${LIBSECUREBOOTDIR}/libsecureboot${PIE_SUFFIX}.a
+LIBBEARSSL?= ${LIBBEARSSLDIR}/libbearssl.a
+LIBSECUREBOOT?=${LIBSECUREBOOTDIR}/libsecureboot.a
.endif
.if ${MK_VERIEXEC} == "yes"
-_INTERNALLIBS+= veriexec
+_LIBRARIES+= veriexec
-LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec${PIE_SUFFIX}.a
+LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec.a
.endif
# Each library's LIBADD needs to be duplicated here for static linkage of
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
