svn commit: r361685 - head/sys/kern
Author: peter
Date: Mon Jun 1 03:37:58 2020
New Revision: 361685
URL: https://svnweb.freebsd.org/changeset/base/361685
Log:
Clarify which hints file is the source of an error message.
PR: 246688
Submitted by: Ashish Gupta
MFC after:1 week
Modified:
head/sys/kern/kern_linker.c
Modified: head/sys/kern/kern_linker.c
==
--- head/sys/kern/kern_linker.c Mon Jun 1 02:54:10 2020(r361684)
+++ head/sys/kern/kern_linker.c Mon Jun 1 03:37:58 2020(r361685)
@@ -1870,7 +1870,7 @@ linker_hints_lookup(const char *path, int pathlen, con
* XXX: we need to limit this number to some reasonable value
*/
if (vattr.va_size > LINKER_HINTS_MAX) {
- printf("hints file too large %ld\n", (long)vattr.va_size);
+ printf("linker.hints file too large %ld\n",
(long)vattr.va_size);
goto bad;
}
hints = malloc(vattr.va_size, M_TEMP, M_WAITOK);
@@ -1888,7 +1888,7 @@ linker_hints_lookup(const char *path, int pathlen, con
intp = (int *)hints;
ival = *intp++;
if (ival != LINKER_HINTS_VERSION) {
- printf("hints file version mismatch %d\n", ival);
+ printf("linker.hints file version mismatch %d\n", ival);
goto bad;
}
bufend = hints + vattr.va_size;
___
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: r361684 - head/usr.bin/svn/lib/libapr
Author: kevans
Date: Mon Jun 1 02:54:10 2020
New Revision: 361684
URL: https://svnweb.freebsd.org/changeset/base/361684
Log:
apr: build some needed emulated 64-bit atomic bits after r361678
This should fix the build on armv{6,7}, mips, and mips64, which all need
emulated 64-bit atomics for apr.
X-MFC-With: r361678
Modified:
head/usr.bin/svn/lib/libapr/Makefile
Modified: head/usr.bin/svn/lib/libapr/Makefile
==
--- head/usr.bin/svn/lib/libapr/MakefileMon Jun 1 01:25:19 2020
(r361683)
+++ head/usr.bin/svn/lib/libapr/MakefileMon Jun 1 02:54:10 2020
(r361684)
@@ -19,6 +19,7 @@ SRCS= apr_cpystrn.c \
apr_tables.c \
buffer.c \
builtins.c \
+ builtins64.c \
charset.c \
common.c \
copy.c \
@@ -45,6 +46,7 @@ SRCS= apr_cpystrn.c \
mmap.c \
multicast.c \
mutex.c \
+ mutex64.c \
open.c \
otherchild.c \
pipe.c \
___
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: r361683 - head/usr.sbin/certctl
n Sun, May 31, 2020 at 8:25 PM Kyle Evans wrote:
>
> Author: kevans
> Date: Mon Jun 1 01:25:19 2020
> New Revision: 361683
> URL: https://svnweb.freebsd.org/changeset/base/361683
>
> Log:
> certctl: fix test syntax
>
> test doesn't understand &&, but it does understand -a.
>
> MFC after:1 week
>
Sorry, this was a pretty low-quality commit message; && is a shell
construct, so the previous version lead to a lot of spam as the [
invocation was split and the ] terminator lost.
> Modified:
> head/usr.sbin/certctl/certctl.sh
>
> Modified: head/usr.sbin/certctl/certctl.sh
> ==
> --- head/usr.sbin/certctl/certctl.shSun May 31 22:46:32 2020
> (r361682)
> +++ head/usr.sbin/certctl/certctl.shMon Jun 1 01:25:19 2020
> (r361683)
> @@ -102,7 +102,7 @@ do_scan()
> [ -d "$CPATH" ] || continue
> echo "Scanning $CPATH for certificates..."
> for CFILE in $(ls -1 "${CPATH}" | grep -Ee "${FILEPAT}"); do
> - [ -e "$CPATH/$CFILE" && $UNPRIV -eq 0 ] || continue
> + [ -e "$CPATH/$CFILE" -a $UNPRIV -eq 0 ] || continue
> [ $VERBOSE -gt 0 ] && echo "Reading $CFILE"
> "$CFUNC" "$CPATH/$CFILE"
> done
___
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: r361683 - head/usr.sbin/certctl
Author: kevans
Date: Mon Jun 1 01:25:19 2020
New Revision: 361683
URL: https://svnweb.freebsd.org/changeset/base/361683
Log:
certctl: fix test syntax
test doesn't understand &&, but it does understand -a.
MFC after:1 week
Modified:
head/usr.sbin/certctl/certctl.sh
Modified: head/usr.sbin/certctl/certctl.sh
==
--- head/usr.sbin/certctl/certctl.shSun May 31 22:46:32 2020
(r361682)
+++ head/usr.sbin/certctl/certctl.shMon Jun 1 01:25:19 2020
(r361683)
@@ -102,7 +102,7 @@ do_scan()
[ -d "$CPATH" ] || continue
echo "Scanning $CPATH for certificates..."
for CFILE in $(ls -1 "${CPATH}" | grep -Ee "${FILEPAT}"); do
- [ -e "$CPATH/$CFILE" && $UNPRIV -eq 0 ] || continue
+ [ -e "$CPATH/$CFILE" -a $UNPRIV -eq 0 ] || continue
[ $VERBOSE -gt 0 ] && echo "Reading $CFILE"
"$CFUNC" "$CPATH/$CFILE"
done
___
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: r361682 - head/include
>Author: rmacklem
>Date: Sun May 31 22:46:32 2020
>New Revision: 361682
>URL: https://svnweb.freebsd.org/changeset/base/361682
>
>Log:
> Oops, I didn't notice the "cd" is needed for each install line.
>
>Modified:
> head/include/Makefile
>
>Modified: head/include/Makefile
>=>=
>--- head/include/Makefile Sun May 31 22:40:39 2020(r361681)
>+++ head/include/Makefile Sun May 31 22:46:32 2020(r361682)
>@@ -236,6 +236,7 @@ copies: .PHONY .META
>cd ${SRCTOP}/sys/rpc; \
>${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444
> rpcsec_tls.h \
>${SDESTDIR}${INCLUDEDIR}/rpc
Or would it be preferable to put a line continuation "\" here instead of adding
the second "cd .."?
>+ cd ${SRCTOP}/sys/rpc; \
>${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 types.h \
>${SDESTDIR}${INCLUDEDIR}/rpc
>cd ${SRCTOP}/sys/teken; \
rick
ps: I'll admit I tried to do a "make buildworld" but it was still building clang
after 7 hours, so I gave up...
___
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: r361682 - head/include
Author: rmacklem
Date: Sun May 31 22:46:32 2020
New Revision: 361682
URL: https://svnweb.freebsd.org/changeset/base/361682
Log:
Oops, I didn't notice the "cd" is needed for each install line.
Modified:
head/include/Makefile
Modified: head/include/Makefile
==
--- head/include/Makefile Sun May 31 22:40:39 2020(r361681)
+++ head/include/Makefile Sun May 31 22:46:32 2020(r361682)
@@ -236,6 +236,7 @@ copies: .PHONY .META
cd ${SRCTOP}/sys/rpc; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 rpcsec_tls.h
\
${SDESTDIR}${INCLUDEDIR}/rpc
+ cd ${SRCTOP}/sys/rpc; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 types.h \
${SDESTDIR}${INCLUDEDIR}/rpc
cd ${SRCTOP}/sys/teken; \
___
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: r361681 - in head/usr.bin/svn: svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc svnrdump svnserve svnsync svnversion
Author: dim
Date: Sun May 31 22:40:39 2020
New Revision: 361681
URL: https://svnweb.freebsd.org/changeset/base/361681
Log:
Change more Makefiles under usr.bin/svn to make them easier to
incrementally update. No functional change intended.
MFC after:2 weeks
X-MFC-With: r361677
Modified:
head/usr.bin/svn/svn/Makefile
head/usr.bin/svn/svnadmin/Makefile
head/usr.bin/svn/svnbench/Makefile
head/usr.bin/svn/svndumpfilter/Makefile
head/usr.bin/svn/svnfsfs/Makefile
head/usr.bin/svn/svnlook/Makefile
head/usr.bin/svn/svnmucc/Makefile
head/usr.bin/svn/svnrdump/Makefile
head/usr.bin/svn/svnserve/Makefile
head/usr.bin/svn/svnsync/Makefile
head/usr.bin/svn/svnversion/Makefile
Modified: head/usr.bin/svn/svn/Makefile
==
--- head/usr.bin/svn/svn/Makefile Sun May 31 22:37:33 2020
(r361680)
+++ head/usr.bin/svn/svn/Makefile Sun May 31 22:40:39 2020
(r361681)
@@ -2,54 +2,111 @@
.include "${.CURDIR:H}/Makefile.inc"
-.PATH: ${SVNDIR}/svn
+.PATH: ${SVNDIR}/svn
-PROG= svn${SVNLITE}
+PROG= svn${SVNLITE}
-SRCS= add-cmd.c auth-cmd.c blame-cmd.c cat-cmd.c changelist-cmd.c \
- checkout-cmd.c cl-conflicts.c cleanup-cmd.c commit-cmd.c \
- conflict-callbacks.c copy-cmd.c delete-cmd.c deprecated.c \
- diff-cmd.c export-cmd.c file-merge.c help-cmd.c import-cmd.c \
- info-cmd.c list-cmd.c lock-cmd.c log-cmd.c merge-cmd.c \
- mergeinfo-cmd.c mkdir-cmd.c move-cmd.c notify.c patch-cmd.c \
- propdel-cmd.c propedit-cmd.c propget-cmd.c proplist-cmd.c \
- props.c propset-cmd.c relocate-cmd.c resolve-cmd.c \
- resolved-cmd.c revert-cmd.c \
- shelve-cmd.c status-cmd.c similarity.c status.c \
- svn.c switch-cmd.c unlock-cmd.c update-cmd.c upgrade-cmd.c util.c
+SRCS= add-cmd.c \
+ auth-cmd.c \
+ blame-cmd.c \
+ cat-cmd.c \
+ changelist-cmd.c \
+ checkout-cmd.c \
+ cl-conflicts.c \
+ cleanup-cmd.c \
+ commit-cmd.c \
+ conflict-callbacks.c \
+ copy-cmd.c \
+ delete-cmd.c \
+ deprecated.c \
+ diff-cmd.c \
+ export-cmd.c \
+ file-merge.c \
+ help-cmd.c \
+ import-cmd.c \
+ info-cmd.c \
+ list-cmd.c \
+ lock-cmd.c \
+ log-cmd.c \
+ merge-cmd.c \
+ mergeinfo-cmd.c \
+ mkdir-cmd.c \
+ move-cmd.c \
+ notify.c \
+ patch-cmd.c \
+ propdel-cmd.c \
+ propedit-cmd.c \
+ propget-cmd.c \
+ proplist-cmd.c \
+ props.c \
+ propset-cmd.c \
+ relocate-cmd.c \
+ resolve-cmd.c \
+ resolved-cmd.c \
+ revert-cmd.c \
+ shelve-cmd.c \
+ status-cmd.c \
+ similarity.c \
+ status.c \
+ svn.c \
+ switch-cmd.c \
+ unlock-cmd.c \
+ update-cmd.c \
+ upgrade-cmd.c \
+ util.c
-CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
- -I${.CURDIR:H}/lib/libapr \
- -I${APR}/include/arch/unix \
- -I${APR}/include \
- -I${.CURDIR:H}/lib/libapr_util \
- -I${APRU}/include/private \
- -I${APRU}/include
+CFLAGS+= -I${SVNDIR}/include \
+ -I${SVNDIR} \
+ -I${.CURDIR:H} \
+ -I${.CURDIR:H}/lib/libapr \
+ -I${APR}/include/arch/unix \
+ -I${APR}/include \
+ -I${.CURDIR:H}/lib/libapr_util \
+ -I${APRU}/include/private \
+ -I${APRU}/include
-LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
- -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
- -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
- -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
- -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
- -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
- -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
- -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
- -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
- -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
- -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
- -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
- -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
- -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
- -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
- -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
- -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
-LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread
+LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX}
svn commit: r361680 - head/libexec/rtld-elf
Author: kib
Date: Sun May 31 22:37:33 2020
New Revision: 361680
URL: https://svnweb.freebsd.org/changeset/base/361680
Log:
rtld: Add -b option to allow to specify image name different from arg0.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/libexec/rtld-elf/rtld.1
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/rtld.1
==
--- head/libexec/rtld-elf/rtld.1Sun May 31 22:15:34 2020
(r361679)
+++ head/libexec/rtld-elf/rtld.1Sun May 31 22:37:33 2020
(r361680)
@@ -28,7 +28,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 20, 2017
+.Dd June 1, 2020
.Dt RTLD 1
.Os
.Sh NAME
@@ -302,6 +302,7 @@ Execution options may be specified.
The syntax of the direct invocation is
.Bd -ragged -offset indent
.Pa /libexec/ld-elf.so.1
+.Op Fl b Ar exe
.Op Fl f Ar fd
.Op Fl p
.Op Fl -
@@ -311,6 +312,17 @@ The syntax of the direct invocation is
.Pp
The options are:
.Bl -tag -width indent
+.It Fl b Ar exe
+Use the executable
+.Fa exe
+instead of
+.Fa image_path
+for activation.
+If this option is specified,
+.Ar image_path
+is only used to provide the
+.Va argv[0]
+value to the program.
.It Fl f Ar fd
File descriptor
.Ar fd
Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cSun May 31 22:15:34 2020
(r361679)
+++ head/libexec/rtld-elf/rtld.cSun May 31 22:37:33 2020
(r361680)
@@ -136,7 +136,8 @@ static void objlist_put_after(Objlist *, Obj_Entry *,
static void objlist_remove(Objlist *, Obj_Entry *);
static int open_binary_fd(const char *argv0, bool search_in_path,
const char **binpath_res);
-static int parse_args(char* argv[], int argc, bool *use_pathp, int *fdp);
+static int parse_args(char* argv[], int argc, bool *use_pathp, int *fdp,
+const char **argv0);
static int parse_integer(const char *);
static void *path_enumerate(const char *, path_enum_proc, const char *, void
*);
static void print_usage(const char *argv0);
@@ -467,8 +468,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entr
}
dbg("opening main program in direct exec mode");
if (argc >= 2) {
- rtld_argc = parse_args(argv, argc, _in_path, );
- argv0 = argv[rtld_argc];
+ rtld_argc = parse_args(argv, argc, _in_path, ,
);
explicit_fd = (fd != -1);
binpath = NULL;
if (!explicit_fd)
@@ -5610,17 +5610,20 @@ open_binary_fd(const char *argv0, bool search_in_path,
* Parse a set of command-line arguments.
*/
static int
-parse_args(char* argv[], int argc, bool *use_pathp, int *fdp)
+parse_args(char* argv[], int argc, bool *use_pathp, int *fdp,
+const char **argv0)
{
const char *arg;
char machine[64];
size_t sz;
int arglen, fd, i, j, mib[2];
char opt;
+ bool seen_b, seen_f;
dbg("Parsing command-line arguments");
*use_pathp = false;
*fdp = -1;
+ seen_b = seen_f = false;
for (i = 1; i < argc; i++ ) {
arg = argv[i];
@@ -5647,7 +5650,21 @@ parse_args(char* argv[], int argc, bool *use_pathp, in
if (opt == 'h') {
print_usage(argv[0]);
_exit(0);
+ } else if (opt == 'b') {
+ if (seen_f) {
+ _rtld_error("Both -b and -f specified");
+ rtld_die();
+ }
+ i++;
+ *argv0 = argv[i];
+ seen_b = true;
+ break;
} else if (opt == 'f') {
+ if (seen_b) {
+ _rtld_error("Both -b and -f specified");
+ rtld_die();
+ }
+
/*
* -f XX can be used to specify a
* descriptor for the binary named at
@@ -5671,6 +5688,7 @@ parse_args(char* argv[], int argc, bool *use_pathp, in
rtld_die();
}
*fdp = fd;
+ seen_f = true;
break;
} else if (opt == 'p') {
*use_pathp = true;
@@ -5700,6 +5718,8 @@ parse_args(char* argv[], int argc, bool *use_pathp, in
}
}
+ if (!seen_b)
+ *argv0 = argv[i];
return (i);
}
@@ -5734,10 +5754,12 @@ static void
print_usage(const char *argv0)
{
-
svn commit: r361679 - head/include
Author: rmacklem
Date: Sun May 31 22:15:34 2020
New Revision: 361679
URL: https://svnweb.freebsd.org/changeset/base/361679
Log:
Update the Makefile to copy rpcsec_tls.h to /usr/include/rpc.
Modified:
head/include/Makefile
Modified: head/include/Makefile
==
--- head/include/Makefile Sun May 31 22:12:56 2020(r361678)
+++ head/include/Makefile Sun May 31 22:15:34 2020(r361679)
@@ -234,6 +234,8 @@ copies: .PHONY .META
.endif
.endfor
cd ${SRCTOP}/sys/rpc; \
+ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 rpcsec_tls.h
\
+ ${SDESTDIR}${INCLUDEDIR}/rpc
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 types.h \
${SDESTDIR}${INCLUDEDIR}/rpc
cd ${SRCTOP}/sys/teken; \
@@ -367,7 +369,7 @@ symlinks: .PHONY .META
${SDESTDIR}${INCLUDEDIR}/isofs/cd9660; \
done
cd ${SRCTOP}/sys/rpc; \
- for h in types.h; do \
+ for h in rpcsec_tls.h types.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/rpc/$$h \
${SDESTDIR}${INCLUDEDIR}/rpc; \
done
___
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: r361678 - in head: contrib/apr contrib/apr/atomic/unix contrib/apr/docs contrib/apr/encoding contrib/apr/file_io/unix contrib/apr/include contrib/apr/include/arch/unix contrib/apr/inclu...
Author: dim Date: Sun May 31 22:12:56 2020 New Revision: 361678 URL: https://svnweb.freebsd.org/changeset/base/361678 Log: Update apr to 1.7.0. See contrib/apr/CHANGES for a summary of changes. MFC after:2 weeks X-MFC-With: r361677 Added: head/contrib/apr/atomic/unix/builtins64.c - copied unchanged from r361671, vendor/apr/dist/atomic/unix/builtins64.c head/contrib/apr/atomic/unix/mutex64.c - copied unchanged from r361671, vendor/apr/dist/atomic/unix/mutex64.c head/contrib/apr/encoding/apr_encode.c - copied unchanged from r361671, vendor/apr/dist/encoding/apr_encode.c head/contrib/apr/include/apr_cstr.h - copied unchanged from r361671, vendor/apr/dist/include/apr_cstr.h head/contrib/apr/include/apr_encode.h - copied unchanged from r361671, vendor/apr/dist/include/apr_encode.h head/contrib/apr/include/apr_perms_set.h - copied unchanged from r361671, vendor/apr/dist/include/apr_perms_set.h head/contrib/apr/include/private/ - copied from r361671, vendor/apr/dist/include/private/ head/contrib/apr/poll/unix/wakeup.c - copied unchanged from r361671, vendor/apr/dist/poll/unix/wakeup.c head/contrib/apr/strings/apr_cstr.c - copied unchanged from r361671, vendor/apr/dist/strings/apr_cstr.c head/usr.bin/svn/lib/libapr/apr_escape_test_char.h (contents, props changed) Modified: head/contrib/apr/CHANGES head/contrib/apr/CMakeLists.txt head/contrib/apr/Makefile.in head/contrib/apr/Makefile.win head/contrib/apr/NOTICE head/contrib/apr/NWGNUmakefile head/contrib/apr/apr.dsp head/contrib/apr/apr.mak head/contrib/apr/apr.spec head/contrib/apr/atomic/unix/ia32.c head/contrib/apr/atomic/unix/mutex.c head/contrib/apr/atomic/unix/ppc.c head/contrib/apr/atomic/unix/s390.c head/contrib/apr/atomic/unix/solaris.c head/contrib/apr/build-outputs.mk head/contrib/apr/buildconf head/contrib/apr/config.layout head/contrib/apr/configure head/contrib/apr/configure.in head/contrib/apr/docs/APRDesign.html head/contrib/apr/docs/canonical_filenames.html head/contrib/apr/docs/incomplete_types head/contrib/apr/docs/pool-design.html head/contrib/apr/encoding/apr_escape.c head/contrib/apr/file_io/unix/copy.c head/contrib/apr/file_io/unix/dir.c head/contrib/apr/file_io/unix/flock.c head/contrib/apr/file_io/unix/pipe.c head/contrib/apr/file_io/unix/readwrite.c head/contrib/apr/file_io/unix/seek.c head/contrib/apr/include/apr.h.in head/contrib/apr/include/apr.hnw head/contrib/apr/include/apr.hw head/contrib/apr/include/apr.hwc head/contrib/apr/include/apr_allocator.h head/contrib/apr/include/apr_atomic.h head/contrib/apr/include/apr_errno.h head/contrib/apr/include/apr_escape.h head/contrib/apr/include/apr_file_info.h head/contrib/apr/include/apr_file_io.h head/contrib/apr/include/apr_general.h head/contrib/apr/include/apr_global_mutex.h head/contrib/apr/include/apr_hash.h head/contrib/apr/include/apr_network_io.h head/contrib/apr/include/apr_poll.h head/contrib/apr/include/apr_portable.h head/contrib/apr/include/apr_proc_mutex.h head/contrib/apr/include/apr_shm.h head/contrib/apr/include/apr_skiplist.h head/contrib/apr/include/apr_strings.h head/contrib/apr/include/apr_tables.h head/contrib/apr/include/apr_thread_mutex.h head/contrib/apr/include/apr_thread_proc.h head/contrib/apr/include/apr_time.h head/contrib/apr/include/apr_version.h head/contrib/apr/include/arch/unix/apr_arch_atomic.h head/contrib/apr/include/arch/unix/apr_arch_networkio.h head/contrib/apr/include/arch/unix/apr_arch_poll_private.h head/contrib/apr/include/arch/unix/apr_arch_proc_mutex.h head/contrib/apr/include/arch/unix/apr_arch_shm.h head/contrib/apr/include/arch/unix/apr_arch_thread_mutex.h head/contrib/apr/include/arch/unix/apr_arch_threadproc.h head/contrib/apr/include/arch/unix/apr_private.h.in head/contrib/apr/libapr.dsp head/contrib/apr/libapr.mak head/contrib/apr/locks/unix/global_mutex.c head/contrib/apr/locks/unix/proc_mutex.c head/contrib/apr/locks/unix/thread_cond.c head/contrib/apr/locks/unix/thread_mutex.c head/contrib/apr/memory/unix/apr_pools.c head/contrib/apr/misc/unix/errorcodes.c head/contrib/apr/misc/unix/rand.c head/contrib/apr/network_io/unix/multicast.c head/contrib/apr/network_io/unix/sockaddr.c head/contrib/apr/network_io/unix/sockets.c head/contrib/apr/network_io/unix/sockopt.c head/contrib/apr/poll/unix/epoll.c head/contrib/apr/poll/unix/kqueue.c head/contrib/apr/poll/unix/poll.c head/contrib/apr/poll/unix/pollcb.c head/contrib/apr/poll/unix/pollset.c head/contrib/apr/poll/unix/port.c head/contrib/apr/poll/unix/select.c head/contrib/apr/poll/unix/z_asio.c head/contrib/apr/shmem/unix/shm.c head/contrib/apr/strings/apr_cpystrn.c head/contrib/apr/strings/apr_fnmatch.c head/contrib/apr/strings/apr_snprintf.c head/contrib/apr/tables/apr_skiplist.c head/contrib/apr/tables/apr_tables.c
svn commit: r361677 - in head/usr.bin/svn: . lib lib/libapr lib/libapr_util lib/libserf lib/libsvn_client lib/libsvn_delta lib/libsvn_diff lib/libsvn_fs lib/libsvn_fs_fs lib/libsvn_fs_util lib/libs...
Author: dim Date: Sun May 31 22:04:51 2020 New Revision: 361677 URL: https://svnweb.freebsd.org/changeset/base/361677 Log: Change Makefiles under usr.bin/svn to make them easier to incrementally update. No functional change intended. MFC after:2 weeks Modified: head/usr.bin/svn/Makefile head/usr.bin/svn/lib/Makefile head/usr.bin/svn/lib/libapr/Makefile head/usr.bin/svn/lib/libapr_util/Makefile head/usr.bin/svn/lib/libserf/Makefile head/usr.bin/svn/lib/libsvn_client/Makefile head/usr.bin/svn/lib/libsvn_delta/Makefile head/usr.bin/svn/lib/libsvn_diff/Makefile head/usr.bin/svn/lib/libsvn_fs/Makefile head/usr.bin/svn/lib/libsvn_fs_fs/Makefile head/usr.bin/svn/lib/libsvn_fs_util/Makefile head/usr.bin/svn/lib/libsvn_fs_x/Makefile head/usr.bin/svn/lib/libsvn_ra/Makefile head/usr.bin/svn/lib/libsvn_ra_local/Makefile head/usr.bin/svn/lib/libsvn_ra_serf/Makefile head/usr.bin/svn/lib/libsvn_ra_svn/Makefile head/usr.bin/svn/lib/libsvn_repos/Makefile head/usr.bin/svn/lib/libsvn_subr/Makefile head/usr.bin/svn/lib/libsvn_wc/Makefile Modified: head/usr.bin/svn/Makefile == --- head/usr.bin/svn/Makefile Sun May 31 21:56:07 2020(r361676) +++ head/usr.bin/svn/Makefile Sun May 31 22:04:51 2020(r361677) @@ -1,8 +1,18 @@ # $FreeBSD$ -SUBDIR=lib .WAIT \ - svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnserve \ - svnsync svnversion svnmucc svnrdump +SUBDIR=lib \ + .WAIT \ + svn \ + svnadmin \ + svnbench \ + svndumpfilter \ + svnfsfs \ + svnlook \ + svnserve \ + svnsync \ + svnversion \ + svnmucc \ + svnrdump SUBDIR_PARALLEL= .include Modified: head/usr.bin/svn/lib/Makefile == --- head/usr.bin/svn/lib/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -1,9 +1,22 @@ # $FreeBSD$ -SUBDIR=libapr libapr_util libserf \ - libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_fs \ - libsvn_fs_util libsvn_fs_x libsvn_ra libsvn_ra_local libsvn_ra_serf \ - libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc +SUBDIR=libapr \ + libapr_util \ + libserf \ + libsvn_client \ + libsvn_delta \ + libsvn_diff \ + libsvn_fs \ + libsvn_fs_fs \ + libsvn_fs_util \ + libsvn_fs_x \ + libsvn_ra \ + libsvn_ra_local \ + libsvn_ra_serf \ + libsvn_ra_svn \ + libsvn_repos \ + libsvn_subr \ + libsvn_wc SUBDIR_PARALLEL= .include Modified: head/usr.bin/svn/lib/libapr/Makefile == --- head/usr.bin/svn/lib/libapr/MakefileSun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libapr/MakefileSun May 31 22:04:51 2020 (r361677) @@ -4,31 +4,109 @@ INTERNALLIB= yes LIB= apr -SRCS= apr_cpystrn.c apr_fnmatch.c apr_getpass.c apr_hash.c apr_skiplist.c \ - apr_pools.c apr_random.c apr_snprintf.c apr_strings.c \ - apr_strnatcmp.c apr_strtok.c apr_tables.c buffer.c \ - builtins.c charset.c common.c copy.c dir.c dso.c env.c \ - epoll.c errorcodes.c fileacc.c filedup.c filepath.c \ - filepath_util.c filestat.c flock.c fullrw.c getopt.c \ - global_mutex.c groupinfo.c ia32.c inet_ntop.c inet_pton.c \ - kqueue.c mktemp.c mmap.c multicast.c mutex.c open.c \ - otherchild.c pipe.c poll.c pollcb.c pollset.c port.c \ - ppc.c proc.c proc_mutex.c procsup.c rand.c readwrite.c \ - s390.c seek.c select.c sendrecv.c sha2.c sha2_glue.c \ - shm.c signals.c sockaddr.c socket_util.c sockets.c \ - sockopt.c solaris.c start.c tempdir.c thread.c thread_cond.c \ - thread_mutex.c thread_rwlock.c threadpriv.c time.c \ - timestr.c userinfo.c version.c waitio.c z_asio.c +SRCS= apr_cpystrn.c \ + apr_fnmatch.c \ + apr_getpass.c \ + apr_hash.c \ + apr_pools.c \ + apr_random.c \ + apr_skiplist.c \ + apr_snprintf.c \ + apr_strings.c \ + apr_strnatcmp.c \ + apr_strtok.c \ + apr_tables.c \ + buffer.c \ + builtins.c \ + charset.c \ + common.c \ + copy.c \ + dir.c \ + dso.c \ + env.c \ + epoll.c \ + errorcodes.c \ + fileacc.c \ + filedup.c \ + filepath.c \ +
svn commit: r361676 - head/libexec/rtld-elf
Author: kib
Date: Sun May 31 21:56:07 2020
New Revision: 361676
URL: https://svnweb.freebsd.org/changeset/base/361676
Log:
rtld: Fix indent in print_usage().
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cSun May 31 21:53:15 2020
(r361675)
+++ head/libexec/rtld-elf/rtld.cSun May 31 21:56:07 2020
(r361676)
@@ -5735,15 +5735,15 @@ print_usage(const char *argv0)
{
rtld_printf("Usage: %s [-h] [-f ] [-p] [--] []\n"
- "\n"
- "Options:\n"
- " -hDisplay this help message\n"
- " -fExecute instead of searching for \n"
- " -pSearch in PATH for named binary\n"
- " -vDisplay identification information\n"
- " --End of RTLD options\n"
- "Name of process to execute\n"
- " Arguments to the executed process\n", argv0);
+ "\n"
+ "Options:\n"
+ " -hDisplay this help message\n"
+ " -fExecute instead of searching for \n"
+ " -pSearch in PATH for named binary\n"
+ " -vDisplay identification information\n"
+ " --End of RTLD options\n"
+ "Name of process to execute\n"
+ " Arguments to the executed process\n", argv0);
}
/*
___
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: r361675 - head/libexec/rtld-elf
Author: kib
Date: Sun May 31 21:53:15 2020
New Revision: 361675
URL: https://svnweb.freebsd.org/changeset/base/361675
Log:
rtld: Add -v switch to print some useful information about the rtld binary.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/libexec/rtld-elf/rtld.1
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/rtld.1
==
--- head/libexec/rtld-elf/rtld.1Sun May 31 21:43:59 2020
(r361674)
+++ head/libexec/rtld-elf/rtld.1Sun May 31 21:53:15 2020
(r361675)
@@ -333,6 +333,8 @@ character,
uses the search path provided by the environment variable
.Dv PATH
to find the binary to execute.
+.It Fl v
+Display information about this run-time linker binary, then exit.
.It Fl -
Ends the
.Nm
Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cSun May 31 21:43:59 2020
(r361674)
+++ head/libexec/rtld-elf/rtld.cSun May 31 21:53:15 2020
(r361675)
@@ -5613,7 +5613,9 @@ static int
parse_args(char* argv[], int argc, bool *use_pathp, int *fdp)
{
const char *arg;
- int fd, i, j, arglen;
+ char machine[64];
+ size_t sz;
+ int arglen, fd, i, j, mib[2];
char opt;
dbg("Parsing command-line arguments");
@@ -5672,6 +5674,24 @@ parse_args(char* argv[], int argc, bool *use_pathp, in
break;
} else if (opt == 'p') {
*use_pathp = true;
+ } else if (opt == 'v') {
+ machine[0] = '\0';
+ mib[0] = CTL_HW;
+ mib[1] = HW_MACHINE;
+ sz = sizeof(machine);
+ sysctl(mib, nitems(mib), machine, , NULL, 0);
+ rtld_printf(
+ "FreeBSD ld-elf.so.1 %s\n"
+ "FreeBSD_version %d\n"
+ "Default lib path %s\n"
+ "Env prefix %s\n"
+ "Hint file %s\n"
+ "libmap file %s\n",
+ machine,
+ __FreeBSD_version, ld_standard_library_path,
+ ld_env_prefix, ld_elf_hints_default,
+ ld_path_libmap_conf);
+ _exit(0);
} else {
_rtld_error("Invalid argument: '%s'", arg);
print_usage(argv[0]);
@@ -5720,6 +5740,7 @@ print_usage(const char *argv0)
" -hDisplay this help message\n"
" -fExecute instead of searching for \n"
" -pSearch in PATH for named binary\n"
+ " -vDisplay identification information\n"
" --End of RTLD options\n"
"Name of process to execute\n"
" Arguments to the executed process\n", argv0);
___
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: r361673 - head/share/misc
Author: imp Date: Sun May 31 21:38:33 2020 New Revision: 361673 URL: https://svnweb.freebsd.org/changeset/base/361673 Log: Correct the release date for 2.11BSD 2.11BSD was announced on March 14, 1991 in comp.bugs.2bsd by Steven M. Schultz. The document has a 'revised January 1991' date at the top. Patch/1 in the official repo is dated March 31, 1991, and an identical copy of it was posted to comp.bugs.2bsd on May 5, 1991. Patch 2 in 22 parts was likewise posted May 18, 1991. This makes the Feb 1992 date too late. It's possible it's a typo for Feb 1991 since that lines up with the announcement being 2 weeks later. Without an extant copy of the 2.11 tape, however, it's hard to say for sure. Go with the date we have the most independent, direct evidence for, which is the announcement date. Modified: head/share/misc/bsd-family-tree Modified: head/share/misc/bsd-family-tree == --- head/share/misc/bsd-family-tree Sun May 31 21:34:21 2020 (r361672) +++ head/share/misc/bsd-family-tree Sun May 31 21:38:33 2020 (r361673) @@ -493,7 +493,7 @@ Tenth Edition 1989-10-xx [QCU] 2.9BSD-Seismo 1985-08-xx [SMS] 2.10BSD1987-04-xx [KKK] 2.10.1BSD 1989-01-xx [SMS] -2.11BSD1992-02-xx [SMS] +2.11BSD1991-03-14 [SMS] 2.11BSD rev #430 1999-12-13 [SMS] 32V1978-1[01]-xx [QCU] 1979-03-26 [TUHS] ___ 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: r361672 - head/libexec/rtld-elf
Author: kib
Date: Sun May 31 21:34:21 2020
New Revision: 361672
URL: https://svnweb.freebsd.org/changeset/base/361672
Log:
rtld: Add -p switch to direct exec mode summary line.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cSun May 31 20:59:11 2020
(r361671)
+++ head/libexec/rtld-elf/rtld.cSun May 31 21:34:21 2020
(r361672)
@@ -5714,12 +5714,12 @@ static void
print_usage(const char *argv0)
{
- rtld_printf("Usage: %s [-h] [-f ] [--] []\n"
+ rtld_printf("Usage: %s [-h] [-f ] [-p] [--] []\n"
"\n"
"Options:\n"
" -hDisplay this help message\n"
- " -pSearch in PATH for named binary\n"
" -fExecute instead of searching for \n"
+ " -pSearch in PATH for named binary\n"
" --End of RTLD options\n"
"Name of process to execute\n"
" Arguments to the executed process\n", argv0);
___
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: r361665 - head/sys/net
Author: mmacy Date: Sun May 31 18:42:00 2020 New Revision: 361665 URL: https://svnweb.freebsd.org/changeset/base/361665 Log: Fix panics when using iflib pseudo device support Reviewed by: gallatin@, hselasky@ MFC after:1 week Sponsored by: Netgate, Inc. Differential Revision:https://reviews.freebsd.org/D23710 Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c == --- head/sys/net/iflib.cSun May 31 18:20:20 2020(r361664) +++ head/sys/net/iflib.cSun May 31 18:42:00 2020(r361665) @@ -4902,6 +4902,7 @@ iflib_pseudo_register(device_t dev, if_shared_ctx_t sc if_setgetcounterfn(ctx->ifc_ifp, iflib_if_get_counter); iflib_add_device_sysctl_post(ctx); ctx->ifc_flags |= IFC_INIT_DONE; + CTX_UNLOCK(ctx); return (0); } _iflib_pre_assert(scctx); @@ -5354,7 +5355,8 @@ iflib_register(if_ctx_t ctx) device_t dev = ctx->ifc_dev; if_t ifp; - _iflib_assert(sctx); + if ((sctx->isc_flags & IFLIB_PSEUDO) == 0) + _iflib_assert(sctx); CTX_LOCK_INIT(ctx); STATE_LOCK_INIT(ctx, device_get_nameunit(ctx->ifc_dev)); ___ 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: r361664 - head/sys/amd64/linux
Author: markj
Date: Sun May 31 18:20:20 2020
New Revision: 361664
URL: https://svnweb.freebsd.org/changeset/base/361664
Log:
Handle getcpu() calls in vsyscall emulation on amd64.
linux_getcpu() has been implemented since r356241.
PR: 246339
Submitted by: John Hay
MFC after:1 week
Modified:
head/sys/amd64/linux/linux_sysvec.c
Modified: head/sys/amd64/linux/linux_sysvec.c
==
--- head/sys/amd64/linux/linux_sysvec.c Sun May 31 17:20:17 2020
(r361663)
+++ head/sys/amd64/linux/linux_sysvec.c Sun May 31 18:20:20 2020
(r361664)
@@ -683,7 +683,7 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigse
const unsigned long linux_vsyscall_vector[] = {
LINUX_SYS_gettimeofday,
LINUX_SYS_linux_time,
- /* getcpu not implemented */
+ LINUX_SYS_linux_getcpu,
};
static int
___
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: r361663 - in head: etc/mtree lib/libxo/encoder/csv lib/libxo/libxo
Author: tijl
Date: Sun May 31 17:20:17 2020
New Revision: 361663
URL: https://svnweb.freebsd.org/changeset/base/361663
Log:
Fix installation of libxo encoder modules.
Because the install location was hardcoded in the Makefile as
/usr/lib/libxo/encoder, the lib32 version was installed over the native
version. Replace /usr/lib with ${LIBDIR}.
Also define SHLIB_NAME instead of LIB + FILES. This prevents building a
static library.
MFC after:2 weeks
Modified:
head/etc/mtree/BSD.lib32.dist
head/lib/libxo/encoder/csv/Makefile
head/lib/libxo/libxo/Makefile
Modified: head/etc/mtree/BSD.lib32.dist
==
--- head/etc/mtree/BSD.lib32.dist Sun May 31 15:31:47 2020
(r361662)
+++ head/etc/mtree/BSD.lib32.dist Sun May 31 17:20:17 2020
(r361663)
@@ -12,5 +12,9 @@
..
i18n
..
+libxo
+encoder
+..
+..
..
..
Modified: head/lib/libxo/encoder/csv/Makefile
==
--- head/lib/libxo/encoder/csv/Makefile Sun May 31 15:31:47 2020
(r361662)
+++ head/lib/libxo/encoder/csv/Makefile Sun May 31 17:20:17 2020
(r361663)
@@ -8,30 +8,17 @@ LIBXOSRC= ${SRCTOP}/contrib/libxo
.PATH: ${LIBXOSRC}/encoder/csv
-# We use FILES to install the encoder library under the proper/magic
-# name, in the proper/magic directory. libxo looks for encoders from
-# "--libxo encoder=name" as "${prefix}/lib/libxo/encoder/${name}.enc"
-FILES = libenc_csv.so
-FILESNAME_libenc_csv.so= csv.enc
-FILESDIR = /usr/lib/libxo/encoder
+SHLIBDIR= ${LIBDIR}/libxo/encoder
+SHLIB_NAME=csv.enc
-LIB= enc_csv
-SHLIB_MAJOR=0
-SHLIB_NAME= lib${LIB}.so
-
SRCS= enc_csv.c
CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR}
-CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\"
+CFLAGS+=-DXO_ENCODERDIR=\"${LIBDIR}/libxo/encoder\"
LIBADD=util xo
LDFLAGS += -L${.OBJDIR:H:H}/libxo
WARNS?= 5
-# Need to define a fake "install" target to block the one in bsd.lib.mk,
-# since that one will install our lib in the wrong place (/usr/lib/).
-install: realinstall
-
.include
-.include
Modified: head/lib/libxo/libxo/Makefile
==
--- head/lib/libxo/libxo/Makefile Sun May 31 15:31:47 2020
(r361662)
+++ head/lib/libxo/libxo/Makefile Sun May 31 17:20:17 2020
(r361663)
@@ -16,7 +16,7 @@ SHLIB_MAJOR=0
SRCS= libxo.c xo_encoder.c xo_syslog.c
CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR}
-CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\"
+CFLAGS+=-DXO_ENCODERDIR=\"${LIBDIR}/libxo/encoder\"
INCS= xo.h xo_encoder.h
INCSDIR=${INCLUDEDIR}/libxo
___
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: r361662 - head/contrib/elftoolchain/readelf
Author: emaste
Date: Sun May 31 15:31:47 2020
New Revision: 361662
URL: https://svnweb.freebsd.org/changeset/base/361662
Log:
readelf: add more DT_FLAGS_1 flags
Reference:
https://docs.oracle.com/cd/E36784_01/html/E36857/chapter6-42444.html
> DF_1_SINGLETON Singleton symbols exist.
> DF_1_STUB Object is a stub.
> DF_1_PIEObject is a position-independent executable.
Sponsored by: The FreeBSD Foundation
Modified:
head/contrib/elftoolchain/readelf/readelf.c
Modified: head/contrib/elftoolchain/readelf/readelf.c
==
--- head/contrib/elftoolchain/readelf/readelf.c Sun May 31 14:43:04 2020
(r361661)
+++ head/contrib/elftoolchain/readelf/readelf.c Sun May 31 15:31:47 2020
(r361662)
@@ -2901,6 +2901,9 @@ static struct flag_desc dt_flags_1[] = {
{ 0x40, "NORELOC" },
{ 0x80, "SYMINTPOSE" },
{ 0x100,"GLOBAUDIT" },
+ { 0x0200, "SINGLETON" },
+ { 0x0400, "STUB" },
+ { DF_1_PIE, "PIE" },
{ 0, NULL }
};
___
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: r361633 - in head/sys: net netipsec
In message <20200531114318.2b415...@hermann.fritz.box>, "Hartmann, O." writes: > --Sig_/K9D9Cgo_rXCeD=+Maiy_5WL > Content-Type: text/plain; charset=US-ASCII > Content-Transfer-Encoding: quoted-printable > > On Fri, 29 May 2020 19:22:40 + (UTC) > John Baldwin wrote: > > > Author: jhb > > Date: Fri May 29 19:22:40 2020 > > New Revision: 361633 > > URL: https://svnweb.freebsd.org/changeset/base/361633 > >=20 > > Log: > > Consistently include opt_ipsec.h for consumers of > > .=20 > > This fixes ipsec.ko to include all of IPSEC_DEBUG. > > =20 > > Reviewed by: imp > > MFC after:2 weeks > > Sponsored by: Netflix > > Differential Revision:https://reviews.freebsd.org/D25046 > >=20 > > Modified: > > head/sys/net/if_enc.c > > head/sys/net/if_ipsec.c > > head/sys/netipsec/ipsec.h > > head/sys/netipsec/ipsec_mbuf.c > > head/sys/netipsec/xform_ah.c > > head/sys/netipsec/xform_esp.c > > head/sys/netipsec/xform_ipcomp.c > >=20 > > Modified: head/sys/net/if_enc.c [...] > > > In my case, kernel build (make buildkernel) fails with the comnpiler > error shown below while compiling ipsec kernel module. Kernel has IPSEC > support enabled. > > Kind regards, > oh > > [...] > --- all_subdir_ipsec --- > --- ipsec_mod.o --- > /usr/src/sys/netipsec/ipsec_mod.c:114:3: error: implicit declaration of > function 'ipsec_support_enable' is invalid in C99 > [-Werror,-Wimplicit-function-declaration] > ipsec_support_enable(ipv4_ipsec_support, _methods); ^ > /usr/src/sys/netipsec/ipsec_mod.c:125:3: error: implicit declaration of > function 'ipsec_support_disable' is invalid in C99 > [-Werror,-Wimplicit-function-declaration] > ipsec_support_disable(ipv4_ipsec_support); ^ --- all_subdir_ipwfw --- > Building > /usr/obj/usr/src/amd64.amd64/sys/WALHALL/modules/usr/src/sys/modules/ipwfw/= > ipw_bss/ipw_bss.ko > --- all_subdir_ipsec --- /usr/src/sys/netipsec/ipsec_mod.c:125:3: note: > did you mean 'ipsec_support_enable'? > /usr/src/sys/netipsec/ipsec_mod.c:114:3: note: 'ipsec_support_enable' > declared here ipsec_support_enable(ipv4_ipsec_support, _methods); > ^ 2 errors generated. *** [ipsec_mod.o] Error code 1 > > make[4]: stopped in /usr/src/sys/modules/ipsec Can you post your kernel config, please. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ 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: r361661 - in head/sys: arm/arm arm/include arm64/arm64 riscv/riscv
Author: mhorne
Date: Sun May 31 14:43:04 2020
New Revision: 361661
URL: https://svnweb.freebsd.org/changeset/base/361661
Log:
Remove remnant of arm's ELF trampoline
The trampoline code used for loading gzipped a.out kernels on arm was
removed in r350436. A portion of this code allowed for DDB to find the
symbol tables when booting without loader(8), and some of this was
untouched in the removal. Remove it now.
Differential Revision:https://reviews.freebsd.org/D24950
Modified:
head/sys/arm/arm/machdep_boot.c
head/sys/arm/include/elf.h
head/sys/arm64/arm64/machdep_boot.c
head/sys/riscv/riscv/machdep.c
Modified: head/sys/arm/arm/machdep_boot.c
==
--- head/sys/arm/arm/machdep_boot.c Sun May 31 05:02:15 2020
(r361660)
+++ head/sys/arm/arm/machdep_boot.c Sun May 31 14:43:04 2020
(r361661)
@@ -352,13 +352,12 @@ vm_offset_t
fake_preload_metadata(struct arm_boot_params *abp __unused, void *dtb_ptr,
size_t dtb_size)
{
-#ifdef DDB
- vm_offset_t zstart = 0, zend = 0;
-#endif
vm_offset_t lastaddr;
int i = 0;
static uint32_t fake_preload[35];
+ lastaddr = (vm_offset_t)
+
fake_preload[i++] = MODINFO_NAME;
fake_preload[i++] = strlen("kernel") + 1;
strcpy((char*)_preload[i++], "kernel");
@@ -373,21 +372,6 @@ fake_preload_metadata(struct arm_boot_params *abp __un
fake_preload[i++] = MODINFO_SIZE;
fake_preload[i++] = sizeof(uint32_t);
fake_preload[i++] = (uint32_t) - KERNVIRTADDR;
-#ifdef DDB
- if (*(uint32_t *)KERNVIRTADDR == MAGIC_TRAMP_NUMBER) {
- fake_preload[i++] = MODINFO_METADATA|MODINFOMD_SSYM;
- fake_preload[i++] = sizeof(vm_offset_t);
- fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 4);
- fake_preload[i++] = MODINFO_METADATA|MODINFOMD_ESYM;
- fake_preload[i++] = sizeof(vm_offset_t);
- fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 8);
- lastaddr = *(uint32_t *)(KERNVIRTADDR + 8);
- zend = lastaddr;
- zstart = *(uint32_t *)(KERNVIRTADDR + 4);
- db_fetch_ksymtab(zstart, zend);
- } else
-#endif
- lastaddr = (vm_offset_t)
if (dtb_ptr != NULL) {
/* Copy DTB to KVA space and insert it into module chain. */
lastaddr = roundup(lastaddr, sizeof(int));
Modified: head/sys/arm/include/elf.h
==
--- head/sys/arm/include/elf.h Sun May 31 05:02:15 2020(r361660)
+++ head/sys/arm/include/elf.h Sun May 31 14:43:04 2020(r361661)
@@ -78,12 +78,6 @@ __ElfType(Auxinfo);
#defineEF_ARM_EABI_VERSION_UNKNOWN 0
#defineEF_ARM_EABI_FREEBSD_MIN 4
-/*
- * Magic number for the elf trampoline, chosen wisely to be an immediate
- * value.
- */
-#defineMAGIC_TRAMP_NUMBER 0x5c03
-
#defineET_DYN_LOAD_ADDR0x50
/* Flags passed in AT_HWCAP. */
Modified: head/sys/arm64/arm64/machdep_boot.c
==
--- head/sys/arm64/arm64/machdep_boot.c Sun May 31 05:02:15 2020
(r361660)
+++ head/sys/arm64/arm64/machdep_boot.c Sun May 31 14:43:04 2020
(r361661)
@@ -84,14 +84,12 @@ static char linux_command_line[LBABI_MAX_COMMAND_LINE
static vm_offset_t
fake_preload_metadata(void *dtb_ptr, size_t dtb_size)
{
-#ifdef DDB
- vm_offset_t zstart = 0, zend = 0;
-#endif
vm_offset_t lastaddr;
static char fake_preload[256];
caddr_t preload_ptr;
size_t size;
+ lastaddr = (vm_offset_t)
preload_ptr = (caddr_t)_preload[0];
size = 0;
@@ -108,25 +106,7 @@ fake_preload_metadata(void *dtb_ptr, size_t dtb_size)
PRELOAD_PUSH_VALUE(uint32_t, MODINFO_SIZE);
PRELOAD_PUSH_VALUE(uint32_t, sizeof(size_t));
PRELOAD_PUSH_VALUE(uint64_t, (size_t)( - VM_MIN_KERNEL_ADDRESS));
-#ifdef DDB
- if (*(uint64_t *)VM_MIN_KERNEL_ADDRESS == MAGIC_TRAMP_NUMBER) {
- PRELOAD_PUSH_VALUE(uint32_t, MODINFO_METADATA|MODINFOMD_SSYM);
- PRELOAD_PUSH_VALUE(uint32_t, sizeof(vm_offset_t));
- PRELOAD_PUSH_VALUE(uint64_t,
- *(uint64_t *)(VM_MIN_KERNEL_ADDRESS + 4));
- PRELOAD_PUSH_VALUE(uint32_t, MODINFO_METADATA | MODINFOMD_ESYM);
- PRELOAD_PUSH_VALUE(uint32_t, sizeof(vm_offset_t));
- PRELOAD_PUSH_VALUE(uint64_t,
- *(uint64_t *)(VM_MIN_KERNEL_ADDRESS + 8));
-
- lastaddr = *(uint64_t *)(VM_MIN_KERNEL_ADDRESS + 8);
- zend = lastaddr;
- zstart = *(uint64_t *)(VM_MIN_KERNEL_ADDRESS + 4);
- db_fetch_ksymtab(zstart, zend);
- } else
-#endif
- lastaddr = (vm_offset_t)
Re: svn commit: r361633 - in head/sys: net netipsec
On Fri, 29 May 2020 19:22:40 + (UTC)
John Baldwin wrote:
> Author: jhb
> Date: Fri May 29 19:22:40 2020
> New Revision: 361633
> URL: https://svnweb.freebsd.org/changeset/base/361633
>
> Log:
> Consistently include opt_ipsec.h for consumers of
> .
> This fixes ipsec.ko to include all of IPSEC_DEBUG.
>
> Reviewed by:imp
> MFC after: 2 weeks
> Sponsored by: Netflix
> Differential Revision: https://reviews.freebsd.org/D25046
>
> Modified:
> head/sys/net/if_enc.c
> head/sys/net/if_ipsec.c
> head/sys/netipsec/ipsec.h
> head/sys/netipsec/ipsec_mbuf.c
> head/sys/netipsec/xform_ah.c
> head/sys/netipsec/xform_esp.c
> head/sys/netipsec/xform_ipcomp.c
>
> Modified: head/sys/net/if_enc.c
> ==
> --- head/sys/net/if_enc.c Fri May 29 19:21:35 2020
> (r361632) +++ head/sys/net/if_enc.c Fri May 29 19:22:40
> 2020 (r361633) @@ -32,6 +32,7 @@
>
> #include "opt_inet.h"
> #include "opt_inet6.h"
> +#include "opt_ipsec.h"
>
> #include
> #include
>
> Modified: head/sys/net/if_ipsec.c
> ==
> --- head/sys/net/if_ipsec.c Fri May 29 19:21:35 2020
> (r361632) +++ head/sys/net/if_ipsec.c Fri May 29 19:22:40
> 2020 (r361633) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
>
> #include "opt_inet.h"
> #include "opt_inet6.h"
> +#include "opt_ipsec.h"
>
> #include
> #include
>
> Modified: head/sys/netipsec/ipsec.h
> ==
> --- head/sys/netipsec/ipsec.h Fri May 29 19:21:35 2020
> (r361632) +++ head/sys/netipsec/ipsec.h Fri May 29 19:22:40
> 2020 (r361633) @@ -39,11 +39,6 @@
> #ifndef _NETIPSEC_IPSEC_H_
> #define _NETIPSEC_IPSEC_H_
>
> -#if defined(_KERNEL) && !defined(_LKM) && !defined(KLD_MODULE)
> -#include "opt_inet.h"
> -#include "opt_ipsec.h"
> -#endif
> -
> #include
> #include
>
>
> Modified: head/sys/netipsec/ipsec_mbuf.c
> ==
> --- head/sys/netipsec/ipsec_mbuf.cFri May 29 19:21:35
> 2020 (r361632) +++ head/sys/netipsec/ipsec_mbuf.cFri
> May 29 19:22:40 2020 (r361633) @@ -32,6 +32,8 @@
> * IPsec-specific mbuf routines.
> */
>
> +#include "opt_ipsec.h"
> +
> #include
> #include
> #include
>
> Modified: head/sys/netipsec/xform_ah.c
> ==
> --- head/sys/netipsec/xform_ah.c Fri May 29 19:21:35
> 2020 (r361632) +++ head/sys/netipsec/xform_ah.c Fri May
> 29 19:22:40 2020 (r361633) @@ -38,6 +38,7 @@
> */
> #include "opt_inet.h"
> #include "opt_inet6.h"
> +#include "opt_ipsec.h"
>
> #include
> #include
>
> Modified: head/sys/netipsec/xform_esp.c
> ==
> --- head/sys/netipsec/xform_esp.c Fri May 29 19:21:35
> 2020 (r361632) +++ head/sys/netipsec/xform_esp.c Fri
> May 29 19:22:40 2020 (r361633) @@ -37,6 +37,7 @@
> */
> #include "opt_inet.h"
> #include "opt_inet6.h"
> +#include "opt_ipsec.h"
>
> #include
> #include
>
> Modified: head/sys/netipsec/xform_ipcomp.c
> ==
> --- head/sys/netipsec/xform_ipcomp.c Fri May 29 19:21:35
> 2020 (r361632) +++ head/sys/netipsec/xform_ipcomp.c Fri
> May 29 19:22:40 2020 (r361633) @@ -33,6 +33,7 @@
> /* IP payload compression protocol (IPComp), see RFC 2393 */
> #include "opt_inet.h"
> #include "opt_inet6.h"
> +#include "opt_ipsec.h"
>
> #include
> #include
> ___
> 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"
In my case, kernel build (make buildkernel) fails with the comnpiler
error shown below while compiling ipsec kernel module. Kernel has IPSEC
support enabled.
Kind regards,
oh
[...]
--- all_subdir_ipsec ---
--- ipsec_mod.o ---
/usr/src/sys/netipsec/ipsec_mod.c:114:3: error: implicit declaration of
function 'ipsec_support_enable' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
ipsec_support_enable(ipv4_ipsec_support, _methods); ^
/usr/src/sys/netipsec/ipsec_mod.c:125:3: error: implicit declaration of
function 'ipsec_support_disable' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
ipsec_support_disable(ipv4_ipsec_support); ^ --- all_subdir_ipwfw ---
Building
/usr/obj/usr/src/amd64.amd64/sys/WALHALL/modules/usr/src/sys/modules/ipwfw/ipw_bss/ipw_bss.ko
--- all_subdir_ipsec --- /usr/src/sys/netipsec/ipsec_mod.c:125:3: note:
did you mean 'ipsec_support_enable'?
/usr/src/sys/netipsec/ipsec_mod.c:114:3: note: 'ipsec_support_enable'
declared here ipsec_support_enable(ipv4_ipsec_support, _methods);
^ 2 errors generated.
