svn commit: r367690 - head/usr.bin/login
Author: bapt Date: Sat Nov 14 19:16:39 2020 New Revision: 367690 URL: https://svnweb.freebsd.org/changeset/base/367690 Log: Change the default locale to C.UTF-8 The C.UTF-8 locales is the same as the actual C locale except it does support the unicode character set. But the collation etc are still the same as the C locale one. Reviewed by: many Approved by: many Differential Revision:https://reviews.freebsd.org/D26973 Modified: head/usr.bin/login/login.conf Modified: head/usr.bin/login/login.conf == --- head/usr.bin/login/login.conf Sat Nov 14 19:04:36 2020 (r367689) +++ head/usr.bin/login/login.conf Sat Nov 14 19:16:39 2020 (r367690) @@ -47,8 +47,9 @@ default:\ :umtxp=unlimited:\ :priority=0:\ :ignoretime@:\ - :umask=022: - + :umask=022:\ + :charset=UTF-8:\ + :lang=C.UTF-8: # # A collection of common class names - forward them all to 'default' ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r367280 - head/lib/libc/gen
On Wed, Nov 04, 2020 at 11:04:37AM -0800, Rodney W. Grimes wrote: > Picking a late message in this thread to reply to > > [ Charset windows-1252 unsupported, converting... ] > > >>>I think that the first question we want to ask is : Do we want to > > >>> support LOCALBASE being different than /usr/local > > >> > > >> The big majority of users will keep the default value, and I do not > > >> see a good reason for a change, except if there is a large installed > > >> base that traditionally uses another prefix (I have seen /vol/local > > >> and /opt, but also OS and architecture-specific prefixes, for example). > > > > > > I'd still like to see some arguments for such installs. > > > > There are no reasons, if you have a narrow scope where FreeBSD should > > get installed. If it only on individual desktop users' system, they > > are best served with LOCALBASE immutably fixed to /usr/local. > > > > But there are other kinds of user and I have already given examples. > > Companies that have tooling that traditionally used some other prefix > > will not rewrite all their tools if we tell them that only /usr/local > > is supported, for example. > > > > I do not have to justify the existence of such use cases, and I'm happy > > with /usr/local on all my systems. But I do know that such use cases > > do exist and I have worked in environments where they were relevant. > > > > For 25 years PREFIX has been rigidly a part of the ports infustructure, > why is it that the BASE system has been allowed to de-evolve from this > concept as documented and REQUIRED by: > > https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/porting-prefix.html > > > I again assert at one time the base system was clean of this, > it has regressed and needs to be fixed. That fix should restore > the independence of PREFIX. If 30k ported pieces of software can > do it why can't the base system do it? > > Those ports do not require a recompile, why should the base system? I am just reacting on that phrase, you do really think the ports do not require a rebuild to be able to relocate from a PREFIX to another? this is a myth! ports support being built with another prefix than localbase but that is all it supports. There has been a flase claim for years that relocating work, but beside the tools proposing the feature it never worked, or to be fait only on some very specific port. But it is just an impossible goal to achieve otherwise as for example all the path which gets hardcoded at build time depending on the prefix will end up in the binary looking for resources in a hardcoded prefix at runtime and so fail if you relocate the package, for example its datadir. Best regards, Bapt signature.asc Description: PGP signature
Re: svn commit: r367076 - head/usr.bin/diff
On Tue, Oct 27, 2020 at 12:27:26PM +, Kyle Evans wrote: > Author: kevans > Date: Tue Oct 27 12:27:26 2020 > New Revision: 367076 > URL: https://svnweb.freebsd.org/changeset/base/367076 > > Log: > diff: don't force the format to 'context' with -p immediately > > Instead, leave the fomat as unspecified (if it hasn't been) and use the > -p flag as a hint to 'context' if no other formatting option is specified. > > This fixes `diff -purw`, used frequently by emaste, and matches the behavior > of its GNU counterpart. > > PR: 250015 > Reviewed by:emaste > MFC after: 1 week > > Modified: > head/usr.bin/diff/diff.c > > Modified: head/usr.bin/diff/diff.c > == > --- head/usr.bin/diff/diff.c Tue Oct 27 11:29:11 2020(r367075) > +++ head/usr.bin/diff/diff.c Tue Oct 27 12:27:26 2020(r367076) > @@ -210,17 +210,6 @@ main(int argc, char **argv) > diff_format = D_NREVERSE; > break; > case 'p': > - /* > - * If it's not unset and it's not set to context or > - * unified, we'll error out here as a conflicting > - * format. If it's unset, we'll go ahead and set it to > - * context. > - */ > - if (FORMAT_MISMATCHED(D_CONTEXT) && > - FORMAT_MISMATCHED(D_UNIFIED)) > - conflicting_format(); > - if (diff_format == D_UNSET) > - diff_format = D_CONTEXT; > dflags |= D_PROTOTYPE; > break; > case 'P': > @@ -320,6 +309,8 @@ main(int argc, char **argv) > newarg = optind != prevoptind; > prevoptind = optind; > } > + if (diff_format == D_UNSET && (dflags & D_PROTOTYPE) != 0) > + diff_format = D_CONTEXT; > if (diff_format == D_UNSET) > diff_format = D_NORMAL; > argc -= optind; I think it would be great to have a test to ensure we don't break it in the futur. Bapt signature.asc Description: PGP signature
Re: svn commit: r366962 - in head: include usr.bin/calendar
On Mon, Oct 26, 2020 at 02:05:28AM -0600, Scott Long wrote: > > > On Oct 26, 2020, at 1:50 AM, Baptiste Daroussin wrote: > > > > On Mon, Oct 26, 2020 at 12:11:56AM -0600, Warner Losh wrote: > >> On Mon, Oct 26, 2020 at 12:01 AM Alex Kozlov wrote: > >> > >>> On Sun, Oct 25, 2020 at 11:37:34AM +0100, Stefan Esser wrote: > >>>> Am 25.10.20 um 06:56 schrieb Alex Kozlov: > >>>>> On Sat, Oct 24, 2020 at 04:37:45PM +0200, Stefan Esser wrote: > >>>>>> Am 24.10.20 um 09:48 schrieb Alex Kozlov: > >>>> [...] > >>>>>>> You are hardcoding assumption that LOCALBASE = /usr/local. Please > >>> make it > >>>>>>> overridable with LOCALBASE environment variable. > >>>>>> This was a trivial change to get us going with calendars provided by > >>>>>> a port (which has not been committed, yet - therefore there are no > >>>>>> port-provided calendars, neither under /usr/local nor under any other > >>>>>> PREFIX, as of now). > >>>>> > >>>>>> I understand what you are asking for, but in such a case I'd rather > >>>>>> think you want to rebuild FreeBSD with _PATH_LOCALBASE modified in > >>>>>> paths.h. > >>>>> The PREFIX != LOCALBASE and both != /usr/local configurations > >>>>> are supported in the ports tree and the base for a long time, please > >>> see > >>>>> > >>> https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/porting-prefix.html > >>>> > >>>> Yes, and I do not need to look that up in the handbook, having been > >>>> a ports committer for 2 decades by now. > >>>> > >>>>> If after this commit you need to rebuild base to use non-default > >>> LOCALBASE/PREFIX > >>>>> it is pretty big regression and POLA. > >>>> > >>>> How is that any different than before? > >>>> > >>>> What I did is make the PATH easier to change when you rebuild base. > >>>> > >>>> There are numerous programs in base that contain the literal string > >>>> /usr/local - and what I did was implement a mechanism that allows > >>>> to replace this literal reference with a simple change in paths.h. > >>>> > >>>> If you do not modify paths.h for a different LOCALBASE, then you'll > >>>> get a wrong _PATH_DEFPATH compiled into your binaries, for example. > >>>> > >>>>>> And I have made this a single instance that needs to be changed. > >>>>>> Before my change there were 2 instances of /usr/local hard-coded > >>>>>> in _PATH_DEFPATH - now you have to only change the definition of > >>>>>> _PATH_LOCALBASE to adjust all 3 locations that use it. > >>>>> I think you made situation worse, there were two stray hardcoded > >>>>> string and now there is official LOCALBASE define which likely will be > >>>>> used by other people in the future. > >>>> > >>>> I'd hope so to get rid of many of the 1713 literal uses of /usr/local > >>>> in our source tree. > >>>> > >>>>>> If you can show me precedence of a LOCALBASE environment variable > >>>>>> being used in the way you suggest, I'd be willing to make calendar > >>>>>> use it. > >>>>> Just an analogy from LOCALBASE make variable, perhaps CALENDAR_HOME > >>>>> is a better name. > >>>> > >>>> Yes, I already suggested CALENDAR_HOME, but as an environment variable > >>>> to check, if you want to be able to path an additional directory (or > >>>> search path) to the calendar program at run-time. But why introduce > >>>> a CALENDAR_HOME macro in the sources, if the port supplied calendar > >>>> files are known to be found at LOCALBASE/share/calendar (for some value > >>>> of LOCALBASE). > >>>> > >>>> I want to make more programs that currently hard-code /usr/local use > >>>> _PATH_LOCALBASE instead. This C macro can then be default to /usr/local > >>>> but can be overridden by passing LOCALBASE to the compiler (from the > >>>> build infrastructure) when paths.h is included. > >>>> > >>
Re: svn commit: r366962 - in head: include usr.bin/calendar
On Mon, Oct 26, 2020 at 12:11:56AM -0600, Warner Losh wrote: > On Mon, Oct 26, 2020 at 12:01 AM Alex Kozlov wrote: > > > On Sun, Oct 25, 2020 at 11:37:34AM +0100, Stefan Esser wrote: > > > Am 25.10.20 um 06:56 schrieb Alex Kozlov: > > > > On Sat, Oct 24, 2020 at 04:37:45PM +0200, Stefan Esser wrote: > > > > > Am 24.10.20 um 09:48 schrieb Alex Kozlov: > > > [...] > > > > > > You are hardcoding assumption that LOCALBASE = /usr/local. Please > > make it > > > > > > overridable with LOCALBASE environment variable. > > > > > This was a trivial change to get us going with calendars provided by > > > > > a port (which has not been committed, yet - therefore there are no > > > > > port-provided calendars, neither under /usr/local nor under any other > > > > > PREFIX, as of now). > > > > > > > > > I understand what you are asking for, but in such a case I'd rather > > > > > think you want to rebuild FreeBSD with _PATH_LOCALBASE modified in > > > > > paths.h. > > > > The PREFIX != LOCALBASE and both != /usr/local configurations > > > > are supported in the ports tree and the base for a long time, please > > see > > > > > > https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/porting-prefix.html > > > > > > Yes, and I do not need to look that up in the handbook, having been > > > a ports committer for 2 decades by now. > > > > > > > If after this commit you need to rebuild base to use non-default > > LOCALBASE/PREFIX > > > > it is pretty big regression and POLA. > > > > > > How is that any different than before? > > > > > > What I did is make the PATH easier to change when you rebuild base. > > > > > > There are numerous programs in base that contain the literal string > > > /usr/local - and what I did was implement a mechanism that allows > > > to replace this literal reference with a simple change in paths.h. > > > > > > If you do not modify paths.h for a different LOCALBASE, then you'll > > > get a wrong _PATH_DEFPATH compiled into your binaries, for example. > > > > > > > > And I have made this a single instance that needs to be changed. > > > > > Before my change there were 2 instances of /usr/local hard-coded > > > > > in _PATH_DEFPATH - now you have to only change the definition of > > > > > _PATH_LOCALBASE to adjust all 3 locations that use it. > > > > I think you made situation worse, there were two stray hardcoded > > > > string and now there is official LOCALBASE define which likely will be > > > > used by other people in the future. > > > > > > I'd hope so to get rid of many of the 1713 literal uses of /usr/local > > > in our source tree. > > > > > > > > If you can show me precedence of a LOCALBASE environment variable > > > > > being used in the way you suggest, I'd be willing to make calendar > > > > > use it. > > > > Just an analogy from LOCALBASE make variable, perhaps CALENDAR_HOME > > > > is a better name. > > > > > > Yes, I already suggested CALENDAR_HOME, but as an environment variable > > > to check, if you want to be able to path an additional directory (or > > > search path) to the calendar program at run-time. But why introduce > > > a CALENDAR_HOME macro in the sources, if the port supplied calendar > > > files are known to be found at LOCALBASE/share/calendar (for some value > > > of LOCALBASE). > > > > > > I want to make more programs that currently hard-code /usr/local use > > > _PATH_LOCALBASE instead. This C macro can then be default to /usr/local > > > but can be overridden by passing LOCALBASE to the compiler (from the > > > build infrastructure) when paths.h is included. > > > > > > Instead of referring to _PATH_LOCALBASE these files could directly use > > > LOCALBASE, but since other paths are defined as _PATH_xxx in paths.h I > > > think it is best to follow this precedent. > > > > > > > > But then I think a CALENDAR_HOME variable would be even more useful, > > > > > since it would allow to search an additional user selected directory > > > > > (and not just share/calendar within what you provide as LOCALBASE). > > > > > > My change did not add any dependency on LOCALBASE to any previously > > > existing functionality. It added support for calendar files provided > > > by a port (a feature that did not exist before) at a location that is > > > correct for the big majority of users (who do not modify LOCALBASE). > > > > > > As I said: I'm going to make it easier to build the base system with > > > a different LOCALBASE, but not by run-time checking an environment > > > variable that specifies LOCALBASE in each affected program. > > It seems that you intend to follow through no matter what. So, just for > > the record, I think that hardcoding LOCALBASE and requiring base rebuild > > to change it is a very wrong approach. > > > > So, first off, it's already hard coded. Stefan's changes change the hard > coding from 'impossible to change' to 'changeable with a recompile' which > is an improvement. It might even wind up as a build variable (or not, doing > that has some
svn commit: r366828 - head/usr.sbin/pkg
Author: bapt Date: Mon Oct 19 07:26:42 2020 New Revision: 366828 URL: https://svnweb.freebsd.org/changeset/base/366828 Log: Use asprintf instead of sbuf Modified: head/usr.sbin/pkg/config.c Modified: head/usr.sbin/pkg/config.c == --- head/usr.sbin/pkg/config.c Mon Oct 19 07:03:04 2020(r366827) +++ head/usr.sbin/pkg/config.c Mon Oct 19 07:26:42 2020(r366828) @@ -32,8 +32,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include +#include #include #include @@ -168,7 +168,7 @@ pkg_get_myabi(char *dest, size_t sz) static void subst_packagesite(const char *abi) { - struct sbuf *newval; + char *newval; const char *variable_string; const char *oldval; @@ -180,14 +180,14 @@ subst_packagesite(const char *abi) if ((variable_string = strstr(oldval, "${ABI}")) == NULL) return; - newval = sbuf_new_auto(); - sbuf_bcat(newval, oldval, variable_string - oldval); - sbuf_cat(newval, abi); - sbuf_cat(newval, variable_string + strlen("${ABI}")); - sbuf_finish(newval); + asprintf(&newval, "%.*s%s%s", + (int)(variable_string - oldval), oldval, abi, + variable_string + strlen("${ABI}")); + if (newval == NULL) + errx(EXIT_FAILURE, "asprintf"); free(c[PACKAGESITE].value); - c[PACKAGESITE].value = strdup(sbuf_data(newval)); + c[PACKAGESITE].value = newval; } static int ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366472 - head/usr.bin/backlight
Author: bapt Date: Tue Oct 6 08:18:09 2020 New Revision: 366472 URL: https://svnweb.freebsd.org/changeset/base/366472 Log: backlight: check the lenght if the input before trimming '%' Reported by: hps Reviewed by: manu Differential Revision:https://reviews.freebsd.org/D26693 Modified: head/usr.bin/backlight/backlight.c Modified: head/usr.bin/backlight/backlight.c == --- head/usr.bin/backlight/backlight.c Tue Oct 6 08:05:19 2020 (r366471) +++ head/usr.bin/backlight/backlight.c Tue Oct 6 08:18:09 2020 (r366472) @@ -145,7 +145,8 @@ main(int argc, char *argv[]) if (argc == 1) { /* ignore a trailing % for user friendlyness */ - if (argv[0][strlen(argv[0]) - 1] == '%') + if (strlen(argv[0]) > 0 && + argv[0][strlen(argv[0]) - 1] == '%') argv[0][strlen(argv[0]) - 1] = '\0'; percent = strtonum(argv[0], 0, 100, &percent_error); if (percent_error) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366471 - head/usr.bin/backlight
Author: bapt Date: Tue Oct 6 08:05:19 2020 New Revision: 366471 URL: https://svnweb.freebsd.org/changeset/base/366471 Log: backlight: accept '%' in the brightness input value Improve friendlyness of the command line by accepting the percent brightness in both format: with or without a trailing '%' Reviewed by: manu Differential Revision:https://reviews.freebsd.org/D26692 Modified: head/usr.bin/backlight/backlight.8 head/usr.bin/backlight/backlight.c Modified: head/usr.bin/backlight/backlight.8 == --- head/usr.bin/backlight/backlight.8 Tue Oct 6 06:45:52 2020 (r366470) +++ head/usr.bin/backlight/backlight.8 Tue Oct 6 08:05:19 2020 (r366471) @@ -22,7 +22,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 02, 2020 +.Dd October 06, 2020 .Dt BACKLIGHT 8 .Os .Sh NAME @@ -63,6 +63,7 @@ When querying the brightness level only print the valu Query information about the backlight (name, type). .It Ar value Set the brightness level to this value, must be between 0 and 100. +A trailing '%' is valid. .It Ar incr | + .Op Ar value Decrement the backlight level. Modified: head/usr.bin/backlight/backlight.c == --- head/usr.bin/backlight/backlight.c Tue Oct 6 06:45:52 2020 (r366470) +++ head/usr.bin/backlight/backlight.c Tue Oct 6 08:05:19 2020 (r366471) @@ -144,6 +144,9 @@ main(int argc, char *argv[]) action = BACKLIGHT_SET_BRIGHTNESS; if (argc == 1) { + /* ignore a trailing % for user friendlyness */ + if (argv[0][strlen(argv[0]) - 1] == '%') + argv[0][strlen(argv[0]) - 1] = '\0'; percent = strtonum(argv[0], 0, 100, &percent_error); if (percent_error) errx(1, "Cannot parse brightness level %s: %s", ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366309 - in head: contrib/nvi contrib/nvi/catalog contrib/nvi/cl contrib/nvi/common contrib/nvi/ex contrib/nvi/files contrib/nvi/regex contrib/nvi/vi usr.bin/vi usr.bin/vi/catalog
Author: bapt Date: Thu Oct 1 04:46:23 2020 New Revision: 366309 URL: https://svnweb.freebsd.org/changeset/base/366309 Log: Update nvi to 2.2.0-05ed8b9 This version incorporates many fixes in particular a fix for vi -w Another approach was proposed to merge those fixes (see review), I find it easier to track changes if we keep importing snapshot on regular basis PR: 241985 Reported by: fernape Differential Revision:https://reviews.freebsd.org/D26158 Modified: head/contrib/nvi/CMakeLists.txt head/contrib/nvi/catalog/dump.c head/contrib/nvi/cl/cl.h head/contrib/nvi/cl/cl_read.c head/contrib/nvi/cl/cl_term.c head/contrib/nvi/common/common.h head/contrib/nvi/common/cut.h head/contrib/nvi/common/exf.c head/contrib/nvi/common/key.c head/contrib/nvi/common/log.c head/contrib/nvi/common/main.c head/contrib/nvi/common/mark.c head/contrib/nvi/common/mem.h head/contrib/nvi/common/msg.c head/contrib/nvi/common/options.c head/contrib/nvi/common/put.c head/contrib/nvi/common/recover.c head/contrib/nvi/common/util.c head/contrib/nvi/ex/ex.c head/contrib/nvi/ex/ex.h head/contrib/nvi/ex/ex_argv.c head/contrib/nvi/ex/ex_bang.c head/contrib/nvi/ex/ex_cscope.c head/contrib/nvi/ex/ex_filter.c head/contrib/nvi/ex/ex_global.c head/contrib/nvi/ex/ex_script.c head/contrib/nvi/ex/ex_shell.c head/contrib/nvi/ex/ex_subst.c head/contrib/nvi/files/config.h.in head/contrib/nvi/files/pathnames.h.in head/contrib/nvi/regex/engine.c head/contrib/nvi/regex/regexec.c head/contrib/nvi/vi/v_itxt.c head/contrib/nvi/vi/v_paragraph.c head/contrib/nvi/vi/v_section.c head/contrib/nvi/vi/v_sentence.c head/contrib/nvi/vi/v_txt.c head/contrib/nvi/vi/vi.c head/contrib/nvi/vi/vs_line.c head/contrib/nvi/vi/vs_msg.c head/contrib/nvi/vi/vs_refresh.c head/contrib/nvi/vi/vs_relative.c head/contrib/nvi/vi/vs_smap.c head/usr.bin/vi/catalog/Makefile head/usr.bin/vi/pathnames.h Directory Properties: head/contrib/nvi/ (props changed) Modified: head/contrib/nvi/CMakeLists.txt == --- head/contrib/nvi/CMakeLists.txt Thu Oct 1 04:26:46 2020 (r366308) +++ head/contrib/nvi/CMakeLists.txt Thu Oct 1 04:46:23 2020 (r366309) @@ -13,6 +13,7 @@ project(nvi2 C) include(CheckIncludeFiles) include(CheckFunctionExists) +include(CheckStructHasMember) include(CheckCSourceCompiles) mark_as_advanced(CMAKE_INSTALL_PREFIX) @@ -127,6 +128,7 @@ endif() if(USE_WIDECHAR) find_library(CURSES_LIBRARY NAMES ncursesw cursesw curses HINTS /usr/lib) +find_library(TERMINFO_LIBRARY NAMES tinfow terminfo HINTS /usr/lib) # link to the wchar_t awared BSD libregex.a add_library(regex STATIC) @@ -136,13 +138,14 @@ if(USE_WIDECHAR) target_link_libraries(nvi PRIVATE regex) else() find_library(CURSES_LIBRARY NAMES ncurses curses HINTS /usr/lib) +find_library(TERMINFO_LIBRARY NAMES tinfo terminfo HINTS /usr/lib) target_compile_options(nvi PRIVATE -Wno-pointer-sign) endif() -target_link_libraries(nvi PRIVATE ${CURSES_LIBRARY}) +target_link_libraries(nvi PRIVATE ${CURSES_LIBRARY} ${TERMINFO_LIBRARY}) if(USE_ICONV) -check_function_exists(__iconv ICONV_IN_LIBC) +check_function_exists(iconv ICONV_IN_LIBC) if(NOT ICONV_IN_LIBC) find_path(ICONV_INCLUDE_DIR iconv.h) find_library(ICONV_LIBRARY iconv) @@ -173,9 +176,26 @@ if(USE_ICONV) target_link_libraries(nvi PRIVATE ${ICONV_LIBRARY}) endif() +check_function_exists(getprogname GETPROGNAME_IN_LIBC) +check_function_exists(strlcpy STRLCPY_IN_LIBC) +if(NOT GETPROGNAME_IN_LIBC OR NOT STRLCPY_IN_LIBC) +find_package(PkgConfig REQUIRED) +pkg_check_modules(LIBBSD libbsd-overlay) +add_definitions(${LIBBSD_CFLAGS}) +target_link_libraries(nvi PRIVATE ${LIBBSD_LIBRARIES}) +endif() + +check_function_exists(dbopen DBOPEN_IN_LIBC) +if(NOT DBOPEN_IN_LIBC) +target_link_libraries(nvi PRIVATE db1) +endif() + check_include_files(libutil.h HAVE_LIBUTIL_H) check_include_files(ncurses.h HAVE_NCURSES_H) +check_include_files(ncursesw/ncurses.h HAVE_NCURSESW_NCURSES_H) +check_include_files(pty.h HAVE_PTY_H) check_include_files(term.h HAVE_TERM_H) +check_struct_has_member("struct dirent" d_namlen dirent.h HAVE_DIRENT_D_NAMLEN LANGUAGE C) configure_file(files/config.h.in config.h) Modified: head/contrib/nvi/catalog/dump.c == --- head/contrib/nvi/catalog/dump.c Thu Oct 1 04:26:46 2020 (r366308) +++ head/contrib/nvi/catalog/dump.c Thu Oct 1 04:46:23 2020 (r366309) @@ -36,24 +36,24 @@ parse(FILE *fp) { int ch, s1, s2, s3; -#defineTESTD(s) { \ +#defineTESTD(s) do { \ if ((s = getc(fp)) == EOF)
svn commit: r366307 - in vendor/nvi/dist: . catalog cl common ex files man regex vi
Author: bapt Date: Thu Oct 1 04:25:54 2020 New Revision: 366307 URL: https://svnweb.freebsd.org/changeset/base/366307 Log: Import nvi 2.2.0-05ed8b9 This snapshot just brings a bunch of fixes in particular a fix for vi -w PR: 241985 Reported by: fernape Modified: vendor/nvi/dist/CMakeLists.txt vendor/nvi/dist/catalog/dump.c vendor/nvi/dist/cl/cl.h vendor/nvi/dist/cl/cl_read.c vendor/nvi/dist/cl/cl_term.c vendor/nvi/dist/common/common.h vendor/nvi/dist/common/cut.h vendor/nvi/dist/common/exf.c vendor/nvi/dist/common/key.c vendor/nvi/dist/common/log.c vendor/nvi/dist/common/main.c vendor/nvi/dist/common/mark.c vendor/nvi/dist/common/mem.h vendor/nvi/dist/common/msg.c vendor/nvi/dist/common/options.c vendor/nvi/dist/common/put.c vendor/nvi/dist/common/recover.c vendor/nvi/dist/common/util.c vendor/nvi/dist/ex/ex.c vendor/nvi/dist/ex/ex.h vendor/nvi/dist/ex/ex_argv.c vendor/nvi/dist/ex/ex_bang.c vendor/nvi/dist/ex/ex_cscope.c vendor/nvi/dist/ex/ex_filter.c vendor/nvi/dist/ex/ex_global.c vendor/nvi/dist/ex/ex_script.c vendor/nvi/dist/ex/ex_shell.c vendor/nvi/dist/ex/ex_subst.c vendor/nvi/dist/files/config.h.in vendor/nvi/dist/files/pathnames.h.in vendor/nvi/dist/man/vi.1 vendor/nvi/dist/regex/engine.c vendor/nvi/dist/regex/regexec.c vendor/nvi/dist/vi/v_itxt.c vendor/nvi/dist/vi/v_paragraph.c vendor/nvi/dist/vi/v_section.c vendor/nvi/dist/vi/v_sentence.c vendor/nvi/dist/vi/v_txt.c vendor/nvi/dist/vi/vi.c vendor/nvi/dist/vi/vs_line.c vendor/nvi/dist/vi/vs_msg.c vendor/nvi/dist/vi/vs_refresh.c vendor/nvi/dist/vi/vs_relative.c vendor/nvi/dist/vi/vs_smap.c Modified: vendor/nvi/dist/CMakeLists.txt == --- vendor/nvi/dist/CMakeLists.txt Thu Oct 1 03:10:42 2020 (r366306) +++ vendor/nvi/dist/CMakeLists.txt Thu Oct 1 04:25:54 2020 (r366307) @@ -13,6 +13,7 @@ project(nvi2 C) include(CheckIncludeFiles) include(CheckFunctionExists) +include(CheckStructHasMember) include(CheckCSourceCompiles) mark_as_advanced(CMAKE_INSTALL_PREFIX) @@ -127,6 +128,7 @@ endif() if(USE_WIDECHAR) find_library(CURSES_LIBRARY NAMES ncursesw cursesw curses HINTS /usr/lib) +find_library(TERMINFO_LIBRARY NAMES tinfow terminfo HINTS /usr/lib) # link to the wchar_t awared BSD libregex.a add_library(regex STATIC) @@ -136,13 +138,14 @@ if(USE_WIDECHAR) target_link_libraries(nvi PRIVATE regex) else() find_library(CURSES_LIBRARY NAMES ncurses curses HINTS /usr/lib) +find_library(TERMINFO_LIBRARY NAMES tinfo terminfo HINTS /usr/lib) target_compile_options(nvi PRIVATE -Wno-pointer-sign) endif() -target_link_libraries(nvi PRIVATE ${CURSES_LIBRARY}) +target_link_libraries(nvi PRIVATE ${CURSES_LIBRARY} ${TERMINFO_LIBRARY}) if(USE_ICONV) -check_function_exists(__iconv ICONV_IN_LIBC) +check_function_exists(iconv ICONV_IN_LIBC) if(NOT ICONV_IN_LIBC) find_path(ICONV_INCLUDE_DIR iconv.h) find_library(ICONV_LIBRARY iconv) @@ -173,9 +176,26 @@ if(USE_ICONV) target_link_libraries(nvi PRIVATE ${ICONV_LIBRARY}) endif() +check_function_exists(getprogname GETPROGNAME_IN_LIBC) +check_function_exists(strlcpy STRLCPY_IN_LIBC) +if(NOT GETPROGNAME_IN_LIBC OR NOT STRLCPY_IN_LIBC) +find_package(PkgConfig REQUIRED) +pkg_check_modules(LIBBSD libbsd-overlay) +add_definitions(${LIBBSD_CFLAGS}) +target_link_libraries(nvi PRIVATE ${LIBBSD_LIBRARIES}) +endif() + +check_function_exists(dbopen DBOPEN_IN_LIBC) +if(NOT DBOPEN_IN_LIBC) +target_link_libraries(nvi PRIVATE db1) +endif() + check_include_files(libutil.h HAVE_LIBUTIL_H) check_include_files(ncurses.h HAVE_NCURSES_H) +check_include_files(ncursesw/ncurses.h HAVE_NCURSESW_NCURSES_H) +check_include_files(pty.h HAVE_PTY_H) check_include_files(term.h HAVE_TERM_H) +check_struct_has_member("struct dirent" d_namlen dirent.h HAVE_DIRENT_D_NAMLEN LANGUAGE C) configure_file(files/config.h.in config.h) Modified: vendor/nvi/dist/catalog/dump.c == --- vendor/nvi/dist/catalog/dump.c Thu Oct 1 03:10:42 2020 (r366306) +++ vendor/nvi/dist/catalog/dump.c Thu Oct 1 04:25:54 2020 (r366307) @@ -35,24 +35,24 @@ parse(FILE *fp) { int ch, s1, s2, s3; -#defineTESTD(s) { \ +#defineTESTD(s) do { \ if ((s = getc(fp)) == EOF) \ return; \ if (!isdigit(s))\ continue; \ -} -#defineTESTP { \ +} while (0) +#de
svn commit: r366308 - in vendor/nvi/2.2.0-05ed8b9: . catalog cl common ex files man regex vi
Author: bapt Date: Thu Oct 1 04:26:46 2020 New Revision: 366308 URL: https://svnweb.freebsd.org/changeset/base/366308 Log: Tag import of nvi 2.2.0-05ed8b9 Added: vendor/nvi/2.2.0-05ed8b9/ - copied from r366306, vendor/nvi/dist/ Replaced: vendor/nvi/2.2.0-05ed8b9/CMakeLists.txt - copied unchanged from r366307, vendor/nvi/dist/CMakeLists.txt vendor/nvi/2.2.0-05ed8b9/catalog/dump.c - copied unchanged from r366307, vendor/nvi/dist/catalog/dump.c vendor/nvi/2.2.0-05ed8b9/cl/cl.h - copied unchanged from r366307, vendor/nvi/dist/cl/cl.h vendor/nvi/2.2.0-05ed8b9/cl/cl_read.c - copied unchanged from r366307, vendor/nvi/dist/cl/cl_read.c vendor/nvi/2.2.0-05ed8b9/cl/cl_term.c - copied unchanged from r366307, vendor/nvi/dist/cl/cl_term.c vendor/nvi/2.2.0-05ed8b9/common/common.h - copied unchanged from r366307, vendor/nvi/dist/common/common.h vendor/nvi/2.2.0-05ed8b9/common/cut.h - copied unchanged from r366307, vendor/nvi/dist/common/cut.h vendor/nvi/2.2.0-05ed8b9/common/exf.c - copied unchanged from r366307, vendor/nvi/dist/common/exf.c vendor/nvi/2.2.0-05ed8b9/common/key.c - copied unchanged from r366307, vendor/nvi/dist/common/key.c vendor/nvi/2.2.0-05ed8b9/common/log.c - copied unchanged from r366307, vendor/nvi/dist/common/log.c vendor/nvi/2.2.0-05ed8b9/common/main.c - copied unchanged from r366307, vendor/nvi/dist/common/main.c vendor/nvi/2.2.0-05ed8b9/common/mark.c - copied unchanged from r366307, vendor/nvi/dist/common/mark.c vendor/nvi/2.2.0-05ed8b9/common/mem.h - copied unchanged from r366307, vendor/nvi/dist/common/mem.h vendor/nvi/2.2.0-05ed8b9/common/msg.c - copied unchanged from r366307, vendor/nvi/dist/common/msg.c vendor/nvi/2.2.0-05ed8b9/common/options.c - copied unchanged from r366307, vendor/nvi/dist/common/options.c vendor/nvi/2.2.0-05ed8b9/common/put.c - copied unchanged from r366307, vendor/nvi/dist/common/put.c vendor/nvi/2.2.0-05ed8b9/common/recover.c - copied unchanged from r366307, vendor/nvi/dist/common/recover.c vendor/nvi/2.2.0-05ed8b9/common/util.c - copied unchanged from r366307, vendor/nvi/dist/common/util.c vendor/nvi/2.2.0-05ed8b9/ex/ex.c - copied unchanged from r366307, vendor/nvi/dist/ex/ex.c vendor/nvi/2.2.0-05ed8b9/ex/ex.h - copied unchanged from r366307, vendor/nvi/dist/ex/ex.h vendor/nvi/2.2.0-05ed8b9/ex/ex_argv.c - copied unchanged from r366307, vendor/nvi/dist/ex/ex_argv.c vendor/nvi/2.2.0-05ed8b9/ex/ex_bang.c - copied unchanged from r366307, vendor/nvi/dist/ex/ex_bang.c vendor/nvi/2.2.0-05ed8b9/ex/ex_cscope.c - copied unchanged from r366307, vendor/nvi/dist/ex/ex_cscope.c vendor/nvi/2.2.0-05ed8b9/ex/ex_filter.c - copied unchanged from r366307, vendor/nvi/dist/ex/ex_filter.c vendor/nvi/2.2.0-05ed8b9/ex/ex_global.c - copied unchanged from r366307, vendor/nvi/dist/ex/ex_global.c vendor/nvi/2.2.0-05ed8b9/ex/ex_script.c - copied unchanged from r366307, vendor/nvi/dist/ex/ex_script.c vendor/nvi/2.2.0-05ed8b9/ex/ex_shell.c - copied unchanged from r366307, vendor/nvi/dist/ex/ex_shell.c vendor/nvi/2.2.0-05ed8b9/ex/ex_subst.c - copied unchanged from r366307, vendor/nvi/dist/ex/ex_subst.c vendor/nvi/2.2.0-05ed8b9/files/config.h.in - copied unchanged from r366307, vendor/nvi/dist/files/config.h.in vendor/nvi/2.2.0-05ed8b9/files/pathnames.h.in - copied unchanged from r366307, vendor/nvi/dist/files/pathnames.h.in vendor/nvi/2.2.0-05ed8b9/man/vi.1 - copied unchanged from r366307, vendor/nvi/dist/man/vi.1 vendor/nvi/2.2.0-05ed8b9/regex/engine.c - copied unchanged from r366307, vendor/nvi/dist/regex/engine.c vendor/nvi/2.2.0-05ed8b9/regex/regexec.c - copied unchanged from r366307, vendor/nvi/dist/regex/regexec.c vendor/nvi/2.2.0-05ed8b9/vi/v_itxt.c - copied unchanged from r366307, vendor/nvi/dist/vi/v_itxt.c vendor/nvi/2.2.0-05ed8b9/vi/v_paragraph.c - copied unchanged from r366307, vendor/nvi/dist/vi/v_paragraph.c vendor/nvi/2.2.0-05ed8b9/vi/v_section.c - copied unchanged from r366307, vendor/nvi/dist/vi/v_section.c vendor/nvi/2.2.0-05ed8b9/vi/v_sentence.c - copied unchanged from r366307, vendor/nvi/dist/vi/v_sentence.c vendor/nvi/2.2.0-05ed8b9/vi/v_txt.c - copied unchanged from r366307, vendor/nvi/dist/vi/v_txt.c vendor/nvi/2.2.0-05ed8b9/vi/vi.c - copied unchanged from r366307, vendor/nvi/dist/vi/vi.c vendor/nvi/2.2.0-05ed8b9/vi/vs_line.c - copied unchanged from r366307, vendor/nvi/dist/vi/vs_line.c vendor/nvi/2.2.0-05ed8b9/vi/vs_msg.c - copied unchanged from r366307, vendor/nvi/dist/vi/vs_msg.c vendor/nvi/2.2.0-05ed8b9/vi/vs_refresh.c - copied unchanged from r366307, vendor/nvi/dist/vi/vs_refresh.c vendor/nvi/2.2.0-05ed8b9/vi/vs_relative.c - copied unchanged from r366307, vendor/nvi/dist/vi/vs_relative.c vendor/nvi/2.2.0-05ed8b9/vi/vs_smap.c - copied unchanged from r366307, ve
svn commit: r365916 - stable/11/share/misc
Author: bapt Date: Sat Sep 19 20:18:14 2020 New Revision: 365916 URL: https://svnweb.freebsd.org/changeset/base/365916 Log: MFC r361361, r365791 r361361: Update pciids to 2020.05.22 r365791: Update to 2020.08.19 Modified: stable/11/share/misc/pci_vendors Directory Properties: stable/11/ (props changed) Modified: stable/11/share/misc/pci_vendors == --- stable/11/share/misc/pci_vendorsSat Sep 19 20:17:08 2020 (r365915) +++ stable/11/share/misc/pci_vendorsSat Sep 19 20:18:14 2020 (r365916) @@ -1,9 +1,10 @@ # $FreeBSD$ +# # List of PCI ID's # -# Version: 2020.02.22 -# Date:2020-02-22 03:15:04 +# Version: 2020.08.19 +# Date:2020-08-19 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -43,6 +44,8 @@ 7a0b SPI Controller 7a0c LPC Controller 7a0f DMA (Direct Memory Access) Controller +# Found on some boards with two sockets + 7a10 Hyper Transport Bridge Controller 7a14 EHCI USB Controller 7a15 Vivante GPU (Graphics Processing Unit) 7a19 PCI-to-PCI Bridge @@ -92,6 +95,8 @@ 1703 ISDN Adapter (PCI Bus, DV, W) 1704 ISDN Adapter (PCI Bus, D, C) 0721 Sapphire, Inc. +0731 Jingjia Microelectronics Co Ltd + 7200 JM7200 Series GPU 0777 Ubiquiti Networks, Inc. 0795 Wired Inc. 6663 Butane II (MPEG2 encoder board) @@ -271,6 +276,9 @@ 0013 53c875a 1000 1000 LSI53C875A PCI to Ultra SCSI Controller 0014 MegaRAID Tri-Mode SAS3516 + 1000 9460 MegaRAID 9460-16i + 1000 9480 MegaRAID 9480-8i8e + 1000 9481 MegaRAID 9480-8e 1028 1f3a PERC H745 Adapter 1028 1f3b PERC H745 Front 1028 1fd4 PERC H745P MX @@ -282,10 +290,15 @@ 8086 9460 RAID Controller RSP3TD160F 8086 9480 RAID Controller RSP3MD088F 0015 MegaRAID Tri-Mode SAS3416 + 1000 9441 MegaRAID 9440-16i 1028 1f3c PERC H345 Adapter 1028 1f3d PERC H345 Front 1d49 0503 ThinkSystem RAID 530-16i PCIe 12Gb Adapter 0016 MegaRAID Tri-Mode SAS3508 + 1000 9461 MegaRAID 9460-8i + 1000 9462 MegaRAID 9460-4i + 1000 9463 MegaRAID 9365-28i + 1000 9464 MegaRAID 9365-24i 1028 1fc9 PERC H840 Adapter 1028 1fcb PERC H740P Adapter 1028 1fcd PERC H740P Mini @@ -296,6 +309,8 @@ 8086 352f Integrated RAID Module RMSP3HD080E 8086 9461 RAID Controller RSP3DD080F 0017 MegaRAID Tri-Mode SAS3408 + 1000 9440 MegaRAID 9440-8i + 1000 9442 MegaRAID 9440-4i 1d49 0500 ThinkSystem RAID 530-8i PCIe 12Gb Adapter 1d49 0502 ThinkSystem RAID 530-8i Dense Adapter 8086 3528 Integrated RAID RMSP3LD060 @@ -438,8 +453,8 @@ 1028 1fd1 PERC H730P MX 17aa 1052 ThinkServer RAID 720i 17aa 1053 ThinkServer RAID 720ix - 1bd4 0014 6G SAS3108 2G - 1bd4 0015 6G SAS3108 4G + 1bd4 0014 12G SAS3108 2G + 1bd4 0015 12G SAS3108 4G 1d49 0600 ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter 1d49 0608 ThinkSystem RAID 730-8i 2GB Flash PCIe 12Gb Adapter 1d49 0609 ThinkSystem RAID 730-8i 4GB Flash PCIe 12Gb Adapter @@ -456,6 +471,7 @@ 1028 1f4c PERC H330 Mini (for blades) 1028 1f4d PERC H330 Embedded (for monolithic) 1054 306a SAS 3004 iMR ROMB + 1734 1211 PRAID CP400i [D3307-A12] 1d49 04db ServeRAID M1210 SAS/SATA Controller 1d49 0504 ThinkSystem RAID 520-8i PCIe 12Gb Adapter 0060 MegaRAID SAS 1078 @@ -655,10 +671,13 @@ 1028 1fd3 HBA330 MMZ # Supermicro AOC-S3008L-L8e uses 0808 for their SAS3008 SAS controller 15d9 0808 AOC-S3008L-L8e + 1bd4 0008 12G SAS3008IMR Onboard 1bd4 000b 12G SAS3008IR 1bd4 000c 12G SAS3008IT 1bd4 0011 Inspur 12Gb 8i-3008 IT SAS HBA 1bd4 0012 12Gb SAS3008IR UDM + 1bd4 001f 12G SAS3008IR Onboard + 1bd4 0020 12G SAS3008IT Onboard 1bd4 0026 12G SAS3008IT RACK 1bd4 0027 12G SAS3008IMR RACK 1bd4 0028 12G SAS3008IR RACK @@ -692,6 +711,7 @@ 00c2 SAS3324 PCI-Express Fusion-MPT SAS-3 00c3 SAS3324 PCI-Express Fusion-MPT SAS-3 00c4 SAS3224 PCI-Express Fusion-MPT SAS-3 + 1170 0002 SAS3224 PCI Express to 12Gb
svn commit: r365915 - stable/12/share/misc
Author: bapt Date: Sat Sep 19 20:17:08 2020 New Revision: 365915 URL: https://svnweb.freebsd.org/changeset/base/365915 Log: MFC r361361, r365791 r361361: Update pciids to 2020.05.22 r365791: Update to 2020.08.19 Modified: stable/12/share/misc/pci_vendors Directory Properties: stable/12/ (props changed) Modified: stable/12/share/misc/pci_vendors == --- stable/12/share/misc/pci_vendorsSat Sep 19 20:15:51 2020 (r365914) +++ stable/12/share/misc/pci_vendorsSat Sep 19 20:17:08 2020 (r365915) @@ -1,9 +1,10 @@ # $FreeBSD$ +# # List of PCI ID's # -# Version: 2020.02.22 -# Date:2020-02-22 03:15:04 +# Version: 2020.08.19 +# Date:2020-08-19 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -43,6 +44,8 @@ 7a0b SPI Controller 7a0c LPC Controller 7a0f DMA (Direct Memory Access) Controller +# Found on some boards with two sockets + 7a10 Hyper Transport Bridge Controller 7a14 EHCI USB Controller 7a15 Vivante GPU (Graphics Processing Unit) 7a19 PCI-to-PCI Bridge @@ -92,6 +95,8 @@ 1703 ISDN Adapter (PCI Bus, DV, W) 1704 ISDN Adapter (PCI Bus, D, C) 0721 Sapphire, Inc. +0731 Jingjia Microelectronics Co Ltd + 7200 JM7200 Series GPU 0777 Ubiquiti Networks, Inc. 0795 Wired Inc. 6663 Butane II (MPEG2 encoder board) @@ -271,6 +276,9 @@ 0013 53c875a 1000 1000 LSI53C875A PCI to Ultra SCSI Controller 0014 MegaRAID Tri-Mode SAS3516 + 1000 9460 MegaRAID 9460-16i + 1000 9480 MegaRAID 9480-8i8e + 1000 9481 MegaRAID 9480-8e 1028 1f3a PERC H745 Adapter 1028 1f3b PERC H745 Front 1028 1fd4 PERC H745P MX @@ -282,10 +290,15 @@ 8086 9460 RAID Controller RSP3TD160F 8086 9480 RAID Controller RSP3MD088F 0015 MegaRAID Tri-Mode SAS3416 + 1000 9441 MegaRAID 9440-16i 1028 1f3c PERC H345 Adapter 1028 1f3d PERC H345 Front 1d49 0503 ThinkSystem RAID 530-16i PCIe 12Gb Adapter 0016 MegaRAID Tri-Mode SAS3508 + 1000 9461 MegaRAID 9460-8i + 1000 9462 MegaRAID 9460-4i + 1000 9463 MegaRAID 9365-28i + 1000 9464 MegaRAID 9365-24i 1028 1fc9 PERC H840 Adapter 1028 1fcb PERC H740P Adapter 1028 1fcd PERC H740P Mini @@ -296,6 +309,8 @@ 8086 352f Integrated RAID Module RMSP3HD080E 8086 9461 RAID Controller RSP3DD080F 0017 MegaRAID Tri-Mode SAS3408 + 1000 9440 MegaRAID 9440-8i + 1000 9442 MegaRAID 9440-4i 1d49 0500 ThinkSystem RAID 530-8i PCIe 12Gb Adapter 1d49 0502 ThinkSystem RAID 530-8i Dense Adapter 8086 3528 Integrated RAID RMSP3LD060 @@ -438,8 +453,8 @@ 1028 1fd1 PERC H730P MX 17aa 1052 ThinkServer RAID 720i 17aa 1053 ThinkServer RAID 720ix - 1bd4 0014 6G SAS3108 2G - 1bd4 0015 6G SAS3108 4G + 1bd4 0014 12G SAS3108 2G + 1bd4 0015 12G SAS3108 4G 1d49 0600 ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter 1d49 0608 ThinkSystem RAID 730-8i 2GB Flash PCIe 12Gb Adapter 1d49 0609 ThinkSystem RAID 730-8i 4GB Flash PCIe 12Gb Adapter @@ -456,6 +471,7 @@ 1028 1f4c PERC H330 Mini (for blades) 1028 1f4d PERC H330 Embedded (for monolithic) 1054 306a SAS 3004 iMR ROMB + 1734 1211 PRAID CP400i [D3307-A12] 1d49 04db ServeRAID M1210 SAS/SATA Controller 1d49 0504 ThinkSystem RAID 520-8i PCIe 12Gb Adapter 0060 MegaRAID SAS 1078 @@ -655,10 +671,13 @@ 1028 1fd3 HBA330 MMZ # Supermicro AOC-S3008L-L8e uses 0808 for their SAS3008 SAS controller 15d9 0808 AOC-S3008L-L8e + 1bd4 0008 12G SAS3008IMR Onboard 1bd4 000b 12G SAS3008IR 1bd4 000c 12G SAS3008IT 1bd4 0011 Inspur 12Gb 8i-3008 IT SAS HBA 1bd4 0012 12Gb SAS3008IR UDM + 1bd4 001f 12G SAS3008IR Onboard + 1bd4 0020 12G SAS3008IT Onboard 1bd4 0026 12G SAS3008IT RACK 1bd4 0027 12G SAS3008IMR RACK 1bd4 0028 12G SAS3008IR RACK @@ -692,6 +711,7 @@ 00c2 SAS3324 PCI-Express Fusion-MPT SAS-3 00c3 SAS3324 PCI-Express Fusion-MPT SAS-3 00c4 SAS3224 PCI-Express Fusion-MPT SAS-3 + 1170 0002 SAS3224 PCI Express to 12Gb
svn commit: r365914 - in stable/12/usr.bin/diff: . tests
Author: bapt Date: Sat Sep 19 20:15:51 2020 New Revision: 365914 URL: https://svnweb.freebsd.org/changeset/base/365914 Log: MFC r361688-r361690, r365041 r361688: Restore compatibility with GNU diff regarding --label Various options to "diff(1)" show filenames, and traditionally make use of the "--label" parameter, if set. Restore this behaviour in BSD diff. While here add a regression test PR: 244533 Submitted by: Jamie Landeg-Jones r361689: diff: restore compatibility with GNU diff regarding -N option When -N is used the missing files are treated as empty. PR: 233402 Submitted by: Fehmi Noyan Isi Reported by: Roman Neuhauser Differential Revision: D25081 r361690: Document long version of -b option PR: 234195 Submitted by: Fehmi Noyan Isi Reported by: Andras Farkas r365041: diff: always properly kill pr(1) When diff is invoked with -l it will spawn the pr(1) program. In some circumpstances the pr(1) was not properly killed when diff program exits. Submitted by: Bret Ketchum Differential Revision: https://reviews.freebsd.org/D26232 Modified: stable/12/usr.bin/diff/diff.1 stable/12/usr.bin/diff/diff.c stable/12/usr.bin/diff/diffreg.c stable/12/usr.bin/diff/tests/diff_test.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/diff/diff.1 == --- stable/12/usr.bin/diff/diff.1 Sat Sep 19 20:06:30 2020 (r365913) +++ stable/12/usr.bin/diff/diff.1 Sat Sep 19 20:15:51 2020 (r365914) @@ -30,7 +30,7 @@ .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 .\" $FreeBSD$ .\" -.Dd April 27, 2020 +.Dd June 1, 2020 .Dt DIFF 1 .Os .Sh NAME @@ -330,7 +330,7 @@ Use of this option forces to produce a diff. .It Fl B Fl -ignore-blank-lines Causes chunks that include only blank lines to be ignored. -.It Fl b +.It Fl b -ignore-space-change Causes trailing blanks (spaces and tabs) to be ignored, and other strings of blanks to compare equal. .It Fl d -minimal Modified: stable/12/usr.bin/diff/diff.c == --- stable/12/usr.bin/diff/diff.c Sat Sep 19 20:06:30 2020 (r365913) +++ stable/12/usr.bin/diff/diff.c Sat Sep 19 20:15:51 2020 (r365914) @@ -27,6 +27,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -351,13 +352,33 @@ main(int argc, char **argv) if (strcmp(argv[0], "-") == 0) { fstat(STDIN_FILENO, &stb1); gotstdin = 1; - } else if (stat(argv[0], &stb1) != 0) - err(2, "%s", argv[0]); + } else if (stat(argv[0], &stb1) != 0) { + if (!Nflag || errno != ENOENT) + err(2, "%s", argv[0]); + dflags |= D_EMPTY1; + memset(&stb1, 0, sizeof(struct stat)); + } + if (strcmp(argv[1], "-") == 0) { fstat(STDIN_FILENO, &stb2); gotstdin = 1; - } else if (stat(argv[1], &stb2) != 0) - err(2, "%s", argv[1]); + } else if (stat(argv[1], &stb2) != 0) { + if (!Nflag || errno != ENOENT) + err(2, "%s", argv[1]); + dflags |= D_EMPTY2; + memset(&stb2, 0, sizeof(stb2)); + stb2.st_mode = stb1.st_mode; + } + + if (dflags & D_EMPTY1 && dflags & D_EMPTY2){ + warn("%s", argv[0]); + warn("%s", argv[1]); + exit(2); + } + + if (stb1.st_mode == 0) + stb1.st_mode = stb2.st_mode; + if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode))) errx(2, "can't compare - to a directory"); set_argstr(oargv, argv); @@ -465,6 +486,9 @@ print_only(const char *path, size_t dirlen, const char void print_status(int val, char *path1, char *path2, const char *entry) { + if (label[0] != NULL) path1 = label[0]; + if (label[1] != NULL) path2 = label[1]; + switch (val) { case D_BINARY: printf("Binary files %s%s and %s%s differ\n", Modified: stable/12/usr.bin/diff/diffreg.c == --- stable/12/usr.bin/diff/diffreg.cSat Sep 19 20:06:30 2020 (r365913) +++ stable/12/usr.bin/diff/diffreg.cSat Sep 19 20:15:51 2020 (r365914) @@ -412,10 +412,10 @@ diffreg(char *file1, char *file2, int flags, int capsi ixnew = xreallocarray(ixnew, len[1] + 2, sizeof(*ixnew)); check(f1, f2, flags); output(file1, f1, file2, f2, flags); - if (pr != NULL) - stop_pr(pr); closem: + if (pr != NULL) + stop_pr(pr); if (anychange) { status |= 1; if (rval == D_SAME) @@ -1704,4 +1704,
svn commit: r365913 - stable/12/share/termcap
Author: bapt Date: Sat Sep 19 20:06:30 2020 New Revision: 365913 URL: https://svnweb.freebsd.org/changeset/base/365913 Log: MFC r360775: Fix indentation of the Kitty entry Modified: stable/12/share/termcap/termcap Directory Properties: stable/12/ (props changed) Modified: stable/12/share/termcap/termcap == --- stable/12/share/termcap/termcap Sat Sep 19 20:06:12 2020 (r365912) +++ stable/12/share/termcap/termcap Sat Sep 19 20:06:30 2020 (r365913) @@ -4740,22 +4740,22 @@ xterm-kitty|KovId's TTY:\ :tc=xterm-256color:tc=kitty+common: kitty+common|KovId's TTY common properties:\ -:am:hs:km:mi:ms:xn:\ -:co#80:it#8:li#24:\ -:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:K1=:K3=:\ -:K4=:K5=:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\ -:ae=\E(B:al=\E[L:as=\E(0:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\ -:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=\r:cs=\E[%i%d;%dr:\ -:ct=\E[3g:dc=\E[P:dl=\E[M:do=\n:ds=\E]2;\007:ec=\E[%dX:\ -:ei=\E[4l:fs=^G:ho=\E[H:im=\E[4h:k1=\EOP:k2=\EOQ:k3=\EOR:\ -:k4=\EOS:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\ -:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:\ -:kd=\EOB:ke=\E[?1l:kh=\EOH:kl=\EOD:kr=\EOC:ks=\E[?1h:\ -:ku=\EOA:le=^H:md=\E[1m:me=\E[0m:mh=\E[2m:mr=\E[7m:nd=\E[C:\ -:rc=\E8:sc=\E7:se=\E[27m:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=^I:\ -:te=\E[?1049l:ti=\E[?1049h:ts=\E]2;:ue=\E[24m:up=\E[A:\ -:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?12l\E[?25h:vi=\E[?25l:\ -:vs=\E[?12;25h: + :am:hs:km:mi:ms:xn:\ + :co#80:it#8:li#24:\ + :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:K1=:K3=:\ + :K4=:K5=:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\ + :ae=\E(B:al=\E[L:as=\E(0:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\ + :cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=\r:cs=\E[%i%d;%dr:\ + :ct=\E[3g:dc=\E[P:dl=\E[M:do=\n:ds=\E]2;\007:ec=\E[%dX:\ + :ei=\E[4l:fs=^G:ho=\E[H:im=\E[4h:k1=\EOP:k2=\EOQ:k3=\EOR:\ + :k4=\EOS:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\ + :k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:\ + :kd=\EOB:ke=\E[?1l:kh=\EOH:kl=\EOD:kr=\EOC:ks=\E[?1h:\ + :ku=\EOA:le=^H:md=\E[1m:me=\E[0m:mh=\E[2m:mr=\E[7m:nd=\E[C:\ + :rc=\E8:sc=\E7:se=\E[27m:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=^I:\ + :te=\E[?1049l:ti=\E[?1049h:ts=\E]2;:ue=\E[24m:up=\E[A:\ + :us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?12l\E[?25h:vi=\E[?25l:\ + :vs=\E[?12;25h: # # END OF TERMCAP ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r365791 - head/share/misc
Author: bapt Date: Wed Sep 16 07:30:18 2020 New Revision: 365791 URL: https://svnweb.freebsd.org/changeset/base/365791 Log: Update to 2020.08.19 MFC after:3 days Modified: head/share/misc/pci_vendors Modified: head/share/misc/pci_vendors == --- head/share/misc/pci_vendors Wed Sep 16 06:02:30 2020(r365790) +++ head/share/misc/pci_vendors Wed Sep 16 07:30:18 2020(r365791) @@ -1,9 +1,10 @@ # $FreeBSD$ +# # List of PCI ID's # -# Version: 2020.05.22 -# Date:2020-05-22 03:15:02 +# Version: 2020.08.19 +# Date:2020-08-19 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -43,6 +44,8 @@ 7a0b SPI Controller 7a0c LPC Controller 7a0f DMA (Direct Memory Access) Controller +# Found on some boards with two sockets + 7a10 Hyper Transport Bridge Controller 7a14 EHCI USB Controller 7a15 Vivante GPU (Graphics Processing Unit) 7a19 PCI-to-PCI Bridge @@ -92,6 +95,8 @@ 1703 ISDN Adapter (PCI Bus, DV, W) 1704 ISDN Adapter (PCI Bus, D, C) 0721 Sapphire, Inc. +0731 Jingjia Microelectronics Co Ltd + 7200 JM7200 Series GPU 0777 Ubiquiti Networks, Inc. 0795 Wired Inc. 6663 Butane II (MPEG2 encoder board) @@ -271,6 +276,9 @@ 0013 53c875a 1000 1000 LSI53C875A PCI to Ultra SCSI Controller 0014 MegaRAID Tri-Mode SAS3516 + 1000 9460 MegaRAID 9460-16i + 1000 9480 MegaRAID 9480-8i8e + 1000 9481 MegaRAID 9480-8e 1028 1f3a PERC H745 Adapter 1028 1f3b PERC H745 Front 1028 1fd4 PERC H745P MX @@ -282,10 +290,15 @@ 8086 9460 RAID Controller RSP3TD160F 8086 9480 RAID Controller RSP3MD088F 0015 MegaRAID Tri-Mode SAS3416 + 1000 9441 MegaRAID 9440-16i 1028 1f3c PERC H345 Adapter 1028 1f3d PERC H345 Front 1d49 0503 ThinkSystem RAID 530-16i PCIe 12Gb Adapter 0016 MegaRAID Tri-Mode SAS3508 + 1000 9461 MegaRAID 9460-8i + 1000 9462 MegaRAID 9460-4i + 1000 9463 MegaRAID 9365-28i + 1000 9464 MegaRAID 9365-24i 1028 1fc9 PERC H840 Adapter 1028 1fcb PERC H740P Adapter 1028 1fcd PERC H740P Mini @@ -296,6 +309,8 @@ 8086 352f Integrated RAID Module RMSP3HD080E 8086 9461 RAID Controller RSP3DD080F 0017 MegaRAID Tri-Mode SAS3408 + 1000 9440 MegaRAID 9440-8i + 1000 9442 MegaRAID 9440-4i 1d49 0500 ThinkSystem RAID 530-8i PCIe 12Gb Adapter 1d49 0502 ThinkSystem RAID 530-8i Dense Adapter 8086 3528 Integrated RAID RMSP3LD060 @@ -696,6 +711,7 @@ 00c2 SAS3324 PCI-Express Fusion-MPT SAS-3 00c3 SAS3324 PCI-Express Fusion-MPT SAS-3 00c4 SAS3224 PCI-Express Fusion-MPT SAS-3 + 1170 0002 SAS3224 PCI Express to 12Gb HBA MEZZ CARD 00c5 SAS3316 PCI-Express Fusion-MPT SAS-3 00c6 SAS3316 PCI-Express Fusion-MPT SAS-3 00c7 SAS3316 PCI-Express Fusion-MPT SAS-3 @@ -743,6 +759,10 @@ 1d49 0205 ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb Internal HBA 1d49 0206 ThinkSystem 440-16e SAS/SATA PCIe Gen4 12Gb HBA 00e6 Fusion-MPT 12GSAS/PCIe Secure SAS38xx + 1000 4050 9500-16i Tri-Mode HBA + 1000 4060 9500-8i Tri-Mode HBA + 1000 4070 9500-16e Tri-Mode HBA + 1000 4080 9500-8e Tri-Mode HBA 1028 200b HBA355i Adapter 1028 200c HBA355i Front 1028 200d HBA355e Adapter @@ -926,7 +946,7 @@ 13e9 Ariel 1478 Navi 10 XL Upstream Port of PCI Express Switch 1479 Navi 10 XL Downstream Port of PCI Express Switch - 154c Kryptos + 154c Kryptos [Radeon RX 350] 154e Garfield 1551 Arlene 1552 Pooky @@ -1660,7 +1680,7 @@ 554a R423 [Radeon X800 XT Platinum Edition] 554b R423 [Radeon X800 GT/SE] 1002 0302 Radeon X800 SE - 554d R430 [Radeon X800 XL] + 554d R480 [Radeon X800 GTO2/XL] 1002 0322 All-In-Wonder X800 XL 1458 2124 GV-R80L256V-B (AGP) 554e R430 [All-In-Wonder X800 GT] @@ -1669,7 +1689,7 @@ 5551 R423 GL [FireGL V5100] 5569 R423 [Radeon X800 PRO] (Secondary) 556b R423 [Radeon X800 GT] (Secondary) - 556d R430 [Radeon X800 XL] (Secondary) + 556d R480 [Radeon X800 GTO2/XL] (Secondary) 1458 2125 GV-R80L256V-B (AGP) 556f R430 [Radeon X800] (Secondary) 5571 R
svn commit: r365499 - in head: contrib/nvi contrib/nvi/catalog contrib/nvi/cl contrib/nvi/common contrib/nvi/docs contrib/nvi/ex contrib/nvi/files contrib/nvi/man contrib/nvi/vi usr.bin/vi usr.bin/...
Author: bapt Date: Wed Sep 9 08:38:47 2020 New Revision: 365499 URL: https://svnweb.freebsd.org/changeset/base/365499 Log: Update nvi to 2.2.0 Main changes: * Vim-style expandtab option * Provides Turkish translation * Backspace now deletes \ rather than being escaped * T during motion commands is now VI-compatible * Encoding related fixes, such as UTF-8 detection * Fixed a number of memory management issues MFC after:3 weeks Added: head/contrib/nvi/.gitignore - copied unchanged from r365495, vendor/nvi/dist/.gitignore head/contrib/nvi/CMakeLists.txt - copied unchanged from r365495, vendor/nvi/dist/CMakeLists.txt head/contrib/nvi/catalog/tr_TR.ISO8859-9.base - copied unchanged from r365495, vendor/nvi/dist/catalog/tr_TR.ISO8859-9.base head/contrib/nvi/catalog/tr_TR.ISO8859-9.owner - copied unchanged from r365495, vendor/nvi/dist/catalog/tr_TR.ISO8859-9.owner head/contrib/nvi/catalog/tr_TR.UTF-8.base - copied unchanged from r365495, vendor/nvi/dist/catalog/tr_TR.UTF-8.base head/contrib/nvi/catalog/tr_TR.UTF-8.owner - copied unchanged from r365495, vendor/nvi/dist/catalog/tr_TR.UTF-8.owner head/contrib/nvi/files/ - copied from r365495, vendor/nvi/dist/files/ head/contrib/nvi/man/ - copied from r365495, vendor/nvi/dist/man/ Replaced: head/contrib/nvi/cl/extern.h - copied unchanged from r365497, vendor/nvi/dist/cl/extern.h head/contrib/nvi/common/extern.h - copied unchanged from r365497, vendor/nvi/dist/common/extern.h head/contrib/nvi/common/options_def.h - copied unchanged from r365497, vendor/nvi/dist/common/options_def.h head/contrib/nvi/ex/ex_def.h - copied unchanged from r365497, vendor/nvi/dist/ex/ex_def.h head/contrib/nvi/ex/extern.h - copied unchanged from r365497, vendor/nvi/dist/ex/extern.h head/contrib/nvi/ex/version.h - copied unchanged from r365497, vendor/nvi/dist/ex/version.h head/contrib/nvi/vi/extern.h - copied unchanged from r365497, vendor/nvi/dist/vi/extern.h Deleted: head/contrib/nvi/docs/ Modified: head/contrib/nvi/LICENSE head/contrib/nvi/README head/contrib/nvi/catalog/Makefile head/contrib/nvi/catalog/README head/contrib/nvi/catalog/dump.c head/contrib/nvi/cl/README.signal head/contrib/nvi/cl/cl.h head/contrib/nvi/cl/cl_funcs.c head/contrib/nvi/cl/cl_main.c head/contrib/nvi/cl/cl_read.c head/contrib/nvi/cl/cl_screen.c head/contrib/nvi/cl/cl_term.c head/contrib/nvi/common/args.h head/contrib/nvi/common/common.h head/contrib/nvi/common/conv.c head/contrib/nvi/common/conv.h head/contrib/nvi/common/cut.c head/contrib/nvi/common/cut.h head/contrib/nvi/common/delete.c head/contrib/nvi/common/encoding.c head/contrib/nvi/common/exf.c head/contrib/nvi/common/exf.h head/contrib/nvi/common/gs.h head/contrib/nvi/common/key.c head/contrib/nvi/common/key.h head/contrib/nvi/common/line.c head/contrib/nvi/common/log.c head/contrib/nvi/common/log.h head/contrib/nvi/common/main.c head/contrib/nvi/common/mark.c head/contrib/nvi/common/mark.h head/contrib/nvi/common/mem.h head/contrib/nvi/common/msg.c head/contrib/nvi/common/msg.h head/contrib/nvi/common/multibyte.h head/contrib/nvi/common/options.c head/contrib/nvi/common/options.h head/contrib/nvi/common/options_f.c head/contrib/nvi/common/put.c head/contrib/nvi/common/recover.c head/contrib/nvi/common/screen.c head/contrib/nvi/common/screen.h head/contrib/nvi/common/search.c head/contrib/nvi/common/seq.c head/contrib/nvi/common/seq.h head/contrib/nvi/common/util.c head/contrib/nvi/common/util.h head/contrib/nvi/ex/ex.c head/contrib/nvi/ex/ex.h head/contrib/nvi/ex/ex_abbrev.c head/contrib/nvi/ex/ex_append.c head/contrib/nvi/ex/ex_args.c head/contrib/nvi/ex/ex_argv.c head/contrib/nvi/ex/ex_at.c head/contrib/nvi/ex/ex_bang.c head/contrib/nvi/ex/ex_cd.c head/contrib/nvi/ex/ex_cmd.c head/contrib/nvi/ex/ex_cscope.c head/contrib/nvi/ex/ex_delete.c head/contrib/nvi/ex/ex_display.c head/contrib/nvi/ex/ex_edit.c head/contrib/nvi/ex/ex_equal.c head/contrib/nvi/ex/ex_file.c head/contrib/nvi/ex/ex_filter.c head/contrib/nvi/ex/ex_global.c head/contrib/nvi/ex/ex_init.c head/contrib/nvi/ex/ex_join.c head/contrib/nvi/ex/ex_map.c head/contrib/nvi/ex/ex_mark.c head/contrib/nvi/ex/ex_mkexrc.c head/contrib/nvi/ex/ex_move.c head/contrib/nvi/ex/ex_open.c head/contrib/nvi/ex/ex_preserve.c head/contrib/nvi/ex/ex_print.c head/contrib/nvi/ex/ex_put.c head/contrib/nvi/ex/ex_quit.c head/contrib/nvi/ex/ex_read.c head/contrib/nvi/ex/ex_screen.c head/contrib/nvi/ex/ex_script.c head/contrib/nvi/ex/ex_set.c head/contrib/nvi/ex/ex_shell.c head/contrib/nvi/ex/ex_shift.c head/contrib/nvi/ex/ex_source.c head/contrib/nvi/ex/ex_stop.c head/contrib/nvi/ex/ex_subst.c head/contrib/nvi/ex/ex_tag.c head/contrib/nvi/ex/ex_txt.c head/contrib/nvi/ex/ex_undo.c head/contrib/nvi/ex/ex_usag
svn commit: r365498 - in vendor/nvi/2.2.0: . catalog cl common docs ex files man vi
Author: bapt Date: Wed Sep 9 08:19:22 2020 New Revision: 365498 URL: https://svnweb.freebsd.org/changeset/base/365498 Log: Retag the import of nvi 2.2.0 previous import was half done Added: vendor/nvi/2.2.0/.gitignore - copied unchanged from r365495, vendor/nvi/dist/.gitignore vendor/nvi/2.2.0/CMakeLists.txt - copied unchanged from r365495, vendor/nvi/dist/CMakeLists.txt vendor/nvi/2.2.0/catalog/tr_TR.ISO8859-9.base - copied unchanged from r365495, vendor/nvi/dist/catalog/tr_TR.ISO8859-9.base vendor/nvi/2.2.0/catalog/tr_TR.ISO8859-9.owner - copied unchanged from r365495, vendor/nvi/dist/catalog/tr_TR.ISO8859-9.owner vendor/nvi/2.2.0/catalog/tr_TR.UTF-8.base - copied unchanged from r365495, vendor/nvi/dist/catalog/tr_TR.UTF-8.base vendor/nvi/2.2.0/catalog/tr_TR.UTF-8.owner - copied unchanged from r365495, vendor/nvi/dist/catalog/tr_TR.UTF-8.owner vendor/nvi/2.2.0/files/ - copied from r365495, vendor/nvi/dist/files/ vendor/nvi/2.2.0/man/ - copied from r365495, vendor/nvi/dist/man/ Replaced: vendor/nvi/2.2.0/ - copied from r365494, vendor/nvi/dist/ vendor/nvi/2.2.0/LICENSE - copied unchanged from r365495, vendor/nvi/dist/LICENSE vendor/nvi/2.2.0/README - copied unchanged from r365495, vendor/nvi/dist/README vendor/nvi/2.2.0/catalog/Makefile - copied unchanged from r365495, vendor/nvi/dist/catalog/Makefile vendor/nvi/2.2.0/catalog/README - copied unchanged from r365495, vendor/nvi/dist/catalog/README vendor/nvi/2.2.0/catalog/dump.c - copied unchanged from r365495, vendor/nvi/dist/catalog/dump.c vendor/nvi/2.2.0/cl/README.signal - copied unchanged from r365495, vendor/nvi/dist/cl/README.signal vendor/nvi/2.2.0/cl/cl.h - copied unchanged from r365495, vendor/nvi/dist/cl/cl.h vendor/nvi/2.2.0/cl/cl_funcs.c - copied unchanged from r365495, vendor/nvi/dist/cl/cl_funcs.c vendor/nvi/2.2.0/cl/cl_main.c - copied unchanged from r365495, vendor/nvi/dist/cl/cl_main.c vendor/nvi/2.2.0/cl/cl_read.c - copied unchanged from r365495, vendor/nvi/dist/cl/cl_read.c vendor/nvi/2.2.0/cl/cl_screen.c - copied unchanged from r365495, vendor/nvi/dist/cl/cl_screen.c vendor/nvi/2.2.0/cl/cl_term.c - copied unchanged from r365495, vendor/nvi/dist/cl/cl_term.c vendor/nvi/2.2.0/cl/extern.h - copied unchanged from r365497, vendor/nvi/dist/cl/extern.h vendor/nvi/2.2.0/common/args.h - copied unchanged from r365495, vendor/nvi/dist/common/args.h vendor/nvi/2.2.0/common/common.h - copied unchanged from r365495, vendor/nvi/dist/common/common.h vendor/nvi/2.2.0/common/conv.c - copied unchanged from r365495, vendor/nvi/dist/common/conv.c vendor/nvi/2.2.0/common/conv.h - copied unchanged from r365495, vendor/nvi/dist/common/conv.h vendor/nvi/2.2.0/common/cut.c - copied unchanged from r365495, vendor/nvi/dist/common/cut.c vendor/nvi/2.2.0/common/cut.h - copied unchanged from r365495, vendor/nvi/dist/common/cut.h vendor/nvi/2.2.0/common/delete.c - copied unchanged from r365495, vendor/nvi/dist/common/delete.c vendor/nvi/2.2.0/common/encoding.c - copied unchanged from r365495, vendor/nvi/dist/common/encoding.c vendor/nvi/2.2.0/common/exf.c - copied unchanged from r365495, vendor/nvi/dist/common/exf.c vendor/nvi/2.2.0/common/exf.h - copied unchanged from r365495, vendor/nvi/dist/common/exf.h vendor/nvi/2.2.0/common/extern.h - copied unchanged from r365497, vendor/nvi/dist/common/extern.h vendor/nvi/2.2.0/common/gs.h - copied unchanged from r365495, vendor/nvi/dist/common/gs.h vendor/nvi/2.2.0/common/key.c - copied unchanged from r365495, vendor/nvi/dist/common/key.c vendor/nvi/2.2.0/common/key.h - copied unchanged from r365495, vendor/nvi/dist/common/key.h vendor/nvi/2.2.0/common/line.c - copied unchanged from r365495, vendor/nvi/dist/common/line.c vendor/nvi/2.2.0/common/log.c - copied unchanged from r365495, vendor/nvi/dist/common/log.c vendor/nvi/2.2.0/common/log.h - copied unchanged from r365495, vendor/nvi/dist/common/log.h vendor/nvi/2.2.0/common/main.c - copied unchanged from r365495, vendor/nvi/dist/common/main.c vendor/nvi/2.2.0/common/mark.c - copied unchanged from r365495, vendor/nvi/dist/common/mark.c vendor/nvi/2.2.0/common/mark.h - copied unchanged from r365495, vendor/nvi/dist/common/mark.h vendor/nvi/2.2.0/common/mem.h - copied unchanged from r365495, vendor/nvi/dist/common/mem.h vendor/nvi/2.2.0/common/msg.c - copied unchanged from r365495, vendor/nvi/dist/common/msg.c vendor/nvi/2.2.0/common/msg.h - copied unchanged from r365495, vendor/nvi/dist/common/msg.h vendor/nvi/2.2.0/common/multibyte.h - copied unchanged from r365495, vendor/nvi/dist/common/multibyte.h vendor/nvi/2.2.0/common/options.c - copied unchanged from r365495, vendor/nvi/dist/common/options.c vendor/nvi/2.2.0/common/options.h - copied
svn commit: r365497 - in vendor/nvi/dist: cl common ex vi
Author: bapt Date: Wed Sep 9 08:18:04 2020 New Revision: 365497 URL: https://svnweb.freebsd.org/changeset/base/365497 Log: Import missing files from the nvi 2.2.0 previous half done import Added: vendor/nvi/dist/cl/extern.h (contents, props changed) vendor/nvi/dist/common/extern.h (contents, props changed) vendor/nvi/dist/common/options_def.h (contents, props changed) vendor/nvi/dist/ex/ex_def.h (contents, props changed) vendor/nvi/dist/ex/extern.h (contents, props changed) vendor/nvi/dist/ex/version.h (contents, props changed) vendor/nvi/dist/vi/extern.h (contents, props changed) Added: vendor/nvi/dist/cl/extern.h == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/nvi/dist/cl/extern.h Wed Sep 9 08:18:04 2020(r365497) @@ -0,0 +1,31 @@ +int cl_waddstr(SCR *, const CHAR_T *, size_t); +int cl_addstr(SCR *, const char *, size_t); +int cl_attr(SCR *, scr_attr_t, int); +int cl_baud(SCR *, u_long *); +int cl_bell(SCR *); +int cl_clrtoeol(SCR *); +int cl_cursor(SCR *, size_t *, size_t *); +int cl_deleteln(SCR *); +int cl_discard(SCR *, SCR **); +int cl_ex_adjust(SCR *, exadj_t); +int cl_insertln(SCR *); +int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *); +int cl_move(SCR *, size_t, size_t); +int cl_refresh(SCR *, int); +int cl_rename(SCR *, char *, int); +void cl_setname(GS *, char *); +int cl_split(SCR *, SCR *); +int cl_suspend(SCR *, int *); +void cl_usage(void); +int sig_init(GS *, SCR *); +int cl_event(SCR *, EVENT *, u_int32_t, int); +int cl_screen(SCR *, u_int32_t); +int cl_quit(GS *); +int cl_getcap(SCR *, char *, char **); +int cl_term_init(SCR *); +int cl_term_end(GS *); +int cl_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t); +int cl_optchange(SCR *, int, char *, u_long *); +int cl_omesg(SCR *, CL_PRIVATE *, int); +int cl_ssize(SCR *, int, size_t *, size_t *, int *); +int cl_putchar(int); Added: vendor/nvi/dist/common/extern.h == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/nvi/dist/common/extern.h Wed Sep 9 08:18:04 2020 (r365497) @@ -0,0 +1,131 @@ +char * codeset(void); +void conv_init(SCR *, SCR *); +int conv_enc(SCR *, int, char *); +void conv_end(SCR *); +int cut(SCR *, CHAR_T *, MARK *, MARK *, int); +int cut_line(SCR *, recno_t, size_t, size_t, CB *); +void cut_close(GS *); +TEXT *text_init(SCR *, const CHAR_T *, size_t, size_t); +void text_lfree(TEXTH *); +void text_free(TEXT *); +int del(SCR *, MARK *, MARK *, int); +int looks_utf8(const char *, size_t); +int looks_utf16(const char *, size_t); +int decode_utf8(const char *); +int decode_utf16(const char *, int); +FREF *file_add(SCR *, char *); +int file_init(SCR *, FREF *, char *, int); +int file_end(SCR *, EXF *, int); +int file_write(SCR *, MARK *, MARK *, char *, int); +int file_m1(SCR *, int, int); +int file_m2(SCR *, int); +int file_m3(SCR *, int); +int file_aw(SCR *, int); +void set_alt_name(SCR *, char *); +lockr_t file_lock(SCR *, char *, int, int); +int v_key_init(SCR *); +void v_key_ilookup(SCR *); +size_t v_key_len(SCR *, ARG_CHAR_T); +char *v_key_name(SCR *, ARG_CHAR_T); +e_key_t v_key_val(SCR *, ARG_CHAR_T); +int v_event_push(SCR *, EVENT *, CHAR_T *, size_t, u_int); +int v_event_get(SCR *, EVENT *, int, u_int32_t); +void v_event_err(SCR *, EVENT *); +int v_event_flush(SCR *, u_int); +int db_eget(SCR *, recno_t, CHAR_T **, size_t *, int *); +int db_get(SCR *, recno_t, u_int32_t, CHAR_T **, size_t *); +int db_delete(SCR *, recno_t); +int db_append(SCR *, int, recno_t, CHAR_T *, size_t); +int db_insert(SCR *, recno_t, CHAR_T *, size_t); +int db_set(SCR *, recno_t, CHAR_T *, size_t); +int db_exist(SCR *, recno_t); +int db_last(SCR *, recno_t *); +int db_rget(SCR *, recno_t, char **, size_t *); +int db_rset(SCR *, recno_t, char *, size_t); +void db_err(SCR *, recno_t); +int log_init(SCR *, EXF *); +int log_end(SCR *, EXF *); +int log_cursor(SCR *); +int log_line(SCR *, recno_t, u_int); +int log_mark(SCR *, LMARK *); +int log_backward(SCR *, MARK *); +int log_setline(SCR *); +int log_forward(SCR *, MARK *); +int editor(GS *, int, char *[]); +void v_end(GS *); +int mark_init(SCR *, EXF *); +int mark_end(SCR *, EXF *); +int mark_get(SCR *, ARG_CHAR_T, MARK *, mtype_t); +int mark_set(SCR *, ARG_CHAR_T, MARK *, int); +int mark_insdel(SCR *, lnop_t, recno_t); +void msgq(SCR *, mtype_t, const char *, ...); +void msgq_wstr(SCR *, mtype_t, const CHAR_T *, const char *); +void msgq_str(SCR *, mtype_t, const char *, const char *); +void mod_rpt(SCR *); +void msgq_status(SCR *, recno_t, u_int); +int msg_open(SCR *, char *); +void msg_close(GS *); +const char *msg_cmsg(SCR *, cmsg_t, size_t *); +const char *msg_cat(SCR *, const char *, size_t *); +char *msg_print(SCR *, const char *, int *); +int opts_init(SCR *, int *); +int opts_set(SCR *, ARGS *[], char *); +int o_s
svn commit: r365496 - in vendor/nvi/2.2.0: . catalog cl common docs ex files man vi
Author: bapt Date: Wed Sep 9 07:58:35 2020 New Revision: 365496 URL: https://svnweb.freebsd.org/changeset/base/365496 Log: Tag import of nvi 2.2.0 Added: vendor/nvi/2.2.0/ - copied from r365494, vendor/nvi/dist/ vendor/nvi/2.2.0/.gitignore - copied unchanged from r365495, vendor/nvi/dist/.gitignore vendor/nvi/2.2.0/CMakeLists.txt - copied unchanged from r365495, vendor/nvi/dist/CMakeLists.txt vendor/nvi/2.2.0/catalog/tr_TR.ISO8859-9.base - copied unchanged from r365495, vendor/nvi/dist/catalog/tr_TR.ISO8859-9.base vendor/nvi/2.2.0/catalog/tr_TR.ISO8859-9.owner - copied unchanged from r365495, vendor/nvi/dist/catalog/tr_TR.ISO8859-9.owner vendor/nvi/2.2.0/catalog/tr_TR.UTF-8.base - copied unchanged from r365495, vendor/nvi/dist/catalog/tr_TR.UTF-8.base vendor/nvi/2.2.0/catalog/tr_TR.UTF-8.owner - copied unchanged from r365495, vendor/nvi/dist/catalog/tr_TR.UTF-8.owner vendor/nvi/2.2.0/files/ - copied from r365495, vendor/nvi/dist/files/ vendor/nvi/2.2.0/man/ - copied from r365495, vendor/nvi/dist/man/ Replaced: vendor/nvi/2.2.0/LICENSE - copied unchanged from r365495, vendor/nvi/dist/LICENSE vendor/nvi/2.2.0/README - copied unchanged from r365495, vendor/nvi/dist/README vendor/nvi/2.2.0/catalog/Makefile - copied unchanged from r365495, vendor/nvi/dist/catalog/Makefile vendor/nvi/2.2.0/catalog/README - copied unchanged from r365495, vendor/nvi/dist/catalog/README vendor/nvi/2.2.0/catalog/dump.c - copied unchanged from r365495, vendor/nvi/dist/catalog/dump.c vendor/nvi/2.2.0/cl/README.signal - copied unchanged from r365495, vendor/nvi/dist/cl/README.signal vendor/nvi/2.2.0/cl/cl.h - copied unchanged from r365495, vendor/nvi/dist/cl/cl.h vendor/nvi/2.2.0/cl/cl_funcs.c - copied unchanged from r365495, vendor/nvi/dist/cl/cl_funcs.c vendor/nvi/2.2.0/cl/cl_main.c - copied unchanged from r365495, vendor/nvi/dist/cl/cl_main.c vendor/nvi/2.2.0/cl/cl_read.c - copied unchanged from r365495, vendor/nvi/dist/cl/cl_read.c vendor/nvi/2.2.0/cl/cl_screen.c - copied unchanged from r365495, vendor/nvi/dist/cl/cl_screen.c vendor/nvi/2.2.0/cl/cl_term.c - copied unchanged from r365495, vendor/nvi/dist/cl/cl_term.c vendor/nvi/2.2.0/common/args.h - copied unchanged from r365495, vendor/nvi/dist/common/args.h vendor/nvi/2.2.0/common/common.h - copied unchanged from r365495, vendor/nvi/dist/common/common.h vendor/nvi/2.2.0/common/conv.c - copied unchanged from r365495, vendor/nvi/dist/common/conv.c vendor/nvi/2.2.0/common/conv.h - copied unchanged from r365495, vendor/nvi/dist/common/conv.h vendor/nvi/2.2.0/common/cut.c - copied unchanged from r365495, vendor/nvi/dist/common/cut.c vendor/nvi/2.2.0/common/cut.h - copied unchanged from r365495, vendor/nvi/dist/common/cut.h vendor/nvi/2.2.0/common/delete.c - copied unchanged from r365495, vendor/nvi/dist/common/delete.c vendor/nvi/2.2.0/common/encoding.c - copied unchanged from r365495, vendor/nvi/dist/common/encoding.c vendor/nvi/2.2.0/common/exf.c - copied unchanged from r365495, vendor/nvi/dist/common/exf.c vendor/nvi/2.2.0/common/exf.h - copied unchanged from r365495, vendor/nvi/dist/common/exf.h vendor/nvi/2.2.0/common/gs.h - copied unchanged from r365495, vendor/nvi/dist/common/gs.h vendor/nvi/2.2.0/common/key.c - copied unchanged from r365495, vendor/nvi/dist/common/key.c vendor/nvi/2.2.0/common/key.h - copied unchanged from r365495, vendor/nvi/dist/common/key.h vendor/nvi/2.2.0/common/line.c - copied unchanged from r365495, vendor/nvi/dist/common/line.c vendor/nvi/2.2.0/common/log.c - copied unchanged from r365495, vendor/nvi/dist/common/log.c vendor/nvi/2.2.0/common/log.h - copied unchanged from r365495, vendor/nvi/dist/common/log.h vendor/nvi/2.2.0/common/main.c - copied unchanged from r365495, vendor/nvi/dist/common/main.c vendor/nvi/2.2.0/common/mark.c - copied unchanged from r365495, vendor/nvi/dist/common/mark.c vendor/nvi/2.2.0/common/mark.h - copied unchanged from r365495, vendor/nvi/dist/common/mark.h vendor/nvi/2.2.0/common/mem.h - copied unchanged from r365495, vendor/nvi/dist/common/mem.h vendor/nvi/2.2.0/common/msg.c - copied unchanged from r365495, vendor/nvi/dist/common/msg.c vendor/nvi/2.2.0/common/msg.h - copied unchanged from r365495, vendor/nvi/dist/common/msg.h vendor/nvi/2.2.0/common/multibyte.h - copied unchanged from r365495, vendor/nvi/dist/common/multibyte.h vendor/nvi/2.2.0/common/options.c - copied unchanged from r365495, vendor/nvi/dist/common/options.c vendor/nvi/2.2.0/common/options.h - copied unchanged from r365495, vendor/nvi/dist/common/options.h vendor/nvi/2.2.0/common/options_f.c - copied unchanged from r365495, vendor/nvi/dist/common/options_f.c vendor/nvi/2.2.0/common/put.c - copied unchanged from r365495,
svn commit: r365495 - in vendor/nvi/dist: . catalog cl common docs ex files man vi
Author: bapt Date: Wed Sep 9 07:57:59 2020 New Revision: 365495 URL: https://svnweb.freebsd.org/changeset/base/365495 Log: Import nvi 2.2.0 Added: vendor/nvi/dist/.gitignore vendor/nvi/dist/CMakeLists.txt (contents, props changed) vendor/nvi/dist/catalog/tr_TR.ISO8859-9.base vendor/nvi/dist/catalog/tr_TR.ISO8859-9.owner vendor/nvi/dist/catalog/tr_TR.UTF-8.base vendor/nvi/dist/catalog/tr_TR.UTF-8.owner vendor/nvi/dist/files/ vendor/nvi/dist/files/config.h.in (contents, props changed) vendor/nvi/dist/files/pathnames.h.in (contents, props changed) vendor/nvi/dist/files/recover.in (contents, props changed) vendor/nvi/dist/man/ vendor/nvi/dist/man/vi.1 (contents, props changed) Deleted: vendor/nvi/dist/cl/extern.h vendor/nvi/dist/common/extern.h vendor/nvi/dist/common/options_def.h vendor/nvi/dist/docs/ vendor/nvi/dist/ex/ex_def.h vendor/nvi/dist/ex/extern.h vendor/nvi/dist/ex/version.h vendor/nvi/dist/vi/extern.h Modified: vendor/nvi/dist/LICENSE vendor/nvi/dist/README vendor/nvi/dist/catalog/Makefile vendor/nvi/dist/catalog/README vendor/nvi/dist/catalog/dump.c vendor/nvi/dist/cl/README.signal vendor/nvi/dist/cl/cl.h vendor/nvi/dist/cl/cl_funcs.c vendor/nvi/dist/cl/cl_main.c vendor/nvi/dist/cl/cl_read.c vendor/nvi/dist/cl/cl_screen.c vendor/nvi/dist/cl/cl_term.c vendor/nvi/dist/common/args.h vendor/nvi/dist/common/common.h vendor/nvi/dist/common/conv.c vendor/nvi/dist/common/conv.h vendor/nvi/dist/common/cut.c vendor/nvi/dist/common/cut.h vendor/nvi/dist/common/delete.c vendor/nvi/dist/common/encoding.c vendor/nvi/dist/common/exf.c vendor/nvi/dist/common/exf.h vendor/nvi/dist/common/gs.h vendor/nvi/dist/common/key.c vendor/nvi/dist/common/key.h vendor/nvi/dist/common/line.c vendor/nvi/dist/common/log.c vendor/nvi/dist/common/log.h vendor/nvi/dist/common/main.c vendor/nvi/dist/common/mark.c vendor/nvi/dist/common/mark.h vendor/nvi/dist/common/mem.h vendor/nvi/dist/common/msg.c vendor/nvi/dist/common/msg.h vendor/nvi/dist/common/multibyte.h vendor/nvi/dist/common/options.c vendor/nvi/dist/common/options.h vendor/nvi/dist/common/options_f.c vendor/nvi/dist/common/put.c vendor/nvi/dist/common/recover.c vendor/nvi/dist/common/screen.c vendor/nvi/dist/common/screen.h vendor/nvi/dist/common/search.c vendor/nvi/dist/common/seq.c vendor/nvi/dist/common/seq.h vendor/nvi/dist/common/util.c vendor/nvi/dist/common/util.h vendor/nvi/dist/ex/ex.c vendor/nvi/dist/ex/ex.h vendor/nvi/dist/ex/ex_abbrev.c vendor/nvi/dist/ex/ex_append.c vendor/nvi/dist/ex/ex_args.c vendor/nvi/dist/ex/ex_argv.c vendor/nvi/dist/ex/ex_at.c vendor/nvi/dist/ex/ex_bang.c vendor/nvi/dist/ex/ex_cd.c vendor/nvi/dist/ex/ex_cmd.c vendor/nvi/dist/ex/ex_cscope.c vendor/nvi/dist/ex/ex_delete.c vendor/nvi/dist/ex/ex_display.c vendor/nvi/dist/ex/ex_edit.c vendor/nvi/dist/ex/ex_equal.c vendor/nvi/dist/ex/ex_file.c vendor/nvi/dist/ex/ex_filter.c vendor/nvi/dist/ex/ex_global.c vendor/nvi/dist/ex/ex_init.c vendor/nvi/dist/ex/ex_join.c vendor/nvi/dist/ex/ex_map.c vendor/nvi/dist/ex/ex_mark.c vendor/nvi/dist/ex/ex_mkexrc.c vendor/nvi/dist/ex/ex_move.c vendor/nvi/dist/ex/ex_open.c vendor/nvi/dist/ex/ex_preserve.c vendor/nvi/dist/ex/ex_print.c vendor/nvi/dist/ex/ex_put.c vendor/nvi/dist/ex/ex_quit.c vendor/nvi/dist/ex/ex_read.c vendor/nvi/dist/ex/ex_screen.c vendor/nvi/dist/ex/ex_script.c vendor/nvi/dist/ex/ex_set.c vendor/nvi/dist/ex/ex_shell.c vendor/nvi/dist/ex/ex_shift.c vendor/nvi/dist/ex/ex_source.c vendor/nvi/dist/ex/ex_stop.c vendor/nvi/dist/ex/ex_subst.c vendor/nvi/dist/ex/ex_tag.c vendor/nvi/dist/ex/ex_txt.c vendor/nvi/dist/ex/ex_undo.c vendor/nvi/dist/ex/ex_usage.c vendor/nvi/dist/ex/ex_util.c vendor/nvi/dist/ex/ex_version.c vendor/nvi/dist/ex/ex_visual.c vendor/nvi/dist/ex/ex_write.c vendor/nvi/dist/ex/ex_yank.c vendor/nvi/dist/ex/ex_z.c vendor/nvi/dist/ex/script.h vendor/nvi/dist/ex/tag.h vendor/nvi/dist/vi/getc.c vendor/nvi/dist/vi/v_at.c vendor/nvi/dist/vi/v_ch.c vendor/nvi/dist/vi/v_cmd.c vendor/nvi/dist/vi/v_delete.c vendor/nvi/dist/vi/v_ex.c vendor/nvi/dist/vi/v_increment.c vendor/nvi/dist/vi/v_init.c vendor/nvi/dist/vi/v_itxt.c vendor/nvi/dist/vi/v_left.c vendor/nvi/dist/vi/v_mark.c vendor/nvi/dist/vi/v_match.c vendor/nvi/dist/vi/v_paragraph.c vendor/nvi/dist/vi/v_put.c vendor/nvi/dist/vi/v_redraw.c vendor/nvi/dist/vi/v_replace.c vendor/nvi/dist/vi/v_right.c vendor/nvi/dist/vi/v_screen.c vendor/nvi/dist/vi/v_scroll.c vendor/nvi/dist/vi/v_search.c vendor/nvi/dist/vi/v_section.c vendor/nvi/dist/vi/v_sentence.c vendor/nvi/dist/vi/v_status.c vendor/nvi/dist/vi/v_txt.c vendor/nvi/dist/vi/v_ulcase.c vendor/nvi/dist/vi/v_undo.c vendor/nvi/dist/vi/v_util.c vendor/nvi/dist/vi/v_word.c vendor/nvi/dist/vi/v_xchar.c vendor/nvi/dist/vi/v_yank.c vendor/nvi/dis
Re: svn commit: r365052 - head/usr.bin/script
On Tue, Sep 01, 2020 at 04:11:23PM +, Warner Losh wrote: > Author: imp > Date: Tue Sep 1 16:11:23 2020 > New Revision: 365052 > URL: https://svnweb.freebsd.org/changeset/base/365052 > > Log: > Have script accept and ignore -e for Linux compat > > In the util-linux version of script, it will always exit with succes. > Except when run with -e, in which case it will have the exit value of > the child. BSD Script already uses the child's exit value for its exit > value. Some config and other helper scripts depend on being able to > specify -e. Accept it for compatibility since we'll already to the > right thing, but otherwise we ignore it. > > Modified: > head/usr.bin/script/script.1 > head/usr.bin/script/script.c > > Modified: head/usr.bin/script/script.1 > == > --- head/usr.bin/script/script.1 Tue Sep 1 15:52:18 2020 > (r365051) > +++ head/usr.bin/script/script.1 Tue Sep 1 16:11:23 2020 > (r365052) > @@ -36,7 +36,7 @@ > .Nd make typescript of terminal session > .Sh SYNOPSIS > .Nm > -.Op Fl adfkpqr > +.Op Fl adefkpqr > .Op Fl F Ar pipe > .Op Fl t Ar time > .Op Ar file Op Ar command ... > @@ -77,6 +77,12 @@ retaining the prior contents. > When playing back a session with the > .Fl p > flag, do not sleep between records when playing back a timestamped session. > +.It Fl e > +Accepted for compatibility with > +.Em util-linux > +.Nm . > +The child command exit status is always the exit status of > +.Nm . > .It Fl F Ar pipe > Immediately flush output after each write. > This will allow a user to create a named pipe using > > Modified: head/usr.bin/script/script.c > == > --- head/usr.bin/script/script.c Tue Sep 1 15:52:18 2020 > (r365051) > +++ head/usr.bin/script/script.c Tue Sep 1 16:11:23 2020 > (r365052) > @@ -111,13 +111,15 @@ main(int argc, char *argv[]) > warning. (not needed w/clang) */ > showexit = 0; > > - while ((ch = getopt(argc, argv, "adFfkpqrt:")) != -1) > + while ((ch = getopt(argc, argv, "adeFfkpqrt:")) != -1) > switch(ch) { > case 'a': > aflg = 1; > break; > case 'd': > usesleep = 0; > + break; > + case 'e': /* Default behaior, accepted for linux compat */ ^^^ You have a typo here, Best regards, Bapt signature.asc Description: PGP signature
svn commit: r365041 - head/usr.bin/diff
Author: bapt Date: Tue Sep 1 14:52:39 2020 New Revision: 365041 URL: https://svnweb.freebsd.org/changeset/base/365041 Log: diff: always properly kill pr(1) When diff is invoked with -l it will spawn the pr(1) program. In some circumpstances the pr(1) was not properly killed when diff program exits. Submitted by: Bret Ketchum MFC after:3 days Differential Revision:https://reviews.freebsd.org/D26232 Modified: head/usr.bin/diff/diffreg.c Modified: head/usr.bin/diff/diffreg.c == --- head/usr.bin/diff/diffreg.c Tue Sep 1 14:52:35 2020(r365040) +++ head/usr.bin/diff/diffreg.c Tue Sep 1 14:52:39 2020(r365041) @@ -412,10 +412,10 @@ diffreg(char *file1, char *file2, int flags, int capsi ixnew = xreallocarray(ixnew, len[1] + 2, sizeof(*ixnew)); check(f1, f2, flags); output(file1, f1, file2, f2, flags); - if (pr != NULL) - stop_pr(pr); closem: + if (pr != NULL) + stop_pr(pr); if (anychange) { status |= 1; if (rval == D_SAME) @@ -1704,4 +1704,4 @@ print_space(int nc, int n, int flags) { } } diff_output("%*s", col, ""); -} \ No newline at end of file +} ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r363091 - in head/contrib/bc: . include manuals src tests tests/bc
On Thu, Jul 30, 2020 at 05:35:20PM +0100, Jessica Clarke wrote: > On 30 Jul 2020, at 17:31, Baptiste Daroussin wrote: > > On Thu, Jul 30, 2020 at 05:28:19PM +0100, Jessica Clarke wrote: > >> On 30 Jul 2020, at 17:20, Baptiste Daroussin wrote: > >>> On Sat, Jul 11, 2020 at 07:33:19AM +, Stefan Eßer wrote: > >>>> Author: se > >>>> Date: Sat Jul 11 07:33:18 2020 > >>>> New Revision: 363091 > >>>> URL: https://svnweb.freebsd.org/changeset/base/363091 > >>>> > >>>> Log: > >>>> Update to version 3.1.3 > >>>> > >>> Jumping on that commit, since the switch from our previous bc. > >>> > >>> The output of the interactive bc has changed, the previous version had a > >>> clean > >>> UI, the new version "pollutes" the output with plenty of lines about the > >>> copyright: > >>> > >>> > >>> Copyright (c) 2018-2020 Gavin D. Howard and contributors > >>> Report bugs at: https://git.yzena.com/gavin/bc > >>> > >>> This is free software with ABSOLUTELY NO WARRANTY. > >>> > >>> > >>> Imagine if all programs where doing that, it would be painful, do you > >>> think > >>> upstream can be convinced to remove those lines? > >>> > >>> I no the GNU version also has the same polluted output which was one of > >>> the > >>> reason I was happy with out previous version of bc. > >> > >> By default both will print such a banner if and only if being called > >> interactively. You can disable the banner explicitly with -q/--quiet > >> for both GNU bc and this bc. I agree it's a bit noisy and would be > >> nicer to not have that printed, but it's not without precedent for > >> REPL-like things. > > > > Yes it is not without precedent for REPL-like things, still I dislike this > > and > > would be happy to get bc interactive be as nice as the previous one we had > > :) > > > > If not I will deal with it and just yell internally each time I run it :D > > `alias bc='bc -q'` / `alias bc bc -q` and preserve your inner zen? :) > That was my actual plan but it was less fun to write :D Bapt signature.asc Description: PGP signature
Re: svn commit: r363091 - in head/contrib/bc: . include manuals src tests tests/bc
On Thu, Jul 30, 2020 at 05:28:19PM +0100, Jessica Clarke wrote: > On 30 Jul 2020, at 17:20, Baptiste Daroussin wrote: > > On Sat, Jul 11, 2020 at 07:33:19AM +, Stefan Eßer wrote: > >> Author: se > >> Date: Sat Jul 11 07:33:18 2020 > >> New Revision: 363091 > >> URL: https://svnweb.freebsd.org/changeset/base/363091 > >> > >> Log: > >> Update to version 3.1.3 > >> > > Jumping on that commit, since the switch from our previous bc. > > > > The output of the interactive bc has changed, the previous version had a > > clean > > UI, the new version "pollutes" the output with plenty of lines about the > > copyright: > > > > > > Copyright (c) 2018-2020 Gavin D. Howard and contributors > > Report bugs at: https://git.yzena.com/gavin/bc > > > > This is free software with ABSOLUTELY NO WARRANTY. > > > > > > Imagine if all programs where doing that, it would be painful, do you think > > upstream can be convinced to remove those lines? > > > > I no the GNU version also has the same polluted output which was one of the > > reason I was happy with out previous version of bc. > > By default both will print such a banner if and only if being called > interactively. You can disable the banner explicitly with -q/--quiet > for both GNU bc and this bc. I agree it's a bit noisy and would be > nicer to not have that printed, but it's not without precedent for > REPL-like things. Yes it is not without precedent for REPL-like things, still I dislike this and would be happy to get bc interactive be as nice as the previous one we had :) If not I will deal with it and just yell internally each time I run it :D Bapt signature.asc Description: PGP signature
Re: svn commit: r363091 - in head/contrib/bc: . include manuals src tests tests/bc
On Sat, Jul 11, 2020 at 07:33:19AM +, Stefan Eßer wrote: > Author: se > Date: Sat Jul 11 07:33:18 2020 > New Revision: 363091 > URL: https://svnweb.freebsd.org/changeset/base/363091 > > Log: > Update to version 3.1.3 > Jumping on that commit, since the switch from our previous bc. The output of the interactive bc has changed, the previous version had a clean UI, the new version "pollutes" the output with plenty of lines about the copyright: Copyright (c) 2018-2020 Gavin D. Howard and contributors Report bugs at: https://git.yzena.com/gavin/bc This is free software with ABSOLUTELY NO WARRANTY. Imagine if all programs where doing that, it would be painful, do you think upstream can be convinced to remove those lines? I no the GNU version also has the same polluted output which was one of the reason I was happy with out previous version of bc. Best regards, Bapt signature.asc Description: PGP signature
svn commit: r362488 - in head: contrib/file/magic/Magdir contrib/tcpdump lib/geom/part stand/efi/include stand/i386/boot0 sys/dev/hptmv sys/geom/part usr.bin/fortune/datfiles usr.bin/mkimg usr.sbin...
Author: bapt Date: Mon Jun 22 07:46:24 2020 New Revision: 362488 URL: https://svnweb.freebsd.org/changeset/base/362488 Log: Revert r362466 Such change should not have happen without prior discussion and review. With hat: transitioning core Modified: head/contrib/file/magic/Magdir/filesystems head/contrib/tcpdump/smbutil.c head/lib/geom/part/gpart.8 head/stand/efi/include/efipart.h head/stand/i386/boot0/boot0.S head/sys/dev/hptmv/vdevice.h head/sys/geom/part/g_part_mbr.c head/usr.bin/fortune/datfiles/freebsd-tips head/usr.bin/mkimg/mbr.c head/usr.sbin/boot0cfg/boot0cfg.8 head/usr.sbin/boot0cfg/boot0cfg.c Modified: head/contrib/file/magic/Magdir/filesystems == --- head/contrib/file/magic/Magdir/filesystems Mon Jun 22 07:35:23 2020 (r362487) +++ head/contrib/file/magic/Magdir/filesystems Mon Jun 22 07:46:24 2020 (r362488) @@ -269,8 +269,8 @@ !:strength +65 >2 string OSBSOS/BS MBR # added by Joerg Jenderek at Feb 2013 according to https://thestarman.pcministry.com/asm/mbr/ -# and https://en.wikipedia.org/wiki/Main_Boot_Record -# test for nearly all MS-DOS Main Boot Record initial program loader (IPL) is now done by +# and https://en.wikipedia.org/wiki/Master_Boot_Record +# test for nearly all MS-DOS Master Boot Record initial program loader (IPL) is now done by # characteristic assembler instructions: xor ax,ax;mov ss,ax;mov sp,7c00 >0 search/2\x33\xc0\x8e\xd0\xbc\x00\x7cMS-MBR # Microsoft Windows 95A and early ( https://thestarman.pcministry.com/asm/mbr/STDMBR.htm ) @@ -436,7 +436,7 @@ >>>387 string Copyright\ (c)\ 1984,1998 411string Caldera\ Inc.\0 \b, DR-DOS MBR (IBMBIO.LDR) # -# tests for different MS-DOS Main Boot Records (MBR) moved and merged +# tests for different MS-DOS Master Boot Records (MBR) moved and merged # #>0x145string Default:\ F \b, FREE-DOS MBR #>0x14Bstring Default:\ F \b, FREE-DOS 1.0 MBR @@ -1087,7 +1087,7 @@ >11ubyte x \b+ >11use DOS-filename -# https://en.wikipedia.org/wiki/Main_boot_record#PTE +# https://en.wikipedia.org/wiki/Master_boot_record#PTE # display standard partition table 0 namepartition-table #>0ubyte x PARTITION-TABLE Modified: head/contrib/tcpdump/smbutil.c == --- head/contrib/tcpdump/smbutil.c Mon Jun 22 07:35:23 2020 (r362487) +++ head/contrib/tcpdump/smbutil.c Mon Jun 22 07:46:24 2020 (r362488) @@ -1339,7 +1339,7 @@ static const nt_err_code_struct nt_errors[] = { { 0xC0A6, "STATUS_CANT_OPEN_ANONYMOUS" }, { 0xC0A7, "STATUS_BAD_VALIDATION_CLASS" }, { 0xC0A8, "STATUS_BAD_TOKEN_TYPE" }, - { 0xC0A9, "STATUS_BAD_MAIN_BOOT_RECORD" }, + { 0xC0A9, "STATUS_BAD_MASTER_BOOT_RECORD" }, { 0xC0AA, "STATUS_INSTRUCTION_MISALIGNMENT" }, { 0xC0AB, "STATUS_INSTANCE_NOT_AVAILABLE" }, { 0xC0AC, "STATUS_PIPE_NOT_AVAILABLE" }, Modified: head/lib/geom/part/gpart.8 == --- head/lib/geom/part/gpart.8 Mon Jun 22 07:35:23 2020(r362487) +++ head/lib/geom/part/gpart.8 Mon Jun 22 07:46:24 2020(r362488) @@ -582,7 +582,7 @@ Requires the .Cm GEOM_PART_GPT kernel option. .It Cm MBR -Main Boot Record is used on PCs and removable media. +Master Boot Record is used on PCs and removable media. Requires the .Cm GEOM_PART_MBR kernel option. @@ -852,7 +852,7 @@ for MBR and .Qq Li "!0657fd6d-a4ab-43c4-84e5-0933c84b4f4f" for GPT. .It Cm mbr -A partition that is sub-partitioned by a Main Boot Record (MBR). +A partition that is sub-partitioned by a Master Boot Record (MBR). This type is known as .Qq Li "!024dee41-33e7-11d3-9d69-0008c781f39f" by GPT. @@ -1020,7 +1020,7 @@ option. The GEOM PART class knows how to safely embed bootstrap code into specific partitioning scheme metadata without causing any damage. .Pp -The Main Boot Record (MBR) uses a 512-byte bootstrap code image, embedded +The Master Boot Record (MBR) uses a 512-byte bootstrap code image, embedded into the partition table's metadata area. There are two variants of this bootstrap code: .Pa /boot/mbr @@ -1256,7 +1256,7 @@ present as independent partition. .Em NOTE : This may break a mirrored volume and lead to data damage. .It Va kern.geom.part.mbr.enforce_chs : No 0 -Specify how the Main Boot Record (MBR) module does alignment. +Specify how the Master Boot Record (MBR) module does alignment. If this variable is set to a non-zero value, the module will automatically recalculate the user-specified offset and size for alignment with the CHS geo
svn commit: r362226 - head/share/man/man5
Author: bapt Date: Tue Jun 16 12:40:19 2020 New Revision: 362226 URL: https://svnweb.freebsd.org/changeset/base/362226 Log: Fix typo in the documentation about the daily ntpd status PR: 245679 Submitted by: Taylor Stearns MFC after:3 days Modified: head/share/man/man5/periodic.conf.5 Modified: head/share/man/man5/periodic.conf.5 == --- head/share/man/man5/periodic.conf.5 Tue Jun 16 12:26:23 2020 (r362225) +++ head/share/man/man5/periodic.conf.5 Tue Jun 16 12:40:19 2020 (r362226) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 7, 2018 +.Dd June 16, 2020 .Dt PERIODIC.CONF 5 .Os .Sh NAME @@ -518,7 +518,7 @@ for the previous day. .Pq Vt num Set to the number of maillog files that should be checked for yesterday's mail rejects. -.It Va daily_status_ntpd +.It Va daily_status_ntpd_enable .Pq Vt bool Set to .Dq Li YES ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r361690 - head/usr.bin/diff
Author: bapt Date: Mon Jun 1 09:15:15 2020 New Revision: 361690 URL: https://svnweb.freebsd.org/changeset/base/361690 Log: Document long version of -b option PR: 234195 Submitted by: Fehmi Noyan Isi Reported by: Andras Farkas MFC after:3 days Modified: head/usr.bin/diff/diff.1 Modified: head/usr.bin/diff/diff.1 == --- head/usr.bin/diff/diff.1Mon Jun 1 09:09:36 2020(r361689) +++ head/usr.bin/diff/diff.1Mon Jun 1 09:15:15 2020(r361690) @@ -30,7 +30,7 @@ .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 .\" $FreeBSD$ .\" -.Dd February 13, 2020 +.Dd June 1, 2020 .Dt DIFF 1 .Os .Sh NAME @@ -330,7 +330,7 @@ Use of this option forces to produce a diff. .It Fl B Fl -ignore-blank-lines Causes chunks that include only blank lines to be ignored. -.It Fl b +.It Fl b -ignore-space-change Causes trailing blanks (spaces and tabs) to be ignored, and other strings of blanks to compare equal. .It Fl d -minimal ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r361689 - in head/usr.bin/diff: . tests
Author: bapt Date: Mon Jun 1 09:09:36 2020 New Revision: 361689 URL: https://svnweb.freebsd.org/changeset/base/361689 Log: diff: restore compatibility with GNU diff regarding -N option When -N is used the missing files are treated as empty. PR: 233402 Submitted by: Fehmi Noyan Isi Reported by: Roman Neuhauser MFC after:3 days Differential Revision:D25081 Modified: head/usr.bin/diff/diff.c head/usr.bin/diff/tests/diff_test.sh Modified: head/usr.bin/diff/diff.c == --- head/usr.bin/diff/diff.cMon Jun 1 09:01:13 2020(r361688) +++ head/usr.bin/diff/diff.cMon Jun 1 09:09:36 2020(r361689) @@ -27,6 +27,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -351,13 +352,33 @@ main(int argc, char **argv) if (strcmp(argv[0], "-") == 0) { fstat(STDIN_FILENO, &stb1); gotstdin = 1; - } else if (stat(argv[0], &stb1) != 0) - err(2, "%s", argv[0]); + } else if (stat(argv[0], &stb1) != 0) { + if (!Nflag || errno != ENOENT) + err(2, "%s", argv[0]); + dflags |= D_EMPTY1; + memset(&stb1, 0, sizeof(struct stat)); + } + if (strcmp(argv[1], "-") == 0) { fstat(STDIN_FILENO, &stb2); gotstdin = 1; - } else if (stat(argv[1], &stb2) != 0) - err(2, "%s", argv[1]); + } else if (stat(argv[1], &stb2) != 0) { + if (!Nflag || errno != ENOENT) + err(2, "%s", argv[1]); + dflags |= D_EMPTY2; + memset(&stb2, 0, sizeof(stb2)); + stb2.st_mode = stb1.st_mode; + } + + if (dflags & D_EMPTY1 && dflags & D_EMPTY2){ + warn("%s", argv[0]); + warn("%s", argv[1]); + exit(2); + } + + if (stb1.st_mode == 0) + stb1.st_mode = stb2.st_mode; + if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode))) errx(2, "can't compare - to a directory"); set_argstr(oargv, argv); Modified: head/usr.bin/diff/tests/diff_test.sh == --- head/usr.bin/diff/tests/diff_test.shMon Jun 1 09:01:13 2020 (r361688) +++ head/usr.bin/diff/tests/diff_test.shMon Jun 1 09:09:36 2020 (r361689) @@ -10,6 +10,7 @@ atf_test_case side_by_side atf_test_case brief_format atf_test_case b230049 atf_test_case Bflag +atf_test_case Nflag atf_test_case tabsize atf_test_case conflicting_format atf_test_case label @@ -165,6 +166,15 @@ Bflag_body() atf_check -s exit:1 -o file:"$(atf_get_srcdir)/Bflag_F.out" diff -B E F } +Nflag_body() +{ + atf_check -x 'printf "foo" > A' + + atf_check -s exit:1 -o ignore -e ignore diff -N A NOFILE + atf_check -s exit:1 -o ignore -e ignore diff -N NOFILE A + atf_check -s exit:2 -o ignore -e ignore diff -N NOFILE1 NOFILE2 +} + tabsize_body() { printf "\tA\n" > A @@ -219,6 +229,7 @@ atf_init_test_cases() atf_add_test_case brief_format atf_add_test_case b230049 atf_add_test_case Bflag + atf_add_test_case Nflag atf_add_test_case tabsize atf_add_test_case conflicting_format atf_add_test_case label ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r361688 - in head/usr.bin/diff: . tests
Author: bapt Date: Mon Jun 1 09:01:13 2020 New Revision: 361688 URL: https://svnweb.freebsd.org/changeset/base/361688 Log: Restore compatibility with GNU diff regarding --label Various options to "diff(1)" show filenames, and traditionally make use of the "--label" parameter, if set. Restore this behaviour in BSD diff. While here add a regression test PR: 244533 Submitted by: Jamie Landeg-Jones MFC after:3 days Modified: head/usr.bin/diff/diff.c head/usr.bin/diff/tests/diff_test.sh Modified: head/usr.bin/diff/diff.c == --- head/usr.bin/diff/diff.cMon Jun 1 06:10:25 2020(r361687) +++ head/usr.bin/diff/diff.cMon Jun 1 09:01:13 2020(r361688) @@ -465,6 +465,9 @@ print_only(const char *path, size_t dirlen, const char void print_status(int val, char *path1, char *path2, const char *entry) { + if (label[0] != NULL) path1 = label[0]; + if (label[1] != NULL) path2 = label[1]; + switch (val) { case D_BINARY: printf("Binary files %s%s and %s%s differ\n", Modified: head/usr.bin/diff/tests/diff_test.sh == --- head/usr.bin/diff/tests/diff_test.shMon Jun 1 06:10:25 2020 (r361687) +++ head/usr.bin/diff/tests/diff_test.shMon Jun 1 09:01:13 2020 (r361688) @@ -12,6 +12,7 @@ atf_test_case b230049 atf_test_case Bflag atf_test_case tabsize atf_test_case conflicting_format +atf_test_case label simple_body() { @@ -195,6 +196,17 @@ conflicting_format_body() atf_check -s exit:1 -o ignore -e ignore diff --normal --normal A B } +label_body() +{ + printf "\tA\n" > A + + atf_check -o inline:"Files hello and world are identical\n" \ + -s exit:0 diff --label hello --label world -s A A + + atf_check -o inline:"Binary files hello and world differ\n" \ + -s exit:1 diff --label hello --label world `which diff` `which ls` +} + atf_init_test_cases() { atf_add_test_case simple @@ -209,4 +221,5 @@ atf_init_test_cases() atf_add_test_case Bflag atf_add_test_case tabsize atf_add_test_case conflicting_format + atf_add_test_case label } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r361361 - head/share/misc
Author: bapt Date: Fri May 22 09:38:44 2020 New Revision: 361361 URL: https://svnweb.freebsd.org/changeset/base/361361 Log: Update pciids to 2020.05.22 MFC after:2 days Modified: head/share/misc/pci_vendors Modified: head/share/misc/pci_vendors == --- head/share/misc/pci_vendors Fri May 22 09:17:07 2020(r361360) +++ head/share/misc/pci_vendors Fri May 22 09:38:44 2020(r361361) @@ -2,8 +2,8 @@ # List of PCI ID's # -# Version: 2020.02.22 -# Date:2020-02-22 03:15:04 +# Version: 2020.05.22 +# Date:2020-05-22 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -438,8 +438,8 @@ 1028 1fd1 PERC H730P MX 17aa 1052 ThinkServer RAID 720i 17aa 1053 ThinkServer RAID 720ix - 1bd4 0014 6G SAS3108 2G - 1bd4 0015 6G SAS3108 4G + 1bd4 0014 12G SAS3108 2G + 1bd4 0015 12G SAS3108 4G 1d49 0600 ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter 1d49 0608 ThinkSystem RAID 730-8i 2GB Flash PCIe 12Gb Adapter 1d49 0609 ThinkSystem RAID 730-8i 4GB Flash PCIe 12Gb Adapter @@ -456,6 +456,7 @@ 1028 1f4c PERC H330 Mini (for blades) 1028 1f4d PERC H330 Embedded (for monolithic) 1054 306a SAS 3004 iMR ROMB + 1734 1211 PRAID CP400i [D3307-A12] 1d49 04db ServeRAID M1210 SAS/SATA Controller 1d49 0504 ThinkSystem RAID 520-8i PCIe 12Gb Adapter 0060 MegaRAID SAS 1078 @@ -655,10 +656,13 @@ 1028 1fd3 HBA330 MMZ # Supermicro AOC-S3008L-L8e uses 0808 for their SAS3008 SAS controller 15d9 0808 AOC-S3008L-L8e + 1bd4 0008 12G SAS3008IMR Onboard 1bd4 000b 12G SAS3008IR 1bd4 000c 12G SAS3008IT 1bd4 0011 Inspur 12Gb 8i-3008 IT SAS HBA 1bd4 0012 12Gb SAS3008IR UDM + 1bd4 001f 12G SAS3008IR Onboard + 1bd4 0020 12G SAS3008IT Onboard 1bd4 0026 12G SAS3008IT RACK 1bd4 0027 12G SAS3008IMR RACK 1bd4 0028 12G SAS3008IR RACK @@ -929,11 +933,13 @@ 1561 Anubis 15d8 Picasso 103c 8615 Pavilion Laptop 15-cw1xxx + 17aa 5124 ThinkPad E595 15dd Raven Ridge [Radeon Vega Series / Radeon Vega Mobile Series] 103c 83c6 Radeon Vega 8 Mobile 1458 d000 Radeon RX Vega 11 15de Raven/Raven2/Fenghuang HDMI/DP Audio Controller 103c 8615 Pavilion Laptop 15-cw1xxx + 17aa 5124 ThinkPad E595 15df Raven/Raven2/Fenghuang/Renoir Cryptographic Coprocessor 103c 8615 Pavilion Laptop 15-cw1xxx 15ff Fenghuang [Zhongshan Subor Z+] @@ -1120,6 +1126,7 @@ 105b 0e13 N15235/A74MX mainboard / AMD SB700 1179 ff50 Satellite P305D-S8995E 1458 a022 GA-MA770-DS3rev2.0 Motherboard + 1458 a102 GA-880GMA-USB3 17f2 5000 KI690-AM2 Motherboard 4384 SBx00 PCI to PCI Bridge 4385 SBx00 SMBus Controller @@ -1190,6 +1197,7 @@ 1043 8443 M5A88-V EVO 1043 84dd M5A99X EVO (R1.0) SB950 105b 0e13 N15235/A74MX mainboard / AMD SB700 + 1458 b002 GA-880GMA-USB3 174b 1001 PURE Fusion Mini 4392 SB7x0/SB8x0/SB9x0 SATA Controller [Non-RAID5 mode] 105b 0e13 N15235/A74MX mainboard / AMD SB700 @@ -1203,6 +1211,7 @@ 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO 105b 0e13 N15235/A74MX mainboard / AMD SB700 + 1458 5004 GA-880GMA-USB3 15d9 a811 H8DGU 174b 1001 PURE Fusion Mini 4397 SB7x0/SB8x0/SB9x0 USB OHCI0 Controller @@ -1212,6 +1221,7 @@ 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO 105b 0e13 N15235/A74MX mainboard / AMD SB700 + 1458 5004 GA-880GMA-USB3 15d9 a811 H8DGU 174b 1001 PURE Fusion Mini 4398 SB7x0 USB OHCI1 Controller @@ -1224,6 +1234,7 @@ 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO 105b 0e13 N15235/A74MX mainboard / AMD SB700 + 1458 5004 GA-880GMA-USB3 174b 1001 PURE Fusion Mini 439c SB7x0/SB8x0/SB9x0 IDE Controller 1002 4392 MSI MS-7713 motherboard @@ -1878,9 +1889,9 @@ 1642 3c81 Radeon HD 8670 1642 3c91 Radeon HD 8670 1642 3f09 Radeon R7 350 - 6611 Oland [
svn commit: r360778 - head/share/termcap
Author: bapt Date: Thu May 7 12:43:28 2020 New Revision: 360778 URL: https://svnweb.freebsd.org/changeset/base/360778 Log: Update the screen termcap entries Those updates have been obtained form converting the terminfo information provided by the screen sources to termcap. MFC after:3 days Modified: head/share/termcap/termcap Modified: head/share/termcap/termcap == --- head/share/termcap/termcap Thu May 7 11:28:39 2020(r360777) +++ head/share/termcap/termcap Thu May 7 12:43:28 2020(r360778) @@ -2758,35 +2758,35 @@ vt340-color|vt340 co:\ # SC,SB,SH,SW names needed for screen(1) # SC|screen|VT 100/ANSI X3.64 virtual terminal:\ - :am:xn:ms:mi:G0:km:\ - :DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:bs:bt=\E[Z:\ - :cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:ct=\E[3g:\ - :do=^J:nd=\E[C:pt:rc=\E8:rs=\Ec:sc=\E7:st=\EH:up=\EM:\ - :le=^H:bl=^G:cr=^M:it#8:ho=\E[H:nw=\EE:ta=^I:is=\E)0:\ - :li#24:co#80:us=\E[4m:ue=\E[24m:so=\E[3m:se=\E[23m:\ - :mb=\E[5m:md=\E[1m:mr=\E[7m:me=\E[m:sr=\EM:al=\E[L:\ - :AL=\E[%dL:dl=\E[M:DL=\E[%dM:cs=\E[%i%d;%dr:dc=\E[P:\ - :DC=\E[%dP:im=\E[4h:ei=\E[4l:IC=\E[%d@:\ - :ks=\E[?1h\E=:ke=\E[?1l\E>:vb=\Eg:\ - :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\ - :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\ - :k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\ - :F3=\E[25~:F4=\E[26~:F5=\E[28~:F6=\E[29~:\ - :F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\ - :kh=\E[1~:kI=\E[2~:kD=\E[3~:@7=\E[4~:kP=\E[5~:\ - :kN=\E[6~:eA=\E(B\E)0:as=^N:ae=^O:ti=\E[?1049h:te=\E[?1049l:\ - :vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l:\ - :Co#8:pa#64:AF=\E[3%dm:AB=\E[4%dm:op=\E[39;49m:AX:\ - :ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++,,hhII00: + :am:km:mi:ms:xn:\ + :Co#8:co#80:it#8:li#24:pa#64:\ + :@7=\E[4~:AB=\E[4%dm:AF=\E[3%dm:AL=\E[%dL:DC=\E[%dP:\ + :DL=\E[%dM:DO=\E[%dB:F1=\E[23~:F2=\E[24~:IC=\E[%d@:\ + :LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\ + :ac=++,,--..00II``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\ + :ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:cb=\E[1K:cd=\E[J:ce=\E[K:\ + :cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=\r:cs=\E[%i%d;%dr:\ + :ct=\E[3g:dc=\E[P:dl=\E[M:do=\n:eA=\E(B\E)0:ei=\E[4l:\ + :ho=\E[H:im=\E[4h:is=\E)0:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\ + :k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\ + :k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kd=\EOB:\ + :ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\ + :ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\ + :nw=\EE:op=\E[39;49m:rc=\E8:rs=\Ec:sc=\E7:se=\E[23m:sf=\n:\ + :so=\E[3m:sr=\EM:st=\EH:ta=^I:te=\E[?1049l:ti=\E[?1049h:\ + :ue=\E[24m:up=\EM:us=\E[4m:vb=\Eg:ve=\E[34h\E[?25h:\ + :vi=\E[?25l:vs=\E[34l: SB|screen-bce|VT 100/ANSI X3.64 virtual terminal with bce:\ :ut:tc=screen: SH|screen-s|VT 100/ANSI X3.64 virtual terminal with hardstatus line:\ - :ts=\E_:fs=\E\\:ds=\E_\E\\:tc=screen: + :ut:hs:ts=\E_:fs=\E\\:ds=\E_\E\\:tc=screen: SW|screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols:\ :co#132:tc=screen: screen-256color|VT 100/ANSI X3.64 terminal with 256 colors:\ + :cc:\ :Co#256:pa#32767:\ - :AB=\E[48;5;%dm:AF=\E[38;5;%dm:tc=screen: + :AB=\E[48;5;%dm:AF=\E[38;5;%dm:\ + :Sb=\E[48;5;%dm:Sf=\E[38;5;%dm:tc=screen: ecma+italics|ECMA-48 italics:\ :ZH=\E[3m:ZR=\E[23m: ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r360775 - head/share/termcap
Author: bapt Date: Thu May 7 08:58:08 2020 New Revision: 360775 URL: https://svnweb.freebsd.org/changeset/base/360775 Log: Fix indentation of the Kitty entry MFC after:2 days Modified: head/share/termcap/termcap Modified: head/share/termcap/termcap == --- head/share/termcap/termcap Thu May 7 08:22:47 2020(r360774) +++ head/share/termcap/termcap Thu May 7 08:58:08 2020(r360775) @@ -4752,22 +4752,22 @@ xterm-kitty|KovId's TTY:\ :tc=xterm-256color:tc=kitty+common: kitty+common|KovId's TTY common properties:\ -:am:hs:km:mi:ms:xn:\ -:co#80:it#8:li#24:\ -:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:K1=:K3=:\ -:K4=:K5=:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\ -:ae=\E(B:al=\E[L:as=\E(0:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\ -:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=\r:cs=\E[%i%d;%dr:\ -:ct=\E[3g:dc=\E[P:dl=\E[M:do=\n:ds=\E]2;\007:ec=\E[%dX:\ -:ei=\E[4l:fs=^G:ho=\E[H:im=\E[4h:k1=\EOP:k2=\EOQ:k3=\EOR:\ -:k4=\EOS:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\ -:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:\ -:kd=\EOB:ke=\E[?1l:kh=\EOH:kl=\EOD:kr=\EOC:ks=\E[?1h:\ -:ku=\EOA:le=^H:md=\E[1m:me=\E[0m:mh=\E[2m:mr=\E[7m:nd=\E[C:\ -:rc=\E8:sc=\E7:se=\E[27m:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=^I:\ -:te=\E[?1049l:ti=\E[?1049h:ts=\E]2;:ue=\E[24m:up=\E[A:\ -:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?12l\E[?25h:vi=\E[?25l:\ -:vs=\E[?12;25h: + :am:hs:km:mi:ms:xn:\ + :co#80:it#8:li#24:\ + :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:K1=:K3=:\ + :K4=:K5=:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\ + :ae=\E(B:al=\E[L:as=\E(0:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\ + :cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=\r:cs=\E[%i%d;%dr:\ + :ct=\E[3g:dc=\E[P:dl=\E[M:do=\n:ds=\E]2;\007:ec=\E[%dX:\ + :ei=\E[4l:fs=^G:ho=\E[H:im=\E[4h:k1=\EOP:k2=\EOQ:k3=\EOR:\ + :k4=\EOS:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\ + :k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:\ + :kd=\EOB:ke=\E[?1l:kh=\EOH:kl=\EOD:kr=\EOC:ks=\E[?1h:\ + :ku=\EOA:le=^H:md=\E[1m:me=\E[0m:mh=\E[2m:mr=\E[7m:nd=\E[C:\ + :rc=\E8:sc=\E7:se=\E[27m:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=^I:\ + :te=\E[?1049l:ti=\E[?1049h:ts=\E]2;:ue=\E[24m:up=\E[A:\ + :us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?12l\E[?25h:vi=\E[?25l:\ + :vs=\E[?12;25h: # # END OF TERMCAP ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r359589 - in stable/12/usr.sbin/pw: . tests
Author: bapt Date: Fri Apr 3 05:08:06 2020 New Revision: 359589 URL: https://svnweb.freebsd.org/changeset/base/359589 Log: MFC r359232: pw: do not removed home directories if not owned When deleting a user, if its home directory does not belong to it, it should not be removed. This is the promise that the manpage makes, the tool should ensure that it respects that promise. Add a regression test about it PR: 244967 Submitted by: Eric Hanneken Modified: stable/12/usr.sbin/pw/rm_r.c stable/12/usr.sbin/pw/tests/pw_userdel_test.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/pw/rm_r.c == --- stable/12/usr.sbin/pw/rm_r.cFri Apr 3 05:06:08 2020 (r359588) +++ stable/12/usr.sbin/pw/rm_r.cFri Apr 3 05:08:06 2020 (r359589) @@ -71,5 +71,8 @@ rm_r(int rootfd, const char *path, uid_t uid) closedir(d); if (fstatat(rootfd, path, &st, AT_SYMLINK_NOFOLLOW) != 0) return; - unlinkat(rootfd, path, S_ISDIR(st.st_mode) ? AT_REMOVEDIR : 0); + if (S_ISLNK(st.st_mode)) + unlinkat(rootfd, path, 0); + else if (st.st_uid == uid) + unlinkat(rootfd, path, AT_REMOVEDIR); } Modified: stable/12/usr.sbin/pw/tests/pw_userdel_test.sh == --- stable/12/usr.sbin/pw/tests/pw_userdel_test.sh Fri Apr 3 05:06:08 2020(r359588) +++ stable/12/usr.sbin/pw/tests/pw_userdel_test.sh Fri Apr 3 05:08:06 2020(r359589) @@ -67,10 +67,30 @@ home_not_a_dir_body() { atf_check ${RPW} userdel foo -r } +atf_test_case home_shared +home_shared_body() { + populate_root_etc_skel + mkdir ${HOME}/shared + atf_check ${RPW} useradd -n testuser1 -d /shared + atf_check ${RPW} useradd -n testuser2 -d /shared + atf_check ${RPW} userdel -n testuser1 -r + test -d ${HOME}/shared || atf_fail "Shared home has been removed" +} + +atf_test_case home_regular_dir +home_regular_dir_body() { + populate_root_etc_skel + atf_check ${RPW} useradd -n foo -d /foo + atf_check ${RPW} userdel -n foo -r + [ ! -d ${HOME}/foo ] || atf_fail "Home has not been removed" +} + atf_init_test_cases() { atf_add_test_case rmuser_seperate_group atf_add_test_case user_do_not_try_to_delete_root_if_user_unknown atf_add_test_case delete_files atf_add_test_case delete_numeric_name atf_add_test_case home_not_a_dir + atf_add_test_case home_shared + atf_add_test_case home_regular_dir } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r359590 - stable/12/sbin/setkey
Author: bapt Date: Fri Apr 3 05:11:16 2020 New Revision: 359590 URL: https://svnweb.freebsd.org/changeset/base/359590 Log: MFC r359239, r359241 setkey r359239: Revove useless linking to yacc r359241: Remove the link to libl which only contains a stub function on yywrap, if the flex is told yywrap is not in use, then this linkage becomes unnecessary Modified: stable/12/sbin/setkey/Makefile stable/12/sbin/setkey/token.l Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/setkey/Makefile == --- stable/12/sbin/setkey/Makefile Fri Apr 3 05:08:06 2020 (r359589) +++ stable/12/sbin/setkey/Makefile Fri Apr 3 05:11:16 2020 (r359590) @@ -38,8 +38,6 @@ WARNS?= 1 CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libipsec YFLAGS=-d -LIBADD=l y - CLEANFILES=y.tab.c y.tab.h key_test.o keytest # libpfkey Modified: stable/12/sbin/setkey/token.l == --- stable/12/sbin/setkey/token.l Fri Apr 3 05:08:06 2020 (r359589) +++ stable/12/sbin/setkey/token.l Fri Apr 3 05:11:16 2020 (r359590) @@ -67,6 +67,8 @@ int parse(FILE **); int yyparse(void); %} +%option noyywrap + /* common section */ nl \n ws [ \t]+ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r359588 - in stable/11/usr.sbin/pw: . tests
Author: bapt Date: Fri Apr 3 05:06:08 2020 New Revision: 359588 URL: https://svnweb.freebsd.org/changeset/base/359588 Log: MFC r359232: pw: do not removed home directories if not owned When deleting a user, if its home directory does not belong to it, it should not be removed. This is the promise that the manpage makes, the tool should ensure that it respects that promise. Add a regression test about it PR: 244967 Submitted by: Eric Hanneken Modified: stable/11/usr.sbin/pw/rm_r.c stable/11/usr.sbin/pw/tests/pw_userdel_test.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/pw/rm_r.c == --- stable/11/usr.sbin/pw/rm_r.cFri Apr 3 02:39:46 2020 (r359587) +++ stable/11/usr.sbin/pw/rm_r.cFri Apr 3 05:06:08 2020 (r359588) @@ -71,5 +71,8 @@ rm_r(int rootfd, const char *path, uid_t uid) closedir(d); if (fstatat(rootfd, path, &st, AT_SYMLINK_NOFOLLOW) != 0) return; - unlinkat(rootfd, path, S_ISDIR(st.st_mode) ? AT_REMOVEDIR : 0); + if (S_ISLNK(st.st_mode)) + unlinkat(rootfd, path, 0); + else if (st.st_uid == uid) + unlinkat(rootfd, path, AT_REMOVEDIR); } Modified: stable/11/usr.sbin/pw/tests/pw_userdel_test.sh == --- stable/11/usr.sbin/pw/tests/pw_userdel_test.sh Fri Apr 3 02:39:46 2020(r359587) +++ stable/11/usr.sbin/pw/tests/pw_userdel_test.sh Fri Apr 3 05:06:08 2020(r359588) @@ -67,10 +67,30 @@ home_not_a_dir_body() { atf_check ${RPW} userdel foo -r } +atf_test_case home_shared +home_shared_body() { + populate_root_etc_skel + mkdir ${HOME}/shared + atf_check ${RPW} useradd -n testuser1 -d /shared + atf_check ${RPW} useradd -n testuser2 -d /shared + atf_check ${RPW} userdel -n testuser1 -r + test -d ${HOME}/shared || atf_fail "Shared home has been removed" +} + +atf_test_case home_regular_dir +home_regular_dir_body() { + populate_root_etc_skel + atf_check ${RPW} useradd -n foo -d /foo + atf_check ${RPW} userdel -n foo -r + [ ! -d ${HOME}/foo ] || atf_fail "Home has not been removed" +} + atf_init_test_cases() { atf_add_test_case rmuser_seperate_group atf_add_test_case user_do_not_try_to_delete_root_if_user_unknown atf_add_test_case delete_files atf_add_test_case delete_numeric_name atf_add_test_case home_not_a_dir + atf_add_test_case home_shared + atf_add_test_case home_regular_dir } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r359296 - in head/libexec/rc: . rc.d
Author: bapt Date: Wed Mar 25 08:35:55 2020 New Revision: 359296 URL: https://svnweb.freebsd.org/changeset/base/359296 Log: Revert r359294 per manu's request It breaks etcupdate Reported by: cy Modified: head/libexec/rc/Makefile head/libexec/rc/rc.d/Makefile Modified: head/libexec/rc/Makefile == --- head/libexec/rc/MakefileWed Mar 25 02:28:47 2020(r359295) +++ head/libexec/rc/MakefileWed Mar 25 08:35:55 2020(r359296) @@ -2,28 +2,25 @@ .include -BINDIR=/etc -FILESGROUPS= RCETC RCETCEXEC RCETCDEFAULTS -RCETC= network.subr rc rc.initdiskless rc.subr rc.shutdown rc.bsdextended -RCETCPACKAGE= rc +CONFGROUPS=CONFETC CONFETCEXEC CONFETCDEFAULTS +CONFETCDIR=/etc +CONFETC= network.subr rc rc.initdiskless rc.subr rc.shutdown rc.bsdextended +CONFETCPACKAGE=rc .if ${MK_IPFW} != "no" -FILESGROUPS+= RCIPFW -RCIPFW+= rc.firewall -RCIPFWPACKAGE= ipfw +CONFETC+= rc.firewall .endif .if ${MK_SENDMAIL} != "no" -FILESGROUPS+= RCSENDMAIL -RCSENDMAIL+= rc.sendmail -RCSENDMAILPACKAGE= sendmail +CONFETC+= rc.sendmail .endif -RCETCMODE= 644 -RCETCEXEC= netstart pccard_ether rc.resume rc.suspend -RCETCEXECMODE= 755 -RCETCEXECPACKAGE= rc -RCETCDEFAULTSDIR= /etc/defaults -RCETCDEFAULTS= rc.conf -RCETCDEFAULTSPACKAGE= rc +CONFETCMODE= 644 +CONFETCEXEC= netstart pccard_ether rc.resume rc.suspend +CONFETCEXECDIR=/etc +CONFETCEXECMODE= 755 +CONFETCEXECPACKAGE=rc +CONFETCDEFAULTSDIR=/etc/defaults +CONFETCDEFAULTS= rc.conf +CONFETCDEFAULTSPACKAGE=rc SUBDIR+= rc.d Modified: head/libexec/rc/rc.d/Makefile == --- head/libexec/rc/rc.d/Makefile Wed Mar 25 02:28:47 2020 (r359295) +++ head/libexec/rc/rc.d/Makefile Wed Mar 25 08:35:55 2020 (r359296) @@ -2,11 +2,11 @@ .include -BINDIR=/etc/rc.d -FILESGROUPS= BASERC -BASERCPACKAGE= rc +CONFDIR= /etc/rc.d +CONFGROUPS=CONFS +CONFSPACKAGE= rc -BASERC=DAEMON \ +CONFS= DAEMON \ FILESYSTEMS \ LOGIN \ NETWORKING \ @@ -115,7 +115,7 @@ BASERC= DAEMON \ watchdogd .if ${MK_NIS} != "no" -BASERC+= ypbind \ +CONFS+=ypbind \ ypldap \ yppasswdd \ ypserv \ @@ -125,23 +125,23 @@ BASERC+= ypbind \ .endif .if ${MK_ACCT} != "no" -FILESGROUPS+= ACCT +CONFGROUPS+= ACCT ACCT+= accounting ACCTPACKAGE= acct .endif .if ${MK_ACPI} != "no" -FILESGROUPS+= ACPI +CONFGROUPS+= ACPI ACPI= power_profile ACPIPACKAGE= acpi .endif .if ${MK_ACPI} != "no" || ${MK_APM} != "no" -BASERC+= powerd +CONFS+=powerd .endif .if ${MK_APM} != "no" -FILESGROUPS+= APM +CONFGROUPS+= APM APM+= apm .if ${MACHINE} == "i386" APM+= apmd @@ -150,17 +150,15 @@ APMPACKAGE= apm .endif .if ${MK_AUDIT} != "no" -FILESGROUPS+= AUDIT +CONFGROUPS+= AUDIT AUDIT+=auditd AUDIT+=auditdistd .endif .if ${MK_AUTOFS} != "no" -FILESGROUPS+= AUFOFS -AUTOFS+= automount -AUTOFS+= automountd -AUTOFS+= autounmountd -AUTOFSPACKAGE= autofs +CONFS+=automount +CONFS+=automountd +CONFS+=autounmountd .endif .if ${MK_BLACKLIST} != "no" @@ -168,7 +166,7 @@ _blacklistd+= blacklistd .endif .if ${MK_BLUETOOTH} != "no" -FILESGROUPS+= BLUETOOTH +CONFGROUPS+= BLUETOOTH BLUETOOTH+=bluetooth \ bthidd \ hcsecd \ @@ -179,79 +177,71 @@ BLUETOOTHPACKAGE= bluetooth .endif .if ${MK_BOOTPARAMD} != "no" -BASERC+= bootparams +CONFS+=bootparams .endif .if ${MK_BSNMP} != "no" -FILESGROUPS+= BSNMP +CONFGROUPS+= BSNMP BSNMP+=bsnmpd BSNMPPACKAGE= bsnmp .endif .if ${MK_CCD} != "no" -FILESGROUPS+= CCD -CCD+= ccd -CCDPACKAGE=ccdconfig +CONFS+=ccd .endif .if ${MK_FTP} != "no" -BASERC+= ftpd +CONFS+=ftpd .endif .if ${MK_HAST} != "no" -FILESGROUPS+= HAST +CONFGROUPS+= HAST HAST= hastd HASTPACKAGE= hast .endif .if ${MK_INETD} != "no" -BASERC+= inetd +CONFS+=inetd .endif .if ${MK_IPFILTER} != "no" -FILESGROUPS+= IPFILTER -IPFILTER+= ipfilter \ - ipfs \ - ipmon \ - ipnat \ - ippool -IPFILTERPACKAGE= ipf +CONFS+=ipfilter \ + ipfs \ + ipmon \ + ipnat \ + ippool .endif .if ${MK_IPFW} != "no" -FILESGROUP+= IPFW -IPFW+= ipfw +CONFS+=ipfw .if ${MK_NETGRAPH} != "no" -IPFW+= ipfw_netflow +CONFS+=ipfw_netflow .endif -IPFWPACKAGE= ipfw .endif .if ${MK_ISCSI} != "no" -FILESGROUPS+= IS
Re: svn commit: r359267 - in head: . share/mk
24 mars 2020 02:24:21 Bryan Drewery : > On 3/23/2020 6:09 PM, Emmanuel Vadot wrote: > > > Author: manu > > Date: Tue Mar 24 01:09:04 2020 > > New Revision: 359267 > > URL: https://svnweb.freebsd.org/changeset/base/359267 > > > > Log: > > bsd.lib.mk: Do not include bsd.incs.mk for INTERNALLIB > > > > If we're building an internal lib do not bother including bsd.incs.mk so we > > will not install the headers. > > This also "solves" a problem with pkgbase where a libXXX-development package > > is created and due to how packages are created we add a dependency to a > > libXXX package that doesn't exists. > > > > Reported by: pizzamig > > Reviewed by: pizzamig bapt emaste > > Differential Revision: https://reviews.freebsd.org/D24166 > > > > Modified: > > head/ObsoleteFiles.inc > > head/share/mk/bsd.lib.mk > > > > Modified: head/ObsoleteFiles.inc > > == > > --- head/ObsoleteFiles.inc Tue Mar 24 01:08:06 2020 (r359266) > > +++ head/ObsoleteFiles.inc Tue Mar 24 01:09:04 2020 (r359267) > > @@ -36,6 +36,11 @@ > > # xargs -n1 | sort | uniq -d; > > # done > > > > +# 20200323: INTERNALLIB don't install headers anymore > > +OLD_FILES+=/usr/include/libelftc.h > > +OLD_FILES+=/usr/include/libifconfig.h > > +OLD_FILES+=/usr/include/libpmcstat.h > > + > > > > lib/libelftc/Makefile:INCS= libelftc.h > lib/libifconfig/Makefile:INCSDIR= ${INCLUDEDIR} > lib/libifconfig/Makefile:INCS= libifconfig.h > lib/libpmcstat/Makefile:INCS= libpmcstat.h > > This commit seems incomplete or wrong due to the leftover logic. > > This is on purpose so if anyone wants to promote those from internallib to something else, they can They just have to remove INTERNALLIB Best regards, Bapt ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r359242 - head/usr.sbin/tcpdump/tcpdump
Author: bapt Date: Mon Mar 23 14:44:23 2020 New Revision: 359242 URL: https://svnweb.freebsd.org/changeset/base/359242 Log: Remove useless linking to libl Modified: head/usr.sbin/tcpdump/tcpdump/Makefile Modified: head/usr.sbin/tcpdump/tcpdump/Makefile == --- head/usr.sbin/tcpdump/tcpdump/Makefile Mon Mar 23 14:37:00 2020 (r359241) +++ head/usr.sbin/tcpdump/tcpdump/Makefile Mon Mar 23 14:44:23 2020 (r359242) @@ -186,7 +186,7 @@ CFLAGS+=-DINET6 -DHAVE_OS_IPV6_SUPPORT CFLAGS+= -DLBL_ALIGN .endif -LIBADD=l pcap +LIBADD=pcap .if ${MK_CASPER} != "no" LIBADD+= casper LIBADD+= cap_dns ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r359241 - head/sbin/setkey
Author: bapt Date: Mon Mar 23 14:37:00 2020 New Revision: 359241 URL: https://svnweb.freebsd.org/changeset/base/359241 Log: Remove the link to libl which only contains a stub function on yywrap, if the flex is told yywrap is not in use, then this linkage becomes unnecessary Modified: head/sbin/setkey/Makefile head/sbin/setkey/token.l Modified: head/sbin/setkey/Makefile == --- head/sbin/setkey/Makefile Mon Mar 23 14:33:29 2020(r359240) +++ head/sbin/setkey/Makefile Mon Mar 23 14:37:00 2020(r359241) @@ -37,8 +37,6 @@ WARNS?= 1 CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libipsec YFLAGS=-d -LIBADD=l - CLEANFILES=y.tab.c y.tab.h key_test.o keytest # libpfkey Modified: head/sbin/setkey/token.l == --- head/sbin/setkey/token.lMon Mar 23 14:33:29 2020(r359240) +++ head/sbin/setkey/token.lMon Mar 23 14:37:00 2020(r359241) @@ -67,6 +67,8 @@ int parse(FILE **); int yyparse(void); %} +%option noyywrap + /* common section */ nl \n ws [ \t]+ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r359240 - head/sys/dev/aic7xxx/aicasm
Author: bapt Date: Mon Mar 23 14:33:29 2020 New Revision: 359240 URL: https://svnweb.freebsd.org/changeset/base/359240 Log: Remove unneeded dependency on libl Modified: head/sys/dev/aic7xxx/aicasm/Makefile Modified: head/sys/dev/aic7xxx/aicasm/Makefile == --- head/sys/dev/aic7xxx/aicasm/MakefileMon Mar 23 14:11:49 2020 (r359239) +++ head/sys/dev/aic7xxx/aicasm/MakefileMon Mar 23 14:33:29 2020 (r359240) @@ -13,7 +13,6 @@ GENHDRS= aicasm_gram.h aicasm_macro_gram.h SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS} CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g} -LIBADD=l WARNS?=0 # Correct path for kernel builds ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r359239 - head/sbin/setkey
Author: bapt Date: Mon Mar 23 14:11:49 2020 New Revision: 359239 URL: https://svnweb.freebsd.org/changeset/base/359239 Log: Revove useless linking to yacc Modified: head/sbin/setkey/Makefile Modified: head/sbin/setkey/Makefile == --- head/sbin/setkey/Makefile Mon Mar 23 14:04:42 2020(r359238) +++ head/sbin/setkey/Makefile Mon Mar 23 14:11:49 2020(r359239) @@ -37,7 +37,7 @@ WARNS?= 1 CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libipsec YFLAGS=-d -LIBADD=l y +LIBADD=l CLEANFILES=y.tab.c y.tab.h key_test.o keytest ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r359232 - in head/usr.sbin/pw: . tests
Author: bapt Date: Mon Mar 23 08:23:22 2020 New Revision: 359232 URL: https://svnweb.freebsd.org/changeset/base/359232 Log: pw: do not removed home directories if not owned When deleting a user, if its home directory does not belong to it, it should not be removed. This is the promise that the manpage makes, the tool should ensure that it respects that promise. Add a regression test about it PR: 244967 Submitted by: Eric Hanneken MFC after:3 days Modified: head/usr.sbin/pw/rm_r.c head/usr.sbin/pw/tests/pw_userdel_test.sh Modified: head/usr.sbin/pw/rm_r.c == --- head/usr.sbin/pw/rm_r.c Sun Mar 22 22:18:06 2020(r359231) +++ head/usr.sbin/pw/rm_r.c Mon Mar 23 08:23:22 2020(r359232) @@ -71,5 +71,8 @@ rm_r(int rootfd, const char *path, uid_t uid) closedir(d); if (fstatat(rootfd, path, &st, AT_SYMLINK_NOFOLLOW) != 0) return; - unlinkat(rootfd, path, S_ISDIR(st.st_mode) ? AT_REMOVEDIR : 0); + if (S_ISLNK(st.st_mode)) + unlinkat(rootfd, path, 0); + else if (st.st_uid == uid) + unlinkat(rootfd, path, AT_REMOVEDIR); } Modified: head/usr.sbin/pw/tests/pw_userdel_test.sh == --- head/usr.sbin/pw/tests/pw_userdel_test.sh Sun Mar 22 22:18:06 2020 (r359231) +++ head/usr.sbin/pw/tests/pw_userdel_test.sh Mon Mar 23 08:23:22 2020 (r359232) @@ -67,10 +67,30 @@ home_not_a_dir_body() { atf_check ${RPW} userdel foo -r } +atf_test_case home_shared +home_shared_body() { + populate_root_etc_skel + mkdir ${HOME}/shared + atf_check ${RPW} useradd -n testuser1 -d /shared + atf_check ${RPW} useradd -n testuser2 -d /shared + atf_check ${RPW} userdel -n testuser1 -r + test -d ${HOME}/shared || atf_fail "Shared home has been removed" +} + +atf_test_case home_regular_dir +home_regular_dir_body() { + populate_root_etc_skel + atf_check ${RPW} useradd -n foo -d /foo + atf_check ${RPW} userdel -n foo -r + [ ! -d ${HOME}/foo ] || atf_fail "Home has not been removed" +} + atf_init_test_cases() { atf_add_test_case rmuser_seperate_group atf_add_test_case user_do_not_try_to_delete_root_if_user_unknown atf_add_test_case delete_files atf_add_test_case delete_numeric_name atf_add_test_case home_not_a_dir + atf_add_test_case home_shared + atf_add_test_case home_regular_dir } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358846 - vendor/groff
Author: bapt Date: Tue Mar 10 16:34:40 2020 New Revision: 358846 URL: https://svnweb.freebsd.org/changeset/base/358846 Log: groff has been removed from the tree for freebsd 12.0 Deleted: vendor/groff/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358845 - vendor/libyaml
Author: bapt Date: Tue Mar 10 16:28:02 2020 New Revision: 358845 URL: https://svnweb.freebsd.org/changeset/base/358845 Log: Remove libyaml from the vendor tree libyaml was only used for a short time by usr.sbin/pkg and since was switched to libucl Deleted: vendor/libyaml/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358612 - stable/11/share/misc
Author: bapt Date: Wed Mar 4 11:32:31 2020 New Revision: 358612 URL: https://svnweb.freebsd.org/changeset/base/358612 Log: MFC r358378: Update pci_vendors to 2020.02.22 Modified: stable/11/share/misc/pci_vendors Directory Properties: stable/11/ (props changed) Modified: stable/11/share/misc/pci_vendors == --- stable/11/share/misc/pci_vendorsWed Mar 4 11:30:08 2020 (r358611) +++ stable/11/share/misc/pci_vendorsWed Mar 4 11:32:31 2020 (r358612) @@ -2,8 +2,8 @@ # List of PCI ID's # -# Version: 2019.01.29 -# Date:2019-01-29 03:15:01 +# Version: 2020.02.22 +# Date:2020-02-22 03:15:04 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -14,6 +14,10 @@ # This file can be distributed under either the GNU General Public License # (version 2 or higher) or the 3-clause BSD License. # +# The database is a compilation of factual data, and as such the copyright +# only covers the aggregation and formatting. The copyright is held by +# Martin Mares and Albert Pool. +# # Vendors, devices and subsystems. Please keep sorted. @@ -64,6 +68,7 @@ # 018a is not LevelOne but there is a board misprogrammed 018a LevelOne 0106 FPC-0106TX misprogrammed [RTL81xx] +01de Oxide Computer Company # 021b is not Compaq but there is a board misprogrammed 021b Compaq Computer Corporation 8139 HNE-300 (RealTek RTL8139c) [iPaq Networking] @@ -92,6 +97,7 @@ 6663 Butane II (MPEG2 encoder board) MediaPress (MPEG2 encoder board) 07d1 D-Link System Inc +0824 T1042 [Freescale] 0925 VIA Technologies, Inc. (Wrong ID) 0a89 BREA Technologies Inc 0b0b Rhino Equipment Corp. @@ -220,8 +226,7 @@ 0eac SHF Communication Technologies AG 0008 Ethernet Powerlink Managing Node 01 0f62 Acrox Technologies Co., Ltd. -# Formerly NCR -1000 LSI Logic / Symbios Logic +1000 Broadcom / LSI 0001 53c810 1000 1000 LSI53C810AE PCI to SCSI I/O Processor 0002 53c820 @@ -266,7 +271,10 @@ 0013 53c875a 1000 1000 LSI53C875A PCI to Ultra SCSI Controller 0014 MegaRAID Tri-Mode SAS3516 + 1028 1f3a PERC H745 Adapter + 1028 1f3b PERC H745 Front 1028 1fd4 PERC H745P MX + 1137 020e UCSC-RAID-M5 12G Modular RAID Controller 1d49 0602 ThinkSystem RAID 930-16i 4GB Flash PCIe 12Gb Adapter 1d49 0604 ThinkSystem RAID 930-8e 4GB Flash PCIe 12Gb Adapter 1d49 0607 ThinkSystem RAID 930-16i 8GB Flash PCIe 12Gb Adapter @@ -274,6 +282,8 @@ 8086 9460 RAID Controller RSP3TD160F 8086 9480 RAID Controller RSP3MD088F 0015 MegaRAID Tri-Mode SAS3416 + 1028 1f3c PERC H345 Adapter + 1028 1f3d PERC H345 Front 1d49 0503 ThinkSystem RAID 530-16i PCIe 12Gb Adapter 0016 MegaRAID Tri-Mode SAS3508 1028 1fc9 PERC H840 Adapter @@ -401,7 +411,7 @@ 8086 3510 RMS25PB080 RAID Controller 8086 3511 RMS25PB040 RAID Controller 8086 3512 RMT3PB080 RAID Controller - 8086 3513 RMS25CB080 RAID Controller + 8086 3513 Integrated RAID Module RMS25CB080 8086 3514 RMS25CB040 RAID Controller 8086 351c RMS25PB080N RAID Controller 8086 351d RMS25CB080N RAID Controller @@ -428,6 +438,8 @@ 1028 1fd1 PERC H730P MX 17aa 1052 ThinkServer RAID 720i 17aa 1053 ThinkServer RAID 720ix + 1bd4 0014 6G SAS3108 2G + 1bd4 0015 6G SAS3108 4G 1d49 0600 ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter 1d49 0608 ThinkSystem RAID 730-8i 2GB Flash PCIe 12Gb Adapter 1d49 0609 ThinkSystem RAID 730-8i 4GB Flash PCIe 12Gb Adapter @@ -480,14 +492,18 @@ 0062 SAS1078 PCI-Express Fusion-MPT SAS 1000 0062 SAS1078 PCI-Express Fusion-MPT SAS 0064 SAS2116 PCI-Express Fusion-MPT SAS-2 [Meteor] + 1000 3030 9200-16e 6Gb/s SAS/SATA PCIe x8 External HBA 1000 30c0 SAS 9201-16i + 1000 30d0 9201-16e 6Gb/s SAS/SATA PCIe x8 External HBA 0065 SAS2116 PCI-Express Fusion-MPT SAS-2 [Meteor] 006e SAS2308 PCI-Express Fusion-MPT SAS-2 0070 SAS2004 PCI-Express Fusion-MPT SAS-2 [Spitfire] 1000 3010 SAS9211-4i + 1014 040e ServeRAID H1110 0071 MR SAS HBA 2004 0072 SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] 1000 3040 9210-8i + 1000 3080 9200-8e [LSI SAS 6Gb/s SAS/SATA PCIe x8 External HBA] 1000 3
svn commit: r358611 - stable/12/share/misc
Author: bapt Date: Wed Mar 4 11:30:08 2020 New Revision: 358611 URL: https://svnweb.freebsd.org/changeset/base/358611 Log: MFC r358378: Update pci_vendors to 2020.02.22 Modified: stable/12/share/misc/pci_vendors Directory Properties: stable/12/ (props changed) Modified: stable/12/share/misc/pci_vendors == --- stable/12/share/misc/pci_vendorsWed Mar 4 11:28:49 2020 (r358610) +++ stable/12/share/misc/pci_vendorsWed Mar 4 11:30:08 2020 (r358611) @@ -2,8 +2,8 @@ # List of PCI ID's # -# Version: 2019.01.29 -# Date:2019-01-29 03:15:01 +# Version: 2020.02.22 +# Date:2020-02-22 03:15:04 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -14,6 +14,10 @@ # This file can be distributed under either the GNU General Public License # (version 2 or higher) or the 3-clause BSD License. # +# The database is a compilation of factual data, and as such the copyright +# only covers the aggregation and formatting. The copyright is held by +# Martin Mares and Albert Pool. +# # Vendors, devices and subsystems. Please keep sorted. @@ -64,6 +68,7 @@ # 018a is not LevelOne but there is a board misprogrammed 018a LevelOne 0106 FPC-0106TX misprogrammed [RTL81xx] +01de Oxide Computer Company # 021b is not Compaq but there is a board misprogrammed 021b Compaq Computer Corporation 8139 HNE-300 (RealTek RTL8139c) [iPaq Networking] @@ -92,6 +97,7 @@ 6663 Butane II (MPEG2 encoder board) MediaPress (MPEG2 encoder board) 07d1 D-Link System Inc +0824 T1042 [Freescale] 0925 VIA Technologies, Inc. (Wrong ID) 0a89 BREA Technologies Inc 0b0b Rhino Equipment Corp. @@ -220,8 +226,7 @@ 0eac SHF Communication Technologies AG 0008 Ethernet Powerlink Managing Node 01 0f62 Acrox Technologies Co., Ltd. -# Formerly NCR -1000 LSI Logic / Symbios Logic +1000 Broadcom / LSI 0001 53c810 1000 1000 LSI53C810AE PCI to SCSI I/O Processor 0002 53c820 @@ -266,7 +271,10 @@ 0013 53c875a 1000 1000 LSI53C875A PCI to Ultra SCSI Controller 0014 MegaRAID Tri-Mode SAS3516 + 1028 1f3a PERC H745 Adapter + 1028 1f3b PERC H745 Front 1028 1fd4 PERC H745P MX + 1137 020e UCSC-RAID-M5 12G Modular RAID Controller 1d49 0602 ThinkSystem RAID 930-16i 4GB Flash PCIe 12Gb Adapter 1d49 0604 ThinkSystem RAID 930-8e 4GB Flash PCIe 12Gb Adapter 1d49 0607 ThinkSystem RAID 930-16i 8GB Flash PCIe 12Gb Adapter @@ -274,6 +282,8 @@ 8086 9460 RAID Controller RSP3TD160F 8086 9480 RAID Controller RSP3MD088F 0015 MegaRAID Tri-Mode SAS3416 + 1028 1f3c PERC H345 Adapter + 1028 1f3d PERC H345 Front 1d49 0503 ThinkSystem RAID 530-16i PCIe 12Gb Adapter 0016 MegaRAID Tri-Mode SAS3508 1028 1fc9 PERC H840 Adapter @@ -401,7 +411,7 @@ 8086 3510 RMS25PB080 RAID Controller 8086 3511 RMS25PB040 RAID Controller 8086 3512 RMT3PB080 RAID Controller - 8086 3513 RMS25CB080 RAID Controller + 8086 3513 Integrated RAID Module RMS25CB080 8086 3514 RMS25CB040 RAID Controller 8086 351c RMS25PB080N RAID Controller 8086 351d RMS25CB080N RAID Controller @@ -428,6 +438,8 @@ 1028 1fd1 PERC H730P MX 17aa 1052 ThinkServer RAID 720i 17aa 1053 ThinkServer RAID 720ix + 1bd4 0014 6G SAS3108 2G + 1bd4 0015 6G SAS3108 4G 1d49 0600 ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter 1d49 0608 ThinkSystem RAID 730-8i 2GB Flash PCIe 12Gb Adapter 1d49 0609 ThinkSystem RAID 730-8i 4GB Flash PCIe 12Gb Adapter @@ -480,14 +492,18 @@ 0062 SAS1078 PCI-Express Fusion-MPT SAS 1000 0062 SAS1078 PCI-Express Fusion-MPT SAS 0064 SAS2116 PCI-Express Fusion-MPT SAS-2 [Meteor] + 1000 3030 9200-16e 6Gb/s SAS/SATA PCIe x8 External HBA 1000 30c0 SAS 9201-16i + 1000 30d0 9201-16e 6Gb/s SAS/SATA PCIe x8 External HBA 0065 SAS2116 PCI-Express Fusion-MPT SAS-2 [Meteor] 006e SAS2308 PCI-Express Fusion-MPT SAS-2 0070 SAS2004 PCI-Express Fusion-MPT SAS-2 [Spitfire] 1000 3010 SAS9211-4i + 1014 040e ServeRAID H1110 0071 MR SAS HBA 2004 0072 SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] 1000 3040 9210-8i + 1000 3080 9200-8e [LSI SAS 6Gb/s SAS/SATA PCIe x8 External HBA] 1000 3
svn commit: r358610 - in stable/12/usr.bin/diff: . tests
Author: bapt Date: Wed Mar 4 11:28:49 2020 New Revision: 358610 URL: https://svnweb.freebsd.org/changeset/base/358610 Log: MFC r357648: diff: implement -y (--side-by-side) along with -W and --suppress-common-lines PR: 219933 Submitted by: fehmi noyan isi Modified: stable/12/usr.bin/diff/diff.1 stable/12/usr.bin/diff/diff.c stable/12/usr.bin/diff/diff.h stable/12/usr.bin/diff/diffreg.c stable/12/usr.bin/diff/tests/diff_test.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/diff/diff.1 == --- stable/12/usr.bin/diff/diff.1 Wed Mar 4 09:46:42 2020 (r358609) +++ stable/12/usr.bin/diff/diff.1 Wed Mar 4 11:28:49 2020 (r358610) @@ -30,7 +30,7 @@ .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 .\" $FreeBSD$ .\" -.Dd August 18, 2018 +.Dd February 07, 2020 .Dt DIFF 1 .Os .Sh NAME @@ -41,7 +41,7 @@ .Op Fl aBbdipTtw .Oo .Fl c | e | f | -.Fl n | q | u +.Fl n | q | u | y .Oc .Op Fl -brief .Op Fl -changed-group-format Ar GFMT @@ -182,6 +182,21 @@ .Op Fl x Ar pattern | Fl -exclude Ar pattern .Ek .Ar dir1 dir2 +.Nm diff +.Op Fl aBbditwW +.Op --expand-tabs +.Op --ignore-all-blanks +.Op --ignore-blank-lines +.Op --ignore-case +.Op --minimal +.Op --no-ignore-file-name-case +.Op --strip-trailing-cr +.Op --suppress-common-lines +.Op --tabsize +.Op --text +.Op --width +.Fl y | Fl -side-by-side +.Ar file1 file2 .Sh DESCRIPTION The .Nm @@ -284,7 +299,21 @@ However, unlike with .Fl c , all lines to be changed (added and/or removed) are present in a single section. +.It Fl y Fl -side-by-side +Output in two columns with a marker between them. The marker can be one +of the following: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It space +Corresponding lines are identical. +.It '|' +Corresponding lines are different. +.It '<' +Files differ and only the first file contains the line. +.It '>' +Files differ and only the second file contains the line. .El +.El .Pp Comparison options: .Bl -tag -width Ds @@ -362,6 +391,10 @@ E.g., .Dq if (\ \&a == b \&) will compare equal to .Dq if(a==b) . +.It Fl W Ar number Fl -width Ar number +Output at most +.Ar number +columns when using side by side format. The default value is 130. .It Fl -changed-group-format Ar GFMT Format input groups in the provided .Pp @@ -382,7 +415,9 @@ default diff output stub option for compatibility with GNU diff .It Fl -strip-trailing-cr strip carriage return on input files -.It Fl tabsize Ar number +.It Fl -suppress-common-lines +Do not output common lines when using the side by side format +.It Fl -tabsize Ar number Number of spaces representing a tab (default 8) .El .Pp Modified: stable/12/usr.bin/diff/diff.c == --- stable/12/usr.bin/diff/diff.c Wed Mar 4 09:46:42 2020 (r358609) +++ stable/12/usr.bin/diff/diff.c Wed Mar 4 11:28:49 2020 (r358610) @@ -37,16 +37,16 @@ __FBSDID("$FreeBSD$"); #include "diff.h" #include "xmalloc.h" -int lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag; -int diff_format, diff_context, status, ignore_file_case; -int tabsize = 8; +int lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag, Wflag; +int diff_format, diff_context, status, ignore_file_case, suppress_common; +int tabsize = 8, width = 130; char *start, *ifdefname, *diffargs, *label[2], *ignore_pats; char *group_format = NULL; struct stat stb1, stb2; struct excludes *excludes_list; regex_t ignore_re; -#defineOPTIONS "0123456789aBbC:cdD:efHhI:iL:lnNPpqrS:sTtU:uwX:x:" +#defineOPTIONS "0123456789aBbC:cdD:efHhI:iL:lnNPpqrS:sTtU:uwW:X:x:y" enum { OPT_TSIZE = CHAR_MAX + 1, OPT_STRIPCR, @@ -55,6 +55,7 @@ enum { OPT_NORMAL, OPT_HORIZON_LINES, OPT_CHANGED_GROUP_FORMAT, + OPT_SUPPRESS_COMMON, }; static struct option longopts[] = { @@ -83,8 +84,10 @@ static struct option longopts[] = { { "initial-tab",no_argument,0, 'T' }, { "unified",optional_argument, 0, 'U' }, { "ignore-all-space", no_argument,0, 'w' }, + { "width", required_argument, 0, 'W' }, { "exclude",required_argument, 0, 'x' }, { "exclude-from", required_argument, 0, 'X' }, + { "side-by-side", no_argument,NULL, 'y' }, { "ignore-file-name-case", no_argument,NULL, OPT_IGN_FN_CASE }, { "horizon-lines", required_argument, NULL, OPT_HORIZON_LINES }, { "no-ignore-file-name-case", no_argument,NULL, OPT_NO_IGN_FN_CASE }, @@ -92,6 +95,7 @@ static struct option longopts[] = { { "stri
svn commit: r358378 - head/share/misc
Author: bapt Date: Thu Feb 27 11:23:44 2020 New Revision: 358378 URL: https://svnweb.freebsd.org/changeset/base/358378 Log: Update pci_vendors to 2020.02.22 MFC after:2 days Modified: head/share/misc/pci_vendors Modified: head/share/misc/pci_vendors == --- head/share/misc/pci_vendors Thu Feb 27 08:23:10 2020(r358377) +++ head/share/misc/pci_vendors Thu Feb 27 11:23:44 2020(r358378) @@ -2,8 +2,8 @@ # List of PCI ID's # -# Version: 2019.01.29 -# Date:2019-01-29 03:15:01 +# Version: 2020.02.22 +# Date:2020-02-22 03:15:04 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -14,6 +14,10 @@ # This file can be distributed under either the GNU General Public License # (version 2 or higher) or the 3-clause BSD License. # +# The database is a compilation of factual data, and as such the copyright +# only covers the aggregation and formatting. The copyright is held by +# Martin Mares and Albert Pool. +# # Vendors, devices and subsystems. Please keep sorted. @@ -64,6 +68,7 @@ # 018a is not LevelOne but there is a board misprogrammed 018a LevelOne 0106 FPC-0106TX misprogrammed [RTL81xx] +01de Oxide Computer Company # 021b is not Compaq but there is a board misprogrammed 021b Compaq Computer Corporation 8139 HNE-300 (RealTek RTL8139c) [iPaq Networking] @@ -92,6 +97,7 @@ 6663 Butane II (MPEG2 encoder board) MediaPress (MPEG2 encoder board) 07d1 D-Link System Inc +0824 T1042 [Freescale] 0925 VIA Technologies, Inc. (Wrong ID) 0a89 BREA Technologies Inc 0b0b Rhino Equipment Corp. @@ -220,8 +226,7 @@ 0eac SHF Communication Technologies AG 0008 Ethernet Powerlink Managing Node 01 0f62 Acrox Technologies Co., Ltd. -# Formerly NCR -1000 LSI Logic / Symbios Logic +1000 Broadcom / LSI 0001 53c810 1000 1000 LSI53C810AE PCI to SCSI I/O Processor 0002 53c820 @@ -266,7 +271,10 @@ 0013 53c875a 1000 1000 LSI53C875A PCI to Ultra SCSI Controller 0014 MegaRAID Tri-Mode SAS3516 + 1028 1f3a PERC H745 Adapter + 1028 1f3b PERC H745 Front 1028 1fd4 PERC H745P MX + 1137 020e UCSC-RAID-M5 12G Modular RAID Controller 1d49 0602 ThinkSystem RAID 930-16i 4GB Flash PCIe 12Gb Adapter 1d49 0604 ThinkSystem RAID 930-8e 4GB Flash PCIe 12Gb Adapter 1d49 0607 ThinkSystem RAID 930-16i 8GB Flash PCIe 12Gb Adapter @@ -274,6 +282,8 @@ 8086 9460 RAID Controller RSP3TD160F 8086 9480 RAID Controller RSP3MD088F 0015 MegaRAID Tri-Mode SAS3416 + 1028 1f3c PERC H345 Adapter + 1028 1f3d PERC H345 Front 1d49 0503 ThinkSystem RAID 530-16i PCIe 12Gb Adapter 0016 MegaRAID Tri-Mode SAS3508 1028 1fc9 PERC H840 Adapter @@ -401,7 +411,7 @@ 8086 3510 RMS25PB080 RAID Controller 8086 3511 RMS25PB040 RAID Controller 8086 3512 RMT3PB080 RAID Controller - 8086 3513 RMS25CB080 RAID Controller + 8086 3513 Integrated RAID Module RMS25CB080 8086 3514 RMS25CB040 RAID Controller 8086 351c RMS25PB080N RAID Controller 8086 351d RMS25CB080N RAID Controller @@ -428,6 +438,8 @@ 1028 1fd1 PERC H730P MX 17aa 1052 ThinkServer RAID 720i 17aa 1053 ThinkServer RAID 720ix + 1bd4 0014 6G SAS3108 2G + 1bd4 0015 6G SAS3108 4G 1d49 0600 ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter 1d49 0608 ThinkSystem RAID 730-8i 2GB Flash PCIe 12Gb Adapter 1d49 0609 ThinkSystem RAID 730-8i 4GB Flash PCIe 12Gb Adapter @@ -480,14 +492,18 @@ 0062 SAS1078 PCI-Express Fusion-MPT SAS 1000 0062 SAS1078 PCI-Express Fusion-MPT SAS 0064 SAS2116 PCI-Express Fusion-MPT SAS-2 [Meteor] + 1000 3030 9200-16e 6Gb/s SAS/SATA PCIe x8 External HBA 1000 30c0 SAS 9201-16i + 1000 30d0 9201-16e 6Gb/s SAS/SATA PCIe x8 External HBA 0065 SAS2116 PCI-Express Fusion-MPT SAS-2 [Meteor] 006e SAS2308 PCI-Express Fusion-MPT SAS-2 0070 SAS2004 PCI-Express Fusion-MPT SAS-2 [Spitfire] 1000 3010 SAS9211-4i + 1014 040e ServeRAID H1110 0071 MR SAS HBA 2004 0072 SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] 1000 3040 9210-8i + 1000 3080 9200-8e [LSI SAS 6Gb/s SAS/SATA PCIe x8 External HBA] 1000 30b0 9200-8e [LSI SAS 6Gb/s SAS/SATA PCIe x8 External HBA]
svn commit: r358210 - head
Author: bapt Date: Fri Feb 21 08:00:42 2020 New Revision: 358210 URL: https://svnweb.freebsd.org/changeset/base/358210 Log: ncurses: set the proper version in the updating message Reported by: @jlduran (github) Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Fri Feb 21 04:48:25 2020(r358209) +++ head/UPDATING Fri Feb 21 08:00:42 2020(r358210) @@ -27,7 +27,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: "ln -s 'abort:false,junk:false' /etc/malloc.conf".) 20200220: - ncurses has been updated to a newer version (6.1-20200118). Given the ABI + ncurses has been updated to a newer version (6.2-20200215). Given the ABI has changed, users will have to rebuild all the ports that are linked to ncurses. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358171 - head
Author: bapt Date: Thu Feb 20 16:38:30 2020 New Revision: 358171 URL: https://svnweb.freebsd.org/changeset/base/358171 Log: Use OLD_LIBS instead of OLD_FILES so the user get a chance to keep them around if needed Reported by: tijl Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Thu Feb 20 15:52:36 2020(r358170) +++ head/ObsoleteFiles.inc Thu Feb 20 16:38:30 2020(r358171) @@ -37,10 +37,10 @@ # done # 20200220: Upgrade of ncurses, shlib bumped to version 9 -OLD_FILES+=lib/libncurses.so.8 -OLD_FILES+=lib/libncursesw.so.8 -OLD_FILES+=usr/lib32/libncurses.so.8 -OLD_FILES+=usr/lib32/libncursesw.so.8 +OLD_LIBS+=lib/libncurses.so.8 +OLD_LIBS+=lib/libncursesw.so.8 +OLD_LIBS+=usr/lib32/libncurses.so.8 +OLD_LIBS+=usr/lib32/libncursesw.so.8 # 20200206: Remove elf2aout OLD_FILES+=usr/bin/elf2aout ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358166 - head
Author: bapt Date: Thu Feb 20 09:33:14 2020 New Revision: 358166 URL: https://svnweb.freebsd.org/changeset/base/358166 Log: Update the UPDATING information now that ncurses shlib has been bumped Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Thu Feb 20 09:17:45 2020(r358165) +++ head/UPDATING Thu Feb 20 09:33:14 2020(r358166) @@ -26,10 +26,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -20200218: - ncurses has been updated to a newer version (6.1-20200118). After an - update some applications using ncurses may results have some rendering - problems and would need to be rebuilt. +20200220: + ncurses has been updated to a newer version (6.1-20200118). Given the ABI + has changed, users will have to rebuild all the ports that are linked to + ncurses. 20200217: The size of struct vnet and the magic cookie have changed. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358165 - head/sys/sys
Author: bapt Date: Thu Feb 20 09:17:45 2020 New Revision: 358165 URL: https://svnweb.freebsd.org/changeset/base/358165 Log: Bump __FreeBSD_version after bumping ncurses shlib Modified: head/sys/sys/param.h Modified: head/sys/sys/param.h == --- head/sys/sys/param.hThu Feb 20 09:12:07 2020(r358164) +++ head/sys/sys/param.hThu Feb 20 09:17:45 2020(r358165) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300078 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300079 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358164 - in head: . lib/ncurses/ncurses
Author: bapt Date: Thu Feb 20 09:12:07 2020 New Revision: 358164 URL: https://svnweb.freebsd.org/changeset/base/358164 Log: ncurses: bump shlib number to version 9 ABI has change in between ncurses 5 or 6. While theorically ncurses 6 is buildable with backward compatibility, I fail at building in a way where the application linked against the previous version of ncurses are rendering properly. Let's go on the new ABI which provides all the latest features. A compat12x package is cooking for backward compatibility Modified: head/ObsoleteFiles.inc head/lib/ncurses/ncurses/Makefile Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Thu Feb 20 09:02:59 2020(r358163) +++ head/ObsoleteFiles.inc Thu Feb 20 09:12:07 2020(r358164) @@ -36,6 +36,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20200220: Upgrade of ncurses, shlib bumped to version 9 +OLD_FILES+=lib/libncurses.so.8 +OLD_FILES+=lib/libncursesw.so.8 +OLD_FILES+=usr/lib32/libncurses.so.8 +OLD_FILES+=usr/lib32/libncursesw.so.8 + # 20200206: Remove elf2aout OLD_FILES+=usr/bin/elf2aout OLD_FILES+=usr/share/man/man1/elf2aout.1.gz Modified: head/lib/ncurses/ncurses/Makefile == --- head/lib/ncurses/ncurses/Makefile Thu Feb 20 09:02:59 2020 (r358163) +++ head/lib/ncurses/ncurses/Makefile Thu Feb 20 09:12:07 2020 (r358164) @@ -13,7 +13,7 @@ MK_MAN=no .include "${.CURDIR:H}/config.mk" LIB= ncurses${LIB_SUFFIX} -SHLIB_MAJOR= 8 +SHLIB_MAJOR= 9 NO_LINT= @@ -292,7 +292,6 @@ CLEANFILES= ${GENSRCS} ${GENHDRS} keys.list make_hash make_keys MKterm.h.awk comp_captab.c curses.head CFLAGS+= -DFREEBSD_NATIVE -DTERMIOS -CFLAGS.lib_freeall.c+= -Wno-missing-prototypes # Installed HEADERS= curses.h term.h termcap.h unctrl.h ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358127 - in head: contrib/ncurses contrib/ncurses/doc/html contrib/ncurses/form contrib/ncurses/include contrib/ncurses/man contrib/ncurses/menu contrib/ncurses/misc contrib/ncurses/nc...
Author: bapt Date: Wed Feb 19 17:09:08 2020 New Revision: 358127 URL: https://svnweb.freebsd.org/changeset/base/358127 Log: Update to 6.2-20200215 While I didn't plan another upgrade, This version incorporate fixes from kevans@ so let's upgrade to it Modified: head/contrib/ncurses/ANNOUNCE head/contrib/ncurses/AUTHORS head/contrib/ncurses/COPYING head/contrib/ncurses/INSTALL head/contrib/ncurses/MANIFEST head/contrib/ncurses/Makefile.in head/contrib/ncurses/Makefile.os2 head/contrib/ncurses/NEWS head/contrib/ncurses/README head/contrib/ncurses/README.MinGW head/contrib/ncurses/README.emx head/contrib/ncurses/TO-DO head/contrib/ncurses/VERSION head/contrib/ncurses/aclocal.m4 head/contrib/ncurses/announce.html.in head/contrib/ncurses/configure head/contrib/ncurses/configure.in head/contrib/ncurses/convert_configure.pl head/contrib/ncurses/dist.mk head/contrib/ncurses/doc/html/announce.html head/contrib/ncurses/doc/html/hackguide.html head/contrib/ncurses/doc/html/ncurses-intro.html head/contrib/ncurses/form/Makefile.in head/contrib/ncurses/form/READ.ME head/contrib/ncurses/form/f_trace.c head/contrib/ncurses/form/fld_arg.c head/contrib/ncurses/form/fld_attr.c head/contrib/ncurses/form/fld_current.c head/contrib/ncurses/form/fld_def.c head/contrib/ncurses/form/fld_dup.c head/contrib/ncurses/form/fld_ftchoice.c head/contrib/ncurses/form/fld_ftlink.c head/contrib/ncurses/form/fld_info.c head/contrib/ncurses/form/fld_just.c head/contrib/ncurses/form/fld_link.c head/contrib/ncurses/form/fld_max.c head/contrib/ncurses/form/fld_move.c head/contrib/ncurses/form/fld_newftyp.c head/contrib/ncurses/form/fld_opts.c head/contrib/ncurses/form/fld_pad.c head/contrib/ncurses/form/fld_page.c head/contrib/ncurses/form/fld_stat.c head/contrib/ncurses/form/fld_type.c head/contrib/ncurses/form/fld_user.c head/contrib/ncurses/form/form.h head/contrib/ncurses/form/form.priv.h head/contrib/ncurses/form/frm_cursor.c head/contrib/ncurses/form/frm_data.c head/contrib/ncurses/form/frm_def.c head/contrib/ncurses/form/frm_driver.c head/contrib/ncurses/form/frm_hook.c head/contrib/ncurses/form/frm_opts.c head/contrib/ncurses/form/frm_page.c head/contrib/ncurses/form/frm_post.c head/contrib/ncurses/form/frm_req_name.c head/contrib/ncurses/form/frm_scale.c head/contrib/ncurses/form/frm_sub.c head/contrib/ncurses/form/frm_user.c head/contrib/ncurses/form/frm_win.c head/contrib/ncurses/form/fty_alnum.c head/contrib/ncurses/form/fty_alpha.c head/contrib/ncurses/form/fty_enum.c head/contrib/ncurses/form/fty_generic.c head/contrib/ncurses/form/fty_int.c head/contrib/ncurses/form/fty_ipv4.c head/contrib/ncurses/form/fty_num.c head/contrib/ncurses/form/fty_regex.c head/contrib/ncurses/form/headers head/contrib/ncurses/form/llib-lform head/contrib/ncurses/form/llib-lformt head/contrib/ncurses/form/llib-lformtw head/contrib/ncurses/form/llib-lformw head/contrib/ncurses/form/modules head/contrib/ncurses/include/Caps head/contrib/ncurses/include/Caps-ncurses head/contrib/ncurses/include/Caps.aix4 head/contrib/ncurses/include/Caps.hpux11 head/contrib/ncurses/include/Caps.keys head/contrib/ncurses/include/Caps.osf1r5 head/contrib/ncurses/include/Caps.uwin head/contrib/ncurses/include/MKhashsize.sh head/contrib/ncurses/include/MKkey_defs.sh head/contrib/ncurses/include/MKncurses_def.sh head/contrib/ncurses/include/MKparametrized.sh head/contrib/ncurses/include/MKterm.h.awk.in head/contrib/ncurses/include/Makefile.in head/contrib/ncurses/include/capdefaults.c head/contrib/ncurses/include/curses.h.in head/contrib/ncurses/include/edit_cfg.sh head/contrib/ncurses/include/hashed_db.h head/contrib/ncurses/include/headers head/contrib/ncurses/include/nc_alloc.h head/contrib/ncurses/include/nc_mingw.h head/contrib/ncurses/include/nc_panel.h head/contrib/ncurses/include/nc_string.h head/contrib/ncurses/include/nc_termios.h head/contrib/ncurses/include/nc_tparm.h head/contrib/ncurses/include/ncurses_cfg.hin head/contrib/ncurses/include/ncurses_defs head/contrib/ncurses/include/ncurses_dll.h.in head/contrib/ncurses/include/ncurses_mingw.h head/contrib/ncurses/include/term_entry.h head/contrib/ncurses/include/termcap.h.in head/contrib/ncurses/include/tic.h head/contrib/ncurses/include/unctrl.h.in head/contrib/ncurses/man/MKada_config.in head/contrib/ncurses/man/MKncu_config.in head/contrib/ncurses/man/MKterminfo.sh head/contrib/ncurses/man/Makefile.in head/contrib/ncurses/man/captoinfo.1m head/contrib/ncurses/man/clear.1 head/contrib/ncurses/man/curs_add_wch.3x head/contrib/ncurses/man/curs_add_wchstr.3x head/contrib/ncurses/man/curs_addch.3x head/contrib/ncurses/man/curs_addchstr.3x head/contrib/ncurses/man/curs_addstr.3x head/contrib/ncurses/man/curs_addwstr.3x head/contrib/ncurses/man/curs_attr.3x head/contrib/ncurses/
svn commit: r358125 - in vendor/ncurses/dist: . Ada95 Ada95/doc Ada95/gen Ada95/include Ada95/samples Ada95/src c++ doc/html doc/html/ada doc/html/ada/funcs doc/html/man form include man menu misc ...
Author: bapt Date: Wed Feb 19 16:58:06 2020 New Revision: 358125 URL: https://svnweb.freebsd.org/changeset/base/358125 Log: import ncurses 6.2-20200215 Added: vendor/ncurses/dist/Ada95/samples/split-path.awk (contents, props changed) Modified: vendor/ncurses/dist/ANNOUNCE vendor/ncurses/dist/AUTHORS vendor/ncurses/dist/Ada95/Makefile.in vendor/ncurses/dist/Ada95/README vendor/ncurses/dist/Ada95/TODO vendor/ncurses/dist/Ada95/aclocal.m4 vendor/ncurses/dist/Ada95/configure vendor/ncurses/dist/Ada95/configure.in vendor/ncurses/dist/Ada95/doc/Makefile.in vendor/ncurses/dist/Ada95/gen/Makefile.in vendor/ncurses/dist/Ada95/gen/adacurses-config.in vendor/ncurses/dist/Ada95/gen/gen.c vendor/ncurses/dist/Ada95/gen/html.m4 vendor/ncurses/dist/Ada95/gen/normal.m4 vendor/ncurses/dist/Ada95/gen/table.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses-aux.ads.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses-forms-field_user_data.ads.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses-forms-form_user_data.ads.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses-forms.ads.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses-menus-item_user_data.ads.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses-menus-menu_user_data.ads.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses-menus.ads.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses-mouse.ads.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses-panels-user_data.ads.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses-panels.ads.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses-trace.ads.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses.adb.m4 vendor/ncurses/dist/Ada95/gen/terminal_interface-curses.ads.m4 vendor/ncurses/dist/Ada95/include/MKncurses_def.sh vendor/ncurses/dist/Ada95/include/Makefile.in vendor/ncurses/dist/Ada95/include/ncurses_cfg.hin vendor/ncurses/dist/Ada95/include/ncurses_defs vendor/ncurses/dist/Ada95/make-tar.sh vendor/ncurses/dist/Ada95/mk-1st.awk vendor/ncurses/dist/Ada95/samples/Makefile.in vendor/ncurses/dist/Ada95/samples/README vendor/ncurses/dist/Ada95/samples/ncurses.adb vendor/ncurses/dist/Ada95/samples/ncurses2-acs_and_scroll.adb vendor/ncurses/dist/Ada95/samples/ncurses2-acs_and_scroll.ads vendor/ncurses/dist/Ada95/samples/ncurses2-acs_display.adb vendor/ncurses/dist/Ada95/samples/ncurses2-acs_display.ads vendor/ncurses/dist/Ada95/samples/ncurses2-attr_test.adb vendor/ncurses/dist/Ada95/samples/ncurses2-attr_test.ads vendor/ncurses/dist/Ada95/samples/ncurses2-color_edit.adb vendor/ncurses/dist/Ada95/samples/ncurses2-color_edit.ads vendor/ncurses/dist/Ada95/samples/ncurses2-color_test.adb vendor/ncurses/dist/Ada95/samples/ncurses2-color_test.ads vendor/ncurses/dist/Ada95/samples/ncurses2-demo_forms.adb vendor/ncurses/dist/Ada95/samples/ncurses2-demo_forms.ads vendor/ncurses/dist/Ada95/samples/ncurses2-demo_pad.adb vendor/ncurses/dist/Ada95/samples/ncurses2-demo_pad.ads vendor/ncurses/dist/Ada95/samples/ncurses2-demo_panels.adb vendor/ncurses/dist/Ada95/samples/ncurses2-demo_panels.ads vendor/ncurses/dist/Ada95/samples/ncurses2-flushinp_test.adb vendor/ncurses/dist/Ada95/samples/ncurses2-flushinp_test.ads vendor/ncurses/dist/Ada95/samples/ncurses2-genericputs.adb vendor/ncurses/dist/Ada95/samples/ncurses2-genericputs.ads vendor/ncurses/dist/Ada95/samples/ncurses2-getch.ads vendor/ncurses/dist/Ada95/samples/ncurses2-getch_test.adb vendor/ncurses/dist/Ada95/samples/ncurses2-getch_test.ads vendor/ncurses/dist/Ada95/samples/ncurses2-getopt.adb vendor/ncurses/dist/Ada95/samples/ncurses2-getopt.ads vendor/ncurses/dist/Ada95/samples/ncurses2-m.adb vendor/ncurses/dist/Ada95/samples/ncurses2-m.ads vendor/ncurses/dist/Ada95/samples/ncurses2-menu_test.adb vendor/ncurses/dist/Ada95/samples/ncurses2-menu_test.ads vendor/ncurses/dist/Ada95/samples/ncurses2-overlap_test.adb vendor/ncurses/dist/Ada95/samples/ncurses2-overlap_test.ads vendor/ncurses/dist/Ada95/samples/ncurses2-slk_test.adb vendor/ncurses/dist/Ada95/samples/ncurses2-slk_test.ads vendor/ncurses/dist/Ada95/samples/ncurses2-test_sgr_attributes.adb vendor/ncurses/dist/Ada95/samples/ncurses2-test_sgr_attributes.ads vendor/ncurses/dist/Ada95/samples/ncurses2-trace_set.adb vendor/ncurses/dist/Ada95/samples/ncurses2-trace_set.ads vendor/ncurses/dist/Ada95/samples/ncurses2-util.adb vendor/ncurses/dist/Ada95/samples/ncurses2-util.ads vendor/ncurses/dist/Ada95/samples/ncurses2.ads vendor/ncurses/dist/Ada95/samples/rain.adb vendor/ncurses/dist/Ada95/samples/rain.ads vendor/ncurses/dist/Ada95/samples/sample-curses_demo-attributes.adb vendor/ncurses/dist/Ada95/samples/sample-curses_demo-attributes.ads vendor/ncurses/dist/Ada95/samples/sample-curses_demo-mouse.adb
Re: svn commit: r358062 - in head: contrib/ncurses contrib/ncurses/doc contrib/ncurses/doc/html contrib/ncurses/form contrib/ncurses/include contrib/ncurses/man contrib/ncurses/menu contrib/ncurses/mi
On Wed, Feb 19, 2020 at 05:18:25PM +0200, Konstantin Belousov wrote: > On Wed, Feb 19, 2020 at 10:41:27AM +0100, Baptiste Daroussin wrote: > > On Wed, Feb 19, 2020 at 11:02:11AM +0300, Yuri Pankov wrote: > > > On 18 Feb 2020, at 11:11, Baptiste Daroussin wrote: > > > > > > > > Author: bapt > > > > Date: Tue Feb 18 08:11:52 2020 > > > > New Revision: 358062 > > > > URL: https://svnweb.freebsd.org/changeset/base/358062 > > > > > > > > Log: > > > > Update ncurses to 20200118 > > > > > > > > Among the changes from before: > > > > - Add support for extended colors on widechar version > > > > - Enable ncurses extended functions > > > > - Enable version 2 of the extended mouse support > > > > - Enable SCREEN extensions > > > > > > > > Modification that differs from upstream: > > > > - _nc_delink_entries used to be exposed and was turn static, > > > >turn it back as dynamic to not break abi > > > > - Adapt our old termcap.c to modern ncurses > > > > > > > > MFC after: 3 weeks > > > > > > Somewhat confusingly, I had to rebuild e.g. dialog4ports after this > > > change as it was displaying garbage. May be a brief headsup is in order > > > (or am I the only one seeing it)? > > > > I will add a not in UPDATING > > Does this mean that the ABI of the libraries changed ? > If yes, that means that the dso version bump is needed (curses seems to be > not versioned). That is what I do not understand yet, according to abi lab, no it hasn't changed. but the reality if that some unicode caracters are not properly rendered when using that new library without having been rebuilt with it. Best regards, Bapt signature.asc Description: PGP signature
svn commit: r358114 - stable/12/bin/sh
Author: bapt Date: Wed Feb 19 14:51:39 2020 New Revision: 358114 URL: https://svnweb.freebsd.org/changeset/base/358114 Log: MFC r352385: Do not use our custom completion function, it is not needed anymore Modified: stable/12/bin/sh/histedit.c Directory Properties: stable/12/ (props changed) Modified: stable/12/bin/sh/histedit.c == --- stable/12/bin/sh/histedit.c Wed Feb 19 14:49:32 2020(r358113) +++ stable/12/bin/sh/histedit.c Wed Feb 19 14:51:39 2020(r358114) @@ -124,7 +124,7 @@ histedit(void) el_set(el, EL_PROMPT, getprompt); el_set(el, EL_ADDFN, "sh-complete", "Filename completion", - _el_fn_sh_complete); + _el_fn_complete); } else { bad: out2fmt_flush("sh: can't initialize editing\n"); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358113 - in stable/12: contrib/libedit lib/libedit lib/libedit/TEST lib/libedit/edit lib/libedit/readline
Author: bapt Date: Wed Feb 19 14:49:32 2020 New Revision: 358113 URL: https://svnweb.freebsd.org/changeset/base/358113 Log: MFC r352136, r352204, r352275, r352341 r352136: Import libedit 2019-09-10 Compared to current version in base: - great improvements on the Unicode support - full support for filename completion including quoting which means we do not need anymore our custom addition) - Improved readline compatiblity Upgrading libedit has been a pain in the past, because somehow we never managed to properly cleanup the tree in lib/libedit and each merge has always been very painful. After years of fighting give up and refresh a merge from scrarch properly in contrib. Note that the switch to this version will be done in another commit. r352204: Readd _el_fn_sh_complete for backward compatibility This function is not needed anymore, it allows old sh binary to continue to run and avoid breaking backward compatibility. Note that is now just calls the regular _el_fn_complete which does a proper job at quoting. Discussed with: jilles r352275: Update libedit to a snapshot from 2019-09-10 This version bring many fixes regarding unicode support It also adds proper support for filename completion (we do not need our custom patches anymore) Improves the libreadline compatibility Note that the same work was done by Yuichiro Naito in https://reviews.freebsd.org/D21196 the main difference is in this case we have reimported libedit in contrib to fix a long standing mess in the previous merges which prevented a proper update workflow. (discussed long ago with pfg@) The only difference with upstream libedit is we have added a compatibility shim for the _elf_fn_sh_complete function which we previously added to support quoting in filename completion and is not needed anymore. This was added to continue supported old /bin/sh binaries and not break backward compatibility (as discussed with jilles@) Reviewed by: Yuichiro Naito Differential Revision: https://reviews.freebsd.org/D21584 r352341: Fix arm and aarch64 builds of libedit after r352275 On arm and arm64, where chars are unsigned by default, buildworld dies with: --- terminal.o --- /usr/src/contrib/libedit/terminal.c:569:41: error: comparison of integers of different signs: 'wint_t' (aka 'int') and 'wchar_t' (aka 'unsigned int') [-Werror,-Wsign-compare] el->el_cursor.v][where & 0370] != ~~ ^ /usr/src/contrib/libedit/terminal.c:659:28: error: comparison of integers of different signs: 'wint_t' (aka 'int') and 'wchar_t' (aka 'unsigned int') [-Werror,-Wsign-compare] [el->el_cursor.h] == MB_FILL_CHAR) ~ ^ Fix this by making MB_FILL_CHAR a wint_t, so no casting is needed. Note that in https://reviews.freebsd.org/D21584 this was also proposed by Yuichiro Naito . Reviewed by: bapt Subscribers: naito.yuichiro_gmail.com, ml_vishwin.info X-MFC-With: r352275 Differential Revision: https://reviews.freebsd.org/D21657 Added: stable/12/contrib/libedit/ - copied from r352136, head/contrib/libedit/ stable/12/lib/libedit/readline/ - copied from r352275, head/lib/libedit/readline/ Deleted: stable/12/lib/libedit/Makefile.depend stable/12/lib/libedit/TEST/ stable/12/lib/libedit/chared.c stable/12/lib/libedit/chared.h stable/12/lib/libedit/chartype.c stable/12/lib/libedit/chartype.h stable/12/lib/libedit/common.c stable/12/lib/libedit/config.h stable/12/lib/libedit/edit/ stable/12/lib/libedit/editline.3 stable/12/lib/libedit/editrc.5 stable/12/lib/libedit/el.c stable/12/lib/libedit/el.h stable/12/lib/libedit/eln.c stable/12/lib/libedit/emacs.c stable/12/lib/libedit/filecomplete.c stable/12/lib/libedit/filecomplete.h stable/12/lib/libedit/hist.c stable/12/lib/libedit/hist.h stable/12/lib/libedit/histedit.h stable/12/lib/libedit/history.c stable/12/lib/libedit/keymacro.c stable/12/lib/libedit/keymacro.h stable/12/lib/libedit/makelist stable/12/lib/libedit/map.c stable/12/lib/libedit/map.h stable/12/lib/libedit/parse.c stable/12/lib/libedit/parse.h stable/12/lib/libedit/prompt.c stable/12/lib/libedit/prompt.h stable/12/lib/libedit/read.c stable/12/lib/libedit/read.h stable/12/lib/libedit/readline.c stable/12/lib/libedit/refresh.c stable/12/lib/libedit/refresh.h stable/12/lib/libedit/search.c stable/12/lib/libedit/search.h stable/12/lib/libedit/sig.c stable/12/lib/libedit/sig.h stable/12/lib/libedit/sys.h stable/12/lib/libedit/terminal.c stable/12/lib/libedit/terminal.h stable/12/lib/libedit/tokenizer.c stable/12/lib/libedit/tty.c stable/12/lib/libedit/tty.h stable/12/lib/libedit/vi.c Modified: stable/12/con
svn commit: r358112 - in stable/12: contrib/gdb/gdb contrib/gdb/gdb/cli gnu/usr.bin/gdb gnu/usr.bin/gdb/kgdb
Author: bapt Date: Wed Feb 19 14:42:21 2020 New Revision: 358112 URL: https://svnweb.freebsd.org/changeset/base/358112 Log: MFC r352242, r352249 r352242: Remove usesless readline compat includes which will reinclude readline.h itself. This simplifies the upcoming update to newer libedit. r352249: Get the readline header from the installed header instead of the from the source location. Modified: stable/12/contrib/gdb/gdb/cli/cli-cmds.c stable/12/contrib/gdb/gdb/cli/cli-setshow.c stable/12/contrib/gdb/gdb/event-top.c stable/12/contrib/gdb/gdb/top.c stable/12/contrib/gdb/gdb/tracepoint.c stable/12/gnu/usr.bin/gdb/Makefile.inc stable/12/gnu/usr.bin/gdb/kgdb/trgt.c Directory Properties: stable/12/ (props changed) Modified: stable/12/contrib/gdb/gdb/cli/cli-cmds.c == --- stable/12/contrib/gdb/gdb/cli/cli-cmds.cWed Feb 19 14:40:53 2020 (r358111) +++ stable/12/contrib/gdb/gdb/cli/cli-cmds.cWed Feb 19 14:42:21 2020 (r358112) @@ -21,7 +21,6 @@ #include "defs.h" #include "readline/readline.h" -#include "readline/tilde.h" #include "completer.h" #include "target.h" /* For baud_rate, remote_debug and remote_timeout */ #include "gdb_wait.h" /* For shell escape implementation */ Modified: stable/12/contrib/gdb/gdb/cli/cli-setshow.c == --- stable/12/contrib/gdb/gdb/cli/cli-setshow.c Wed Feb 19 14:40:53 2020 (r358111) +++ stable/12/contrib/gdb/gdb/cli/cli-setshow.c Wed Feb 19 14:42:21 2020 (r358112) @@ -18,7 +18,6 @@ Boston, MA 02111-1307, USA. */ #include "defs.h" -#include "readline/tilde.h" #include "value.h" #include #include "gdb_string.h" Modified: stable/12/contrib/gdb/gdb/event-top.c == --- stable/12/contrib/gdb/gdb/event-top.c Wed Feb 19 14:40:53 2020 (r358111) +++ stable/12/contrib/gdb/gdb/event-top.c Wed Feb 19 14:42:21 2020 (r358112) @@ -34,7 +34,6 @@ /* readline include files */ #include "readline/readline.h" -#include "readline/history.h" /* readline defines this. */ #undef savestring Modified: stable/12/contrib/gdb/gdb/top.c == --- stable/12/contrib/gdb/gdb/top.c Wed Feb 19 14:40:53 2020 (r358111) +++ stable/12/contrib/gdb/gdb/top.c Wed Feb 19 14:42:21 2020 (r358112) @@ -48,7 +48,6 @@ /* readline include files */ #include "readline/readline.h" -#include "readline/history.h" /* readline defines this. */ #undef savestring Modified: stable/12/contrib/gdb/gdb/tracepoint.c == --- stable/12/contrib/gdb/gdb/tracepoint.c Wed Feb 19 14:40:53 2020 (r358111) +++ stable/12/contrib/gdb/gdb/tracepoint.c Wed Feb 19 14:42:21 2020 (r358112) @@ -45,7 +45,6 @@ /* readline include files */ #include "readline/readline.h" -#include "readline/history.h" /* readline defines this. */ #undef savestring Modified: stable/12/gnu/usr.bin/gdb/Makefile.inc == --- stable/12/gnu/usr.bin/gdb/Makefile.inc Wed Feb 19 14:40:53 2020 (r358111) +++ stable/12/gnu/usr.bin/gdb/Makefile.inc Wed Feb 19 14:42:21 2020 (r358112) @@ -45,7 +45,7 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config CFLAGS+= -I${CNTRB_BU}/include CFLAGS+= -I${CNTRB_GDB}/include CFLAGS+= -I${CNTRB_BU}/bfd -CFLAGS+= -I${SRCTOP}/lib/libedit/edit +CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit GENSRCS+= nm.h tm.h Modified: stable/12/gnu/usr.bin/gdb/kgdb/trgt.c == --- stable/12/gnu/usr.bin/gdb/kgdb/trgt.c Wed Feb 19 14:40:53 2020 (r358111) +++ stable/12/gnu/usr.bin/gdb/kgdb/trgt.c Wed Feb 19 14:42:21 2020 (r358112) @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358110 - in stable/12/usr.sbin/ntp: libntp ntpdc ntpq
Author: bapt Date: Wed Feb 19 14:37:56 2020 New Revision: 358110 URL: https://svnweb.freebsd.org/changeset/base/358110 Log: MFC r352247-r352248 r352247: Remove useless extra definition of libedit flags Note that all the line editor part is done in the libntp r352248: Get the readline header from the installed header instead of the from the source location. With newer import of libedit, the path to be able to access readline/readline.h will also include header which name will conflict with some expected by ntp in another path and end up breaking the build. Modified: stable/12/usr.sbin/ntp/libntp/Makefile stable/12/usr.sbin/ntp/ntpdc/Makefile stable/12/usr.sbin/ntp/ntpq/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/ntp/libntp/Makefile == --- stable/12/usr.sbin/ntp/libntp/Makefile Wed Feb 19 14:32:55 2020 (r358109) +++ stable/12/usr.sbin/ntp/libntp/Makefile Wed Feb 19 14:37:56 2020 (r358110) @@ -79,7 +79,7 @@ CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \ -I${SRCTOP}/contrib/ntp/sntp/libopts \ -I${SRCTOP}/lib/libc/${MACHINE_ARCH} \ - -I${SRCTOP}/lib/libedit/edit \ + -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit \ -I${.CURDIR:H} \ -I${.CURDIR}/ Modified: stable/12/usr.sbin/ntp/ntpdc/Makefile == --- stable/12/usr.sbin/ntp/ntpdc/Makefile Wed Feb 19 14:32:55 2020 (r358109) +++ stable/12/usr.sbin/ntp/ntpdc/Makefile Wed Feb 19 14:37:56 2020 (r358110) @@ -18,8 +18,6 @@ CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ -I${.CURDIR:H} -I${.CURDIR} LIBADD=edit ntp m opts pthread -CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \ - -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit .if ${MK_OPENSSL} != "no" LIBADD+= crypto Modified: stable/12/usr.sbin/ntp/ntpq/Makefile == --- stable/12/usr.sbin/ntp/ntpq/MakefileWed Feb 19 14:32:55 2020 (r358109) +++ stable/12/usr.sbin/ntp/ntpq/MakefileWed Feb 19 14:37:56 2020 (r358110) @@ -28,9 +28,6 @@ LIBADD+= crypto LIBADD+= md .endif -CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \ - -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit - CLEANFILES+= .version version.c version.c: ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358108 - stable/12/tools/tools/locale/tools
Author: bapt Date: Wed Feb 19 14:29:47 2020 New Revision: 358108 URL: https://svnweb.freebsd.org/changeset/base/358108 Log: MFC r352274: Insert proper copyright/license headers Those scripts are without copyright and license assignement since their creation After grabbing information from The various authors and contributors assign proper license header and copyrights. This has been reported by yuripv in his work on integrating those in Illumos! Reported by: yuripv Discussed with: marino, edwin Modified: stable/12/tools/tools/locale/tools/charmaps.pm stable/12/tools/tools/locale/tools/cldr2def.pl stable/12/tools/tools/locale/tools/extract-colldef.awk stable/12/tools/tools/locale/tools/finalize stable/12/tools/tools/locale/tools/utf8-rollup.pl Directory Properties: stable/12/ (props changed) Modified: stable/12/tools/tools/locale/tools/charmaps.pm == --- stable/12/tools/tools/locale/tools/charmaps.pm Wed Feb 19 14:27:22 2020(r358107) +++ stable/12/tools/tools/locale/tools/charmaps.pm Wed Feb 19 14:29:47 2020(r358108) @@ -1,5 +1,29 @@ #!/usr/local/bin/perl -w +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright 2009 Edwin Groothuis +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +#notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +#notice, this list of conditions and the following disclaimer in the +#documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. # # $FreeBSD$ # Modified: stable/12/tools/tools/locale/tools/cldr2def.pl == --- stable/12/tools/tools/locale/tools/cldr2def.pl Wed Feb 19 14:27:22 2020(r358107) +++ stable/12/tools/tools/locale/tools/cldr2def.pl Wed Feb 19 14:29:47 2020(r358108) @@ -1,4 +1,31 @@ #!/usr/local/bin/perl -wC + +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright 2009 Edwin Groothuis +# Copyright 2015 John Marino +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +#notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +#notice, this list of conditions and the following disclaimer in the +#documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# # $FreeBSD$ use strict; Modified: stable/12/tools/tools/locale/tools/extract-colldef.awk == --- stable/12/tools/tools/locale/tools/extract-colldef.awk Wed Feb 19 14:27:22 2020(r358107) +++ stable/12/tools/tools/locale/tools/extract-colldef.awk Wed Feb 19 14:29:47 2020(r358108) @@ -1,3 +1,29 @@ +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright 2016 Baptiste Daroussin +# +# Redistribution and use in source and binary forms, with or wit
svn commit: r358107 - stable/11/share/man/man7
Author: bapt Date: Wed Feb 19 14:27:22 2020 New Revision: 358107 URL: https://svnweb.freebsd.org/changeset/base/358107 Log: MFC r356918: The ports tree now accepts /usr/local/share/man as a directory for manpage and will slowly transition from /usr/local/man to it. To reflect this remove the documentation of the manpages being an exception in the layout of /usr/local Reported by: Dan Nelson (via IRC) Modified: stable/11/share/man/man7/hier.7 Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man7/hier.7 == --- stable/11/share/man/man7/hier.7 Wed Feb 19 14:26:27 2020 (r358106) +++ stable/11/share/man/man7/hier.7 Wed Feb 19 14:27:22 2020 (r358107) @@ -28,7 +28,7 @@ .\"@(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd September 10, 2019 +.Dd January 20, 2020 .Dt HIER 7 .Os .Sh NAME @@ -435,12 +435,6 @@ for .Pa /usr should be used. Exceptions are the -.Pa man -directory -.Po directly under -.Pa local/ -rather than under -.Pa local/share/ Ns Pc , ports documentation .Po in .Pa share/doc// Ns Pc , ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358106 - stable/12/share/man/man7
Author: bapt Date: Wed Feb 19 14:26:27 2020 New Revision: 358106 URL: https://svnweb.freebsd.org/changeset/base/358106 Log: MFC r356918: The ports tree now accepts /usr/local/share/man as a directory for manpage and will slowly transition from /usr/local/man to it. To reflect this remove the documentation of the manpages being an exception in the layout of /usr/local Reported by: Dan Nelson (via IRC) Modified: stable/12/share/man/man7/hier.7 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man7/hier.7 == --- stable/12/share/man/man7/hier.7 Wed Feb 19 14:26:27 2020 (r358105) +++ stable/12/share/man/man7/hier.7 Wed Feb 19 14:26:27 2020 (r358106) @@ -28,7 +28,7 @@ .\"@(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd September 10, 2019 +.Dd January 20, 2020 .Dt HIER 7 .Os .Sh NAME @@ -414,12 +414,6 @@ for .Pa /usr should be used. Exceptions are the -.Pa man -directory -.Po directly under -.Pa local/ -rather than under -.Pa local/share/ Ns Pc , ports documentation .Po in .Pa share/doc// Ns Pc , ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358104 - stable/12/tools/build/mk
Author: bapt Date: Wed Feb 19 14:24:05 2020 New Revision: 358104 URL: https://svnweb.freebsd.org/changeset/base/358104 Log: MFC r353100: Do not remove the locale directory when building a system without locales This directory is actually needed during make installworld and will prevent to reinstall a system after make delete-old is done. PR: 226137 Reported by: rakuco Modified: stable/12/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/12/ (props changed) Modified: stable/12/tools/build/mk/OptionalObsoleteFiles.inc == --- stable/12/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 19 14:18:17 2020(r358103) +++ stable/12/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 19 14:24:05 2020(r358104) @@ -4849,7 +4849,6 @@ OLD_FILES+=usr/share/man/man1/lldb.1.gz .endif .if ${MK_LOCALES} == no -OLD_DIRS+=usr/share/locale OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358103 - head
Author: bapt Date: Wed Feb 19 14:18:17 2020 New Revision: 358103 URL: https://svnweb.freebsd.org/changeset/base/358103 Log: Add a note about some fallouts due to the ncurses update Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Wed Feb 19 14:16:48 2020(r358102) +++ head/UPDATING Wed Feb 19 14:18:17 2020(r358103) @@ -26,6 +26,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20200218: + ncurses has been updated to a newer version (6.1-20200118). After an + update some applications using ncurses may results have some rendering + problems and would need to be rebuilt. + 20200217: The size of struct vnet and the magic cookie have changed. Users need to recompile libkvm and all modules using VIMAGE ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r358100 - head/lib/ncurses/ncurses
Author: bapt Date: Wed Feb 19 14:09:15 2020 New Revision: 358100 URL: https://svnweb.freebsd.org/changeset/base/358100 Log: lib_gen.c now also depends on ncurses_dll.h specify it to prevent some breakage if ncurses_dll.h is already present in base while building Modified: head/lib/ncurses/ncurses/Makefile Modified: head/lib/ncurses/ncurses/Makefile == --- head/lib/ncurses/ncurses/Makefile Wed Feb 19 12:49:49 2020 (r358099) +++ head/lib/ncurses/ncurses/Makefile Wed Feb 19 14:09:15 2020 (r358100) @@ -345,7 +345,7 @@ names.c: MKnames.awk codes.c: MKcodes.awk ${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKcodes.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > codes.c -lib_gen.c: MKlib_gen.sh curses.h +lib_gen.c: MKlib_gen.sh curses.h ncurses_dll.h LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CPP:N${CCACHE_BIN}} ${CPPFLAGS}" \ "${AWK}" generated < curses.h >$@ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r358062 - in head: contrib/ncurses contrib/ncurses/doc contrib/ncurses/doc/html contrib/ncurses/form contrib/ncurses/include contrib/ncurses/man contrib/ncurses/menu contrib/ncurses/mi
On Wed, Feb 19, 2020 at 04:45:27AM -0800, Rodney W. Grimes wrote: > > On 18 Feb 2020, at 11:11, Baptiste Daroussin wrote: > > > > > > Author: bapt > > > Date: Tue Feb 18 08:11:52 2020 > > > New Revision: 358062 > > > URL: https://svnweb.freebsd.org/changeset/base/358062 > > > > > > Log: > > > Update ncurses to 20200118 > > > > > > Among the changes from before: > > > - Add support for extended colors on widechar version > > > - Enable ncurses extended functions > > > - Enable version 2 of the extended mouse support > > > - Enable SCREEN extensions > > > > > > Modification that differs from upstream: > > > - _nc_delink_entries used to be exposed and was turn static, > > >turn it back as dynamic to not break abi > > > - Adapt our old termcap.c to modern ncurses > > > > > > MFC after: 3 weeks > > > > Somewhat confusingly, I had to rebuild e.g. dialog4ports after this change > > as it was displaying garbage. May be a brief headsup is in order (or am I > > the only one seeing it)? > > If this is infact found to cause those types of dependency breakage I would > wonder about MFC: status. > Yes I don't plan to MFC without a fix on this, if any. Best regards, Bapt signature.asc Description: PGP signature
Re: svn commit: r358062 - in head: contrib/ncurses contrib/ncurses/doc contrib/ncurses/doc/html contrib/ncurses/form contrib/ncurses/include contrib/ncurses/man contrib/ncurses/menu contrib/ncurses/mi
On Wed, Feb 19, 2020 at 11:02:11AM +0300, Yuri Pankov wrote: > On 18 Feb 2020, at 11:11, Baptiste Daroussin wrote: > > > > Author: bapt > > Date: Tue Feb 18 08:11:52 2020 > > New Revision: 358062 > > URL: https://svnweb.freebsd.org/changeset/base/358062 > > > > Log: > > Update ncurses to 20200118 > > > > Among the changes from before: > > - Add support for extended colors on widechar version > > - Enable ncurses extended functions > > - Enable version 2 of the extended mouse support > > - Enable SCREEN extensions > > > > Modification that differs from upstream: > > - _nc_delink_entries used to be exposed and was turn static, > >turn it back as dynamic to not break abi > > - Adapt our old termcap.c to modern ncurses > > > > MFC after: 3 weeks > > Somewhat confusingly, I had to rebuild e.g. dialog4ports after this change as > it was displaying garbage. May be a brief headsup is in order (or am I the > only one seeing it)? I will add a not in UPDATING Best regards, Bapt signature.asc Description: PGP signature
svn commit: r358062 - in head: contrib/ncurses contrib/ncurses/doc contrib/ncurses/doc/html contrib/ncurses/form contrib/ncurses/include contrib/ncurses/man contrib/ncurses/menu contrib/ncurses/mis...
Author: bapt Date: Tue Feb 18 08:11:52 2020 New Revision: 358062 URL: https://svnweb.freebsd.org/changeset/base/358062 Log: Update ncurses to 20200118 Among the changes from before: - Add support for extended colors on widechar version - Enable ncurses extended functions - Enable version 2 of the extended mouse support - Enable SCREEN extensions Modification that differs from upstream: - _nc_delink_entries used to be exposed and was turn static, turn it back as dynamic to not break abi - Adapt our old termcap.c to modern ncurses MFC after:3 weeks Added: head/contrib/ncurses/VERSION - copied unchanged from r357645, vendor/ncurses/dist/VERSION head/contrib/ncurses/include/Caps-ncurses - copied unchanged from r357645, vendor/ncurses/dist/include/Caps-ncurses head/contrib/ncurses/man/new_pair.3x - copied unchanged from r357645, vendor/ncurses/dist/man/new_pair.3x head/contrib/ncurses/man/scr_dump.5 - copied unchanged from r357645, vendor/ncurses/dist/man/scr_dump.5 head/contrib/ncurses/man/user_caps.5 - copied unchanged from r357645, vendor/ncurses/dist/man/user_caps.5 head/contrib/ncurses/misc/magic - copied unchanged from r357645, vendor/ncurses/dist/misc/magic head/contrib/ncurses/ncurses/base/new_pair.c - copied unchanged from r357645, vendor/ncurses/dist/ncurses/base/new_pair.c head/contrib/ncurses/ncurses/new_pair.h - copied unchanged from r357645, vendor/ncurses/dist/ncurses/new_pair.h head/contrib/ncurses/ncurses/report_offsets.c - copied unchanged from r357645, vendor/ncurses/dist/ncurses/report_offsets.c head/contrib/ncurses/ncurses/tinfo/MKuserdefs.sh - copied unchanged from r357645, vendor/ncurses/dist/ncurses/tinfo/MKuserdefs.sh head/contrib/ncurses/progs/clear_cmd.c - copied unchanged from r357645, vendor/ncurses/dist/progs/clear_cmd.c head/contrib/ncurses/progs/clear_cmd.h - copied unchanged from r357645, vendor/ncurses/dist/progs/clear_cmd.h head/contrib/ncurses/progs/reset_cmd.c - copied unchanged from r357645, vendor/ncurses/dist/progs/reset_cmd.c head/contrib/ncurses/progs/reset_cmd.h - copied unchanged from r357645, vendor/ncurses/dist/progs/reset_cmd.h head/contrib/ncurses/progs/tparm_type.c - copied unchanged from r357645, vendor/ncurses/dist/progs/tparm_type.c head/contrib/ncurses/progs/tparm_type.h - copied unchanged from r357645, vendor/ncurses/dist/progs/tparm_type.h head/contrib/ncurses/progs/tty_settings.c - copied unchanged from r357645, vendor/ncurses/dist/progs/tty_settings.c head/contrib/ncurses/progs/tty_settings.h - copied unchanged from r357645, vendor/ncurses/dist/progs/tty_settings.h Modified: head/contrib/ncurses/ANNOUNCE head/contrib/ncurses/AUTHORS head/contrib/ncurses/COPYING head/contrib/ncurses/INSTALL head/contrib/ncurses/MANIFEST head/contrib/ncurses/Makefile.in head/contrib/ncurses/NEWS head/contrib/ncurses/README head/contrib/ncurses/README.emx head/contrib/ncurses/aclocal.m4 head/contrib/ncurses/announce.html.in head/contrib/ncurses/config.guess head/contrib/ncurses/config.sub head/contrib/ncurses/configure head/contrib/ncurses/configure.in head/contrib/ncurses/dist.mk head/contrib/ncurses/doc/hackguide.doc head/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html head/contrib/ncurses/doc/html/announce.html head/contrib/ncurses/doc/html/hackguide.html head/contrib/ncurses/doc/html/ncurses-intro.html head/contrib/ncurses/doc/ncurses-intro.doc head/contrib/ncurses/form/Makefile.in head/contrib/ncurses/form/f_trace.c head/contrib/ncurses/form/fld_arg.c head/contrib/ncurses/form/fld_attr.c head/contrib/ncurses/form/fld_current.c head/contrib/ncurses/form/fld_def.c head/contrib/ncurses/form/fld_ftchoice.c head/contrib/ncurses/form/fld_max.c head/contrib/ncurses/form/fld_newftyp.c head/contrib/ncurses/form/form.h head/contrib/ncurses/form/form.priv.h head/contrib/ncurses/form/frm_driver.c head/contrib/ncurses/form/frm_hook.c head/contrib/ncurses/form/frm_post.c head/contrib/ncurses/form/frm_req_name.c head/contrib/ncurses/form/fty_generic.c head/contrib/ncurses/form/fty_num.c head/contrib/ncurses/form/fty_regex.c head/contrib/ncurses/form/llib-lform head/contrib/ncurses/form/llib-lformt head/contrib/ncurses/form/llib-lformtw head/contrib/ncurses/form/llib-lformw head/contrib/ncurses/include/Caps head/contrib/ncurses/include/Caps.aix4 head/contrib/ncurses/include/Caps.hpux11 head/contrib/ncurses/include/Caps.keys head/contrib/ncurses/include/Caps.osf1r5 head/contrib/ncurses/include/Caps.uwin head/contrib/ncurses/include/MKhashsize.sh head/contrib/ncurses/include/MKkey_defs.sh head/contrib/ncurses/include/MKncurses_def.sh head/contrib/ncurses/include/MKparametrized.sh head/contrib/ncurses/include/MKterm.h.awk.in head/contrib/ncurses/include/Makefile.in head/contrib/ncurses/include/curses.h.i
svn commit: r357652 - head/usr.bin/diff
Author: bapt Date: Fri Feb 7 12:26:38 2020 New Revision: 357652 URL: https://svnweb.freebsd.org/changeset/base/357652 Log: Fix most of the style warnings Modified: head/usr.bin/diff/diff.1 Modified: head/usr.bin/diff/diff.1 == --- head/usr.bin/diff/diff.1Fri Feb 7 12:15:39 2020(r357651) +++ head/usr.bin/diff/diff.1Fri Feb 7 12:26:38 2020(r357652) @@ -30,7 +30,7 @@ .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 .\" $FreeBSD$ .\" -.Dd February 07, 2020 +.Dd February 7, 2020 .Dt DIFF 1 .Os .Sh NAME @@ -232,7 +232,7 @@ are marked with those added to .Ar file2 are marked -.Sq \+\ \& . +.Sq +\ \& . Lines which are changed from one file to the other are marked in both files with .Sq !\ \& . @@ -300,11 +300,12 @@ However, unlike with all lines to be changed (added and/or removed) are present in a single section. .It Fl y Fl -side-by-side -Output in two columns with a marker between them. The marker can be one +Output in two columns with a marker between them. +The marker can be one of the following: .Pp .Bl -tag -width Ds -offset indent -compact -.It space +.It space Corresponding lines are identical. .It '|' Corresponding lines are different. @@ -318,9 +319,7 @@ Files differ and only the second file contains the lin Comparison options: .Bl -tag -width Ds .It Fl a -text -Treat all files as -.Tn ASCII -text. +Treat all files as ASCII text. Normally .Nm will simply print @@ -394,7 +393,8 @@ will compare equal to .It Fl W Ar number Fl -width Ar number Output at most .Ar number -columns when using side by side format. The default value is 130. +columns when using side by side format. +The default value is 130. .It Fl -changed-group-format Ar GFMT Format input groups in the provided .Pp @@ -473,9 +473,8 @@ Binary files which differ, common subdirectories, and files which appear in only one directory are described as such. In directory mode only regular files and directories are compared. -If a non-regular file such as a device special file or -.Tn FIFO -is encountered, a diagnostic message is printed. +If a non-regular file such as a device special file or FIFO is encountered, +a diagnostic message is printed. .Pp If only one of .Ar file1 @@ -596,7 +595,7 @@ pairs (where num1 = num2) are abbreviated as a single number. .Sh FILES .Bl -tag -width /tmp/diff. -compact -.It Pa /tmp/diff. Ns Ar +.It Pa /tmp/diff. Temporary file used when comparing a device or the standard input. Note that the temporary file is unlinked as soon as it is created so it will not show up in a directory listing. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r357649 - head/usr.bin/diff
Author: bapt Date: Fri Feb 7 10:18:01 2020 New Revision: 357649 URL: https://svnweb.freebsd.org/changeset/base/357649 Log: Update diff(1) TODO removing what has been implemented Modified: head/usr.bin/diff/TODO Modified: head/usr.bin/diff/TODO == --- head/usr.bin/diff/TODO Fri Feb 7 10:17:13 2020(r357648) +++ head/usr.bin/diff/TODO Fri Feb 7 10:18:01 2020(r357649) @@ -1,9 +1,3 @@ --y: - * soc implemented it via calling sdiff directly, but some options are - incompatible so it is fragile - * just recommend the user to run sdiff directly and do not implement it - * make a libsdiff and use that directly to avoid duplicating the code - to be implemented: --horizon-lines --ignore-tab-expansion @@ -13,5 +7,3 @@ Will probably be not implemented: --GTYPE-group-format (partially implement - minimal) --LTYPE-line-format --help (We have a manpage already) ---suppress-common-lines: depends on -y (won't be implemented, as it conflicts -the way sdiff expects it and in any case we have sdiff for that feature) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r357648 - in head/usr.bin/diff: . tests
Author: bapt Date: Fri Feb 7 10:17:13 2020 New Revision: 357648 URL: https://svnweb.freebsd.org/changeset/base/357648 Log: diff: implement -y (--side-by-side) along with -W and --suppress-common-lines PR: 219933 Submitted by: fehmi noyan isi MFC after:3 weeks Modified: head/usr.bin/diff/diff.1 head/usr.bin/diff/diff.c head/usr.bin/diff/diff.h head/usr.bin/diff/diffreg.c head/usr.bin/diff/tests/diff_test.sh Modified: head/usr.bin/diff/diff.1 == --- head/usr.bin/diff/diff.1Fri Feb 7 09:22:08 2020(r357647) +++ head/usr.bin/diff/diff.1Fri Feb 7 10:17:13 2020(r357648) @@ -30,7 +30,7 @@ .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 .\" $FreeBSD$ .\" -.Dd August 18, 2018 +.Dd February 07, 2020 .Dt DIFF 1 .Os .Sh NAME @@ -41,7 +41,7 @@ .Op Fl aBbdipTtw .Oo .Fl c | e | f | -.Fl n | q | u +.Fl n | q | u | y .Oc .Op Fl -brief .Op Fl -changed-group-format Ar GFMT @@ -182,6 +182,21 @@ .Op Fl x Ar pattern | Fl -exclude Ar pattern .Ek .Ar dir1 dir2 +.Nm diff +.Op Fl aBbditwW +.Op --expand-tabs +.Op --ignore-all-blanks +.Op --ignore-blank-lines +.Op --ignore-case +.Op --minimal +.Op --no-ignore-file-name-case +.Op --strip-trailing-cr +.Op --suppress-common-lines +.Op --tabsize +.Op --text +.Op --width +.Fl y | Fl -side-by-side +.Ar file1 file2 .Sh DESCRIPTION The .Nm @@ -284,7 +299,21 @@ However, unlike with .Fl c , all lines to be changed (added and/or removed) are present in a single section. +.It Fl y Fl -side-by-side +Output in two columns with a marker between them. The marker can be one +of the following: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It space +Corresponding lines are identical. +.It '|' +Corresponding lines are different. +.It '<' +Files differ and only the first file contains the line. +.It '>' +Files differ and only the second file contains the line. .El +.El .Pp Comparison options: .Bl -tag -width Ds @@ -362,6 +391,10 @@ E.g., .Dq if (\ \&a == b \&) will compare equal to .Dq if(a==b) . +.It Fl W Ar number Fl -width Ar number +Output at most +.Ar number +columns when using side by side format. The default value is 130. .It Fl -changed-group-format Ar GFMT Format input groups in the provided .Pp @@ -382,7 +415,9 @@ default diff output stub option for compatibility with GNU diff .It Fl -strip-trailing-cr strip carriage return on input files -.It Fl tabsize Ar number +.It Fl -suppress-common-lines +Do not output common lines when using the side by side format +.It Fl -tabsize Ar number Number of spaces representing a tab (default 8) .El .Pp Modified: head/usr.bin/diff/diff.c == --- head/usr.bin/diff/diff.cFri Feb 7 09:22:08 2020(r357647) +++ head/usr.bin/diff/diff.cFri Feb 7 10:17:13 2020(r357648) @@ -37,16 +37,16 @@ __FBSDID("$FreeBSD$"); #include "diff.h" #include "xmalloc.h" -int lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag; -int diff_format, diff_context, status, ignore_file_case; -int tabsize = 8; +int lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag, Wflag; +int diff_format, diff_context, status, ignore_file_case, suppress_common; +int tabsize = 8, width = 130; char *start, *ifdefname, *diffargs, *label[2], *ignore_pats; char *group_format = NULL; struct stat stb1, stb2; struct excludes *excludes_list; regex_t ignore_re; -#defineOPTIONS "0123456789aBbC:cdD:efHhI:iL:lnNPpqrS:sTtU:uwX:x:" +#defineOPTIONS "0123456789aBbC:cdD:efHhI:iL:lnNPpqrS:sTtU:uwW:X:x:y" enum { OPT_TSIZE = CHAR_MAX + 1, OPT_STRIPCR, @@ -55,6 +55,7 @@ enum { OPT_NORMAL, OPT_HORIZON_LINES, OPT_CHANGED_GROUP_FORMAT, + OPT_SUPPRESS_COMMON, }; static struct option longopts[] = { @@ -83,8 +84,10 @@ static struct option longopts[] = { { "initial-tab",no_argument,0, 'T' }, { "unified",optional_argument, 0, 'U' }, { "ignore-all-space", no_argument,0, 'w' }, + { "width", required_argument, 0, 'W' }, { "exclude",required_argument, 0, 'x' }, { "exclude-from", required_argument, 0, 'X' }, + { "side-by-side", no_argument,NULL, 'y' }, { "ignore-file-name-case", no_argument,NULL, OPT_IGN_FN_CASE }, { "horizon-lines", required_argument, NULL, OPT_HORIZON_LINES }, { "no-ignore-file-name-case", no_argument,NULL, OPT_NO_IGN_FN_CASE }, @@ -92,6 +95,7 @@ static struct option longopts[] = { { "strip-trailing-cr", no_argument,NULL, OPT_STRIPCR }, { "tabsize",optio
svn commit: r357646 - vendor/ncurses/6.1-20200118
Author: bapt Date: Fri Feb 7 08:39:00 2020 New Revision: 357646 URL: https://svnweb.freebsd.org/changeset/base/357646 Log: Tag import of ncurses 6.1-20200118 Added: vendor/ncurses/6.1-20200118/ - copied from r357645, vendor/ncurses/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r357645 - in vendor/ncurses/dist: . Ada95 Ada95/doc Ada95/gen Ada95/include Ada95/package Ada95/package/debian Ada95/samples Ada95/src c++ doc doc/html doc/html/ada doc/html/ada/files d...
Author: bapt Date: Fri Feb 7 08:36:41 2020 New Revision: 357645 URL: https://svnweb.freebsd.org/changeset/base/357645 Log: Vendor import ncurses 6.1-20200118 Added: vendor/ncurses/dist/Ada95/samples/sample-explanation.adb_p vendor/ncurses/dist/Ada95/src/c_threaded_variables.c (contents, props changed) vendor/ncurses/dist/Ada95/src/c_threaded_variables.h (contents, props changed) vendor/ncurses/dist/Ada95/src/library-cfg.sh (contents, props changed) vendor/ncurses/dist/Ada95/src/library.gpr.in (contents, props changed) vendor/ncurses/dist/VERSION vendor/ncurses/dist/doc/html/ada/terminal_interface-curses_constants__ads.htm vendor/ncurses/dist/doc/html/man/adacurses6-config.1.html (contents, props changed) vendor/ncurses/dist/doc/html/man/ncurses6-config.1.html (contents, props changed) vendor/ncurses/dist/doc/html/man/new_pair.3x.html (contents, props changed) vendor/ncurses/dist/doc/html/man/scr_dump.5.html (contents, props changed) vendor/ncurses/dist/doc/html/man/user_caps.5.html (contents, props changed) vendor/ncurses/dist/include/Caps-ncurses vendor/ncurses/dist/man/new_pair.3x vendor/ncurses/dist/man/scr_dump.5 (contents, props changed) vendor/ncurses/dist/man/user_caps.5 (contents, props changed) vendor/ncurses/dist/misc/magic vendor/ncurses/dist/ncurses/base/new_pair.c (contents, props changed) vendor/ncurses/dist/ncurses/new_pair.h (contents, props changed) vendor/ncurses/dist/ncurses/report_offsets.c (contents, props changed) vendor/ncurses/dist/ncurses/tinfo/MKuserdefs.sh (contents, props changed) vendor/ncurses/dist/package/debian-mingw/mingw32-ncurses6.lintian-overrides vendor/ncurses/dist/package/debian-mingw64/mingw64-ncurses6.lintian-overrides vendor/ncurses/dist/package/debian/ncurses6.lintian-overrides vendor/ncurses/dist/package/debian/ncurses6.triggers vendor/ncurses/dist/package/debian/ncursest6.lintian-overrides vendor/ncurses/dist/package/debian/ncursest6.triggers vendor/ncurses/dist/package/ncurses.map vendor/ncurses/dist/package/ncurses.sym vendor/ncurses/dist/package/ncursest.map vendor/ncurses/dist/package/ncursest.spec vendor/ncurses/dist/package/ncursest.sym vendor/ncurses/dist/package/ncursestw.map vendor/ncurses/dist/package/ncursestw.sym vendor/ncurses/dist/package/ncursesw.map vendor/ncurses/dist/package/ncursesw.sym vendor/ncurses/dist/progs/clear_cmd.c (contents, props changed) vendor/ncurses/dist/progs/clear_cmd.h (contents, props changed) vendor/ncurses/dist/progs/reset_cmd.c (contents, props changed) vendor/ncurses/dist/progs/reset_cmd.h (contents, props changed) vendor/ncurses/dist/progs/tparm_type.c (contents, props changed) vendor/ncurses/dist/progs/tparm_type.h (contents, props changed) vendor/ncurses/dist/progs/tty_settings.c (contents, props changed) vendor/ncurses/dist/progs/tty_settings.h (contents, props changed) vendor/ncurses/dist/test/bulgarian-utf8-tabs.txt (contents, props changed) vendor/ncurses/dist/test/color_content.c (contents, props changed) vendor/ncurses/dist/test/demo_new_pair.c (contents, props changed) vendor/ncurses/dist/test/demo_tabs.c (contents, props changed) vendor/ncurses/dist/test/dots_curses.c (contents, props changed) vendor/ncurses/dist/test/dots_xcurses.c (contents, props changed) vendor/ncurses/dist/test/dump_window.c (contents, props changed) vendor/ncurses/dist/test/dump_window.h (contents, props changed) vendor/ncurses/dist/test/escherknot.xbm vendor/ncurses/dist/test/extended_color.c (contents, props changed) vendor/ncurses/dist/test/list_keys.c (contents, props changed) vendor/ncurses/dist/test/mensetmanus.xbm vendor/ncurses/dist/test/mini.xterm_48x48.xpm (contents, props changed) vendor/ncurses/dist/test/package/debian-mingw/ vendor/ncurses/dist/test/package/debian-mingw/compat vendor/ncurses/dist/test/package/debian-mingw/control vendor/ncurses/dist/test/package/debian-mingw/copyright vendor/ncurses/dist/test/package/debian-mingw/docs vendor/ncurses/dist/test/package/debian-mingw/rules (contents, props changed) vendor/ncurses/dist/test/package/debian-mingw/source/ vendor/ncurses/dist/test/package/debian-mingw/source/format vendor/ncurses/dist/test/package/debian-mingw/watch vendor/ncurses/dist/test/package/debian-mingw64/ vendor/ncurses/dist/test/package/debian-mingw64/compat vendor/ncurses/dist/test/package/debian-mingw64/control vendor/ncurses/dist/test/package/debian-mingw64/copyright vendor/ncurses/dist/test/package/debian-mingw64/docs vendor/ncurses/dist/test/package/debian-mingw64/rules (contents, props changed) vendor/ncurses/dist/test/package/debian-mingw64/source/ vendor/ncurses/dist/test/package/debian-mingw64/source/format vendor/ncurses/dist/test/package/debian-mingw64/watch vendor/ncurses/dist/test/padview.c (contents, props changed) vendor/ncurses/dist/test/pair_content.c (c
svn commit: r356918 - head/share/man/man7
Author: bapt Date: Mon Jan 20 16:59:39 2020 New Revision: 356918 URL: https://svnweb.freebsd.org/changeset/base/356918 Log: The ports tree now accepts /usr/local/share/man as a directory for manpage and will slowly transition from /usr/local/man to it. To reflect this remove the documentation of the manpages being an exception in the layout of /usr/local Reported by: Dan Nelson (via IRC) MFC after:3 days Modified: head/share/man/man7/hier.7 Modified: head/share/man/man7/hier.7 == --- head/share/man/man7/hier.7 Mon Jan 20 15:38:05 2020(r356917) +++ head/share/man/man7/hier.7 Mon Jan 20 16:59:39 2020(r356918) @@ -28,7 +28,7 @@ .\"@(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd September 10, 2019 +.Dd January 20, 2020 .Dt HIER 7 .Os .Sh NAME @@ -420,12 +420,6 @@ for .Pa /usr should be used. Exceptions are the -.Pa man -directory -.Po directly under -.Pa local/ -rather than under -.Pa local/share/ Ns Pc , ports documentation .Po in .Pa share/doc// Ns Pc , ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r356725 - head/usr.bin/diff
On Tue, Jan 14, 2020 at 08:44:29AM -0700, Ian Lepore wrote: > On Tue, 2020-01-14 at 08:22 +0000, Baptiste Daroussin wrote: > > Author: bapt > > Date: Tue Jan 14 08:22:28 2020 > > New Revision: 356725 > > URL: https://svnweb.freebsd.org/changeset/base/356725 > > > > Log: > > When system calls indicate an error they return -1, not some > > arbitrary > > value < 0. errno is only updated in this case. > > > > What's the point of these changes, other than almost certainly leading > to worse code generation? > > In most instruction sets, you can test for a value < 0 without using > any instructions, you only need to examine the condition flags after > loading the value. To compare equal to -1 typically requires at least > 1 extra instruction, and on risc architectures typically at least two > extra (load -1 to a register then compare). > our diff has forked from the OpenBSD one. The goal of those patches is to keep in sync code that is still close to the original OpenBSD one as much as possible. Best regards, Bapt signature.asc Description: PGP signature
svn commit: r356725 - head/usr.bin/diff
Author: bapt Date: Tue Jan 14 08:22:28 2020 New Revision: 356725 URL: https://svnweb.freebsd.org/changeset/base/356725 Log: When system calls indicate an error they return -1, not some arbitrary value < 0. errno is only updated in this case. Obtained from:OpenBSD MFC after:3 days Modified: head/usr.bin/diff/diff.c head/usr.bin/diff/diffreg.c Modified: head/usr.bin/diff/diff.c == --- head/usr.bin/diff/diff.cTue Jan 14 08:18:04 2020(r356724) +++ head/usr.bin/diff/diff.cTue Jan 14 08:22:28 2020(r356725) @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.65 2015/12/29 19:04:46 gsoares Exp $ */ +/* $OpenBSD: diff.c,v 1.67 2019/06/28 13:35:00 deraadt Exp $ */ /* * Copyright (c) 2003 Todd C. Miller @@ -316,12 +316,12 @@ main(int argc, char **argv) } else { if (S_ISDIR(stb1.st_mode)) { argv[0] = splice(argv[0], argv[1]); - if (stat(argv[0], &stb1) < 0) + if (stat(argv[0], &stb1) == -1) err(2, "%s", argv[0]); } if (S_ISDIR(stb2.st_mode)) { argv[1] = splice(argv[1], argv[0]); - if (stat(argv[1], &stb2) < 0) + if (stat(argv[1], &stb2) == -1) err(2, "%s", argv[1]); } print_status(diffreg(argv[0], argv[1], dflags, 1), argv[0], Modified: head/usr.bin/diff/diffreg.c == --- head/usr.bin/diff/diffreg.c Tue Jan 14 08:18:04 2020(r356724) +++ head/usr.bin/diff/diffreg.c Tue Jan 14 08:22:28 2020(r356725) @@ -1,4 +1,4 @@ -/* $OpenBSD: diffreg.c,v 1.92 2019/06/28 05:35:34 deraadt Exp $*/ +/* $OpenBSD: diffreg.c,v 1.93 2019/06/28 13:35:00 deraadt Exp $*/ /*- * SPDX-License-Identifier: BSD-4-Clause @@ -277,7 +277,7 @@ diffreg(char *file1, char *file2, int flags, int capsi else { if (!S_ISREG(stb1.st_mode)) { if ((f1 = opentemp(file1)) == NULL || - fstat(fileno(f1), &stb1) < 0) { + fstat(fileno(f1), &stb1) == -1) { warn("%s", file1); status |= 2; goto closem; @@ -298,7 +298,7 @@ diffreg(char *file1, char *file2, int flags, int capsi else { if (!S_ISREG(stb2.st_mode)) { if ((f2 = opentemp(file2)) == NULL || - fstat(fileno(f2), &stb2) < 0) { + fstat(fileno(f2), &stb2) == -1) { warn("%s", file2); status |= 2; goto closem; @@ -446,7 +446,7 @@ opentemp(const char *f) if (strcmp(f, "-") == 0) ifd = STDIN_FILENO; - else if ((ifd = open(f, O_RDONLY, 0644)) < 0) + else if ((ifd = open(f, O_RDONLY, 0644)) == -1) return (NULL); (void)strlcpy(tempfile, _PATH_TMP "/diff.", sizeof(tempfile)); @@ -942,7 +942,7 @@ preadline(int fd, size_t rlen, off_t off) ssize_t nr; line = xmalloc(rlen + 1); - if ((nr = pread(fd, line, rlen, off)) < 0) + if ((nr = pread(fd, line, rlen, off)) == -1) err(2, "preadline"); if (nr > 0 && line[nr-1] == '\n') nr--; ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r356724 - head/usr.bin/diff
Author: bapt Date: Tue Jan 14 08:18:04 2020 New Revision: 356724 URL: https://svnweb.freebsd.org/changeset/base/356724 Log: asprintf returns -1, not an arbitrary value < 0. Also upon error the (very sloppy specification) leaves an undefined value in *ret, so it is wrong to inspect it, the error condition is enough. Obtained from:OpenBSD MFC after:3 days Modified: head/usr.bin/diff/xmalloc.c Modified: head/usr.bin/diff/xmalloc.c == --- head/usr.bin/diff/xmalloc.c Tue Jan 14 08:16:15 2020(r356723) +++ head/usr.bin/diff/xmalloc.c Tue Jan 14 08:18:04 2020(r356724) @@ -1,4 +1,4 @@ -/* $OpenBSD: xmalloc.c,v 1.9 2015/11/17 18:25:02 tobias Exp $ */ +/* $OpenBSD: xmalloc.c,v 1.10 2019/06/28 05:44:09 deraadt Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -81,7 +81,7 @@ xasprintf(char **ret, const char *fmt, ...) i = vasprintf(ret, fmt, ap); va_end(ap); - if (i < 0 || *ret == NULL) + if (i == -1) err(2, "xasprintf"); return i; ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r356723 - head/usr.bin/diff
Author: bapt Date: Tue Jan 14 08:16:15 2020 New Revision: 356723 URL: https://svnweb.freebsd.org/changeset/base/356723 Log: mkstemp returns -1 Obtained from:OpenBSD MFC after:3 days Modified: head/usr.bin/diff/diffreg.c Modified: head/usr.bin/diff/diffreg.c == --- head/usr.bin/diff/diffreg.c Tue Jan 14 06:28:07 2020(r356722) +++ head/usr.bin/diff/diffreg.c Tue Jan 14 08:16:15 2020(r356723) @@ -1,4 +1,4 @@ -/* $OpenBSD: diffreg.c,v 1.91 2016/03/01 20:57:35 natano Exp $ */ +/* $OpenBSD: diffreg.c,v 1.92 2019/06/28 05:35:34 deraadt Exp $*/ /*- * SPDX-License-Identifier: BSD-4-Clause @@ -451,7 +451,7 @@ opentemp(const char *f) (void)strlcpy(tempfile, _PATH_TMP "/diff.", sizeof(tempfile)); - if ((ofd = mkstemp(tempfile)) < 0) { + if ((ofd = mkstemp(tempfile)) == -1) { close(ifd); return (NULL); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r356599 - stable/11/contrib/smbfs/lib/smb
On Fri, Jan 10, 2020 at 12:20:25PM +, Sergey Kandaurov wrote: > Author: pluknet > Date: Fri Jan 10 12:20:25 2020 > New Revision: 356599 > URL: https://svnweb.freebsd.org/changeset/base/356599 > > Log: > Fixed build after r356566 (MFC of r356317). > > This is a direct change. > Thanks a lot, you have been faster than me to do it. And sorry about the breakage. Best regards, Bapt signature.asc Description: PGP signature
svn commit: r356566 - stable/11/contrib/smbfs/lib/smb
Author: bapt Date: Thu Jan 9 19:58:05 2020 New Revision: 356566 URL: https://svnweb.freebsd.org/changeset/base/356566 Log: MFC r356317 (by arrowd): mount_smbfs: Issue a warning when .nsmbrc section name contains lowercase characters. PR: 231656 Approved by: bapt Differential Revision: https://reviews.freebsd.org/D22289 Modified: stable/11/contrib/smbfs/lib/smb/rcfile.c Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/smbfs/lib/smb/rcfile.c == --- stable/11/contrib/smbfs/lib/smb/rcfile.cThu Jan 9 19:56:25 2020 (r356565) +++ stable/11/contrib/smbfs/lib/smb/rcfile.cThu Jan 9 19:58:05 2020 (r356566) @@ -156,11 +156,19 @@ static struct rcsection * rc_addsect(struct rcfile *rcp, const char *sectname) { struct rcsection *p; + const char* sectletter = sectname; p = rc_findsect(rcp, sectname); if (p) return p; p = malloc(sizeof(*p)); if (!p) return NULL; + for(sectletter = sectname; *sectletter; sectletter++) { + if (islower(*sectletter)) { + if (strcmp(sectname, "default")) + dprintf(STDERR_FILENO, "warning: section name [%s] contains lower-case letters\n", sectname); + break; + } + } p->rs_name = strdup(sectname); SLIST_INIT(&p->rs_keys); SLIST_INSERT_HEAD(&rcp->rf_sect, p, rs_next); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r356565 - stable/12/contrib/smbfs/lib/smb
Author: bapt Date: Thu Jan 9 19:56:25 2020 New Revision: 356565 URL: https://svnweb.freebsd.org/changeset/base/356565 Log: MFC r356317 (by arrowd): mount_smbfs: Issue a warning when .nsmbrc section name contains lowercase characters. PR: 231656 Approved by: bapt Differential Revision: https://reviews.freebsd.org/D22289 Modified: stable/12/contrib/smbfs/lib/smb/rcfile.c Directory Properties: stable/12/ (props changed) Modified: stable/12/contrib/smbfs/lib/smb/rcfile.c == --- stable/12/contrib/smbfs/lib/smb/rcfile.cThu Jan 9 19:22:11 2020 (r356564) +++ stable/12/contrib/smbfs/lib/smb/rcfile.cThu Jan 9 19:56:25 2020 (r356565) @@ -156,11 +156,19 @@ static struct rcsection * rc_addsect(struct rcfile *rcp, const char *sectname) { struct rcsection *p; + const char* sectletter = sectname; p = rc_findsect(rcp, sectname); if (p) return p; p = malloc(sizeof(*p)); if (!p) return NULL; + for(sectletter = sectname; *sectletter; sectletter++) { + if (islower(*sectletter)) { + if (strcmp(sectname, "default")) + dprintf(STDERR_FILENO, "warning: section name [%s] contains lower-case letters\n", sectname); + break; + } + } p->rs_name = strdup(sectname); SLIST_INIT(&p->rs_keys); SLIST_INSERT_HEAD(&rcp->rf_sect, p, rs_next); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r355854 - head/usr.bin/diff3
Author: bapt Date: Tue Dec 17 11:03:32 2019 New Revision: 355854 URL: https://svnweb.freebsd.org/changeset/base/355854 Log: Replace homemade getline(3) by actual getline(3) Modified: head/usr.bin/diff3/diff3.c Modified: head/usr.bin/diff3/diff3.c == --- head/usr.bin/diff3/diff3.c Tue Dec 17 10:57:31 2019(r355853) +++ head/usr.bin/diff3/diff3.c Tue Dec 17 11:03:32 2019(r355854) @@ -257,28 +257,16 @@ getchange(FILE *b) static char * get_line(FILE *b, size_t *n) { - char *cp; - size_t len; - static char *buf; - static size_t bufsize; + ssize_t len; + static char *buf = NULL; + static size_t bufsize = 0; - if ((cp = fgetln(b, &len)) == NULL) + if ((len = getline(&buf, &bufsize, b)) < 0) return (NULL); - if (cp[len - 1] != '\n') - len++; - if (len + 1 > bufsize) { - do { - bufsize += 1024; - } while (len + 1 > bufsize); - if ((buf = realloc(buf, bufsize)) == NULL) - err(EXIT_FAILURE, NULL); - } - memcpy(buf, cp, len - 1); - buf[len - 1] = '\n'; - buf[len] = '\0'; if (n != NULL) *n = len; + return (buf); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r355847 - head/usr.bin/diff3
Author: bapt Date: Tue Dec 17 09:13:48 2019 New Revision: 355847 URL: https://svnweb.freebsd.org/changeset/base/355847 Log: Use strtoimax. Use existing strtoimax instead of reinventing it Modified: head/usr.bin/diff3/diff3.c Modified: head/usr.bin/diff3/diff3.c == --- head/usr.bin/diff3/diff3.c Tue Dec 17 08:57:01 2019(r355846) +++ head/usr.bin/diff3/diff3.c Tue Dec 17 09:13:48 2019(r355847) @@ -84,6 +84,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include #include #include @@ -132,7 +134,6 @@ static bool duplicate(struct range *, struct range *); static int edit(struct diff *, bool, int); static char *getchange(FILE *); static char *get_line(FILE *, size_t *); -static int number(char **); static int readin(int fd, struct diff **); static int skip(int, int, const char *); static void change(int, struct range *, bool); @@ -188,16 +189,16 @@ readin(int fd, struct diff **dd) for (i=0; (p = getchange(f)); i++) { if (i >= szchanges - 1) increase(); - a = b = number(&p); + a = b = (int)strtoimax(p, &p, 10); if (*p == ',') { p++; - b = number(&p); + b = (int)strtoimax(p, &p, 10); } kind = *p++; - c = d = number(&p); + c = d = (int)strtoimax(p, &p, 10); if (*p==',') { p++; - d = number(&p); + d = (int)strtoimax(p, &p, 10); } if (kind == 'a') a++; @@ -238,17 +239,6 @@ diffexec(const char *diffprog, char **diffargv, int fd } close(fd[1]); return (pd); -} - -static int -number(char **lc) -{ - int nn; - - nn = 0; - while (isdigit((unsigned char)(**lc))) - nn = nn*10 + *(*lc)++ - '0'; - return (nn); } static char * ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r355664 - stable/11/usr.bin/netstat
Author: bapt Date: Thu Dec 12 19:17:30 2019 New Revision: 355664 URL: https://svnweb.freebsd.org/changeset/base/355664 Log: MFC: r34 Fix: netstat -rs Routing statistics requires somes symbols that are only loaded when not running live. Load them only in that specific case PR: 242423 Submitted by: olivier Modified: stable/11/usr.bin/netstat/main.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/netstat/main.c == --- stable/11/usr.bin/netstat/main.cThu Dec 12 19:17:26 2019 (r355663) +++ stable/11/usr.bin/netstat/main.cThu Dec 12 19:17:30 2019 (r355664) @@ -478,6 +478,9 @@ main(int argc, char *argv[]) if (rflag) { xo_open_container("statistics"); if (sflag) { + if (live) { + kresolve_list(nl); + } rt_stats(); flowtable_stats(); } else ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r355663 - stable/12/usr.bin/netstat
Author: bapt Date: Thu Dec 12 19:17:26 2019 New Revision: 355663 URL: https://svnweb.freebsd.org/changeset/base/355663 Log: MFC: r34 Fix: netstat -rs Routing statistics requires somes symbols that are only loaded when not running live. Load them only in that specific case PR: 242423 Submitted by: olivier Modified: stable/12/usr.bin/netstat/main.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/netstat/main.c == --- stable/12/usr.bin/netstat/main.cThu Dec 12 18:53:45 2019 (r355662) +++ stable/12/usr.bin/netstat/main.cThu Dec 12 19:17:26 2019 (r355663) @@ -484,6 +484,9 @@ main(int argc, char *argv[]) if (rflag) { xo_open_container("statistics"); if (sflag) { + if (live) { + kresolve_list(nl); + } rt_stats(); } else routepr(fib, af); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r355554 - head/usr.bin/netstat
Author: bapt Date: Mon Dec 9 10:21:24 2019 New Revision: 34 URL: https://svnweb.freebsd.org/changeset/base/34 Log: Fix: netstat -rs Routing statistics requires somes symbols that are only loaded when not running live. Load them only in that specific case PR: 242423 Submitted by: olivier MFC after:3 days Modified: head/usr.bin/netstat/main.c Modified: head/usr.bin/netstat/main.c == --- head/usr.bin/netstat/main.c Mon Dec 9 07:18:40 2019(r33) +++ head/usr.bin/netstat/main.c Mon Dec 9 10:21:24 2019(r34) @@ -484,6 +484,9 @@ main(int argc, char *argv[]) if (rflag) { xo_open_container("statistics"); if (sflag) { + if (live) { + kresolve_list(nl); + } rt_stats(); } else routepr(fib, af); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r353100 - head/tools/build/mk
Author: bapt Date: Fri Oct 4 10:24:10 2019 New Revision: 353100 URL: https://svnweb.freebsd.org/changeset/base/353100 Log: Do not remove the locale directory when building a system without locales This directory is actually needed during make installworld and will prevent to reinstall a system after make delete-old is done. PR: 226137 Reported by: rakuco MFC after:3 days Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Oct 4 05:28:36 2019(r353099) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Oct 4 10:24:10 2019(r353100) @@ -4796,7 +4796,6 @@ OLD_FILES+=usr/share/man/man1/lldb.1.gz .endif .if ${MK_LOCALES} == no -OLD_DIRS+=usr/share/locale OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r352668 - in head/usr.sbin/cron: cron crontab lib
On Wed, Sep 25, 2019 at 02:37:41AM +, Kyle Evans wrote: > Author: kevans > Date: Wed Sep 25 02:37:40 2019 > New Revision: 352668 > URL: https://svnweb.freebsd.org/changeset/base/352668 > > Log: > cron: add log suppression and mail suppression for successful runs > > This commit adds two new extensions to crontab, ported from OpenBSD: > - -n: suppress mail on succesful run > - -q: suppress logging of command execution > > The -q option appears decades old, but -n is relatively new. The > original proposal by Job Snijder can be found here [1], and gives very > convincing reasons for inclusion in base. > > This patch is a nearly identical port of OpenBSD cron for -q and -n > features. It is written to follow existing conventions and style of the > existing codebase. > > Example usage: > > # should only send email, but won't show up in log > * * * * * -q date > > # should not send email > * * * * * -n date > > # should not send email or log > * * * * * -n -q date > > # should send email because of ping failure > * * * * * -n -q ping -c 1 5.5.5.5 > > [1]: https://marc.info/?l=openbsd-tech&m=152874866117948&w=2 > > PR: 237538 > Submitted by: Naveen Nathan > Reviewed by:bcr (manpages) > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D20046 > I do think this deserves an entry in the release notes Best regards, Bapt signature.asc Description: PGP signature
svn commit: r352553 - head
Author: bapt Date: Fri Sep 20 09:45:38 2019 New Revision: 352553 URL: https://svnweb.freebsd.org/changeset/base/352553 Log: Ensure libthr is always built before libprivatezstd when building the startup libs Reported by: "Galazka, Krzysztof" Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 == --- head/Makefile.inc1 Fri Sep 20 09:36:07 2019(r352552) +++ head/Makefile.inc1 Fri Sep 20 09:45:38 2019(r352553) @@ -2832,6 +2832,7 @@ _lib_casper= lib/libcasper lib/libpjdlog__L: lib/libutil__L lib/libcasper__L: lib/libnv__L lib/liblzma__L: lib/libthr__L +lib/libzstd__L: lib/libthr__L _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib .if ${MK_IPFILTER} != "no" ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r352483 - head/share/mk
Author: bapt Date: Wed Sep 18 08:02:03 2019 New Revision: 352483 URL: https://svnweb.freebsd.org/changeset/base/352483 Log: Add the missing bits for LIBADD to properly function now that libarchive is linked to libzstd Pointy hat: bapt Reported by: antoine Modified: head/share/mk/src.libnames.mk Modified: head/share/mk/src.libnames.mk == --- head/share/mk/src.libnames.mk Wed Sep 18 07:57:56 2019 (r352482) +++ head/share/mk/src.libnames.mk Wed Sep 18 08:02:03 2019 (r352483) @@ -230,7 +230,7 @@ LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec${PIE_SUFFI # Each library's LIBADD needs to be duplicated here for static linkage of # 2nd+ order consumers. Auto-generating this would be better. _DP_80211= sbuf bsdxml -_DP_archive= z bz2 lzma bsdxml +_DP_archive= z bz2 lzma bsdxml zstd _DP_zstd= pthread .if ${MK_BLACKLIST} != "no" _DP_blacklist+=pthread ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r352482 - in head: . lib lib/libarchive
Author: bapt Date: Wed Sep 18 07:57:56 2019 New Revision: 352482 URL: https://svnweb.freebsd.org/changeset/base/352482 Log: Add native support for zstd to libarchive Note that old pkg will failed to build after this. A recent ports tree (one providing pkg 1.12+) is required to build. Older already built pkg, should continue working as expected PR: 238797 Exp run by: antoine Reviewed by: cem Approved by: cem Differential Revision:https://reviews.freebsd.org/D20752 Modified: head/Makefile.inc1 head/lib/Makefile head/lib/libarchive/Makefile Modified: head/Makefile.inc1 == --- head/Makefile.inc1 Wed Sep 18 07:32:15 2019(r352481) +++ head/Makefile.inc1 Wed Sep 18 07:57:56 2019(r352482) @@ -2770,6 +2770,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/libfigpar \ ${_lib_libgssapi} \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \ + lib/libzstd \ ${_lib_casper} \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam/libpam ${_lib_libthr} \ Modified: head/lib/Makefile == --- head/lib/Makefile Wed Sep 18 07:32:15 2019(r352481) +++ head/lib/Makefile Wed Sep 18 07:57:56 2019(r352482) @@ -102,7 +102,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ # libraries, those libraries should be listed as build order dependencies here. SUBDIR_DEPEND_geom=libufs -SUBDIR_DEPEND_libarchive= libz libbz2 libexpat liblzma libmd +SUBDIR_DEPEND_libarchive= libz libbz2 libexpat liblzma libmd libzstd SUBDIR_DEPEND_libauditdm= libbsm SUBDIR_DEPEND_libbsnmp= ${_libnetgraph} SUBDIR_DEPEND_libc++:= libcxxrt Modified: head/lib/libarchive/Makefile == --- head/lib/libarchive/MakefileWed Sep 18 07:32:15 2019 (r352481) +++ head/lib/libarchive/MakefileWed Sep 18 07:57:56 2019 (r352482) @@ -6,8 +6,8 @@ _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive LIB= archive -LIBADD=z bz2 lzma bsdxml -CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 +LIBADD=z bz2 lzma bsdxml zstd +CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 -DHAVE_ZSTD_H=1 -DHAVE_LIBZSTD=1 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the libarchive version number. @@ -15,6 +15,7 @@ SHLIB_MAJOR= 7 CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" CFLAGS+= -I${.OBJDIR} +CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_OPENSSL ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r352385 - head/bin/sh
Author: bapt Date: Mon Sep 16 07:31:59 2019 New Revision: 352385 URL: https://svnweb.freebsd.org/changeset/base/352385 Log: Do not use our custom completion function, it is not needed anymore Modified: head/bin/sh/histedit.c Modified: head/bin/sh/histedit.c == --- head/bin/sh/histedit.c Mon Sep 16 06:42:01 2019(r352384) +++ head/bin/sh/histedit.c Mon Sep 16 07:31:59 2019(r352385) @@ -122,7 +122,7 @@ histedit(void) el_set(el, EL_PROMPT, getprompt); el_set(el, EL_ADDFN, "sh-complete", "Filename completion", - _el_fn_sh_complete); + _el_fn_complete); } else { bad: out2fmt_flush("sh: can't initialize editing\n"); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r352341 - head/contrib/libedit
On Sat, Sep 14, 2019 at 09:49:43PM +, Dimitry Andric wrote: > Author: dim > Date: Sat Sep 14 21:49:42 2019 > New Revision: 352341 > URL: https://svnweb.freebsd.org/changeset/base/352341 > > Log: > Fix arm and aarch64 builds of libedit after r352275 > > On arm and arm64, where chars are unsigned by default, buildworld dies > with: > > --- terminal.o --- > /usr/src/contrib/libedit/terminal.c:569:41: error: comparison of > integers of different signs: 'wint_t' (aka 'int') and 'wchar_t' (aka > 'unsigned int') [-Werror,-Wsign-compare] >el->el_cursor.v][where & 0370] != >~~ ^ > /usr/src/contrib/libedit/terminal.c:659:28: error: comparison of > integers of different signs: 'wint_t' (aka 'int') and 'wchar_t' (aka > 'unsigned int') [-Werror,-Wsign-compare] >[el->el_cursor.h] == MB_FILL_CHAR) >~ ^ > > Fix this by making MB_FILL_CHAR a wint_t, so no casting is needed. > > Note that in https://reviews.freebsd.org/D21584 this was also proposed > by Yuichiro Naito . > > Reviewed by:bapt > Subscribers:naito.yuichiro_gmail.com, ml_vishwin.info > MFC after: 3 weeks > X-MFC-With: r352275 > Differential Revision: https://reviews.freebsd.org/D21657 > Just for completeness it was also approved by christos@NetBSD (upstream) signature.asc Description: PGP signature
svn commit: r352288 - head/usr.bin/grdc
Author: bapt Date: Fri Sep 13 14:51:00 2019 New Revision: 352288 URL: https://svnweb.freebsd.org/changeset/base/352288 Log: Remove remnant from the pre LIBADD era Modified: head/usr.bin/grdc/Makefile Modified: head/usr.bin/grdc/Makefile == --- head/usr.bin/grdc/Makefile Fri Sep 13 14:43:44 2019(r352287) +++ head/usr.bin/grdc/Makefile Fri Sep 13 14:51:00 2019(r352288) @@ -2,7 +2,6 @@ PROG= grdc MAN= grdc.6 -DPADD= ${LIBNCURSESW} LIBADD=ncursesw .include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r352283 - stable/11/lib/libc/locale
Author: bapt Date: Fri Sep 13 07:24:29 2019 New Revision: 352283 URL: https://svnweb.freebsd.org/changeset/base/352283 Log: MFC r352127: In FreeBSD 11 localedef(1) has replaced the mklocale(1) and colldef(1) tools to generate the locales data. state it in the libc manpages. Modified: stable/11/lib/libc/locale/euc.5 stable/11/lib/libc/locale/multibyte.3 stable/11/lib/libc/locale/setlocale.3 Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/locale/euc.5 == --- stable/11/lib/libc/locale/euc.5 Fri Sep 13 07:23:46 2019 (r352282) +++ stable/11/lib/libc/locale/euc.5 Fri Sep 13 07:24:29 2019 (r352283) @@ -31,7 +31,7 @@ .\"@(#)euc.4 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd November 8, 2003 +.Dd September 9, 2019 .Dt EUC 5 .Os .Sh NAME @@ -58,7 +58,7 @@ .\".Ux .\"based systems. .\"See -.\".Xr mklocale 1 +.\".Xr localedef 1 .\"for a complete description of the .\".Ev LC_CTYPE .\"source file format. @@ -130,5 +130,5 @@ Notice that the global is set to 0x8080, this implies that from those 2 bits the codeset can be determined. .Sh SEE ALSO -.Xr mklocale 1 , +.Xr localedef 1 , .Xr setlocale 3 Modified: stable/11/lib/libc/locale/multibyte.3 == --- stable/11/lib/libc/locale/multibyte.3 Fri Sep 13 07:23:46 2019 (r352282) +++ stable/11/lib/libc/locale/multibyte.3 Fri Sep 13 07:24:29 2019 (r352283) @@ -32,7 +32,7 @@ .\"@(#)multibyte.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd April 8, 2004 +.Dd September 9, 2019 .Dt MULTIBYTE 3 .Os .Sh NAME @@ -127,7 +127,7 @@ multibyte characters: .It Xr wctomb 3 Ta "convert a wide-character code to a character" .El .Sh SEE ALSO -.Xr mklocale 1 , +.Xr localedef 1 , .Xr setlocale 3 , .Xr stdio 3 , .Xr big5 5 , Modified: stable/11/lib/libc/locale/setlocale.3 == --- stable/11/lib/libc/locale/setlocale.3 Fri Sep 13 07:23:46 2019 (r352282) +++ stable/11/lib/libc/locale/setlocale.3 Fri Sep 13 07:24:29 2019 (r352283) @@ -31,7 +31,7 @@ .\"@(#)setlocale.3 8.1 (Berkeley) 6/9/93 .\" $FreeBSD$ .\" -.Dd November 21, 2003 +.Dd September 9, 2019 .Dt SETLOCALE 3 .Os .Sh NAME @@ -150,8 +150,7 @@ and the category .Sh ERRORS No errors are defined. .Sh SEE ALSO -.Xr colldef 1 , -.Xr mklocale 1 , +.Xr localedef 1 , .Xr catopen 3 , .Xr ctype 3 , .Xr localeconv 3 , ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r352282 - stable/11/share/man/man7
Author: bapt Date: Fri Sep 13 07:23:46 2019 New Revision: 352282 URL: https://svnweb.freebsd.org/changeset/base/352282 Log: MFC r352126: Remove reference to mklocale regarding the nls directory mklocale never had anything to do with the content of this directory Modified: stable/11/share/man/man7/hier.7 Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man7/hier.7 == --- stable/11/share/man/man7/hier.7 Fri Sep 13 07:22:09 2019 (r352281) +++ stable/11/share/man/man7/hier.7 Fri Sep 13 07:23:46 2019 (r352282) @@ -28,7 +28,7 @@ .\"@(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd February 11, 2018 +.Dd September 10, 2019 .Dt HIER 7 .Os .Sh NAME @@ -568,9 +568,7 @@ templates for make; see .Xr make 1 .It Pa nls/ -national language support files; -see -.Xr mklocale 1 +national language support files .It Pa security/ data files for security policies such as .Xr mac_lomac 4 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r352281 - stable/11/usr.bin/m4
Author: bapt Date: Fri Sep 13 07:22:09 2019 New Revision: 352281 URL: https://svnweb.freebsd.org/changeset/base/352281 Log: MFC r352065-r352070 Sync with OpenBSD, in particular this adds support for -E flags (GNU compatibility) Modified: stable/11/usr.bin/m4/Makefile stable/11/usr.bin/m4/eval.c stable/11/usr.bin/m4/extern.h stable/11/usr.bin/m4/gnum4.c stable/11/usr.bin/m4/m4.1 stable/11/usr.bin/m4/main.c stable/11/usr.bin/m4/misc.c stable/11/usr.bin/m4/tokenizer.l Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/m4/Makefile == --- stable/11/usr.bin/m4/Makefile Fri Sep 13 07:21:06 2019 (r352280) +++ stable/11/usr.bin/m4/Makefile Fri Sep 13 07:22:09 2019 (r352281) @@ -8,7 +8,7 @@ PROG= m4 CFLAGS+=-DEXTENDED -I${.CURDIR} -I${SRCTOP}/lib/libopenbsd -LIBADD=y l m openbsd +LIBADD=m openbsd NO_WMISSING_VARIABLE_DECLARATIONS= Modified: stable/11/usr.bin/m4/eval.c == --- stable/11/usr.bin/m4/eval.c Fri Sep 13 07:21:06 2019(r352280) +++ stable/11/usr.bin/m4/eval.c Fri Sep 13 07:22:09 2019(r352281) @@ -1,4 +1,4 @@ -/* $OpenBSD: eval.c,v 1.74 2015/02/05 12:59:57 millert Exp $ */ +/* $OpenBSD: eval.c,v 1.78 2019/06/28 05:35:34 deraadt Exp $ */ /* $NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $ */ /* @@ -124,6 +124,7 @@ void expand_builtin(const char *argv[], int argc, int td) { int c, n; + const char *errstr; int ac; static int sysval = 0; @@ -184,13 +185,15 @@ expand_builtin(const char *argv[], int argc, int td) if (argc > 3) { base = strtonum(argv[3], 2, 36, &errstr); if (errstr) { - m4errx(1, "expr: base %s invalid.", argv[3]); + m4errx(1, "expr: base is %s: %s.", + errstr, argv[3]); } } if (argc > 4) { maxdigits = strtonum(argv[4], 0, INT_MAX, &errstr); if (errstr) { - m4errx(1, "expr: maxdigits %s invalid.", argv[4]); + m4errx(1, "expr: maxdigits is %s: %s.", + errstr, argv[4]); } } if (argc > 2) @@ -199,8 +202,7 @@ expand_builtin(const char *argv[], int argc, int td) } case IFELTYPE: - if (argc > 4) - doifelse(argv, argc); + doifelse(argv, argc); break; case IFDFTYPE: @@ -230,8 +232,13 @@ expand_builtin(const char *argv[], int argc, int td) * doincr - increment the value of the * argument */ - if (argc > 2) - pbnum(atoi(argv[2]) + 1); + if (argc > 2) { + n = strtonum(argv[2], INT_MIN, INT_MAX-1, &errstr); + if (errstr != NULL) + m4errx(1, "incr: argument is %s: %s.", + errstr, argv[2]); + pbnum(n + 1); + } break; case DECRTYPE: @@ -239,8 +246,13 @@ expand_builtin(const char *argv[], int argc, int td) * dodecr - decrement the value of the * argument */ - if (argc > 2) - pbnum(atoi(argv[2]) - 1); + if (argc > 2) { + n = strtonum(argv[2], INT_MIN+1, INT_MAX, &errstr); + if (errstr) + m4errx(1, "decr: argument is %s: %s.", + errstr, argv[2]); + pbnum(n - 1); + } break; case SYSCTYPE: @@ -273,6 +285,10 @@ expand_builtin(const char *argv[], int argc, int td) warn("%s at line %lu: include(%s)", CURRENT_NAME, CURRENT_LINE, argv[2]); exit_code = 1; + if (fatal_warns) { + killdiv(); + exit(exit_code); + } } else err(1, "%s at line %lu: include(%s)", CURRENT_NAME, CURRENT_LINE, argv[2]); @@ -337,12 +353,18 @@ expand_builtin(const char *argv[], int argc, int td) break; case DIVRTYPE: - if (argc > 2 && (n = atoi(argv[2])) != 0) - dodi