CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: maya
Date: Wed Aug 11 23:02:39 UTC 2021
Modified Files:
src/external/mit/xorg/server/xorg-server/glamor: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
Log Message:
Fix glamor - don't use stub functions
${LDADD.gbm} seems to be empty - use -lgbm directly (couldn't find a better
fix)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/glamor/Makefile
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/glamor/Makefile
diff -u src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.3 src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.3 Fri Sep 2 03:58:59 2016
+++ src/external/mit/xorg/server/xorg-server/glamor/Makefile Wed Aug 11 23:02:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/09/02 03:58:59 jakllsch Exp $
+# $NetBSD: Makefile,v 1.4 2021/08/11 23:02:39 maya Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -42,13 +42,19 @@ SRCS= \
glamor_sync.c
SRCS+= \
glamor_xv.c
+.if ${HAVE_XORG_GLAMOR} == "no"
SRCS+= \
glamor_egl_stubs.c
-SRCS.EGL= \
- glamor_egl.c
+.else
+SRCS+= \
+ glamor_egl.c \
+ glamor_eglmodule.c
+.endif
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${DESTDIR}${X11INCDIR}/libdrm \
+ -I${X11SRCDIR.xorg-server}/glamor \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.18 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.19
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.18 Sun Sep 13 23:01:02 2020
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Wed Aug 11 23:02:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/09/13 23:01:02 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2021/08/11 23:02:39 maya Exp $
.include
@@ -33,7 +33,7 @@ LDADD+= ${LDADD.dix}
LDADD+= ${LDADD.config}
LDADD+= ${LDADD.dbe}
.if ${HAVE_XORG_GLAMOR} != "no"
-LDADD+= ${LDADD.glamor} ${LDADD.gbm}
+LDADD+= ${LDADD.glamor} -lgbm
.endif
LDADD+= ${LDADD.record}
LDADD+= ${LDADD.hw/xfree86/loader}
CVS commit: src
Module Name:src Committed By: maya Date: Sat May 29 13:08:08 UTC 2021 Modified Files: src: README.md Log Message: use libera.chat-hosted kiwiirc To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/README.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/README.md diff -u src/README.md:1.7 src/README.md:1.8 --- src/README.md:1.7 Wed May 26 22:26:16 2021 +++ src/README.md Sat May 29 13:08:08 2021 @@ -35,7 +35,7 @@ Troubleshooting - Send bugs and patches [via web form](https://www.NetBSD.org/cgi-bin/sendpr.cgi?gndb=netbsd). - Subscribe to the [mailing lists](https://www.NetBSD.org/mailinglists/). The [netbsd-users](https://www.NetBSD.org/mailinglists/#netbsd-users) list is a good choice for many problems; watch [current-users](https://www.NetBSD.org/mailinglists/#current-users) if you follow the bleeding edge of NetBSD-current. -- Join the community IRC channel [#netbsd @ libera.chat](https://kiwiirc.com/nextclient/irc.libera.chat/netbsd). +- Join the community IRC channel [#netbsd @ libera.chat](https://web.libera.chat/#netbsd). Latest sources --
CVS commit: src
Module Name:src Committed By: maya Date: Wed May 26 22:26:16 UTC 2021 Modified Files: src: README.md Log Message: suggest libera.chat instead To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/README.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/README.md diff -u src/README.md:1.6 src/README.md:1.7 --- src/README.md:1.6 Wed Mar 17 15:26:20 2021 +++ src/README.md Wed May 26 22:26:16 2021 @@ -35,7 +35,7 @@ Troubleshooting - Send bugs and patches [via web form](https://www.NetBSD.org/cgi-bin/sendpr.cgi?gndb=netbsd). - Subscribe to the [mailing lists](https://www.NetBSD.org/mailinglists/). The [netbsd-users](https://www.NetBSD.org/mailinglists/#netbsd-users) list is a good choice for many problems; watch [current-users](https://www.NetBSD.org/mailinglists/#current-users) if you follow the bleeding edge of NetBSD-current. -- Join the community IRC channel [#netbsd @ freenode](https://webchat.freenode.net/?channels=#netbsd). +- Join the community IRC channel [#netbsd @ libera.chat](https://kiwiirc.com/nextclient/irc.libera.chat/netbsd). Latest sources --
CVS commit: src/sbin/cgdconfig
Module Name:src
Committed By: maya
Date: Sun Apr 18 19:56:10 UTC 2021
Modified Files:
src/sbin/cgdconfig: cgdconfig.8 cgdconfig.c
Log Message:
The -n flag is useless with -g, don't mention it.
>From rudolf in PR misc/36243
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sbin/cgdconfig/cgdconfig.8
cvs rdiff -u -r1.50 -r1.51 src/sbin/cgdconfig/cgdconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/cgdconfig.8
diff -u src/sbin/cgdconfig/cgdconfig.8:1.48 src/sbin/cgdconfig/cgdconfig.8:1.49
--- src/sbin/cgdconfig/cgdconfig.8:1.48 Fri Dec 11 21:52:19 2020
+++ src/sbin/cgdconfig/cgdconfig.8 Sun Apr 18 19:56:09 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: cgdconfig.8,v 1.48 2020/12/11 21:52:19 riastradh Exp $
+.\" $NetBSD: cgdconfig.8,v 1.49 2021/04/18 19:56:09 maya Exp $
.\"
.\" Copyright (c) 2002, The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd December 11, 2020
+.Dd April 18, 2021
.Dt CGDCONFIG 8
.Os
.Sh NAME
@@ -52,7 +52,8 @@
.Ar paramsfile
.Nm
.Fl g
-.Op Fl nv
+.Op Fl v
+.Op Fl V Ar vmeth
.Op Fl i Ar ivmeth
.Op Fl k Ar kgmeth
.Op Fl o Ar outfile
Index: src/sbin/cgdconfig/cgdconfig.c
diff -u src/sbin/cgdconfig/cgdconfig.c:1.50 src/sbin/cgdconfig/cgdconfig.c:1.51
--- src/sbin/cgdconfig/cgdconfig.c:1.50 Wed Apr 10 06:11:37 2019
+++ src/sbin/cgdconfig/cgdconfig.c Sun Apr 18 19:56:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.50 2019/04/10 06:11:37 kre Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.51 2021/04/18 19:56:09 maya Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 2002, 2003\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: cgdconfig.c,v 1.50 2019/04/10 06:11:37 kre Exp $");
+__RCSID("$NetBSD: cgdconfig.c,v 1.51 2021/04/18 19:56:09 maya Exp $");
#endif
#include
@@ -144,7 +144,7 @@ usage(void)
getprogname());
(void)fprintf(stderr, " %s -G [-enpv] [-i ivmeth] [-k kgmeth] "
"[-o outfile] paramsfile\n", getprogname());
- (void)fprintf(stderr, " %s -g [-nv] [-i ivmeth] [-k kgmeth] "
+ (void)fprintf(stderr, " %s -g [-v] [-i ivmeth] [-k kgmeth] "
"[-o outfile] alg [keylen]\n", getprogname());
(void)fprintf(stderr, " %s -l [-v[v]] [cgd]\n", getprogname());
(void)fprintf(stderr, " %s -s [-nv] [-i ivmeth] cgd dev alg "
CVS commit: src/bin/ps
Module Name:src
Committed By: maya
Date: Sat Apr 17 08:35:33 UTC 2021
Modified Files:
src/bin/ps: print.c
Log Message:
Remove SCCS workaround. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/bin/ps/print.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ps/print.c
diff -u src/bin/ps/print.c:1.134 src/bin/ps/print.c:1.135
--- src/bin/ps/print.c:1.134 Tue Apr 6 13:35:52 2021
+++ src/bin/ps/print.c Sat Apr 17 08:35:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.134 2021/04/06 13:35:52 christos Exp $ */
+/* $NetBSD: print.c,v 1.135 2021/04/17 08:35:33 maya Exp $ */
/*
* Copyright (c) 2000, 2007 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
#else
-__RCSID("$NetBSD: print.c,v 1.134 2021/04/06 13:35:52 christos Exp $");
+__RCSID("$NetBSD: print.c,v 1.135 2021/04/17 08:35:33 maya Exp $");
#endif
#endif /* not lint */
@@ -800,11 +800,9 @@ started(struct pinfo *pi, VARENT *ve, en
if (now == 0)
(void)time(&now);
if (now - k->p_ustart_sec < SECSPERDAY)
- /* I *hate* SCCS... */
- safe_strftime(buf, sizeof(buf) - 1, "%l:%" "M%p", tp);
+ safe_strftime(buf, sizeof(buf) - 1, "%l:%M%p", tp);
else if (now - k->p_ustart_sec < DAYSPERWEEK * SECSPERDAY)
- /* I *hate* SCCS... */
- safe_strftime(buf, sizeof(buf) - 1, "%a%" "I%p", tp);
+ safe_strftime(buf, sizeof(buf) - 1, "%a%I%p", tp);
else
safe_strftime(buf, sizeof(buf) - 1, "%e%b%y", tp);
/* %e and %l can start with a space. */
CVS commit: src/usr.bin/systat
Module Name:src
Committed By: maya
Date: Sat Apr 17 08:34:28 UTC 2021
Modified Files:
src/usr.bin/systat: ps.c
Log Message:
Remove SCCS workarounds. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/systat/ps.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/systat/ps.c
diff -u src/usr.bin/systat/ps.c:1.39 src/usr.bin/systat/ps.c:1.40
--- src/usr.bin/systat/ps.c:1.39 Wed Aug 26 10:56:01 2020
+++ src/usr.bin/systat/ps.c Sat Apr 17 08:34:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ps.c,v 1.39 2020/08/26 10:56:01 simonb Exp $ */
+/* $NetBSD: ps.c,v 1.40 2021/04/17 08:34:27 maya Exp $ */
/*-
* Copyright (c) 1999
@@ -45,7 +45,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ps.c,v 1.39 2020/08/26 10:56:01 simonb Exp $");
+__RCSID("$NetBSD: ps.c,v 1.40 2021/04/17 08:34:27 maya Exp $");
#endif /* not lint */
#include
@@ -340,11 +340,9 @@ start2str(struct kinfo_proc2 *kp)
if (now == 0)
time(&now);
if (now - u_start.tv_sec < 24 * SECSPERHOUR) {
- /* I *hate* SCCS... */
- strftime(startstr, sizeof(startstr) - 1, "%l:%" "M%p", tp);
+ strftime(startstr, sizeof(startstr) - 1, "%l:%M%p", tp);
} else if (now - u_start.tv_sec < 7 * SECSPERDAY) {
- /* I *hate* SCCS... */
- strftime(startstr, sizeof(startstr) - 1, "%a%" "I%p", tp);
+ strftime(startstr, sizeof(startstr) - 1, "%a%I%p", tp);
} else
strftime(startstr, sizeof(startstr) - 1, "%e%b%y", tp);
CVS commit: src/usr.bin/w
Module Name:src
Committed By: maya
Date: Sat Apr 17 06:14:15 UTC 2021
Modified Files:
src/usr.bin/w: pr_time.c w.c
Log Message:
Remove SCCS workarounds. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/w/pr_time.c
cvs rdiff -u -r1.90 -r1.91 src/usr.bin/w/w.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/w/pr_time.c
diff -u src/usr.bin/w/pr_time.c:1.18 src/usr.bin/w/pr_time.c:1.19
--- src/usr.bin/w/pr_time.c:1.18 Wed Aug 17 13:48:11 2011
+++ src/usr.bin/w/pr_time.c Sat Apr 17 06:14:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pr_time.c,v 1.18 2011/08/17 13:48:11 christos Exp $ */
+/* $NetBSD: pr_time.c,v 1.19 2021/04/17 06:14:15 maya Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pr_time.c 8.2 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: pr_time.c,v 1.18 2011/08/17 13:48:11 christos Exp $");
+__RCSID("$NetBSD: pr_time.c,v 1.19 2021/04/17 06:14:15 maya Exp $");
#endif
#endif /* not lint */
@@ -51,9 +51,6 @@ __RCSID("$NetBSD: pr_time.c,v 1.18 2011/
/*
* pr_attime --
* Print the time since the user logged in.
- *
- * Note: SCCS forces the bizarre string manipulation, things like
- * %I% get replaced in the source code.
*/
void
pr_attime(time_t *started, time_t *now)
@@ -71,11 +68,11 @@ pr_attime(time_t *started, time_t *now)
/* If more than a week, use day-month-year. */
(void)strftime(buf, sizeof(buf), "%d%b%y", tp);
} else if (tp->tm_yday != tnow_yday) {
- /* If not today, use day-hour-am/pm. Damn SCCS */
- (void)strftime(buf, sizeof(buf), "%a%" "I%p", tp);
+ /* If not today, use day-hour-am/pm. */
+ (void)strftime(buf, sizeof(buf), "%a%I%p", tp);
} else {
- /* Default is hh:mm{am,pm}. Damn SCCS */
- (void)strftime(buf, sizeof(buf), "%l:%" "M%p", tp);
+ /* Default is hh:mm{am,pm}. */
+ (void)strftime(buf, sizeof(buf), "%l:%M%p", tp);
}
buf[sizeof(buf) - 1] = '\0';
Index: src/usr.bin/w/w.c
diff -u src/usr.bin/w/w.c:1.90 src/usr.bin/w/w.c:1.91
--- src/usr.bin/w/w.c:1.90 Sat Aug 1 17:53:38 2020
+++ src/usr.bin/w/w.c Sat Apr 17 06:14:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: w.c,v 1.90 2020/08/01 17:53:38 kim Exp $ */
+/* $NetBSD: w.c,v 1.91 2021/04/17 06:14:15 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)w.c 8.6 (Berkeley) 6/30/94";
#else
-__RCSID("$NetBSD: w.c,v 1.90 2020/08/01 17:53:38 kim Exp $");
+__RCSID("$NetBSD: w.c,v 1.91 2021/04/17 06:14:15 maya Exp $");
#endif
#endif /* not lint */
@@ -465,11 +465,8 @@ pr_header(time_t *nowp, int nusers)
/*
* Print time of day.
- *
- * SCCS forces the string manipulation below, as it replaces
- * %, M, and % in a character string with the file name.
*/
- (void)strftime(buf, sizeof(buf), "%l:%" "M%p", localtime(nowp));
+ (void)strftime(buf, sizeof(buf), "%l:%M%p", localtime(nowp));
buf[sizeof(buf) - 1] = '\0';
(void)printf("%s ", buf);
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: maya Date: Fri Dec 25 09:02:41 UTC 2020 Modified Files: src/usr.bin/calendar/calendars: calendar.judaic Log Message: Update to 2021, hopefully less errors made in this year. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.bin/calendar/calendars/calendar.judaic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.judaic diff -u src/usr.bin/calendar/calendars/calendar.judaic:1.9 src/usr.bin/calendar/calendars/calendar.judaic:1.10 --- src/usr.bin/calendar/calendars/calendar.judaic:1.9 Fri Dec 20 22:58:53 2019 +++ src/usr.bin/calendar/calendars/calendar.judaic Fri Dec 25 09:02:41 2020 @@ -1,29 +1,29 @@ -01/21* Tu B'Shvat (Feast of Trees) -03/09* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) -03/10* Purim (Feast of Lots; 30 days before Pesach) -04/09* Pesach (First Day of Passover; sabbatical) -04/10* Pesach (sabbatical) -04/11* Pesach (sabbatical) -04/16* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) -04/17* Mimouna (Morrocan Jewish Celebration of End of Pesach) -04/09* Yom HaAtzma'ut (Israel Independence Day) -05/12* Lag B'Omer (Commemoration of the Great Rebellion) -05/22* Yom Yerushalayim (Reunification of Jerusalem) -05/29* Shavuot (Festival of Weeks; 50 days after Pesach; sabbatical) -07/09* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; +01/28* Tu B'Shvat (Feast of Trees) +02/25* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) +02/26* Purim (Feast of Lots; 30 days before Pesach) +03/29* Pesach (First Day of Passover; sabbatical) +03/30* Pesach (sabbatical) +03/31* Pesach (sabbatical) +04/04* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) +04/05* Mimouna (Morrocan Jewish Celebration of End of Pesach) +04/15* Yom HaAtzma'ut (Israel Independence Day) +04/30* Lag B'Omer (Commemoration of the Great Rebellion) +05/10* Yom Yerushalayim (Reunification of Jerusalem) +05/17* Shavuot (Festival of Weeks; 50 days after Pesach; sabbatical) +06/27* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; fast day) -07/30* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) -09/19* First Day of Rosh Hashanah (Jewish Lunar New Year; 5781 == 2021; +07/18* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) +09/07* First Day of Rosh Hashanah (Jewish Lunar New Year; 5782 == 2022; sabbatical) -09/20* Rosh Hashanah (sabbatical) -09/21* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day +09/08* Rosh Hashanah (sabbatical) +09/09* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day after Rosh Hashanah; fast day) -09/28* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; +09/16* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; sabbatical, fast day) -10/03* Sukkot (Festival of Tabernacles; 14 days after Rosh Hashanah; +09/21* Sukkot (Festival of Tabernacles; 14 days after Rosh Hashanah; sabbatical) -10/09* Hoshanah Rabba (7th day of Sukkot) -10/01* Shmini Atzeret (8th Day of Gathering; 1 day after Sukkot; sabbatical) -11/16* Sigd (Beta Israel; 50 days after Yom Kippur) -12/10* First Day of Chanukah -12/25* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day) +09/27* Hoshanah Rabba (7th day of Sukkot) +09/28* Shmini Atzeret (8th Day of Gathering; 1 day after Sukkot; sabbatical) +11/04* Sigd (Beta Israel; 50 days after Yom Kippur) +11/28* First Day of Chanukah +12/14* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day)
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: maya Date: Fri Dec 18 20:07:40 UTC 2020 Removed Files: src/external/bsd/pkg_install/dist: Makefile.in README config.guess config.sub configure configure.ac diff install-sh tkpkg src/external/bsd/pkg_install/dist/add: Makefile.in pkg_add.cat src/external/bsd/pkg_install/dist/admin: Makefile.in audit-packages.cat download-vulnerability-list.cat pkg_admin.cat src/external/bsd/pkg_install/dist/create: Makefile.in pkg_create.cat src/external/bsd/pkg_install/dist/delete: Makefile.in pkg_delete.cat src/external/bsd/pkg_install/dist/info: Makefile.in pkg_info.cat src/external/bsd/pkg_install/dist/lib: Makefile.in pkg_install.conf.cat.in pkg_summary.cat pkgsrc.cat Log Message: Merge pkg_install-20201218 To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/Makefile.in \ src/external/bsd/pkg_install/dist/README \ src/external/bsd/pkg_install/dist/config.guess \ src/external/bsd/pkg_install/dist/config.sub \ src/external/bsd/pkg_install/dist/configure \ src/external/bsd/pkg_install/dist/configure.ac \ src/external/bsd/pkg_install/dist/install-sh \ src/external/bsd/pkg_install/dist/tkpkg cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/diff cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/add/Makefile.in cvs rdiff -u -r1.4 -r0 src/external/bsd/pkg_install/dist/add/pkg_add.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/admin/Makefile.in \ src/external/bsd/pkg_install/dist/admin/audit-packages.cat \ src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.cat cvs rdiff -u -r1.5 -r0 src/external/bsd/pkg_install/dist/admin/pkg_admin.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/create/Makefile.in cvs rdiff -u -r1.4 -r0 \ src/external/bsd/pkg_install/dist/create/pkg_create.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/delete/Makefile.in cvs rdiff -u -r1.4 -r0 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/info/Makefile.in cvs rdiff -u -r1.4 -r0 src/external/bsd/pkg_install/dist/info/pkg_info.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/lib/Makefile.in cvs rdiff -u -r1.4 -r0 \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in \ src/external/bsd/pkg_install/dist/lib/pkg_summary.cat \ src/external/bsd/pkg_install/dist/lib/pkgsrc.cat Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/pkg_install/dist
Module Name:src Committed By: maya Date: Fri Dec 18 19:41:45 UTC 2020 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6964 Log Message: Import pkg_install-20201218 This time with the right style tag, and not adding unnecessary files (same as previous imports). Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20201218 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS import: src/external/bsd/pkg_install/dist
Module Name:src Committed By: maya Date: Fri Dec 18 17:19:17 UTC 2020 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8075 Log Message: import pkg_install version 20201218 from pkgsrc - Support continuing to install to /var/db/pkg if it exists and the new pkgdb doesn't. In the future, we can warn about this once we have tested advice that we can give to users who want to move the location of pkgdb. - Don't do anything about /var/db/pkg on non-NetBSD-base. This creates conflicts with other package managers that also install to /var/db/pkg. Status: Vendor Tag: PKGSRC Release Tags: pkg-install-20201218 U src/external/bsd/pkg_install/dist/Makefile.in U src/external/bsd/pkg_install/dist/README U src/external/bsd/pkg_install/dist/config.guess U src/external/bsd/pkg_install/dist/config.sub C src/external/bsd/pkg_install/dist/configure C src/external/bsd/pkg_install/dist/configure.ac U src/external/bsd/pkg_install/dist/install-sh U src/external/bsd/pkg_install/dist/tkpkg N src/external/bsd/pkg_install/dist/diff C src/external/bsd/pkg_install/dist/add/Makefile.in U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 C src/external/bsd/pkg_install/dist/add/pkg_add.cat U src/external/bsd/pkg_install/dist/admin/Makefile.in U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.cat U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.cat U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 C src/external/bsd/pkg_install/dist/admin/pkg_admin.cat C src/external/bsd/pkg_install/dist/create/Makefile.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 C src/external/bsd/pkg_install/dist/create/pkg_create.cat U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/Makefile.in U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c C src/external/bsd/pkg_install/dist/delete/pkg_delete.cat U src/external/bsd/pkg_install/dist/info/Makefile.in U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 C src/external/bsd/pkg_install/dist/info/pkg_info.cat U src/external/bsd/pkg_install/dist/info/show.c C src/external/bsd/pkg_install/dist/lib/Makefile.in U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in C src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 C src/external/bsd/pkg_install/dist/lib/pkg_summary.cat C src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 C src/external/bsd/pkg_install/dist/lib/pkgsrc.cat C src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c C src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/
CVS commit: src/share/misc
Module Name:src Committed By: maya Date: Tue Nov 17 19:56:42 UTC 2020 Modified Files: src/share/misc: acronyms.comp Log Message: Add "AOT" Ahead Of Time To generate a diff of this commit: cvs rdiff -u -r1.315 -r1.316 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.315 src/share/misc/acronyms.comp:1.316 --- src/share/misc/acronyms.comp:1.315 Thu Nov 5 18:05:06 2020 +++ src/share/misc/acronyms.comp Tue Nov 17 19:56:42 2020 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.315 2020/11/05 18:05:06 dholland Exp $ +$NetBSD: acronyms.comp,v 1.316 2020/11/17 19:56:42 maya Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -62,6 +62,7 @@ AO analog output AOC add-on card AOL Alert-on-LAN AOS add or subtract +AOT ahead of time AP access point AP application processor APFS Apple file system
CVS commit: src/external/ofl
Module Name:src
Committed By: maya
Date: Fri Nov 13 09:56:53 UTC 2020
Modified Files:
src/external/ofl: Makefile
Log Message:
Needs bsd.own.mk for MKX11.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/ofl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ofl/Makefile
diff -u src/external/ofl/Makefile:1.2 src/external/ofl/Makefile:1.3
--- src/external/ofl/Makefile:1.2 Fri Nov 13 08:33:07 2020
+++ src/external/ofl/Makefile Fri Nov 13 09:56:53 2020
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2020/11/13 08:33:07 maya Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/13 09:56:53 maya Exp $
+
+.include
.if ${MKX11} != "no"
SUBDIR+= font-liberation-ttf
CVS commit: src/external/ofl
Module Name:src
Committed By: maya
Date: Fri Nov 13 08:33:07 UTC 2020
Modified Files:
src/external/ofl: Makefile
Log Message:
add rcsid, make font conditional on MKX11.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/ofl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ofl/Makefile
diff -u src/external/ofl/Makefile:1.1 src/external/ofl/Makefile:1.2
--- src/external/ofl/Makefile:1.1 Thu Nov 12 22:28:02 2020
+++ src/external/ofl/Makefile Fri Nov 13 08:33:07 2020
@@ -1,3 +1,7 @@
+# $NetBSD: Makefile,v 1.2 2020/11/13 08:33:07 maya Exp $
+
+.if ${MKX11} != "no"
SUBDIR+= font-liberation-ttf
+.endif
.include
CVS commit: src
Module Name:src
Committed By: maya
Date: Thu Nov 12 22:28:02 UTC 2020
Modified Files:
src/distrib/sets/lists/xfont: mi
src/external: Makefile
Added Files:
src/external/ofl: Makefile
src/external/ofl/font-liberation-ttf: Makefile
Log Message:
Hook up font-liberation-ttf to the build.
license ok'd by board.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/xfont/mi
cvs rdiff -u -r1.21 -r1.22 src/external/Makefile
cvs rdiff -u -r0 -r1.1 src/external/ofl/Makefile
cvs rdiff -u -r0 -r1.1 src/external/ofl/font-liberation-ttf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xfont/mi
diff -u src/distrib/sets/lists/xfont/mi:1.44 src/distrib/sets/lists/xfont/mi:1.45
--- src/distrib/sets/lists/xfont/mi:1.44 Sun Oct 11 17:49:07 2020
+++ src/distrib/sets/lists/xfont/mi Thu Nov 12 22:28:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.44 2020/10/11 17:49:07 nia Exp $
+# $NetBSD: mi,v 1.45 2020/11/12 22:28:02 maya Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3799,6 +3799,18 @@
./usr/X11R7/lib/X11/fonts/75dpi/timR24-ISO8859-4.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/timR24-ISO8859-9.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/timR24.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationMono-Bold.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationMono-BoldItalic.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationMono-Italic.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationMono-Regular.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSans-Bold.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSans-BoldItalic.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSans-Italic.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSans-Regular.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSerif-Bold.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSerif-BoldItalic.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSerif-Italic.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSerif-Regular.ttf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/TTF/Vera.ttf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/TTF/VeraBI.ttf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/TTF/VeraBd.ttf xfont share,xorg,x11fonts
Index: src/external/Makefile
diff -u src/external/Makefile:1.21 src/external/Makefile:1.22
--- src/external/Makefile:1.21 Sat Apr 7 22:39:31 2018
+++ src/external/Makefile Thu Nov 12 22:28:02 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2018/04/07 22:39:31 christos Exp $
+# $NetBSD: Makefile,v 1.22 2020/11/12 22:28:02 maya Exp $
SUBDIR+= apache2 atheros broadcom bsd cddl gpl2 gpl3 historical intel-fw-eula
-SUBDIR+= intel-fw-public ibm-public mpl mit nvidia-firmware public-domain
+SUBDIR+= intel-fw-public ibm-public mpl mit nvidia-firmware ofl public-domain
SUBDIR+= realtek
.include
Added files:
Index: src/external/ofl/Makefile
diff -u /dev/null src/external/ofl/Makefile:1.1
--- /dev/null Thu Nov 12 22:28:02 2020
+++ src/external/ofl/Makefile Thu Nov 12 22:28:02 2020
@@ -0,0 +1,3 @@
+SUBDIR+= font-liberation-ttf
+
+.include
Index: src/external/ofl/font-liberation-ttf/Makefile
diff -u /dev/null src/external/ofl/font-liberation-ttf/Makefile:1.1
--- /dev/null Thu Nov 12 22:28:02 2020
+++ src/external/ofl/font-liberation-ttf/Makefile Thu Nov 12 22:28:02 2020
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2020/11/12 22:28:02 maya Exp $
+
+.include
+
+FONTSUBDIR= TTF
+FONTSRCPKG= font-liberation-ttf
+FILESDIR= ${X11FONTDIR}/TTF
+
+.PATH: ${X11SRCDIR}/external/ofl/${FONTSRCPKG}/src \
+ ${X11SRCDIR}/external/ofl/${FONTSRCPKG}/dist
+
+FILES= LiberationMono-Bold.ttf LiberationMono-BoldItalic.ttf \
+ LiberationMono-Italic.ttf LiberationMono-Regular.ttf \
+ LiberationSans-Bold.ttf LiberationSans-BoldItalic.ttf \
+ LiberationSans-Italic.ttf LiberationSans-Regular.ttf \
+ LiberationSerif-Bold.ttf LiberationSerif-BoldItalic.ttf \
+ LiberationSerif-Italic.ttf LiberationSerif-Regular.ttf
+
+.include
+.include
+.include
CVS commit: xsrc/external/ofl/font-liberation-ttf/src
Module Name:xsrc Committed By: maya Date: Thu Nov 12 22:23:48 UTC 2020 Added Files: xsrc/external/ofl/font-liberation-ttf/src: LiberationMono-Bold.ttf LiberationMono-BoldItalic.ttf LiberationMono-Italic.ttf LiberationMono-Regular.ttf LiberationSans-Bold.ttf LiberationSans-BoldItalic.ttf LiberationSans-Italic.ttf LiberationSans-Regular.ttf LiberationSerif-Bold.ttf LiberationSerif-BoldItalic.ttf LiberationSerif-Italic.ttf LiberationSerif-Regular.ttf Log Message: Add the generated TTF files from font-liberation-ttf This was done using the pkgsrc package. The build is simple enough that we can add our own generation target, but duplicating the generation logic will probably make updates annoying. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Bold.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-BoldItalic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Italic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Regular.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Bold.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-BoldItalic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Italic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Regular.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Bold.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-BoldItalic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Italic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Regular.ttf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Bold.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-BoldItalic.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Italic.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Regular.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Bold.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-BoldItalic.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Italic.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Regular.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Bold.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-BoldItalic.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Italic.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Regular.ttf Binary files are different
CVS import: xsrc/external/ofl/font-liberation-ttf/dist
Module Name:xsrc Committed By: maya Date: Thu Nov 12 22:16:47 UTC 2020 Update of /cvsroot/xsrc/external/ofl/font-liberation-ttf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5803 Log Message: Initial import of font-liberation-ttf version 2.1.1 These are a set of 3 fonts that are metric-compatible with the most commonly used Microsoft Windows fonts. This is a fork of the ChromeOS core fonts that is maintained by RedHat. Status: Vendor Tag: REDHAT Release Tags: font-liberation-ttf-2-1-1 N xsrc/external/ofl/font-liberation-ttf/dist/AUTHORS N xsrc/external/ofl/font-liberation-ttf/dist/ChangeLog N xsrc/external/ofl/font-liberation-ttf/dist/LICENSE N xsrc/external/ofl/font-liberation-ttf/dist/Makefile N xsrc/external/ofl/font-liberation-ttf/dist/README.md N xsrc/external/ofl/font-liberation-ttf/dist/TODO N xsrc/external/ofl/font-liberation-ttf/dist/docs/CVTSpecs.csv N xsrc/external/ofl/font-liberation-ttf/dist/images/icon.png N xsrc/external/ofl/font-liberation-ttf/dist/images/icon.svg N xsrc/external/ofl/font-liberation-ttf/dist/scripts/fontexport.pe N xsrc/external/ofl/font-liberation-ttf/dist/scripts/setisFixedPitch-fonttools.py N xsrc/external/ofl/font-liberation-ttf/dist/scripts/sfd2ttf.pe N xsrc/external/ofl/font-liberation-ttf/dist/scripts/ttf2sfd.pe N xsrc/external/ofl/font-liberation-ttf/dist/src/LiberationMono-Bold.sfd N xsrc/external/ofl/font-liberation-ttf/dist/src/LiberationMono-BoldItalic.sfd N xsrc/external/ofl/font-liberation-ttf/dist/src/LiberationMono-Italic.sfd N xsrc/external/ofl/font-liberation-ttf/dist/src/LiberationMono-Regular.sfd N xsrc/external/ofl/font-liberation-ttf/dist/src/LiberationSans-Bold.sfd N xsrc/external/ofl/font-liberation-ttf/dist/src/LiberationSans-BoldItalic.sfd N xsrc/external/ofl/font-liberation-ttf/dist/src/LiberationSans-Italic.sfd N xsrc/external/ofl/font-liberation-ttf/dist/src/LiberationSans-Regular.sfd N xsrc/external/ofl/font-liberation-ttf/dist/src/LiberationSerif-Bold.sfd N xsrc/external/ofl/font-liberation-ttf/dist/src/LiberationSerif-BoldItalic.sfd N xsrc/external/ofl/font-liberation-ttf/dist/src/LiberationSerif-Italic.sfd N xsrc/external/ofl/font-liberation-ttf/dist/src/LiberationSerif-Regular.sfd No conflicts created by this import
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src Committed By: maya Date: Sat Oct 31 04:05:42 UTC 2020 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915: intel_sprite.c Log Message: Match linux here and wait without interrupts. >From David H. Gutteridge in PR port-amd64/5 There's a second part to the patch, but "make our code behave the way the upstream code does" is very welcome. Also PR kern/54515 and possibly others. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c:1.10 src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c:1.11 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c:1.10 Fri Feb 14 04:36:12 2020 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c Sat Oct 31 04:05:42 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_sprite.c,v 1.10 2020/02/14 04:36:12 riastradh Exp $ */ +/* $NetBSD: intel_sprite.c,v 1.11 2020/10/31 04:05:42 maya Exp $ */ /* * Copyright © 2011 Intel Corporation @@ -32,7 +32,7 @@ * support. */ #include -__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.10 2020/02/14 04:36:12 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.11 2020/10/31 04:05:42 maya Exp $"); #include #include @@ -124,7 +124,7 @@ void intel_pipe_update_start(struct inte trace_i915_pipe_update_start(crtc); #ifdef __NetBSD__ - DRM_SPIN_TIMED_WAIT_UNTIL(ret, wq, &dev->vbl_lock, timeout, + DRM_SPIN_TIMED_WAIT_NOINTR_UNTIL(ret, wq, &dev->vbl_lock, timeout, (scanline = intel_get_crtc_scanline(crtc), scanline < min || scanline > max)); if (ret <= 0)
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src
Committed By: maya
Date: Fri Oct 30 12:32:04 UTC 2020
Modified Files:
src/external/public-domain/sqlite/dist: sqlite3.c
Log Message:
Use the same macro used before for avoiding too large floats on vax.
This has the advantage of not changing the number for non-vax, so is a
safer change for those architectures.
(Might not actually matter).
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/public-domain/sqlite/dist/sqlite3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/dist/sqlite3.c
diff -u src/external/public-domain/sqlite/dist/sqlite3.c:1.19 src/external/public-domain/sqlite/dist/sqlite3.c:1.20
--- src/external/public-domain/sqlite/dist/sqlite3.c:1.19 Fri Oct 30 06:02:05 2020
+++ src/external/public-domain/sqlite/dist/sqlite3.c Fri Oct 30 12:32:04 2020
@@ -185409,7 +185409,7 @@ SQLITE_API int sqlite3_rtree_init(
**May you share freely, never taking more than you give.
**
*
-** $Id: sqlite3.c,v 1.19 2020/10/30 06:02:05 martin Exp $
+** $Id: sqlite3.c,v 1.20 2020/10/30 12:32:04 maya Exp $
**
** This file implements an integration between the ICU library
** ("International Components for Unicode", an open-source library
@@ -213756,7 +213756,7 @@ static int fts5BestIndexMethod(sqlite3_v
}else{
/* As there exists an unusable MATCH constraint this is an
** unusable plan. Set a prohibitively high cost. */
-pInfo->estimatedCost = DBL_MAX;
+pInfo->estimatedCost = SQLITE_HUGE_COST;
return SQLITE_OK;
}
}else if( p->op<=SQLITE_INDEX_CONSTRAINT_MATCH ){
CVS commit: src
Module Name:src
Committed By: maya
Date: Wed Oct 21 15:12:15 UTC 2020
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/freetype/freetype/config: Makefile
Log Message:
Build fixes for freetype 2.10.4
To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/lib/freetype/freetype/config/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.217 src/distrib/sets/lists/xcomp/mi:1.218
--- src/distrib/sets/lists/xcomp/mi:1.217 Sun Aug 30 04:51:03 2020
+++ src/distrib/sets/lists/xcomp/mi Wed Oct 21 15:12:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.217 2020/08/30 04:51:03 mrg Exp $
+# $NetBSD: mi,v 1.218 2020/10/21 15:12:15 maya Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -570,6 +570,9 @@
./usr/X11R7/include/freetype2/freetype/config/ftmodule.h xcomp-freetype2-include xorg
./usr/X11R7/include/freetype2/freetype/config/ftoption.h xcomp-freetype2-include xorg
./usr/X11R7/include/freetype2/freetype/config/ftstdlib.h xcomp-freetype2-include xorg
+./usr/X11R7/include/freetype2/freetype/config/integer-types.h xcomp-freetype2-include xorg
+./usr/X11R7/include/freetype2/freetype/config/mac-support.h xcomp-freetype2-include xorg
+./usr/X11R7/include/freetype2/freetype/config/public-macros.h xcomp-freetype2-include xorg
./usr/X11R7/include/freetype2/freetype/freetype.h xcomp-freetype2-include xorg
./usr/X11R7/include/freetype2/freetype/ftadvanc.h xcomp-freetype2-include xorg
./usr/X11R7/include/freetype2/freetype/ftautoh.h xcomp-obsolete obsolete
Index: src/external/mit/xorg/lib/freetype/freetype/config/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.3 src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.4
--- src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.3 Mon May 16 22:19:10 2016
+++ src/external/mit/xorg/lib/freetype/freetype/config/Makefile Wed Oct 21 15:12:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/05/16 22:19:10 christos Exp $
+# $NetBSD: Makefile,v 1.4 2020/10/21 15:12:15 maya Exp $
.include
@@ -7,6 +7,7 @@
INCSDIR=${X11INCDIR}/freetype2/freetype/config
INCS= ftconfig.h ftheader.h ftmodule.h ftoption.h ftstdlib.h
+INCS+= integer-types.h mac-support.h public-macros.h
.include
.include
CVS commit: xsrc/external/mit/freetype/dist
Module Name:xsrc Committed By: maya Date: Wed Oct 21 14:55:07 UTC 2020 Modified Files: xsrc/external/mit/freetype/dist: CMakeLists.txt ChangeLog ChangeLog.20 ChangeLog.21 ChangeLog.22 ChangeLog.23 ChangeLog.24 Makefile README README.git autogen.sh configure modules.cfg vms_make.com xsrc/external/mit/freetype/dist/builds: detect.mk exports.mk freetype.mk link_dos.mk link_std.mk modules.mk toplevel.mk xsrc/external/mit/freetype/dist/builds/amiga: README makefile makefile.os4 smakefile xsrc/external/mit/freetype/dist/builds/amiga/include/config: ftconfig.h ftmodule.h xsrc/external/mit/freetype/dist/builds/amiga/src/base: ftdebug.c ftsystem.c xsrc/external/mit/freetype/dist/builds/ansi: ansi-def.mk ansi.mk xsrc/external/mit/freetype/dist/builds/beos: beos-def.mk beos.mk detect.mk xsrc/external/mit/freetype/dist/builds/cmake: iOS.cmake xsrc/external/mit/freetype/dist/builds/compiler: ansi-cc.mk bcc-dev.mk bcc.mk emx.mk gcc-dev.mk gcc.mk intelc.mk unix-lcc.mk visualage.mk visualc.mk watcom.mk win-lcc.mk xsrc/external/mit/freetype/dist/builds/dos: detect.mk dos-def.mk dos-emx.mk dos-gcc.mk dos-wat.mk xsrc/external/mit/freetype/dist/builds/mac: ftmac.c xsrc/external/mit/freetype/dist/builds/os2: detect.mk os2-def.mk os2-dev.mk os2-gcc.mk xsrc/external/mit/freetype/dist/builds/symbian: bld.inf freetype.mmp xsrc/external/mit/freetype/dist/builds/unix: aclocal.m4 config.guess config.sub configure configure.ac configure.raw detect.mk freetype-config.in freetype2.m4 ft-munmap.m4 ftsystem.c install.mk unix-cc.in unix-def.in unix-dev.mk unix-lcc.mk unix.mk unixddef.mk xsrc/external/mit/freetype/dist/builds/vms: ftconfig.h ftsystem.c xsrc/external/mit/freetype/dist/builds/wince: ftdebug.c xsrc/external/mit/freetype/dist/builds/wince/vc2005-ce: freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/wince/vc2008-ce: freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/windows: detect.mk ftdebug.c w32-bcc.mk w32-bccd.mk w32-dev.mk w32-gcc.mk w32-icc.mk w32-intl.mk w32-lcc.mk w32-mingw32.mk w32-vcc.mk w32-wat.mk win32-def.mk xsrc/external/mit/freetype/dist/builds/windows/vc2010: index.html xsrc/external/mit/freetype/dist/builds/windows/visualc: freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/windows/visualce: freetype.dsp freetype.vcproj index.html xsrc/external/mit/freetype/dist/devel: ft2build.h ftoption.h xsrc/external/mit/freetype/dist/docs: CHANGES CUSTOMIZE DEBUG INSTALL INSTALL.ANY INSTALL.CROSS INSTALL.GNU INSTALL.UNIX INSTALL.VMS TODO formats.txt freetype-config.1 raster.txt release xsrc/external/mit/freetype/dist/include: ft2build.h xsrc/external/mit/freetype/dist/include/freetype: freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h ftcid.h fterrdef.h fterrors.h ftgasp.h ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h ftsystem.h fttrigon.h fttypes.h ftwinfnt.h t1tables.h ttnameid.h tttables.h tttags.h xsrc/external/mit/freetype/dist/include/freetype/config: ftconfig.h ftheader.h ftmodule.h ftoption.h ftstdlib.h xsrc/external/mit/freetype/dist/include/freetype/internal: autohint.h ftcalc.h ftdebug.h ftgloadr.h ftmemory.h ftobjs.h ftrfork.h ftserv.h ftstream.h fttrace.h ftvalid.h psaux.h pshints.h sfnt.h t1types.h tttypes.h xsrc/external/mit/freetype/dist/include/freetype/internal/services: svbdf.h svcid.h svgldict.h svgxval.h svkern.h svmm.h svotval.h svpfr.h svpostnm.h svprop.h svpscmap.h svpsinfo.h svsfnt.h svttcmap.h svtteng.h svttglyf.h svwinfnt.h xsrc/external/mit/freetype/dist/src/autofit: afangles.c afblue.c afblue.cin afblue.dat afblue.h afblue.hin afcjk.c afcjk.h afcover.h afdummy.c afdummy.h aferrors.h afglobal.c afglobal.h afhints.c afhints.h afindic.c afindic.h aflatin.c aflatin.h aflatin2.c aflatin2.h afloader.c afloader.h afmodule.c afmodule.h afranges.c afranges.h afscript.h afstyles.h aftypes.h afwarp.c afwarp.h afwrtsys.h autofit.c module.mk rules.mk xsrc/external/mit/freetype/dist/src/base: ftadvanc.c ftbase.c ftbase.h ftbbox.c ftbdf.c ftbitmap.c ftcalc.c ftcid.c ftdbgmem.c ftdebug.c ftfntfmt.c ftfstype.c ftgasp.c ftgloadr.c ftgl
CVS import: xsrc/external/mit/freetype/dist
Module Name:xsrc Committed By: maya Date: Wed Oct 21 14:49:13 UTC 2020 Update of /cvsroot/xsrc/external/mit/freetype/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1256 Log Message: Initial import of freetype-2.10.4 Status: Vendor Tag: xorg Release Tags: freetype-2-10-4 C xsrc/external/mit/freetype/dist/modules.cfg C xsrc/external/mit/freetype/dist/ChangeLog.21 C xsrc/external/mit/freetype/dist/README.git N xsrc/external/mit/freetype/dist/meson.build C xsrc/external/mit/freetype/dist/ChangeLog.20 C xsrc/external/mit/freetype/dist/ChangeLog.22 C xsrc/external/mit/freetype/dist/ChangeLog.23 C xsrc/external/mit/freetype/dist/ChangeLog.24 U xsrc/external/mit/freetype/dist/ChangeLog.25 U xsrc/external/mit/freetype/dist/ChangeLog.26 U xsrc/external/mit/freetype/dist/ChangeLog.27 U xsrc/external/mit/freetype/dist/ChangeLog.28 N xsrc/external/mit/freetype/dist/ChangeLog.29 C xsrc/external/mit/freetype/dist/Makefile U xsrc/external/mit/freetype/dist/version.sed C xsrc/external/mit/freetype/dist/vms_make.com C xsrc/external/mit/freetype/dist/configure C xsrc/external/mit/freetype/dist/autogen.sh N xsrc/external/mit/freetype/dist/meson_options.txt C xsrc/external/mit/freetype/dist/README N xsrc/external/mit/freetype/dist/.clang-format C xsrc/external/mit/freetype/dist/ChangeLog C xsrc/external/mit/freetype/dist/CMakeLists.txt N xsrc/external/mit/freetype/dist/.ChangeLog.swp C xsrc/external/mit/freetype/dist/devel/ft2build.h C xsrc/external/mit/freetype/dist/devel/ftoption.h U xsrc/external/mit/freetype/dist/docs/GPLv2.TXT U xsrc/external/mit/freetype/dist/docs/FTL.TXT U xsrc/external/mit/freetype/dist/docs/CMAKE C xsrc/external/mit/freetype/dist/docs/CUSTOMIZE U xsrc/external/mit/freetype/dist/docs/DOCGUIDE C xsrc/external/mit/freetype/dist/docs/INSTALL C xsrc/external/mit/freetype/dist/docs/INSTALL.CROSS U xsrc/external/mit/freetype/dist/docs/INSTALL.MAC C xsrc/external/mit/freetype/dist/docs/INSTALL.UNIX C xsrc/external/mit/freetype/dist/docs/INSTALL.VMS U xsrc/external/mit/freetype/dist/docs/LICENSE.TXT U xsrc/external/mit/freetype/dist/docs/MAKEPP U xsrc/external/mit/freetype/dist/docs/PROBLEMS C xsrc/external/mit/freetype/dist/docs/TODO C xsrc/external/mit/freetype/dist/docs/formats.txt C xsrc/external/mit/freetype/dist/docs/raster.txt C xsrc/external/mit/freetype/dist/docs/release C xsrc/external/mit/freetype/dist/docs/INSTALL.GNU N xsrc/external/mit/freetype/dist/docs/README C xsrc/external/mit/freetype/dist/docs/INSTALL.ANY U xsrc/external/mit/freetype/dist/docs/VERSIONS.TXT C xsrc/external/mit/freetype/dist/docs/DEBUG C xsrc/external/mit/freetype/dist/docs/CHANGES C xsrc/external/mit/freetype/dist/docs/freetype-config.1 N xsrc/external/mit/freetype/dist/docs/reference/404.html N xsrc/external/mit/freetype/dist/docs/reference/sitemap.xml N xsrc/external/mit/freetype/dist/docs/reference/sitemap.xml.gz N xsrc/external/mit/freetype/dist/docs/reference/index.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-auto_hinter.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-base_interface.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-basic_types.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-bdf_fonts.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-bitmap_handling.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-bzip2.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-cache_subsystem.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-cff_driver.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-cid_fonts.html N xsrc/external/mit/freetype/dist/docs/reference/ft2-color_management.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-computations.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-error_code_values.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-error_enumerations.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-font_formats.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-gasp_table.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-glyph_management.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-glyph_stroker.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-glyph_variants.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-gx_validation.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-gzip.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-header_file_macros.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-header_inclusion.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-incremental.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-index.html N xsrc/external/mit/freetype/dist/docs/reference/ft2-layer_management.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-lzw.html N xsrc/external/mit/freetype/dist/docs/reference/ft2-lcd_rendering.html C xsrc/external/mit/freetype/dist/docs/reference/ft2-list_processing.html C xsrc/external/mit/freetype/dist/docs/reference/ft
CVS commit: src/external/gpl3/gcc/dist/libcpp
Module Name:src
Committed By: maya
Date: Mon Oct 19 07:44:52 UTC 2020
Modified Files:
src/external/gpl3/gcc/dist/libcpp: macro.c
Log Message:
Remove unused local diff. Pointed out by htodd.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/dist/libcpp/macro.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libcpp/macro.c
diff -u src/external/gpl3/gcc/dist/libcpp/macro.c:1.11 src/external/gpl3/gcc/dist/libcpp/macro.c:1.12
--- src/external/gpl3/gcc/dist/libcpp/macro.c:1.11 Sat Sep 5 09:12:29 2020
+++ src/external/gpl3/gcc/dist/libcpp/macro.c Mon Oct 19 07:44:52 2020
@@ -406,33 +406,6 @@ add_cpp_remap_path (const char *arg)
++remap_pairs;
}
-static const char *
-cpp_remap_file (const char *arg, char **tmp_name)
-{
- char *result;
- size_t i, len;
-
- for (i = 0; i < remap_pairs; ++i) {
- len = strlen (remap_src[i]);
- if (strncmp (remap_src[i], arg, len))
- continue;
- if (arg[len] == '\0')
- return remap_dst[i];
- if (arg[len] != '/')
- continue;
- arg += len;
- len = strlen (remap_dst[i]);
- result = (char *) xmalloc (len + strlen (arg) + 1);
- memcpy(result, remap_dst[i], len);
- strcpy(result + len, arg);
- *tmp_name = result;
-
- return result;
- }
-
- return arg;
-}
-
/* Helper function for builtin_macro. Returns the text generated by
a builtin macro. */
const uchar *
CVS commit: src/sys/arch/alpha/common
Module Name:src
Committed By: maya
Date: Sat Sep 5 04:11:10 UTC 2020
Modified Files:
src/sys/arch/alpha/common: sgmapvar.h
Log Message:
fix typo
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/common/sgmapvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/common/sgmapvar.h
diff -u src/sys/arch/alpha/common/sgmapvar.h:1.18 src/sys/arch/alpha/common/sgmapvar.h:1.19
--- src/sys/arch/alpha/common/sgmapvar.h:1.18 Sat Sep 5 03:47:16 2020
+++ src/sys/arch/alpha/common/sgmapvar.h Sat Sep 5 04:11:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sgmapvar.h,v 1.18 2020/09/05 03:47:16 thorpej Exp $ */
+/* $NetBSD: sgmapvar.h,v 1.19 2020/09/05 04:11:10 maya Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
* of it on its own.
*
* [*] While the page table is a `global' resource, access to it is
- * controlled by the arenaa; once a region has been allocated from
+ * controlled by the arena; once a region has been allocated from
* the arena, that region is effectively `locked'.
*/
struct alpha_sgmap {
CVS commit: src/share/misc
Module Name:src Committed By: maya Date: Sun Aug 9 22:07:06 UTC 2020 Modified Files: src/share/misc: acronyms.comp Log Message: Add another TOFU To generate a diff of this commit: cvs rdiff -u -r1.309 -r1.310 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.309 src/share/misc/acronyms.comp:1.310 --- src/share/misc/acronyms.comp:1.309 Tue Jul 28 14:35:34 2020 +++ src/share/misc/acronyms.comp Sun Aug 9 22:07:06 2020 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.309 2020/07/28 14:35:34 leot Exp $ +$NetBSD: acronyms.comp,v 1.310 2020/08/09 22:07:06 maya Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1616,6 +1616,7 @@ TMG transmogrifier TMDS transition minimized differential signaling TMO timeout TOD time of day +TOFU trust on first use TOS terms of service TOS trusted operating system TOS type of service
CVS commit: xsrc/external/mit/libX11/dist/modules/im/ximcp
Module Name:xsrc Committed By: maya Date: Tue Aug 4 15:47:28 UTC 2020 Modified Files: xsrc/external/mit/libX11/dist/modules/im/ximcp: imRmAttr.c Log Message: >From 93fce3f4e79cbc737d6468a4f68ba3de1b83953b Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Sun, 2 Aug 2020 13:43:58 -0400 Subject: [PATCH] Fix size calculation in `_XimAttributeToValue`. The check here guards the read below. For `XimType_XIMStyles`, these are `num` of `CARD32` and for `XimType_XIMHotKeyTriggers` these are `num` of `XIMTRIGGERKEY` ref[1] which is defined as 3 x `CARD32`. (There are data after the `XIMTRIGGERKEY` according to the spec but they are not read by this function and doesn't need to be checked.) The old code here used the native datatype size instead of the wire protocol size causing the check to always fail. Also fix the size calculation for the header (size). It is 2 x CARD16 for both types despite the unused `CARD16` for `XimType_XIMStyles`. [1] https://www.x.org/releases/X11R7.6/doc/libX11/specs/XIM/xim.html#Input_Method_Styles This fixes a regression caused by 388b303c62aa35a245f1704211a023440ad2c488 in 1.6.10. To generate a diff of this commit: cvs rdiff -u -r1.1.1.9 -r1.2 \ xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c diff -u xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c:1.1.1.9 xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c:1.2 --- xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c:1.1.1.9 Fri Jul 31 19:19:40 2020 +++ xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c Tue Aug 4 15:47:27 2020 @@ -265,7 +265,7 @@ _XimAttributeToValue( if (num > (USHRT_MAX / sizeof(XIMStyle))) return False; - if ((sizeof(num) + (num * sizeof(XIMStyle))) > data_len) + if ((2 * sizeof(CARD16) + (num * sizeof(CARD32))) > data_len) return False; alloc_len = sizeof(XIMStyles) + sizeof(XIMStyle) * num; if (alloc_len < sizeof(XIMStyles)) @@ -379,7 +379,7 @@ _XimAttributeToValue( if (num > (UINT_MAX / sizeof(XIMHotKeyTrigger))) return False; - if ((sizeof(num) + (num * sizeof(XIMHotKeyTrigger))) > data_len) + if ((2 * sizeof(CARD16) + (num * 3 * sizeof(CARD32))) > data_len) return False; alloc_len = sizeof(XIMHotKeyTriggers) + sizeof(XIMHotKeyTrigger) * num;
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: maya Date: Fri Jul 31 19:35:22 UTC 2020 Modified Files: xsrc/external/mit/xorg-server.old/dist/dix: pixmap.c xsrc/external/mit/xorg-server/dist/dix: pixmap.c Log Message: Backport the only patch from xorg-server 1.20.9 as I can't find a tarball. >From aac28e162e5108510065ad4c323affd6deffd816 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sat, 25 Jul 2020 19:33:50 +0200 Subject: [PATCH] fix for ZDI-11426 Avoid leaking un-initalized memory to clients by zeroing the whole pixmap on initial allocation. This vulnerability was discovered by: Jan-Niklas Sohn working with Trend Micro Zero Day Initiative Signed-off-by: Matthieu Herrb Reviewed-by: Alan Coopersmith To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/xorg-server/dist/dix/pixmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c diff -u xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c:1.2 --- xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c:1.1.1.1 Thu Jun 9 09:07:56 2016 +++ xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c Fri Jul 31 19:35:22 2020 @@ -120,7 +120,7 @@ AllocatePixmap(ScreenPtr pScreen, int pi if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize) return NullPixmap; -pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize); +pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize); if (!pPixmap) return NullPixmap; Index: xsrc/external/mit/xorg-server/dist/dix/pixmap.c diff -u xsrc/external/mit/xorg-server/dist/dix/pixmap.c:1.1.1.6 xsrc/external/mit/xorg-server/dist/dix/pixmap.c:1.2 --- xsrc/external/mit/xorg-server/dist/dix/pixmap.c:1.1.1.6 Sun Feb 23 10:17:39 2020 +++ xsrc/external/mit/xorg-server/dist/dix/pixmap.c Fri Jul 31 19:35:22 2020 @@ -117,7 +117,7 @@ AllocatePixmap(ScreenPtr pScreen, int pi if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize) return NullPixmap; -pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize); +pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize); if (!pPixmap) return NullPixmap;
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: maya
Date: Fri Jul 31 19:29:52 UTC 2020
Modified Files:
xsrc/external/mit/libX11/dist/m4: libtool.m4
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src: Font.c FontNames.c XlibInt.c
Log Message:
Merge libX11 1.6.10
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libX11/dist/m4/libtool.m4
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/src/Font.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libX11/dist/src/FontNames.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libX11/dist/src/XlibInt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/m4/libtool.m4
diff -u xsrc/external/mit/libX11/dist/m4/libtool.m4:1.8 xsrc/external/mit/libX11/dist/m4/libtool.m4:1.9
--- xsrc/external/mit/libX11/dist/m4/libtool.m4:1.8 Sun Feb 23 09:05:16 2020
+++ xsrc/external/mit/libX11/dist/m4/libtool.m4 Fri Jul 31 19:29:52 2020
@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
@@ -2867,9 +2866,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
@@ -2878,7 +2874,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
# appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2890,6 +2886,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3549,7 +3557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4427,7 +4435,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4939,6 +4947,9 @@ m4_if([$1], [CXX], [
;;
esac
;;
+ linux* | k*bsd*-gnu | gnu*)
+_LT_TAGVAR(link_all_deplibs, $1)=no
+;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5001,6 +5012,9 @@ dnl Note also adjust exclude_expsyms for
openbsd* | bitrig*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+_LT_TAGVAR(link_all_deplibs, $1)=no
+;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5255,7 +5269,7 @@ _LT_EOF
fi
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5776,6 +5790,7 @@ _LT_EOF
if test yes = "$lt_cv_irix_exported_symbol"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
_LT_TAGVAR(archive
CVS import: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: maya Date: Fri Jul 31 19:20:23 UTC 2020 Update of /cvsroot/xsrc/external/mit/libX11/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5152 Log Message: initial import of libX11-1.6.10 Status: Vendor Tag: xorg Release Tags: libX11-1-6-10 U xsrc/external/mit/libX11/dist/Makefile.am U xsrc/external/mit/libX11/dist/configure U xsrc/external/mit/libX11/dist/configure.ac U xsrc/external/mit/libX11/dist/aclocal.m4 U xsrc/external/mit/libX11/dist/Makefile.in U xsrc/external/mit/libX11/dist/x11-xcb.pc.in U xsrc/external/mit/libX11/dist/x11.pc.in U xsrc/external/mit/libX11/dist/AUTHORS U xsrc/external/mit/libX11/dist/COPYING U xsrc/external/mit/libX11/dist/ChangeLog U xsrc/external/mit/libX11/dist/INSTALL U xsrc/external/mit/libX11/dist/NEWS U xsrc/external/mit/libX11/dist/compile U xsrc/external/mit/libX11/dist/config.guess U xsrc/external/mit/libX11/dist/config.sub U xsrc/external/mit/libX11/dist/install-sh U xsrc/external/mit/libX11/dist/ltmain.sh U xsrc/external/mit/libX11/dist/missing U xsrc/external/mit/libX11/dist/README.md U xsrc/external/mit/libX11/dist/depcomp U xsrc/external/mit/libX11/dist/cpprules.in U xsrc/external/mit/libX11/dist/test-driver U xsrc/external/mit/libX11/dist/docbook.am U xsrc/external/mit/libX11/dist/include/Makefile.am U xsrc/external/mit/libX11/dist/include/Makefile.in U xsrc/external/mit/libX11/dist/include/X11/XlibConf.h.in U xsrc/external/mit/libX11/dist/include/X11/XKBlib.h U xsrc/external/mit/libX11/dist/include/X11/Xcms.h U xsrc/external/mit/libX11/dist/include/X11/Xlib.h U xsrc/external/mit/libX11/dist/include/X11/Xlibint.h U xsrc/external/mit/libX11/dist/include/X11/Xlocale.h U xsrc/external/mit/libX11/dist/include/X11/Xresource.h U xsrc/external/mit/libX11/dist/include/X11/Xutil.h U xsrc/external/mit/libX11/dist/include/X11/cursorfont.h U xsrc/external/mit/libX11/dist/include/X11/Xregion.h U xsrc/external/mit/libX11/dist/include/X11/ImUtil.h U xsrc/external/mit/libX11/dist/include/X11/Xlib-xcb.h U xsrc/external/mit/libX11/dist/include/X11/extensions/XKBgeom.h U xsrc/external/mit/libX11/dist/m4/ax_define_dir.m4 C xsrc/external/mit/libX11/dist/m4/libtool.m4 U xsrc/external/mit/libX11/dist/m4/ltoptions.m4 U xsrc/external/mit/libX11/dist/m4/ltsugar.m4 U xsrc/external/mit/libX11/dist/m4/ltversion.m4 U xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4 U xsrc/external/mit/libX11/dist/modules/Makefile.am U xsrc/external/mit/libX11/dist/modules/Makefile.in U xsrc/external/mit/libX11/dist/modules/im/Makefile.am U xsrc/external/mit/libX11/dist/modules/im/Makefile.in U xsrc/external/mit/libX11/dist/modules/im/ximcp/Makefile.am U xsrc/external/mit/libX11/dist/modules/im/ximcp/Makefile.in U xsrc/external/mit/libX11/dist/modules/im/ximcp/imCallbk.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imDefFlt.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imDefIc.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imDefIm.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imDefLkup.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imDispch.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imEvToWire.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imExten.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imImSw.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imInsClbk.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imInt.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcFlt.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcGIc.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcIc.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcIm.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcSIc.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imRm.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imThaiFlt.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imThaiIc.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imThaiIm.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imTrans.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imTransR.c U xsrc/external/mit/libX11/dist/modules/im/ximcp/imTrX.c U xsrc/external/mit/libX11/dist/modules/lc/Makefile.am U xsrc/external/mit/libX11/dist/modules/lc/Makefile.in U xsrc/external/mit/libX11/dist/modules/lc/Utf8/Makefile.am U xsrc/external/mit/libX11/dist/modules/lc/Utf8/Makefile.in U xsrc/external/mit/libX11/dist/modules/lc/Utf8/lcUTF8Load.c U xsrc/external/mit/libX11/dist/modules/lc/def/Makefile.am U xsrc/external/mit/libX11/dist/modules/lc/def/Makefile.in U xsrc/external/mit/libX11/dist/modules/lc/def/lcDefConv.c U xsrc/external/mit/libX11/dist/modules/lc/gen/Makefile.am U xsrc/external/mit/libX11/dist/modules/lc/gen/Makefile.in U xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c U xsrc/external/mit/libX11/dist/modules/om/Makefile.am U xsrc/external/mit/libX11/dist/m
CVS commit: src/tests/lib/libc/stdlib
Module Name:src Committed By: maya Date: Mon Jun 29 20:53:40 UTC 2020 Modified Files: src/tests/lib/libc/stdlib: t_mbtowc.c Log Message: Avoid copyright issues and name the listed author as the copyright holder. In a private email, Miloslav had agreed that if they had written the test, then it can be licensed bsd-2-clause. I am going to assume this is true as the file names Miloslav as the author. This test was likely sent to tcsh (not netbsd) that had changed bug report systems since. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/stdlib/t_mbtowc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/stdlib/t_mbtowc.c diff -u src/tests/lib/libc/stdlib/t_mbtowc.c:1.2 src/tests/lib/libc/stdlib/t_mbtowc.c:1.3 --- src/tests/lib/libc/stdlib/t_mbtowc.c:1.2 Sat Jun 27 10:19:43 2020 +++ src/tests/lib/libc/stdlib/t_mbtowc.c Mon Jun 29 20:53:40 2020 @@ -1,22 +1,23 @@ -/* $NetBSD: t_mbtowc.c,v 1.2 2020/06/27 10:19:43 jruoho Exp $ */ +/* $NetBSD: t_mbtowc.c,v 1.3 2020/06/29 20:53:40 maya Exp $ */ /*- - * Copyright (c) 2005 The NetBSD Foundation, Inc. + * Copyright (c) 2005 Miloslav Trmac * All rights reserved. * * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 FOUNDATION OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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
CVS commit: src/distrib/notes
Module Name:src Committed By: maya Date: Mon Jun 22 12:03:47 UTC 2020 Modified Files: src/distrib/notes/alpha: contents src/distrib/notes/amd64: contents src/distrib/notes/evbarm: contents src/distrib/notes/sparc64: contents Log Message: Mention that USE_XZ_SETS are either always xzipped, and in evbarm might be xzipped or gzipped. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/distrib/notes/alpha/contents cvs rdiff -u -r1.9 -r1.10 src/distrib/notes/amd64/contents cvs rdiff -u -r1.6 -r1.7 src/distrib/notes/evbarm/contents cvs rdiff -u -r1.9 -r1.10 src/distrib/notes/sparc64/contents Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/alpha/contents diff -u src/distrib/notes/alpha/contents:1.20 src/distrib/notes/alpha/contents:1.21 --- src/distrib/notes/alpha/contents:1.20 Sun Nov 24 11:15:31 2019 +++ src/distrib/notes/alpha/contents Mon Jun 22 12:03:46 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: contents,v 1.20 2019/11/24 11:15:31 martin Exp $ +.\" $NetBSD: contents,v 1.21 2020/06/22 12:03:46 maya Exp $ .\" .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -309,7 +309,7 @@ The X server. .\" XXX: should be in notes/common . .Pp -The \*M binary distribution sets are distributed as gzipped tar files +The \*M binary distribution sets are distributed as xzipped tar files named with the extension .Sy .\*[setsuffix] , e.g. Index: src/distrib/notes/amd64/contents diff -u src/distrib/notes/amd64/contents:1.9 src/distrib/notes/amd64/contents:1.10 --- src/distrib/notes/amd64/contents:1.9 Sun Nov 24 11:15:32 2019 +++ src/distrib/notes/amd64/contents Mon Jun 22 12:03:47 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: contents,v 1.9 2019/11/24 11:15:32 martin Exp $ +.\" $NetBSD: contents,v 1.10 2020/06/22 12:03:47 maya Exp $ .\" .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -245,7 +245,7 @@ This includes the modular X.Org server. .\" . .Pp -The \*M binary distribution sets are distributed as gzipped tar files +The \*M binary distribution sets are distributed as xzipped tar files named with the extension .Sy .\*[setsuffix] .Pq e.g., Pa base.\*[setsuffix] . Index: src/distrib/notes/evbarm/contents diff -u src/distrib/notes/evbarm/contents:1.6 src/distrib/notes/evbarm/contents:1.7 --- src/distrib/notes/evbarm/contents:1.6 Sun Nov 24 11:15:33 2019 +++ src/distrib/notes/evbarm/contents Mon Jun 22 12:03:47 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: contents,v 1.6 2019/11/24 11:15:33 martin Exp $ +.\" $NetBSD: contents,v 1.7 2020/06/22 12:03:47 maya Exp $ .\" .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -259,8 +259,8 @@ The X server. .\" XXX: should be in notes/common . .Pp -The \*M binary distribution sets are distributed as gzipped tar files -named with the extension +The \*M binary distribution sets are distributed as gzipped or xzipped +tar files named with the extension .Sy .\*[setsuffix] , e.g. .Pa base.\*[setsuffix] . Index: src/distrib/notes/sparc64/contents diff -u src/distrib/notes/sparc64/contents:1.9 src/distrib/notes/sparc64/contents:1.10 --- src/distrib/notes/sparc64/contents:1.9 Sun Nov 24 11:15:36 2019 +++ src/distrib/notes/sparc64/contents Mon Jun 22 12:03:47 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: contents,v 1.9 2019/11/24 11:15:36 martin Exp $ +.\" $NetBSD: contents,v 1.10 2020/06/22 12:03:47 maya Exp $ .\" .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -295,7 +295,7 @@ This includes the modular Xorg and Xvfb .\" XXX: should be in notes/common . .Pp -The \*M binary distribution sets are distributed as gzipped tar files +The \*M binary distribution sets are distributed as xzipped tar files named with the extension .Sy .\*[setsuffix] , e.g.,
CVS commit: src/distrib/amd64
Module Name:src
Committed By: maya
Date: Wed May 27 22:27:58 UTC 2020
Modified Files:
src/distrib/amd64: Makefile
src/distrib/amd64/installimage: Makefile
Removed Files:
src/distrib/amd64/uefi-installimage: Makefile Makefile.bootimage
Makefile.installimage boot.cfg.in etc.rc etc.ttys install.sh
spec.inst
Log Message:
rename amd64 uefi-installimage to be just installimage.
Works for both purposes, no confusing name.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/amd64/Makefile
cvs rdiff -u -r1.10 -r1.11 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.7 -r0 src/distrib/amd64/uefi-installimage/Makefile
cvs rdiff -u -r1.13 -r0 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
cvs rdiff -u -r1.3 -r0 \
src/distrib/amd64/uefi-installimage/Makefile.installimage
cvs rdiff -u -r1.2 -r0 src/distrib/amd64/uefi-installimage/boot.cfg.in \
src/distrib/amd64/uefi-installimage/etc.rc
cvs rdiff -u -r1.1 -r0 src/distrib/amd64/uefi-installimage/etc.ttys \
src/distrib/amd64/uefi-installimage/install.sh \
src/distrib/amd64/uefi-installimage/spec.inst
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/Makefile
diff -u src/distrib/amd64/Makefile:1.13 src/distrib/amd64/Makefile:1.14
--- src/distrib/amd64/Makefile:1.13 Sun May 21 15:28:37 2017
+++ src/distrib/amd64/Makefile Wed May 27 22:27:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/05/21 15:28:37 riastradh Exp $
+# $NetBSD: Makefile,v 1.14 2020/05/27 22:27:58 maya Exp $
.include
@@ -14,7 +14,6 @@ SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= liveimage
SUBDIR+= installimage
-SUBDIR+= uefi-installimage
TARGETS+= release
iso_image:
@@ -25,6 +24,5 @@ live_image:
install_image:
${MAKEDIRTARGET} installimage install_image
- ${MAKEDIRTARGET} uefi-installimage install_image
.include
Index: src/distrib/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.10 src/distrib/amd64/installimage/Makefile:1.11
--- src/distrib/amd64/installimage/Makefile:1.10 Sat Dec 15 18:03:16 2018
+++ src/distrib/amd64/installimage/Makefile Wed May 27 22:27:58 2020
@@ -1,16 +1,21 @@
-# $NetBSD: Makefile,v 1.10 2018/12/15 18:03:16 gson Exp $
+# $NetBSD: Makefile,v 1.11 2020/05/27 22:27:58 maya Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1450 # for all installation binaries
+INSTIMAGEMB?= 1550 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
SECONDARY_BOOT_ARG= # unnecessary
+EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi
+EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi
+#EFIBOOT= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootx64/bootx64.efi
+#EFIBOOT+= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootia32/bootia32.efi
USE_MBR= yes
+USE_GPT= yes
CLEANFILES+= boot.cfg
@@ -35,4 +40,4 @@ IMGFILE_EXTRA=\
${SYSINSTDIR}/sysinstmsgs.pl .\
${SYSINSTDIR}/sysinst .
-.include "${DISTRIBDIR}/common/bootimage/Makefile.installimage"
+.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
CVS commit: src
Module Name:src Committed By: maya Date: Sat May 16 13:46:12 UTC 2020 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile usb.4 src/sys/arch/algor/conf: P4032 P5064 P6032 src/sys/arch/alpha/conf: GENERIC src/sys/arch/amd64/conf: ALL XEN3_DOM0 src/sys/arch/cats/conf: GENERIC src/sys/arch/evbarm/conf: HDL_G HPT5325 MINI2440 MMNET_GENERIC MPCSA_GENERIC POGO SHEEVAPLUG SMDK2410 TS7200 TWINTAIL src/sys/arch/evbppc/conf: OPENBLOCKS266_OPT PMPPC src/sys/arch/hpcmips/conf: GENERIC TX3922 VR41XX src/sys/arch/hppa/conf: GENERIC src/sys/arch/i386/conf: ALL GENERIC_TINY INSTALL_FLOPPY XEN3PAE_DOM0 src/sys/arch/landisk/conf: GENERIC src/sys/arch/ofppc/conf: GENERIC src/sys/arch/playstation2/conf: DEBUG src/sys/arch/prep/conf: GENERIC src/sys/arch/x68k/conf: GENERIC src/sys/dev: DEVNAMES src/sys/dev/usb: FILES TODO.usbmp files.usb usbdevices.config Removed Files: src/share/man/man4: uyap.4 src/sys/dev/usb: ezload.c ezload.h uyap.c uyap_firmware.h Log Message: Remove uyap, USB YAP phone firmware loader. And the associated ezload EZ-USB code, which is only used by uyap. It could theoretically be used by other drivers, but none of them are in tree. I suspect that this device isn't in use, as phone technology has improved a lot since 2001 when uyap(4) was added to the tree. Proposed with no objections on netbsd-users on 13 April 2020 To generate a diff of this commit: cvs rdiff -u -r1.1687 -r1.1688 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.704 -r1.705 src/share/man/man4/Makefile cvs rdiff -u -r1.111 -r1.112 src/share/man/man4/usb.4 cvs rdiff -u -r1.5 -r0 src/share/man/man4/uyap.4 cvs rdiff -u -r1.81 -r1.82 src/sys/arch/algor/conf/P4032 cvs rdiff -u -r1.92 -r1.93 src/sys/arch/algor/conf/P5064 cvs rdiff -u -r1.82 -r1.83 src/sys/arch/algor/conf/P6032 cvs rdiff -u -r1.401 -r1.402 src/sys/arch/alpha/conf/GENERIC cvs rdiff -u -r1.149 -r1.150 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.178 -r1.179 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.180 -r1.181 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.61 -r1.62 src/sys/arch/evbarm/conf/HDL_G cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbarm/conf/HPT5325 cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/MINI2440 cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbarm/conf/MMNET_GENERIC cvs rdiff -u -r1.71 -r1.72 src/sys/arch/evbarm/conf/MPCSA_GENERIC cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/POGO cvs rdiff -u -r1.68 -r1.69 src/sys/arch/evbarm/conf/SHEEVAPLUG cvs rdiff -u -r1.74 -r1.75 src/sys/arch/evbarm/conf/SMDK2410 cvs rdiff -u -r1.75 -r1.76 src/sys/arch/evbarm/conf/TS7200 cvs rdiff -u -r1.79 -r1.80 src/sys/arch/evbarm/conf/TWINTAIL cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbppc/conf/PMPPC cvs rdiff -u -r1.241 -r1.242 src/sys/arch/hpcmips/conf/GENERIC cvs rdiff -u -r1.110 -r1.111 src/sys/arch/hpcmips/conf/TX3922 cvs rdiff -u -r1.74 -r1.75 src/sys/arch/hpcmips/conf/VR41XX cvs rdiff -u -r1.33 -r1.34 src/sys/arch/hppa/conf/GENERIC cvs rdiff -u -r1.491 -r1.492 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.167 -r1.168 src/sys/arch/i386/conf/GENERIC_TINY cvs rdiff -u -r1.54 -r1.55 src/sys/arch/i386/conf/INSTALL_FLOPPY cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.66 -r1.67 src/sys/arch/landisk/conf/GENERIC cvs rdiff -u -r1.170 -r1.171 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.26 -r1.27 src/sys/arch/playstation2/conf/DEBUG cvs rdiff -u -r1.191 -r1.192 src/sys/arch/prep/conf/GENERIC cvs rdiff -u -r1.198 -r1.199 src/sys/arch/x68k/conf/GENERIC cvs rdiff -u -r1.327 -r1.328 src/sys/dev/DEVNAMES cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/FILES cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/TODO.usbmp cvs rdiff -u -r1.18 -r0 src/sys/dev/usb/ezload.c cvs rdiff -u -r1.6 -r0 src/sys/dev/usb/ezload.h cvs rdiff -u -r1.174 -r1.175 src/sys/dev/usb/files.usb cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/usbdevices.config cvs rdiff -u -r1.24 -r0 src/sys/dev/usb/uyap.c cvs rdiff -u -r1.8 -r0 src/sys/dev/usb/uyap_firmware.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1687 src/distrib/sets/lists/man/mi:1.1688 --- src/distrib/sets/lists/man/mi:1.1687 Sun Apr 12 01:10:53 2020 +++ src/distrib/sets/lists/man/mi Sat May 16 13:46:10 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1687 2020/04/12 01:10:53 simonb Exp $ +# $NetBSD: mi,v 1.1688 2020/05/16 13:46:10 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1958,7 +1958,7 @@ ./usr/share/man/cat4/uvisor.0 man-sys-catman .cat ./usr/share/man/cat4/uvscom.0 man-sys-catman .cat ./usr/share/man/cat4/uxrcom.0 man-sys-catman .cat -./
CVS commit: src/lib/libc/gen
Module Name:src Committed By: maya Date: Sun May 10 19:36:49 UTC 2020 Modified Files: src/lib/libc/gen: Makefile.inc Log Message: Don't add getentropy.c to the build (remove symbol from libc) Still being discussed in tech-userlevel. If we wait any longer someone is going to try the excuse that the discussion is entirely pointless, since removing symbols is too hard. To generate a diff of this commit: cvs rdiff -u -r1.202 -r1.203 src/lib/libc/gen/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/Makefile.inc diff -u src/lib/libc/gen/Makefile.inc:1.202 src/lib/libc/gen/Makefile.inc:1.203 --- src/lib/libc/gen/Makefile.inc:1.202 Wed May 6 16:17:36 2020 +++ src/lib/libc/gen/Makefile.inc Sun May 10 19:36:49 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.202 2020/05/06 16:17:36 nia Exp $ +# $NetBSD: Makefile.inc,v 1.203 2020/05/10 19:36:49 maya Exp $ # from: @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 # gen sources @@ -15,7 +15,7 @@ SRCS+= alarm.c alphasort.c arc4random.c errc.c errlist.c errno.c execl.c execle.c execlp.c execv.c execvp.c \ exect.c extattr.c fmtcheck.c fmtmsg.c fnmatch.c fstab.c ftok.c \ fts.c ftw.c getbsize.c getcap.c getcwd.c \ - getdevmajor.c getdomainname.c getentropy.c getgrent.c \ + getdevmajor.c getdomainname.c getgrent.c \ getgrouplist.c getgroupmembership.c gethostname.c \ getloadavg.c getlogin.c getmntinfo.c \ getnetgrent.c getpagesize.c \
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: maya Date: Sun Apr 19 17:49:42 UTC 2020 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h Log Message: Include dev/sysmon/sysmonvar.h for sysmon_pswitch. Somehow only triggered by the compat build (which shouldn't have been enabled!) To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/external/bsd/drm2/dist/include/drm/drmP.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.40 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.41 --- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.40 Sun Apr 19 17:19:13 2020 +++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Apr 19 17:49:41 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: drmP.h,v 1.40 2020/04/19 17:19:13 maya Exp $ */ +/* $NetBSD: drmP.h,v 1.41 2020/04/19 17:49:41 maya Exp $ */ /* * Internal Header for the Direct Rendering Manager @@ -67,6 +67,7 @@ #include #ifdef __NetBSD__ +#include #include #include #include
CVS commit: src/sys/modules/compat_netbsd32
Module Name:src
Committed By: maya
Date: Sun Apr 19 17:40:50 UTC 2020
Modified Files:
src/sys/modules/compat_netbsd32: Makefile
Log Message:
Turn off compat drm.
XXX issue security advisory
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/modules/compat_netbsd32/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/compat_netbsd32/Makefile
diff -u src/sys/modules/compat_netbsd32/Makefile:1.32 src/sys/modules/compat_netbsd32/Makefile:1.33
--- src/sys/modules/compat_netbsd32/Makefile:1.32 Thu Mar 12 15:02:29 2020
+++ src/sys/modules/compat_netbsd32/Makefile Sun Apr 19 17:40:49 2020
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.32 2020/03/12 15:02:29 pgoyette Exp $
+# $NetBSD: Makefile,v 1.33 2020/04/19 17:40:49 maya Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
KMOD= compat_netbsd32
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-NETBSD32_DRMKMS?=yes
-.endif
+#.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+#NETBSD32_DRMKMS?=yes
+#.endif
CPPFLAGS+= -DCOMPAT_NETBSD32
CPPFLAGS+= -DEXEC_ELF32 -DEXEC_ELF64
CVS commit: src/sys/external/bsd/drm2/dist
Module Name:src
Committed By: maya
Date: Sun Apr 19 17:19:13 UTC 2020
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_drv.c drm_probe_helper.c
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
Log Message:
For drm drivers and on monitor hotplug, report a 'display-cycle' hotkey click
If powerd is running, it will invoke the script
/etc/powerd/actions/display-cycle
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/dist/drm/drm_drv.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c
cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.13 src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.13 Thu Mar 5 07:46:59 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_drv.c Sun Apr 19 17:19:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.13 2020/03/05 07:46:59 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.14 2020/04/19 17:19:13 maya Exp $ */
/*
* Created: Fri Jan 19 10:48:35 2001 by fa...@acm.org
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.13 2020/03/05 07:46:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.14 2020/04/19 17:19:13 maya Exp $");
#include
#include
@@ -660,6 +660,14 @@ struct drm_device *drm_dev_alloc(struct
kref_init(&dev->ref);
dev->dev = parent;
dev->driver = driver;
+#ifdef __NetBSD__
+ dev->sc_monitor_hotplug.smpsw_name = PSWITCH_HK_DISPLAY_CYCLE;
+ dev->sc_monitor_hotplug.smpsw_type = PSWITCH_TYPE_HOTKEY;
+
+ ret = sysmon_pswitch_register(&dev->sc_monitor_hotplug);
+ if (ret)
+ goto err_pswitch;
+#endif
INIT_LIST_HEAD(&dev->filelist);
INIT_LIST_HEAD(&dev->ctxlist);
@@ -727,6 +735,10 @@ err_free:
mutex_destroy(&dev->master_mutex);
mutex_destroy(&dev->ctxlist_mutex);
mutex_destroy(&dev->struct_mutex);
+#ifdef __NetBSD__
+err_pswitch:
+ sysmon_pswitch_unregister(&dev->sc_monitor_hotplug);
+#endif
kfree(dev);
return NULL;
}
@@ -739,6 +751,10 @@ static void drm_dev_release(struct kref
if (drm_core_check_feature(dev, DRIVER_GEM))
drm_gem_destroy(dev);
+#ifdef __NetBSD__
+ sysmon_pswitch_unregister(&dev->sc_monitor_hotplug);
+#endif
+
drm_legacy_ctxbitmap_cleanup(dev);
drm_ht_remove(&dev->map_hash);
drm_fs_inode_free(dev->anon_inode);
Index: src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c:1.4 src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c:1.4 Fri Feb 14 14:34:57 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c Sun Apr 19 17:19:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_probe_helper.c,v 1.4 2020/02/14 14:34:57 maya Exp $ */
+/* $NetBSD: drm_probe_helper.c,v 1.5 2020/04/19 17:19:13 maya Exp $ */
/*
* Copyright (c) 2006-2008 Intel Corporation
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_probe_helper.c,v 1.4 2020/02/14 14:34:57 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_probe_helper.c,v 1.5 2020/04/19 17:19:13 maya Exp $");
#include
#include
@@ -328,6 +328,9 @@ EXPORT_SYMBOL(drm_helper_probe_single_co
*/
void drm_kms_helper_hotplug_event(struct drm_device *dev)
{
+#ifdef __NetBSD__
+ sysmon_pswitch_event(&dev->sc_monitor_hotplug, PSWITCH_EVENT_PRESSED);
+#endif
/* send a uevent + call fbdev */
drm_sysfs_hotplug_event(dev);
if (dev->mode_config.funcs->output_poll_changed)
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.39 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.40
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.39 Thu Mar 5 08:36:53 2020
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Apr 19 17:19:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.39 2020/03/05 08:36:53 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.40 2020/04/19 17:19:13 maya Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -903,6 +903,7 @@ struct drm_device {
int irq;
#ifdef __NetBSD__
struct drm_bus_irq_cookie *irq_cookie;
+ struct sysmon_pswitch sc_monitor_hotplug;
#endif
/*
CVS commit: src/usr.bin/man
Module Name:src
Committed By: maya
Date: Mon Apr 6 19:53:22 UTC 2020
Modified Files:
src/usr.bin/man: man.c
Log Message:
Exit successfully after printing the search path, stop further processing.
Continuing to process had the unintended effect that `man` failed to find
a matching manual page for {EMPTY LIST OF REQUESTED MANUAL PAGES}, and
exited with 1.
Prompted by a fish shell snippet that tried and failed to distinguish between
FreeBSD man (-p takes argument) and NetBSD man (-p no argument) by comparing
`man -p` exit code.
ok riastradh, logix (which also pointed out the manual page SYNOPSIS is
saying man -p should be used this way).
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/usr.bin/man/man.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/man/man.c
diff -u src/usr.bin/man/man.c:1.67 src/usr.bin/man/man.c:1.68
--- src/usr.bin/man/man.c:1.67 Fri Jun 15 20:16:35 2018
+++ src/usr.bin/man/man.c Mon Apr 6 19:53:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: man.c,v 1.67 2018/06/15 20:16:35 mrg Exp $ */
+/* $NetBSD: man.c,v 1.68 2020/04/06 19:53:22 maya Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95";
#else
-__RCSID("$NetBSD: man.c,v 1.67 2018/06/15 20:16:35 mrg Exp $");
+__RCSID("$NetBSD: man.c,v 1.68 2020/04/06 19:53:22 maya Exp $");
#endif
#endif /* not lint */
@@ -363,8 +363,10 @@ main(int argc, char **argv)
}
- if (m.getpath)
+ if (m.getpath) {
printmanpath(&m);
+ exit(cleanup());
+ }
/*
* now m.mymanpath is complete!
CVS commit: src/share/man/man4
Module Name:src Committed By: maya Date: Mon Mar 30 20:47:57 UTC 2020 Modified Files: src/share/man/man4: ddb.4 Log Message: Don't mention a.out support, which does not exist in ddb any more. To generate a diff of this commit: cvs rdiff -u -r1.188 -r1.189 src/share/man/man4/ddb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ddb.4 diff -u src/share/man/man4/ddb.4:1.188 src/share/man/man4/ddb.4:1.189 --- src/share/man/man4/ddb.4:1.188 Sun Dec 15 20:29:08 2019 +++ src/share/man/man4/ddb.4 Mon Mar 30 20:47:57 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: ddb.4,v 1.188 2019/12/15 20:29:08 joerg Exp $ +.\" $NetBSD: ddb.4,v 1.189 2020/03/30 20:47:57 maya Exp $ .\" .\" Copyright (c) 1997 - 2019 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -56,7 +56,7 @@ .\" any improvements or extensions that they make and grant Carnegie Mellon .\" the rights to redistribute these changes. .\" -.Dd December 15, 2019 +.Dd March 30, 2020 .Dt DDB 4 .Os .Sh NAME @@ -834,21 +834,7 @@ If is specified, a character is displayed immediately after each symbol name indicating the type of symbol. .Pp -For -.Xr a.out 5 Ns -format -symbol tables, -absolute symbols display -.Sy @ , -text segment symbols display -.Sy * , -data segment symbols display -.Sy + , -BSS segment symbols display -.Sy - , -and filename symbols display -.Sy / . -For ELF-format symbol tables, -object symbols display +Object symbols display .Sy + , function symbols display .Sy * ,
CVS commit: src/sys/ddb
Module Name:src Committed By: maya Date: Mon Mar 30 20:45:59 UTC 2020 Modified Files: src/sys/ddb: db_sym.c Log Message: Remove a.out leftovers (unused) To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/ddb/db_sym.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/ddb/db_sym.c diff -u src/sys/ddb/db_sym.c:1.65 src/sys/ddb/db_sym.c:1.66 --- src/sys/ddb/db_sym.c:1.65 Fri Nov 3 09:59:07 2017 +++ src/sys/ddb/db_sym.c Mon Mar 30 20:45:59 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: db_sym.c,v 1.65 2017/11/03 09:59:07 maxv Exp $ */ +/* $NetBSD: db_sym.c,v 1.66 2020/03/30 20:45:59 maya Exp $ */ /* * Mach Operating System @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: db_sym.c,v 1.65 2017/11/03 09:59:07 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_sym.c,v 1.66 2020/03/30 20:45:59 maya Exp $"); #ifdef _KERNEL_OPT #include "opt_ddbparam.h" @@ -50,7 +50,6 @@ static void db_symsplit(char *, char ** const db_symformat_t *db_symformat; static db_forall_func_t db_sift; -extern db_symformat_t db_symformat_aout; extern db_symformat_t db_symformat_elf; #endif
CVS commit: src/lib/libc/gen
Module Name:src Committed By: maya Date: Mon Mar 30 20:37:04 UTC 2020 Modified Files: src/lib/libc/gen: nlist.3 Log Message: Mention elf rather than a.out some more. (Also, inspired by freebsd, which removed the non-elf support) To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libc/gen/nlist.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/nlist.3 diff -u src/lib/libc/gen/nlist.3:1.12 src/lib/libc/gen/nlist.3:1.13 --- src/lib/libc/gen/nlist.3:1.12 Mon Mar 30 20:35:12 2020 +++ src/lib/libc/gen/nlist.3 Mon Mar 30 20:37:03 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: nlist.3,v 1.12 2020/03/30 20:35:12 maya Exp $ +.\" $NetBSD: nlist.3,v 1.13 2020/03/30 20:37:03 maya Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -48,7 +48,7 @@ function retrieves name list entries from the symbol table of an executable file. (See -.Xr a.out 5 . ) +.Xr elf 5 . ) The argument .Fa \&nl is set to reference the
CVS commit: src/lib/libc/gen
Module Name:src Committed By: maya Date: Mon Mar 30 20:35:12 UTC 2020 Modified Files: src/lib/libc/gen: nlist.3 Log Message: xref elf(5). To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libc/gen/nlist.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/nlist.3 diff -u src/lib/libc/gen/nlist.3:1.11 src/lib/libc/gen/nlist.3:1.12 --- src/lib/libc/gen/nlist.3:1.11 Thu Aug 7 16:42:53 2003 +++ src/lib/libc/gen/nlist.3 Mon Mar 30 20:35:12 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: nlist.3,v 1.11 2003/08/07 16:42:53 agc Exp $ +.\" $NetBSD: nlist.3,v 1.12 2020/03/30 20:35:12 maya Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)nlist.3 8.3 (Berkeley) 4/19/94 .\" -.Dd April 19, 1994 +.Dd March 30, 2020 .Dt NLIST 3 .Os .Sh NAME @@ -72,6 +72,7 @@ if the file does not exist or is not executable, the returned value is \-1. .Sh SEE ALSO .Xr a.out 5 +.Xr elf 5 .Sh HISTORY A .Fn nlist
CVS commit: src/lib/libc/gen
Module Name:src Committed By: maya Date: Mon Mar 30 20:34:11 UTC 2020 Modified Files: src/lib/libc/gen: nlist_private.h Log Message: Be less of a minefield for new architectures. They're not going to be a.out. Remove sh5, long gone. (Hopefully nothing hits the #else case) To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/lib/libc/gen/nlist_private.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/nlist_private.h diff -u src/lib/libc/gen/nlist_private.h:1.25 src/lib/libc/gen/nlist_private.h:1.26 --- src/lib/libc/gen/nlist_private.h:1.25 Fri Jan 29 21:38:35 2016 +++ src/lib/libc/gen/nlist_private.h Mon Mar 30 20:34:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: nlist_private.h,v 1.25 2016/01/29 21:38:35 christos Exp $ */ +/* $NetBSD: nlist_private.h,v 1.26 2020/03/30 20:34:11 maya Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou @@ -54,9 +54,6 @@ # define NLIST_AOUT # define NLIST_ELF32 # define NLIST_ELF64 -#elif defined(__SH5__) -# define NLIST_ELF32 -# define NLIST_ELF64 #elif defined(__sh__) # define NLIST_COFF # define NLIST_ELF32 @@ -74,10 +71,7 @@ #elif defined(__or1k__) # define NLIST_ELF32 #else -# define NLIST_AOUT -/* #define NLIST_ECOFF */ -/* #define NLIST_ELF32 */ -/* #define NLIST_ELF64 */ +# error "Add your architecture here" #endif #define ISLAST(p) (N_NAME(p) == 0 || N_NAME(p)[0] == 0)
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: maya
Date: Sun Mar 29 21:06:03 UTC 2020
Modified Files:
src/external/mit/xorg/lib: libloader.mk
src/external/mit/xorg/lib/libGL: Makefile
Log Message:
Define GL_LIB_NAME somewhere that applies to dri_common.c, which is the
file that needs it.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libloader.mk
cvs rdiff -u -r1.28 -r1.29 src/external/mit/xorg/lib/libGL/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libloader.mk
diff -u src/external/mit/xorg/lib/libloader.mk:1.5 src/external/mit/xorg/lib/libloader.mk:1.6
--- src/external/mit/xorg/lib/libloader.mk:1.5 Fri Feb 7 19:00:18 2020
+++ src/external/mit/xorg/lib/libloader.mk Sun Mar 29 21:06:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: libloader.mk,v 1.5 2020/02/07 19:00:18 jmcneill Exp $
+# $NetBSD: libloader.mk,v 1.6 2020/03/29 21:06:03 maya Exp $
# makefile fragment for mesa src/loader
@@ -15,7 +15,6 @@ CPPFLAGS.${_f}= -I${X11SRCDIR.Mesa}/src
-I${X11SRCDIR.Mesa}/../src/util \
-I${X11SRCDIR.Mesa}/src/mesa \
-I${X11SRCDIR.Mesa}/src \
- -DGL_LIB_NAME=\"libGL.so.3\" \
-DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\" \
-DUSE_DRICONF \
-DHAVE_LIBDRM
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.28 src/external/mit/xorg/lib/libGL/Makefile:1.29
--- src/external/mit/xorg/lib/libGL/Makefile:1.28 Tue Sep 24 19:29:42 2019
+++ src/external/mit/xorg/lib/libGL/Makefile Sun Mar 29 21:06:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/09/24 19:29:42 maya Exp $
+# $NetBSD: Makefile,v 1.29 2020/03/29 21:06:03 maya Exp $
.include
@@ -117,7 +117,8 @@ SRCS.dri= \
.for fn in ${SRCS.dri}
CPPFLAGS.${fn}= \
- -I${X11SRCDIR.Mesa}/src
+ -I${X11SRCDIR.Mesa}/src \
+ -DGL_LIB_NAME="\"libGL.so.${SHLIB_MAJOR}\""
.endfor
.endif
CVS commit: xsrc/external/mit/xf86-video-ati-kms/dist/src
Module Name:xsrc
Committed By: maya
Date: Sun Mar 8 18:27:52 UTC 2020
Modified Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: radeon.h
Log Message:
Backport upstream commits (there is no newer release yet):
>From c0eb5dbd9c1db6b6d5b1574bcd8c584170d7ab54 Mon Sep 17 00:00:00 2001
From: Alexey Sheplyakov
Date: Wed, 27 Nov 2019 20:50:58 +0400
Subject: Don't crash X server if GPU acceleration is not available
>From 4d84cf438e7f1bebf0053035ef0292e9fed257d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?=
Date: Fri, 29 Nov 2019 16:37:32 +0100
Subject: Handle NULL fb_ptr in pixmap_get_fb
This can happen when HW acceleration is disabled.
>From Onno van der Linden in xsrc/55059.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.10 -r1.2 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h:1.1.1.10 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h:1.2
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h:1.1.1.10 Sun Feb 23 06:17:09 2020
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h Sun Mar 8 18:27:51 2020
@@ -790,8 +790,8 @@ static inline Bool radeon_set_pixmap_bo(
static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix)
{
-#ifdef USE_GLAMOR
RADEONInfoPtr info = RADEONPTR(xf86ScreenToScrn(pPix->drawable.pScreen));
+#ifdef USE_GLAMOR
if (info->use_glamor) {
struct radeon_pixmap *priv;
@@ -799,7 +799,7 @@ static inline struct radeon_buffer *rade
return priv ? priv->bo : NULL;
} else
#endif
-{
+if (info->accelOn) {
struct radeon_exa_pixmap_priv *driver_priv;
driver_priv = exaGetPixmapDriverPrivate(pPix);
return driver_priv ? driver_priv->bo : NULL;
@@ -896,7 +896,7 @@ radeon_pixmap_get_fb(PixmapPtr pix)
handle);
}
-return *fb_ptr;
+return fb_ptr ? *fb_ptr : NULL;
}
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: maya
Date: Sat Mar 7 13:28:45 UTC 2020
Modified Files:
src/sys/arch/x86/x86: via_padlock.c
Log Message:
Fold constant. err is always 0, so switch to return 0;
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/x86/via_padlock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/via_padlock.c
diff -u src/sys/arch/x86/x86/via_padlock.c:1.27 src/sys/arch/x86/x86/via_padlock.c:1.28
--- src/sys/arch/x86/x86/via_padlock.c:1.27 Sat Mar 7 12:31:50 2020
+++ src/sys/arch/x86/x86/via_padlock.c Sat Mar 7 13:28:45 2020
@@ -1,5 +1,5 @@
/* $OpenBSD: via.c,v 1.8 2006/11/17 07:47:56 tom Exp $ */
-/* $NetBSD: via_padlock.c,v 1.27 2020/03/07 12:31:50 fcambus Exp $ */
+/* $NetBSD: via_padlock.c,v 1.28 2020/03/07 13:28:45 maya Exp $ */
/*-
* Copyright (c) 2003 Jason Wright
@@ -20,7 +20,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.27 2020/03/07 12:31:50 fcambus Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.28 2020/03/07 13:28:45 maya Exp $");
#include
#include
@@ -370,7 +370,6 @@ via_padlock_crypto_encdec(struct cryptop
struct via_padlock_session *ses, struct via_padlock_softc *sc, void *buf)
{
uint32_t *key;
- int err = 0;
if ((crd->crd_len % 16) != 0)
return (EINVAL);
@@ -461,7 +460,7 @@ via_padlock_crypto_encdec(struct cryptop
sc->op_buf = NULL;
}
- return (err);
+ return 0;
}
int
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: maya Date: Fri Mar 6 20:07:26 UTC 2020 Modified Files: src/usr.sbin/sysinst: sysinst.8 Log Message: Remove note that has been incorrect for a while. Thanks ottavio for the heads up. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/sysinst.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/sysinst.8 diff -u src/usr.sbin/sysinst/sysinst.8:1.2 src/usr.sbin/sysinst/sysinst.8:1.3 --- src/usr.sbin/sysinst/sysinst.8:1.2 Wed Feb 19 21:51:21 2020 +++ src/usr.sbin/sysinst/sysinst.8 Fri Mar 6 20:07:26 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysinst.8,v 1.2 2020/02/19 21:51:21 martin Exp $ +.\" $NetBSD: sysinst.8,v 1.3 2020/03/06 20:07:26 maya Exp $ .\" .\" Copyright (c) 2007 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -24,7 +24,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 30, 2012 +.Dd March 6, 2020 .Dt SYSINST 8 .Os .Sh NAME @@ -43,11 +43,6 @@ It is usually invoked automatically when the system is booted from appropriate installation media. .Pp -.Nm -is usually not present on a -.Nx -system that has been fully installed. -.Pp The following options are available: .Bl -tag -width XfXdefinition_fileXX .It Fl D
CVS commit: src/share/misc
Module Name:src Committed By: maya Date: Wed Mar 4 14:59:00 UTC 2020 Modified Files: src/share/misc: airport Log Message: Remove ETH (defunct) and add ETM. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/share/misc/airport Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/airport diff -u src/share/misc/airport:1.68 src/share/misc/airport:1.69 --- src/share/misc/airport:1.68 Wed Mar 4 14:19:14 2020 +++ src/share/misc/airport Wed Mar 4 14:59:00 2020 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.68 2020/03/04 14:19:14 fcambus Exp $ +# $NetBSD: airport,v 1.69 2020/03/04 14:59:00 maya Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -2149,7 +2149,7 @@ ESW:Easton State Airport, WA, USA ETB:West Bend Municipal Airport, WI, USA ETD:Etadunna, South Australia, Australia ETE:Genda Wuha, Ethiopia -ETH:Elat (Hozman), Israel +ETM:Eilat, Israel ETN:Eastland Municipal Airport, TX, USA ETS:Enterprise Municipal Airport, AL, USA ETZ:Metz/Nancy (Lorraine), France
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: maya
Date: Fri Feb 21 23:27:06 UTC 2020
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
Make sure to convey a failure to the calling function
Likely fix for PR kern/54999, but that was a one-off panic.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/arm/arm32/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.118 src/sys/arch/arm/arm32/bus_dma.c:1.119
--- src/sys/arch/arm/arm32/bus_dma.c:1.118 Tue Nov 5 10:21:31 2019
+++ src/sys/arch/arm/arm32/bus_dma.c Fri Feb 21 23:27:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.118 2019/11/05 10:21:31 jmcneill Exp $ */
+/* $NetBSD: bus_dma.c,v 1.119 2020/02/21 23:27:06 maya Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include "opt_cputypes.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.118 2019/11/05 10:21:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.119 2020/02/21 23:27:06 maya Exp $");
#include
#include
@@ -404,7 +404,7 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
#ifdef DEBUG_DMA
printf("dmamap_create:map=%p\n", map);
#endif /* DEBUG_DMA */
- return 0;
+ return error;
}
/*
CVS commit: src/sys/external/bsd
Module Name:src Committed By: maya Date: Fri Feb 14 14:35:00 UTC 2020 Modified Files: src/sys/external/bsd/common/include/linux: kernel.h src/sys/external/bsd/drm2/dist/drm: drm_agpsupport.c drm_atomic.c drm_atomic_helper.c drm_bufs.c drm_context.c drm_crtc.c drm_crtc_helper.c drm_dp_helper.c drm_dp_mst_topology.c drm_drv.c drm_edid.c drm_fb_helper.c drm_flip_work.c drm_gem.c drm_global.c drm_irq.c drm_mm.c drm_modeset_lock.c drm_plane_helper.c drm_probe_helper.c src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_atom.c amdgpu_atombios.c amdgpu_atombios_crtc.c amdgpu_atombios_dp.c amdgpu_atombios_encoders.c amdgpu_atombios_i2c.c amdgpu_cgs.c amdgpu_ci_dpm.c amdgpu_ci_smc.c amdgpu_cik_ih.c amdgpu_cik_sdma.c amdgpu_cz_dpm.c amdgpu_cz_ih.c amdgpu_cz_smc.c amdgpu_dpm.c amdgpu_fence.c amdgpu_fiji_dpm.c amdgpu_fiji_smc.c amdgpu_gfx_v7_0.c amdgpu_gfx_v8_0.c amdgpu_gmc_v7_0.c amdgpu_gmc_v8_0.c amdgpu_i2c.c amdgpu_iceland_dpm.c amdgpu_iceland_ih.c amdgpu_iceland_smc.c amdgpu_ih.c amdgpu_kv_dpm.c amdgpu_object.h amdgpu_ring.c amdgpu_sdma_v2_4.c amdgpu_sdma_v3_0.c amdgpu_tonga_dpm.c amdgpu_tonga_ih.c amdgpu_tonga_smc.c amdgpu_ucode.c amdgpu_uvd.c amdgpu_uvd_v4_2.c amdgpu_uvd_v5_0.c amdgpu_uvd_v6_0.c amdgpu_vce.c amdgpu_vce_v3_0.c src/sys/external/bsd/drm2/dist/drm/i915: i915_cmd_parser.c i915_drv.c i915_gem.c i915_gem_context.c i915_gem_execbuffer.c i915_gem_gtt.c i915_gem_stolen.c i915_gpu_error.c i915_irq.c i915_params.c intel_csr.c intel_display.c intel_dp.c intel_drv.h intel_fbdev.c intel_guc_loader.c intel_hdmi.c intel_i2c.c intel_lvds.c intel_opregion.c intel_overlay.c intel_panel.c intel_pm.c intel_ringbuffer.c intel_ringbuffer.h intel_sdvo.c intel_uncore.c src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_bios.h nouveau_connector.c nouveau_display.c nouveau_fence.c nouveau_gem.c nouveau_nv50_display.c src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04: nouveau_dispnv04_disp.c nouveau_dispnv04_tvmodesnv17.c nouveau_dispnv04_tvnv04.c src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core: device.h src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp: nouveau_nvkm_engine_disp_gf119.c nouveau_nvkm_engine_disp_nv50.c src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/gr: nouveau_nvkm_engine_gr_gf100.c src/sys/external/bsd/drm2/dist/drm/radeon: radeon.h radeon_bios.c radeon_cik_sdma.c radeon_device.c radeon_display.c radeon_drv.c radeon_evergreen.c radeon_i2c.c radeon_r600.c radeon_ring.c radeon_si_dpm.c src/sys/external/bsd/drm2/dist/drm/ttm: ttm_bo.c ttm_bo_manager.c ttm_bo_util.c ttm_execbuf_util.c ttm_memory.c ttm_tt.c src/sys/external/bsd/drm2/dist/drm/via: via_dma.c via_dmablit.c src/sys/external/bsd/drm2/dist/include/drm: drmP.h src/sys/external/bsd/drm2/include/linux: atomic.h fs.h interrupt.h jiffies.h ktime.h mm_types.h mutex.h pci.h pm_qos.h pm_runtime.h Log Message: Reduce diffs by side-loading some header files like Linux. >From riastradh To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/common/include/linux/kernel.h cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/drm_atomic.c \ src/sys/external/bsd/drm2/dist/drm/drm_edid.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/drm_atomic_helper.c \ src/sys/external/bsd/drm2/dist/drm/drm_dp_mst_topology.c cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c \ src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c \ src/sys/external/bsd/drm2/dist/drm/drm_drv.c cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/drm_context.c \ src/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c \ src/sys/external/bsd/drm2/dist/drm/drm_global.c \ src/sys/external/bsd/drm2/dist/drm/drm_mm.c cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c \ src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c \ src/sys/external/bsd/drm2/dist/drm/drm_irq.c cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/drm_flip_work.c \ src/sys/external/bsd/drm2/dist/drm/drm_modeset_lock.c \ src/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c \ src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/dist/drm/drm_gem.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c \ src/sys/external/bsd/drm2/dist/drm/amd/amdgp
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: maya
Date: Mon Feb 10 21:54:26 UTC 2020
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_opregion.c
Log Message:
Use a closer equivalent to MEMREMAP_WB: BUS_SPACE_MAP_CACHEABLE
Not a fix for PR port-amd64/54808
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.14 src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.15
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.14 Mon Aug 27 13:54:48 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c Mon Feb 10 21:54:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_opregion.c,v 1.14 2018/08/27 13:54:48 riastradh Exp $ */
+/* $NetBSD: intel_opregion.c,v 1.15 2020/02/10 21:54:26 maya Exp $ */
/*
* Copyright 2008 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intel_opregion.c,v 1.14 2018/08/27 13:54:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_opregion.c,v 1.15 2020/02/10 21:54:26 maya Exp $");
#include
#include
@@ -997,7 +997,7 @@ int intel_opregion_setup(struct drm_devi
#ifdef __NetBSD__
opregion->bst = dev->pdev->pd_pa.pa_memt;
err = -bus_space_map(opregion->bst, asls, OPREGION_SIZE,
- BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_PREFETCHABLE, &opregion->bsh);
+ BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_CACHEABLE, &opregion->bsh);
if (err) {
DRM_DEBUG_DRIVER("Failed to map opregion: %d\n", err);
return err;
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: maya
Date: Sun Feb 9 15:46:15 UTC 2020
Modified Files:
src/sys/dev/usb: files.usb
Log Message:
Remove trace of uyurex. Pointed out by maxv, thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/sys/dev/usb/files.usb
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.171 src/sys/dev/usb/files.usb:1.172
--- src/sys/dev/usb/files.usb:1.171 Mon Feb 3 19:37:42 2020
+++ src/sys/dev/usb/files.usb Sun Feb 9 15:46:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.171 2020/02/03 19:37:42 maya Exp $
+# $NetBSD: files.usb,v 1.172 2020/02/09 15:46:15 maya Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -83,7 +83,6 @@ defflag opt_usb.h UTS_DEBUG: USB_DEBUG
defflag opt_usb.h UVIDEO_DEBUG: USB_DEBUG
defflag opt_usb.h UVISOR_DEBUG: USB_DEBUG
defflag opt_usb.h UVSCOM_DEBUG: USB_DEBUG
-defflag opt_usb.h UYUREX_DEBUG: USB_DEBUG
defflag opt_usb.h ZYD_DEBUG: USB_DEBUG
define usbroothubif { }
CVS commit: src/share/mk
Module Name:src
Committed By: maya
Date: Sat Feb 8 21:16:53 UTC 2020
Modified Files:
src/share/mk: sys.mk
Log Message:
Don't special case aarch64 and add -fomit-frame-pointer to builds.
This behaviour is probably due to a past behaviour of clang, where it
always emitted frame pointer code.
This is no longer true for clang on netbsd, and I don't think it was true
for GCC.
Meanwhile, this flag bleeds into pkgsrc where it breaks random packages,
requiring workarounds like lang/ruby*-base/hacks.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/share/mk/sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.142 src/share/mk/sys.mk:1.143
--- src/share/mk/sys.mk:1.142 Wed Jan 8 22:04:24 2020
+++ src/share/mk/sys.mk Sat Feb 8 21:16:53 2020
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.142 2020/01/08 22:04:24 christos Exp $
+# $NetBSD: sys.mk,v 1.143 2020/02/08 21:16:53 maya Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
#
# This file contains the basic rules for make(1) and is read first
@@ -33,8 +33,6 @@ DBG?= -Os -freorder-blocks
DBG?= -O2 -fno-reorder-blocks
.elif ${MACHINE_ARCH} == "coldfire"
DBG?= -O1
-.elif !empty(MACHINE_ARCH:Maarch64*)
-DBG?= -O2 ${"${.TARGET:M*.po}" == "":? -fomit-frame-pointer:}
.else
DBG?= -O2
.endif
CVS commit: src/sys
Module Name:src Committed By: maya Date: Mon Feb 3 19:37:42 UTC 2020 Modified Files: src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL src/sys/dev/usb: files.usb Log Message: Remove more urio(4) traces. Pointed out by maxv, thanks. To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.144 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.487 -r1.488 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.170 -r1.171 src/sys/dev/usb/files.usb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.143 src/sys/arch/amd64/conf/ALL:1.144 --- src/sys/arch/amd64/conf/ALL:1.143 Wed Jan 29 18:39:00 2020 +++ src/sys/arch/amd64/conf/ALL Mon Feb 3 19:37:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.143 2020/01/29 18:39:00 maya Exp $ +# $NetBSD: ALL,v 1.144 2020/02/03 19:37:42 maya Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.143 $" +#ident "ALL-$Revision: 1.144 $" maxusers 64 # estimated number of users @@ -2263,7 +2263,6 @@ options UPGT_DEBUG options UPLCOM_DEBUG options UPL_DEBUG options URAL_DEBUG -options URIO_DEBUG options URLPHY_DEBUG options URL_DEBUG options URNDIS_DEBUG Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.487 src/sys/arch/i386/conf/ALL:1.488 --- src/sys/arch/i386/conf/ALL:1.487 Wed Jan 29 18:39:02 2020 +++ src/sys/arch/i386/conf/ALL Mon Feb 3 19:37:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.487 2020/01/29 18:39:02 maya Exp $ +# $NetBSD: ALL,v 1.488 2020/02/03 19:37:42 maya Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.487 $" +#ident "ALL-$Revision: 1.488 $" maxusers 64 # estimated number of users @@ -2379,7 +2379,6 @@ options UPGT_DEBUG options UPLCOM_DEBUG options UPL_DEBUG options URAL_DEBUG -options URIO_DEBUG options URLPHY_DEBUG options URL_DEBUG options URNDIS_DEBUG Index: src/sys/dev/usb/files.usb diff -u src/sys/dev/usb/files.usb:1.170 src/sys/dev/usb/files.usb:1.171 --- src/sys/dev/usb/files.usb:1.170 Mon Feb 3 12:56:26 2020 +++ src/sys/dev/usb/files.usb Mon Feb 3 19:37:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.usb,v 1.170 2020/02/03 12:56:26 kre Exp $ +# $NetBSD: files.usb,v 1.171 2020/02/03 19:37:42 maya Exp $ # # Config file and device description for machine-independent USB code. # Included by ports that need it. Ports that use it must provide @@ -68,7 +68,6 @@ defflag opt_usb.h UPGT_DEBUG: USB_DEBUG defflag opt_usb.h UPLCOM_DEBUG: USB_DEBUG defflag opt_usb.h UPL_DEBUG: USB_DEBUG defflag opt_usb.h URAL_DEBUG: USB_DEBUG -defflag opt_usb.h URIO_DEBUG: USB_DEBUG defflag opt_usb.h URL_DEBUG: USB_DEBUG defflag opt_usb.h URNDIS_DEBUG: USB_DEBUG defflag opt_usb.h URTWN_DEBUG: USB_DEBUG
CVS commit: src/doc
Module Name:src Committed By: maya Date: Wed Jan 29 19:04:12 UTC 2020 Modified Files: src/doc: CHANGES Log Message: Note urio removal To generate a diff of this commit: cvs rdiff -u -r1.2645 -r1.2646 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2645 src/doc/CHANGES:1.2646 --- src/doc/CHANGES:1.2645 Mon Jan 27 21:14:17 2020 +++ src/doc/CHANGES Wed Jan 29 19:04:12 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2645 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2646 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -138,3 +138,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: OpenSSL: Imported 1.1.1d. [christos 20200122] dhcpcd(8): Import dhcpcd-8.1.6 [roy 20200127] openresolv(8): Import openresolv-3.10.0 [roy 20200127] + urio(4): Removed from the tree. [maya 20200129]
CVS commit: src
Module Name:src Committed By: maya Date: Wed Jan 29 18:39:05 UTC 2020 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi src/etc: MAKEDEV.tmpl src/share/man/man4: Makefile usb.4 src/share/man/man8: MAKEDEV.8 src/sys/arch/aarch64/conf: majors.aarch64 src/sys/arch/algor/conf: majors.algor src/sys/arch/alpha/conf: majors.alpha src/sys/arch/amd64/conf: ALL XEN3_DOM0 majors.amd64 src/sys/arch/arm/conf: majors.arm32 src/sys/arch/cats/conf: GENERIC src/sys/arch/cobalt/conf: majors.cobalt src/sys/arch/epoc32/conf: majors.epoc32 src/sys/arch/evbarm/conf: HDL_G HPT5325 MINI2440 MMNET_GENERIC MPCSA_GENERIC POGO SHEEVAPLUG SMDK2410 TS7200 TWINTAIL src/sys/arch/evbmips/conf: majors.evbmips src/sys/arch/evbppc/conf: OPENBLOCKS266_OPT PMPPC majors.evbppc src/sys/arch/hpcarm/conf: majors.hpcarm src/sys/arch/hpcmips/conf: GENERIC VR41XX majors.hpcmips src/sys/arch/hppa/conf: GENERIC src/sys/arch/i386/conf: ALL XEN3PAE_DOM0 majors.i386 src/sys/arch/ia64/conf: majors.ia64 src/sys/arch/landisk/conf: GENERIC majors.landisk src/sys/arch/or1k/conf: majors.or1k src/sys/arch/playstation2/conf: DEBUG majors.playstation2 src/sys/arch/powerpc/conf: majors.powerpc src/sys/arch/prep/conf: GENERIC src/sys/arch/sgimips/conf: majors.sgimips src/sys/arch/sparc/conf: majors.sparc src/sys/arch/sparc64/conf: GENERIC majors.sparc64 src/sys/arch/x68k/conf: GENERIC majors.x68k src/sys/arch/zaurus/conf: majors.zaurus src/sys/dev/usb: FILES TODO.usbmp usbdevices.config Removed Files: src/share/man/man4: urio.4 src/sys/dev/usb: urio.c urio.h Log Message: remove urio(4), a driver for the Rio500 MP3 player. At this point it is highly unlikely this 1999 device still has users, but it still comes up in the context of maxv's USB-fuzzing (and any device could pretend to be a urio(4)), so it's best to get rid of it. Renamed all major entries to obsolete, as was done in previous removals. This still requires an update to sanitizers, but they're located in "external", perhaps it should be first committed upstream? Proposed on tech-kern a month ago. To generate a diff of this commit: cvs rdiff -u -r1.2306 -r1.2307 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1677 -r1.1678 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.213 -r1.214 src/etc/MAKEDEV.tmpl cvs rdiff -u -r1.700 -r1.701 src/share/man/man4/Makefile cvs rdiff -u -r1.9 -r0 src/share/man/man4/urio.4 cvs rdiff -u -r1.110 -r1.111 src/share/man/man4/usb.4 cvs rdiff -u -r1.55 -r1.56 src/share/man/man8/MAKEDEV.8 cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/conf/majors.aarch64 cvs rdiff -u -r1.27 -r1.28 src/sys/arch/algor/conf/majors.algor cvs rdiff -u -r1.34 -r1.35 src/sys/arch/alpha/conf/majors.alpha cvs rdiff -u -r1.142 -r1.143 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.173 -r1.174 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amd64/conf/majors.amd64 cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/conf/majors.arm32 cvs rdiff -u -r1.177 -r1.178 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.32 -r1.33 src/sys/arch/cobalt/conf/majors.cobalt cvs rdiff -u -r1.4 -r1.5 src/sys/arch/epoc32/conf/majors.epoc32 cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbarm/conf/HDL_G cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/conf/HPT5325 cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/MINI2440 cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/conf/MMNET_GENERIC cvs rdiff -u -r1.69 -r1.70 src/sys/arch/evbarm/conf/MPCSA_GENERIC cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/POGO cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/SHEEVAPLUG cvs rdiff -u -r1.72 -r1.73 src/sys/arch/evbarm/conf/SMDK2410 cvs rdiff -u -r1.73 -r1.74 src/sys/arch/evbarm/conf/TS7200 cvs rdiff -u -r1.77 -r1.78 src/sys/arch/evbarm/conf/TWINTAIL cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbmips/conf/majors.evbmips cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbppc/conf/PMPPC cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbppc/conf/majors.evbppc cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcarm/conf/majors.hpcarm cvs rdiff -u -r1.240 -r1.241 src/sys/arch/hpcmips/conf/GENERIC cvs rdiff -u -r1.73 -r1.74 src/sys/arch/hpcmips/conf/VR41XX cvs rdiff -u -r1.33 -r1.34 src/sys/arch/hpcmips/conf/majors.hpcmips cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hppa/conf/GENERIC cvs rdiff -u -r1.486 -r1.487 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.51 -r1.52 src/sys/arch/i386/conf/majors.i386 cvs rdiff -u -r1.17 -r1.18 src/sys/arch/ia64/conf/majors.ia64 cvs rdiff -u -r1.64 -r1.65 src/sys/arch/landisk/conf/GENERIC cvs rdiff -u -r1.9 -r1.10 src/sys/arch/landisk/conf/majors.landisk cvs rdiff -u -r1.2
CVS commit: src/doc
Module Name:src Committed By: maya Date: Sun Jan 19 06:40:09 UTC 2020 Modified Files: src/doc: CHANGES Log Message: Note removal of uyurex To generate a diff of this commit: cvs rdiff -u -r1.2635 -r1.2636 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2635 src/doc/CHANGES:1.2636 --- src/doc/CHANGES:1.2635 Sun Jan 19 01:38:26 2020 +++ src/doc/CHANGES Sun Jan 19 06:40:09 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2635 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2636 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -97,4 +97,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0: evbarm: Add support for NXP i.MX 8M family SoCs. [jmcneill 20200114] arm: Add support for cpu topology for ARMv7 and ARMv7 CPUs. [mrg 20201114] + uyurex(4): Removed from the tree. [maya 20200117] strip(4): Removed from the tree. [thorpej 20200118]
CVS commit: src
Module Name:src Committed By: maya Date: Fri Jan 17 15:00:21 UTC 2020 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL src/sys/dev: DEVNAMES src/sys/dev/usb: TODO.usbmp files.usb src/usr.sbin/makemandb: nostem.txt Removed Files: src/share/man/man4: uyurex.4 src/sys/dev/usb: uyurex.c Log Message: Remove uyurex(4). This is a driver for a "nonsense machine" made by the art group Maywa-Denki in 2008. It was disabled by default. Unfortunately even so it draws development attention (flaws found in the code, MP-ification needs) and it is best not to continue to maintain this driver. Proposed without objections on tech-kern. To generate a diff of this commit: cvs rdiff -u -r1.1668 -r1.1669 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.693 -r1.694 src/share/man/man4/Makefile cvs rdiff -u -r1.6 -r0 src/share/man/man4/uyurex.4 cvs rdiff -u -r1.135 -r1.136 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.479 -r1.480 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.325 -r1.326 src/sys/dev/DEVNAMES cvs rdiff -u -r1.16 -r1.17 src/sys/dev/usb/TODO.usbmp cvs rdiff -u -r1.168 -r1.169 src/sys/dev/usb/files.usb cvs rdiff -u -r1.16 -r0 src/sys/dev/usb/uyurex.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/makemandb/nostem.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1668 src/distrib/sets/lists/man/mi:1.1669 --- src/distrib/sets/lists/man/mi:1.1668 Wed Jan 1 10:11:21 2020 +++ src/distrib/sets/lists/man/mi Fri Jan 17 15:00:20 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1668 2020/01/01 10:11:21 ryo Exp $ +# $NetBSD: mi,v 1.1669 2020/01/17 15:00:20 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1928,7 +1928,6 @@ ./usr/share/man/cat4/uvisor.0 man-sys-catman .cat ./usr/share/man/cat4/uvscom.0 man-sys-catman .cat ./usr/share/man/cat4/uyap.0 man-sys-catman .cat -./usr/share/man/cat4/uyurex.0 man-sys-catman .cat ./usr/share/man/cat4/vald.0 man-sys-catman .cat ./usr/share/man/cat4/valz.0 man-sys-catman .cat ./usr/share/man/cat4/vax/acc.0 man-sys-catman .cat @@ -5037,7 +5036,6 @@ ./usr/share/man/html4/uvisor.html man-sys-htmlman html ./usr/share/man/html4/uvscom.html man-sys-htmlman html ./usr/share/man/html4/uyap.html man-sys-htmlman html -./usr/share/man/html4/uyurex.html man-sys-htmlman html ./usr/share/man/html4/vald.html man-sys-htmlman html ./usr/share/man/html4/valz.html man-sys-htmlman html ./usr/share/man/html4/vax/acc.html man-sys-htmlman html @@ -8070,7 +8068,6 @@ ./usr/share/man/man4/uvisor.4 man-sys-man .man ./usr/share/man/man4/uvscom.4 man-sys-man .man ./usr/share/man/man4/uyap.4 man-sys-man .man -./usr/share/man/man4/uyurex.4 man-sys-man .man ./usr/share/man/man4/vald.4 man-sys-man .man ./usr/share/man/man4/valz.4 man-sys-man .man ./usr/share/man/man4/vax/acc.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.693 src/share/man/man4/Makefile:1.694 --- src/share/man/man4/Makefile:1.693 Wed Jan 1 10:11:21 2020 +++ src/share/man/man4/Makefile Fri Jan 17 15:00:20 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.693 2020/01/01 10:11:21 ryo Exp $ +# $NetBSD: Makefile,v 1.694 2020/01/17 15:00:20 maya Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -88,7 +88,6 @@ MAN+= atu.4 aubtfwl.4 aue.4 axe.4 axen.4 uplcom.4 ure.4 urio.4 url.4 urndis.4 urtw.4 urtwn.4 \ usb.4 usbnet.4 uscanner.4 uslsa.4 usmsc.4 usscanner.4 \ ustir.4 uthum.4 utoppy.4 uts.4 uvideo.4 uvisor.4 uvscom.4 uyap.4 \ - uyurex.4 \ xhci.4 \ # Ir devices Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.135 src/sys/arch/amd64/conf/ALL:1.136 --- src/sys/arch/amd64/conf/ALL:1.135 Wed Jan 1 10:36:43 2020 +++ src/sys/arch/amd64/conf/ALL Fri Jan 17 15:00:20 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.135 2020/01/01 10:36:43 ryo Exp $ +# $NetBSD: ALL,v 1.136 2020/01/17 15:00:20 maya Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.135 $" +#ident "ALL-$Revision: 1.136 $" maxusers 64 # estimated number of users @@ -1182,8 +1182,6 @@ wsmouse* at uep? mux 0 uatp* at uhidev? reportid ? wsmouse* at uatp? mux 0 -uyurex* at uhidev? reportid ? - # USB Keyboards ukbd* at uhidev? reportid ? wskbd* at ukbd? console ? mux 1 Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.479 src/sys/arch/i386/conf/ALL:1.480 --- src/sys/arch/i386/conf/ALL:1.479 Wed Jan 1 10:36:43 2020 +++ src/sys/arch/
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: maya
Date: Thu Jan 16 07:18:08 UTC 2020
Modified Files:
src/sys/dev/dm: device-mapper.c
Log Message:
dm(8) doesn't cause problems on suspend, don't block it.
Tested by Matthias Petermann, thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/dm/device-mapper.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.59 src/sys/dev/dm/device-mapper.c:1.60
--- src/sys/dev/dm/device-mapper.c:1.59 Sun Dec 22 13:16:09 2019
+++ src/sys/dev/dm/device-mapper.c Thu Jan 16 07:18:08 2020
@@ -1,4 +1,4 @@
-/*$NetBSD: device-mapper.c,v 1.59 2019/12/22 13:16:09 tkusumi Exp $ */
+/*$NetBSD: device-mapper.c,v 1.60 2020/01/16 07:18:08 maya Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -245,6 +245,9 @@ dm_match(device_t parent, cfdata_t match
static void
dm_attach(device_t parent, device_t self, void *aux)
{
+
+ if (!pmf_device_register(self, NULL, NULL))
+ aprint_error_dev(self, "couldn't establish power handler\n");
}
/*
@@ -259,6 +262,8 @@ dm_detach(device_t self, int flags)
{
dm_dev_t *dmv;
+ pmf_device_deregister(self);
+
/* Detach device from global device list */
if ((dmv = dm_dev_detach(self)) == NULL)
return ENOENT;
CVS commit: src/share/man/man7
Module Name:src Committed By: maya Date: Fri Jan 10 14:56:00 UTC 2020 Modified Files: src/share/man/man7: hier.7 Log Message: Fix markup typo. To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 src/share/man/man7/hier.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/hier.7 diff -u src/share/man/man7/hier.7:1.137 src/share/man/man7/hier.7:1.138 --- src/share/man/man7/hier.7:1.137 Fri Jan 10 12:58:41 2020 +++ src/share/man/man7/hier.7 Fri Jan 10 14:56:00 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: hier.7,v 1.137 2020/01/10 12:58:41 maya Exp $ +.\" $NetBSD: hier.7,v 1.138 2020/01/10 14:56:00 maya Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -664,7 +664,7 @@ Apache 2.0 license. BSD (or equivalent) licensed software, possibly with the .Dq advertising clause . -.It pa broadcom/ +.It Pa broadcom/ Broadcom firmware license. .It Pa cddl/ Common Development and Distribution License (the Sun license which is
CVS commit: src/share/man/man7
Module Name:src Committed By: maya Date: Fri Jan 10 12:58:41 UTC 2020 Modified Files: src/share/man/man7: hier.7 Log Message: Add some more licenses appearing in external. Remove mentions of src/gnu that no longer exists. Mention /usr/pkg/etc. Bump date To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/share/man/man7/hier.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/hier.7 diff -u src/share/man/man7/hier.7:1.136 src/share/man/man7/hier.7:1.137 --- src/share/man/man7/hier.7:1.136 Mon Mar 25 19:24:30 2019 +++ src/share/man/man7/hier.7 Fri Jan 10 12:58:41 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: hier.7,v 1.136 2019/03/25 19:24:30 maxv Exp $ +.\" $NetBSD: hier.7,v 1.137 2020/01/10 12:58:41 maya Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)hier.7 8.5 (Berkeley) 6/1/94 .\" -.Dd March 25, 2019 +.Dd January 10, 2020 .Dt HIER 7 .Os .Sh NAME @@ -504,6 +504,8 @@ Installed third-party software packages. .Bl -tag -width "include/" -compact .It Pa bin/ Package binaries. +.It Pa etc/ +Package configuration files. .It Pa include/ Package include files. .It Pa lib/ @@ -662,6 +664,8 @@ Apache 2.0 license. BSD (or equivalent) licensed software, possibly with the .Dq advertising clause . +.It pa broadcom/ +Broadcom firmware license. .It Pa cddl/ Common Development and Distribution License (the Sun license which is based on the Mozilla Public License version 1.1). @@ -681,8 +685,12 @@ terms similar to BSD licensed software. .It Pa intel-public/ Intel license permitting redistribution with terms similar to BSD licensed software. +.It Pa lgpl3/ +GNU lesser general public license, version 3. .It Pa mit/ MIT (X11) style license. +.It Pa mpl/ +Mozilla Public License. .It Pa zlib/ BSD-like zlib license. .El @@ -690,13 +698,6 @@ BSD-like zlib license. .It Pa games/ Source for utilities/files in .Pa /usr/games . -.It Pa gnu/ -Source for programs covered by the GNU license (or similar) -(deprecated; use -.Pa external/gpl2/ -or -.Pa external/gpl3/ -as appropriate). .It Pa include/ Source for files in .Pa /usr/include .
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: maya Date: Fri Dec 20 22:58:53 UTC 2019 Modified Files: src/usr.bin/calendar/calendars: calendar.judaic Log Message: Avoid the risk of being wrong and don't expand meaning of holiday. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.bin/calendar/calendars/calendar.judaic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.judaic diff -u src/usr.bin/calendar/calendars/calendar.judaic:1.8 src/usr.bin/calendar/calendars/calendar.judaic:1.9 --- src/usr.bin/calendar/calendars/calendar.judaic:1.8 Fri Dec 20 18:37:20 2019 +++ src/usr.bin/calendar/calendars/calendar.judaic Fri Dec 20 22:58:53 2019 @@ -24,6 +24,6 @@ sabbatical) 10/09* Hoshanah Rabba (7th day of Sukkot) 10/01* Shmini Atzeret (8th Day of Gathering; 1 day after Sukkot; sabbatical) -11/16* Sigd (Beta Israel Day of Atonement; 50 days after Yom Kippur) +11/16* Sigd (Beta Israel; 50 days after Yom Kippur) 12/10* First Day of Chanukah 12/25* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day)
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: maya Date: Fri Dec 20 18:37:20 UTC 2019 Modified Files: src/usr.bin/calendar/calendars: calendar.judaic Log Message: Update to 2020 dates. While here: - Add regional holidays: Sigd (Beta Israel), Mimouna (Morrocan). - Transliterate some things in an Israeli Hebrew accent (Succos -> Sukkot, Atzeres -> Atzeret) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.bin/calendar/calendars/calendar.judaic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.judaic diff -u src/usr.bin/calendar/calendars/calendar.judaic:1.7 src/usr.bin/calendar/calendars/calendar.judaic:1.8 --- src/usr.bin/calendar/calendars/calendar.judaic:1.7 Sat Jun 2 05:55:47 2018 +++ src/usr.bin/calendar/calendars/calendar.judaic Fri Dec 20 18:37:20 2019 @@ -1,27 +1,29 @@ 01/21* Tu B'Shvat (Feast of Trees) -03/19* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) -03/20* Purim (Feast of Lots; 30 days before Pesach) -04/19* Pesach (First Day of Passover; sabbatical) -04/20* Pesach (sabbatical) -04/21* Pesach (sabbatical) -04/26* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) -05/09* Yom HaAtzma'ut (Israel Independence Day) -05/23* Lag B'Omer (Commemoration of the Great Rebellion) -06/01* Yom Yerushalayim (Reunification of Jerusalem) -06/08* Shavuot (Festival of Weeks; 50 days after Pesach; sabbatical) -07/20* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; +03/09* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) +03/10* Purim (Feast of Lots; 30 days before Pesach) +04/09* Pesach (First Day of Passover; sabbatical) +04/10* Pesach (sabbatical) +04/11* Pesach (sabbatical) +04/16* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) +04/17* Mimouna (Morrocan Jewish Celebration of End of Pesach) +04/09* Yom HaAtzma'ut (Israel Independence Day) +05/12* Lag B'Omer (Commemoration of the Great Rebellion) +05/22* Yom Yerushalayim (Reunification of Jerusalem) +05/29* Shavuot (Festival of Weeks; 50 days after Pesach; sabbatical) +07/09* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; fast day) -07/21* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) -09/09* First Day of Rosh Hashanah (Jewish Lunar New Year; 5778 == 2017; +07/30* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) +09/19* First Day of Rosh Hashanah (Jewish Lunar New Year; 5781 == 2021; sabbatical) -09/09* Rosh Hashanah (sabbatical) -09/10* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day +09/20* Rosh Hashanah (sabbatical) +09/21* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day after Rosh Hashanah; fast day) -09/18* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; +09/28* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; sabbatical, fast day) -09/23* Succos (Festival of Tabernacles; 14 days after Rosh Hashanah; +10/03* Sukkot (Festival of Tabernacles; 14 days after Rosh Hashanah; sabbatical) -09/30* Hoshanah Rabba (7th day of Succos) -10/01* Shmini Atzeres (8th Day of Gathering; 1 day after Succos; sabbatical) -12/02* First Day of Chanukah -12/18* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day) +10/09* Hoshanah Rabba (7th day of Sukkot) +10/01* Shmini Atzeret (8th Day of Gathering; 1 day after Sukkot; sabbatical) +11/16* Sigd (Beta Israel Day of Atonement; 50 days after Yom Kippur) +12/10* First Day of Chanukah +12/25* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day)
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: maya
Date: Sat Dec 14 15:40:43 UTC 2019
Modified Files:
src/sys/dev/usb: usbnet.c
Log Message:
Don't assume mii is not null here. Some drivers like urndis don't use
mii, so they always have mii == NULL.
ok riastradh. fixes PR kern/54762
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/usb/usbnet.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbnet.c
diff -u src/sys/dev/usb/usbnet.c:1.32 src/sys/dev/usb/usbnet.c:1.33
--- src/sys/dev/usb/usbnet.c:1.32 Tue Dec 3 05:01:58 2019
+++ src/sys/dev/usb/usbnet.c Sat Dec 14 15:40:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.32 2019/12/03 05:01:58 riastradh Exp $ */
+/* $NetBSD: usbnet.c,v 1.33 2019/12/14 15:40:43 maya Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.32 2019/12/03 05:01:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.33 2019/12/14 15:40:43 maya Exp $");
#include
#include
@@ -1188,7 +1188,6 @@ usbnet_tick_task(void *arg)
struct mii_data * const mii = usbnet_mii(un);
KASSERT(ifp != NULL); /* embedded member */
- KASSERT(mii != NULL); /* only removed after dying=true and wait */
unp->unp_refcnt++;
mutex_exit(&unp->unp_lock);
@@ -1197,9 +1196,11 @@ usbnet_tick_task(void *arg)
usbnet_watchdog(ifp);
DPRINTFN(8, "mii %jx ifp %jx", (uintptr_t)mii, (uintptr_t)ifp, 0, 0);
- mii_tick(mii);
- if (!unp->unp_link)
- (*mii->mii_statchg)(ifp);
+ if (mii) {
+ mii_tick(mii);
+ if (!unp->unp_link)
+ (*mii->mii_statchg)(ifp);
+ }
/* Call driver if requested. */
uno_tick(un);
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: maya
Date: Thu Dec 5 20:25:54 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_cmd_parser.c
Log Message:
Use the original linux function rather than my wrong translation.
...Include the header to have it.
Thanks Riastradh!
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.19 src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.20
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.19 Thu Dec 5 20:03:09 2019
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c Thu Dec 5 20:25:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_cmd_parser.c,v 1.19 2019/12/05 20:03:09 maya Exp $ */
+/* $NetBSD: i915_cmd_parser.c,v 1.20 2019/12/05 20:25:54 maya Exp $ */
/*
* Copyright © 2013 Intel Corporation
@@ -28,10 +28,11 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_cmd_parser.c,v 1.19 2019/12/05 20:03:09 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_cmd_parser.c,v 1.20 2019/12/05 20:25:54 maya Exp $");
#include "i915_drv.h"
#include
+#include
/**
* DOC: batch buffer command parser
@@ -1259,7 +1260,7 @@ static void init_whitelist(struct intel_
{
const u32 batch_cmds = DIV_ROUND_UP(batch_len, sizeof(u32));
const u32 exact_size = BITS_TO_LONGS(batch_cmds);
- u32 next_size = BITS_TO_LONGS(powerof2(batch_cmds));
+ u32 next_size = BITS_TO_LONGS(roundup_pow_of_two(batch_cmds));
unsigned long *next_whitelist;
if (CMDPARSER_USES_GGTT(ctx->i915))
CVS commit: src/sys/external/bsd
Module Name:src Committed By: maya Date: Thu Dec 5 20:03:09 UTC 2019 Modified Files: src/sys/external/bsd/common/include/linux: bitops.h src/sys/external/bsd/drm2/dist/drm/i915: i915_cmd_parser.c i915_dma.c i915_drv.c i915_drv.h i915_gem_context.c i915_gem_execbuffer.c i915_gem_gtt.c i915_gem_gtt.h i915_reg.h intel_display.c intel_drv.h intel_pm.c intel_ringbuffer.c intel_ringbuffer.h Log Message: Add what appears to be the fixes to CVE-2019-0154, CVE-2019-0155. This commit requires review, but I'd also like it to be tested by others while it is being reviewed. CVE-2019-0155: It was discovered that the Intel i915 graphics chipsets allowed userspace to modify page table entries via writes to MMIO from the Blitter Command Streamer and expose kernel memory information. A local attacker could use this to expose sensitive information or possibly elevate privileges. CVE-2019-0154: It was discovered that the Intel i915 graphics chipsets could cause a system hang when userspace performed a read from GT memory mapped input output (MMIO) when the product is in certain low power states. A local attacker could use this to cause a denial of service. >From upstream commits to linux-4.4.y: --- >From 6d0cfddc7afc715835f0e17827106f832b14dd2a Mon Sep 17 00:00:00 2001 From: Jon Bloomfield Date: Thu, 12 Jul 2018 19:53:10 +0100 Subject: [PATCH] drm/i915/gtt: Add read only pages to gen8_pte_encode We can set a bit inside the ppGTT PTE to indicate a page is read-only; writes from the GPU will be discarded. We can use this to protect pages and in particular support read-only userptr mappings (necessary for importing PROT_READ vma). --- >From 774b68aa2105c70b40c3b1777feb7ab500d716dd Mon Sep 17 00:00:00 2001 From: Jon Bloomfield Date: Mon, 6 Aug 2018 14:10:48 -0700 Subject: [PATCH] drm/i915/gtt: Read-only pages for insert_entries on bdw+ Hook up the flags to allow read-only ppGTT mappings for gen8+ v2: Include a selftest to check that writes to a readonly PTE are dropped v3: Don't duplicate cpu_check() as we can just reuse it, and even worse don't wholesale copy the theory-of-operation comment from igt_ctx_exec without changing it to explain the intention behind the new test! v4: Joonas really likes magic mystery values --- >From 3fd1c2e65c60c1c513155e1d1d74138b141aa8a3 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 12 Jul 2018 19:53:12 +0100 Subject: [PATCH] drm/i915/gtt: Disable read-only support under GVT GVT is not propagating the PTE bits, and is always setting the read-write bit, thus breaking read-only support. --- >From e5e3c0154c19f2d8213e0af88b7a10d9de7fbafd Mon Sep 17 00:00:00 2001 From: Jon Bloomfield Date: Fri, 20 Apr 2018 14:26:01 -0700 Subject: [PATCH] drm/i915: Rename gen7 cmdparser tables We're about to introduce some new tables for later gens, and the current naming for the gen7 tables will no longer make sense. v2: rebase --- >From 3122671a5df3ee13f5cf22b7bdacf422b7b4319a Mon Sep 17 00:00:00 2001 From: Jon Bloomfield Date: Fri, 8 Jun 2018 08:53:46 -0700 Subject: [PATCH] drm/i915: Disable Secure Batches for gen6+ Retroactively stop reporting support for secure batches through the api for gen6+ so that older binaries trigger the fallback path instead. Older binaries use secure batches pre gen6 to access resources that are not available to normal usermode processes. However, all known userspace explicitly checks for HAS_SECURE_BATCHES before relying on the secure batch feature. Since there are no known binaries relying on this for newer gens we can kill secure batches from gen6, via I915_PARAM_HAS_SECURE_BATCHES. v2: rebase (Mika) v3: rebase (Mika) --- >From 544fd7d9d4cfe32357beab2f1dc543637d42e69f Mon Sep 17 00:00:00 2001 From: Jon Bloomfield Date: Fri, 8 Jun 2018 10:05:26 -0700 Subject: [PATCH] drm/i915: Remove Master tables from cmdparser The previous patch has killed support for secure batches on gen6+, and hence the cmdparsers master tables are now dead code. Remove them. --- >From 17e89f38212d8b3cba470efca91b997ac03c592c Mon Sep 17 00:00:00 2001 From: Jon Bloomfield Date: Wed, 1 Aug 2018 09:33:59 -0700 Subject: [PATCH] drm/i915: Add support for mandatory cmdparsing The existing cmdparser for gen7 can be bypassed by specifying batch_len=0 in the execbuf call. This is safe because bypassing simply reduces the cmd-set available. In a later patch we will introduce cmdparsing for gen9, as a security measure, which must be strictly enforced since without it we are vulnerable to DoS attacks. Introduce the concept of 'required' cmd parsing that cannot be bypassed by submitting zero-length bb's. v2: rebase (Mika) v2: rebase (Mika) v3: fix conflict on engine flags (Mika) --- >From 77524398bccea3592a25cbe92a9a54fa555013af Mon Sep 17 00:00:00 2001 From: Jon Bloomfield Date: Tue, 22 May 2018 1
CVS commit: xsrc/external/mit/MesaLib/dist/src
Module Name:xsrc
Committed By: maya
Date: Thu Dec 5 17:41:10 UTC 2019
Modified Files:
xsrc/external/mit/MesaLib/dist/src/intel/dev: gen_device_info.c
xsrc/external/mit/MesaLib/dist/src/loader: loader.c
xsrc/external/mit/MesaLib/dist/src/mesa/main: context.c
xsrc/external/mit/MesaLib/dist/src/util: disk_cache.c
Log Message:
Wherever we test for setuid, also test for setgid.
Inspired by a diff to openbsd but with a few more instances.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/loader/loader.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/MesaLib/dist/src/util/disk_cache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c
diff -u xsrc/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c:1.4 xsrc/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c:1.5
--- xsrc/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c:1.4 Tue Sep 24 19:26:45 2019
+++ xsrc/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c Thu Dec 5 17:41:10 2019
@@ -83,7 +83,7 @@ gen_device_name_to_pci_device_id(const c
int
gen_get_pci_device_id_override(void)
{
- if (geteuid() == getuid()) {
+ if (!issetugid()) {
const char *devid_override = getenv("INTEL_DEVID_OVERRIDE");
if (devid_override) {
const int id = gen_device_name_to_pci_device_id(devid_override);
Index: xsrc/external/mit/MesaLib/dist/src/loader/loader.c
diff -u xsrc/external/mit/MesaLib/dist/src/loader/loader.c:1.1.1.3 xsrc/external/mit/MesaLib/dist/src/loader/loader.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/loader/loader.c:1.1.1.3 Tue Sep 24 17:55:48 2019
+++ xsrc/external/mit/MesaLib/dist/src/loader/loader.c Thu Dec 5 17:41:10 2019
@@ -445,7 +445,7 @@ loader_get_driver_for_fd(int fd)
* user's problem, but this allows vc4 simulator to run on an i965 host,
* and may be useful for some touch testing of i915 on an i965 host.
*/
- if (geteuid() == getuid()) {
+ if (!issetugid()) {
driver = getenv("MESA_LOADER_DRIVER_OVERRIDE");
if (driver)
return strdup(driver);
@@ -533,7 +533,7 @@ loader_open_driver(const char *driver_na
const struct __DRIextensionRec **(*get_extensions)(void);
search_paths = NULL;
- if (geteuid() == getuid() && search_path_vars) {
+ if (!issetugid() && search_path_vars) {
for (int i = 0; search_path_vars[i] != NULL; i++) {
search_paths = getenv(search_path_vars[i]);
if (search_paths)
Index: xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c:1.7 xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c:1.8
--- xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c:1.7 Tue Sep 24 19:26:50 2019
+++ xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c Thu Dec 5 17:41:10 2019
@@ -1240,7 +1240,7 @@ _mesa_initialize_context(struct gl_conte
*/
if (env_var_as_boolean("MESA_NO_ERROR", false)) {
#if !defined(_WIN32)
- if (geteuid() == getuid())
+ if (!issetugid())
#endif
ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR;
}
Index: xsrc/external/mit/MesaLib/dist/src/util/disk_cache.c
diff -u xsrc/external/mit/MesaLib/dist/src/util/disk_cache.c:1.3 xsrc/external/mit/MesaLib/dist/src/util/disk_cache.c:1.4
--- xsrc/external/mit/MesaLib/dist/src/util/disk_cache.c:1.3 Tue Sep 24 19:26:51 2019
+++ xsrc/external/mit/MesaLib/dist/src/util/disk_cache.c Thu Dec 5 17:41:10 2019
@@ -212,7 +212,7 @@ disk_cache_create(const char *gpu_name,
size_t cv_size = sizeof(cache_version);
/* If running as a users other than the real user disable cache */
- if (geteuid() != getuid())
+ if (issetugid())
return NULL;
/* A ralloc context for transient data during this invocation. */
CVS commit: xsrc/external/mit/MesaLib/dist/src
Module Name:xsrc
Committed By: maya
Date: Sun Dec 1 20:21:21 UTC 2019
Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/dri:
dri_sw_winsys.c
xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/xlib:
xlib_sw_winsys.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/x11: xm_buffer.c
Log Message:
>From 02c3dad0f3b4d26e0faa5cc51d06bc50d693dcdc Mon Sep 17 00:00:00 2001
From: Brian Paul
Date: Wed, 9 Oct 2019 12:05:16 -0600
Subject: [PATCH] Call shmget() with permission 0600 instead of 0777
A security advisory (TALOS-2019-0857/CVE-2019-5068) found that
creating shared memory regions with permission mode 0777 could allow
any user to access that memory. Several Mesa drivers use shared-
memory XImages to implement back buffers for improved performance.
This path changes the shmget() calls to use 0600 (user r/w).
Tested with legacy Xlib driver and llvmpipe.
Cc: mesa-sta...@lists.freedesktop.org
Reviewed-by: Kristian H. Kristensen
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/dri/dri_sw_winsys.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/x11/xm_buffer.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/dri/dri_sw_winsys.c
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/dri/dri_sw_winsys.c:1.1.1.4 xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/dri/dri_sw_winsys.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/dri/dri_sw_winsys.c:1.1.1.4 Tue Sep 24 17:31:59 2019
+++ xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/dri/dri_sw_winsys.c Sun Dec 1 20:21:21 2019
@@ -94,7 +94,8 @@ alloc_shm(struct dri_sw_displaytarget *d
{
char *addr;
- dri_sw_dt->shmid = shmget(IPC_PRIVATE, size, IPC_CREAT|0777);
+ /* 0600 = user read+write */
+ dri_sw_dt->shmid = shmget(IPC_PRIVATE, size, IPC_CREAT | 0600);
if (dri_sw_dt->shmid < 0)
return NULL;
Index: xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c:1.1.1.3 xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c:1.1.1.3 Sun Mar 10 03:42:41 2019
+++ xsrc/external/mit/MesaLib/dist/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c Sun Dec 1 20:21:21 2019
@@ -126,7 +126,8 @@ alloc_shm(struct xlib_displaytarget *buf
shminfo->shmid = -1;
shminfo->shmaddr = (char *) -1;
- shminfo->shmid = shmget(IPC_PRIVATE, size, IPC_CREAT|0777);
+ /* 0600 = user read+write */
+ shminfo->shmid = shmget(IPC_PRIVATE, size, IPC_CREAT | 0600);
if (shminfo->shmid < 0) {
return NULL;
}
Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/x11/xm_buffer.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/x11/xm_buffer.c:1.1.1.7 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/x11/xm_buffer.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/x11/xm_buffer.c:1.1.1.7 Sun Mar 10 03:42:37 2019
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/x11/xm_buffer.c Sun Dec 1 20:21:21 2019
@@ -89,8 +89,9 @@ alloc_back_shm_ximage(XMesaBuffer b, GLu
return GL_FALSE;
}
+ /* 0600 = user read+write */
b->shminfo.shmid = shmget(IPC_PRIVATE, b->backxrb->ximage->bytes_per_line
- * b->backxrb->ximage->height, IPC_CREAT|0777);
+ * b->backxrb->ximage->height, IPC_CREAT | 0600);
if (b->shminfo.shmid < 0) {
_mesa_warning(NULL, "shmget failed while allocating back buffer.\n");
XDestroyImage(b->backxrb->ximage);
CVS commit: src/share/mk
Module Name:src
Committed By: maya
Date: Thu May 9 23:34:51 UTC 2019
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
G/C unused code.
gcc -combine is no longer a thing, so this entire block isn't usable.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.60 src/share/mk/bsd.kmodule.mk:1.61
--- src/share/mk/bsd.kmodule.mk:1.60 Mon Jan 21 21:11:54 2019
+++ src/share/mk/bsd.kmodule.mk Thu May 9 23:34:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.60 2019/01/21 21:11:54 christos Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.61 2019/05/09 23:34:51 maya Exp $
# We are not building this with PIE
MKPIE=no
@@ -105,39 +105,6 @@ PROG?= ${KMOD}.kmod
# Build rules
realall: ${PROG}
-.if (defined(USE_COMBINE) && ${USE_COMBINE} != "no" && !commands(${_P}) \
- && !defined(NOCOMBINE.${_P}) && !defined(NOCOMBINE))
-.for f in ${SRCS:N*.h:N*.sh:N*.fth:C/\.[yl]$/.c/g}
-.if (${CPPFLAGS.$f:D1} == "1" || ${CPUFLAGS.$f:D2} == "2" \
- || ${COPTS.$f:D3} == "3" || ${OBJCOPTS.$f:D4} == "4" \
- || ${CXXFLAGS.$f:D5} == "5") \
-|| ("${f:M*.[cyl]}" == "" || commands(${f:R:S/$/.o/}))
-XOBJS+= ${f:R:S/$/.o/}
-.else
-XSRCS+= ${f}
-NODPSRCS+= ${f}
-.endif
-.endfor
-
-.if !empty(XOBJS)
-${XOBJS}: ${DPSRCS}
-.endif
-
-.if ${MKLDSCRIPT} == "yes"
-${KMODSCRIPT}: ${KMODSCRIPTSRC} ${XOBJS} $S/conf/mkldscript.sh
- @rm -f ${.TARGET}
- @OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
- -t ${KMODSCRIPTSRC} ${XOBJS} > ${.TARGET}
-.endif
-
-${PROG}: ${XOBJS} ${XSRCS} ${DPSRCS} ${DPADD} ${KMODSCRIPT}
- ${CC} ${LDFLAGS} -nostdlib -MD -combine -r -Wl,-T,${KMODSCRIPT},-d \
- -Wl,-Map=${.TARGET}.map \
- -o ${.TARGET} ${CFLAGS} ${CPPFLAGS} ${XOBJS} \
- ${XSRCS:@.SRC.@${.ALLSRC:M*.c:M*${.SRC.}}@:O:u} && \
- echo '.-include "${KMOD}.d"' > .depend
-
-.else
OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g}
${OBJS} ${LOBJS}: ${DPSRCS}
@@ -191,7 +158,6 @@ ${PROG}: ${OBJS} ${DPADD} ${KMODSCRIPT}
-Wl,-Map=${.TARGET}.map \
-o ${.TARGET} ${OBJS}
.endif
-.endif
.if defined(CTFMERGE)
${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS}
.endif
CVS commit: src/lib/libpthread
Module Name:src
Committed By: maya
Date: Tue May 7 18:45:37 UTC 2019
Modified Files:
src/lib/libpthread: Makefile
Log Message:
Make CLEANFILES actually work. .TARGET is not defined when not in a target
rule.
Thanks xtos for the heads up.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/lib/libpthread/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/Makefile
diff -u src/lib/libpthread/Makefile:1.93 src/lib/libpthread/Makefile:1.94
--- src/lib/libpthread/Makefile:1.93 Tue May 7 18:12:53 2019
+++ src/lib/libpthread/Makefile Tue May 7 18:45:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2019/05/07 18:12:53 maya Exp $
+# $NetBSD: Makefile,v 1.94 2019/05/07 18:45:37 maya Exp $
#
NOSANITIZER= # defined
@@ -281,7 +281,7 @@ __archivebuild: .USE
${LD} -r -o ${.TARGET}.o `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
${AR} ${_ARFL} ${.TARGET} ${.TARGET}.o
-CLEANFILES+= ${.TARGET}.o
+CLEANFILES+= ${_LIBS:=.o}
.include
CVS commit: src/lib/libpthread
Module Name:src
Committed By: maya
Date: Tue May 7 18:12:53 UTC 2019
Modified Files:
src/lib/libpthread: Makefile
Log Message:
Replace the link command for libpthread.a so that we create a single section
with all the libpthread symbols in it.
This makes -lpthread behave like to -Wl,--whole-archive -lpthread.
This avoids a situation where threaded static binaries use some libc thread
stubs, which are racy.
Fixes PR lib/54001: call_once2_32, call_once2_static test cases failing on
amd64 since gcc7 import.
Suggested by Jonathan Wakely, thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/lib/libpthread/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/Makefile
diff -u src/lib/libpthread/Makefile:1.92 src/lib/libpthread/Makefile:1.93
--- src/lib/libpthread/Makefile:1.92 Wed Apr 24 11:43:19 2019
+++ src/lib/libpthread/Makefile Tue May 7 18:12:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2019/04/24 11:43:19 kamil Exp $
+# $NetBSD: Makefile,v 1.93 2019/05/07 18:12:53 maya Exp $
#
NOSANITIZER= # defined
@@ -269,6 +269,20 @@ MLINKS+= tss.3 tss_set.3
INCS+= threads.h
+# PR lib/54001: create libpthread.a as a single large object, with all the
+# symbols in one section. ensures that if any libpthread function is used,
+# you get all of them from libpthread, and not the libc stubs.
+#
+# This makes -lpthread equivalent to -Wl,--whole-archive -lpthread
+
+__archivebuild: .USE
+ ${_MKTARGET_BUILD}
+ @rm -f ${.TARGET}
+ ${LD} -r -o ${.TARGET}.o `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
+ ${AR} ${_ARFL} ${.TARGET} ${.TARGET}.o
+
+CLEANFILES+= ${.TARGET}.o
+
.include
.else
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: maya
Date: Fri Apr 26 20:41:10 UTC 2019
Modified Files:
src/tests/lib/libc/sys: Makefile
Log Message:
Use LDADD, which apparently puts the libraries at the end of the command,
and makes static builds (aka sun2) happier.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/tests/lib/libc/sys/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.55 src/tests/lib/libc/sys/Makefile:1.56
--- src/tests/lib/libc/sys/Makefile:1.55 Thu Apr 25 19:15:23 2019
+++ src/tests/lib/libc/sys/Makefile Fri Apr 26 20:41:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2019/04/25 19:15:23 kamil Exp $
+# $NetBSD: Makefile,v 1.56 2019/04/26 20:41:10 maya Exp $
MKMAN= no
@@ -88,12 +88,12 @@ SRCS.t_mprotect= t_mprotect.c ${SRCS_EXE
LDADD.t_getpid+=-lpthread
-LDFLAGS.t_ptrace_wait+= -pthread -lm
-LDFLAGS.t_ptrace_wait3+= -pthread -lm
-LDFLAGS.t_ptrace_wait4+= -pthread -lm
-LDFLAGS.t_ptrace_wait6+= -pthread -lm
-LDFLAGS.t_ptrace_waitid+= -pthread -lm
-LDFLAGS.t_ptrace_waitpid+= -pthread -lm
+LDADD.t_ptrace_wait+= -pthread -lm
+LDADD.t_ptrace_wait3+= -pthread -lm
+LDADD.t_ptrace_wait4+= -pthread -lm
+LDADD.t_ptrace_wait6+= -pthread -lm
+LDADD.t_ptrace_waitid+= -pthread -lm
+LDADD.t_ptrace_waitpid+= -pthread -lm
.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
CPPFLAGS.t_posix_fadvise.c += -D_KERNTYPES
CVS commit: src/tests/lib/libc/gen
Module Name:src
Committed By: maya
Date: Fri Apr 26 19:17:05 UTC 2019
Modified Files:
src/tests/lib/libc/gen: Makefile
Log Message:
-frounding-math is gcc specific, help clang builds
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/tests/lib/libc/gen/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/gen/Makefile
diff -u src/tests/lib/libc/gen/Makefile:1.52 src/tests/lib/libc/gen/Makefile:1.53
--- src/tests/lib/libc/gen/Makefile:1.52 Wed Apr 24 15:12:09 2019
+++ src/tests/lib/libc/gen/Makefile Fri Apr 26 19:17:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/04/24 15:12:09 christos Exp $
+# $NetBSD: Makefile,v 1.53 2019/04/26 19:17:05 maya Exp $
.include
@@ -40,7 +40,7 @@ TESTS_C+= t_ttyname
TESTS_C+= t_vis
CPPFLAGS.t_siginfo.c+=-D__TEST_FENV
-COPTS.t_fpsetround.c+=-frounding-math
+COPTS.t_fpsetround.c+=${${ACTIVE_CC} == "gcc":? -frounding-math :}
LDADD.t_siginfo+= -lm
DPADD.t_siginfo+= ${LIBM}
CVS commit: src/lib/libm/arch/i387
Module Name:src Committed By: maya Date: Fri Apr 26 10:11:14 UTC 2019 Removed Files: src/lib/libm/arch/i387: s_cos.S s_cosf.S s_ilogb.S s_ilogbf.S s_modf.S s_sin.S s_sinf.S s_tan.S s_tanf.S Log Message: Remove unused 387 implementations. These were removed from the build for being wrong, but the implementation stayed around. This is confusing, we have the attic for old code, let's delete the unused implementations. To generate a diff of this commit: cvs rdiff -u -r1.8 -r0 src/lib/libm/arch/i387/s_cos.S cvs rdiff -u -r1.6 -r0 src/lib/libm/arch/i387/s_cosf.S \ src/lib/libm/arch/i387/s_ilogbf.S cvs rdiff -u -r1.7 -r0 src/lib/libm/arch/i387/s_ilogb.S \ src/lib/libm/arch/i387/s_sin.S src/lib/libm/arch/i387/s_tan.S cvs rdiff -u -r1.1 -r0 src/lib/libm/arch/i387/s_modf.S cvs rdiff -u -r1.5 -r0 src/lib/libm/arch/i387/s_sinf.S \ src/lib/libm/arch/i387/s_tanf.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc
Module Name:src Committed By: maya Date: Fri Apr 26 09:03:47 UTC 2019 Modified Files: src/lib/libc/arch/i386/gen: Makefile.inc src/lib/libc/arch/m68k/gen: Makefile.inc src/lib/libc/arch/sparc64/gen: Makefile.inc src/lib/libc/arch/x86_64/gen: Makefile.inc src/lib/libc/gen: signbitl_ieee754.c Removed Files: src/lib/libc/arch/i386/gen: signbitl.c src/lib/libc/arch/m68k/gen: signbitl.c src/lib/libc/arch/sparc64/gen: signbitl.c src/lib/libc/arch/x86_64/gen: signbitl.c Log Message: Unify signbitl implementations. (Unclear why they were different, it was only the comments that differed) Add a comment describing why the generic version works for both 80-bit and 128-bit double. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/lib/libc/arch/i386/gen/Makefile.inc cvs rdiff -u -r1.2 -r0 src/lib/libc/arch/i386/gen/signbitl.c cvs rdiff -u -r1.35 -r1.36 src/lib/libc/arch/m68k/gen/Makefile.inc cvs rdiff -u -r1.2 -r0 src/lib/libc/arch/m68k/gen/signbitl.c cvs rdiff -u -r1.19 -r1.20 src/lib/libc/arch/sparc64/gen/Makefile.inc cvs rdiff -u -r1.2 -r0 src/lib/libc/arch/sparc64/gen/signbitl.c cvs rdiff -u -r1.18 -r1.19 src/lib/libc/arch/x86_64/gen/Makefile.inc cvs rdiff -u -r1.2 -r0 src/lib/libc/arch/x86_64/gen/signbitl.c cvs rdiff -u -r1.1 -r1.2 src/lib/libc/gen/signbitl_ieee754.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/i386/gen/Makefile.inc diff -u src/lib/libc/arch/i386/gen/Makefile.inc:1.29 src/lib/libc/arch/i386/gen/Makefile.inc:1.30 --- src/lib/libc/arch/i386/gen/Makefile.inc:1.29 Wed Jul 15 14:27:49 2015 +++ src/lib/libc/arch/i386/gen/Makefile.inc Fri Apr 26 09:03:46 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.29 2015/07/15 14:27:49 pooka Exp $ +# $NetBSD: Makefile.inc,v 1.30 2019/04/26 09:03:46 maya Exp $ # objects built from assembler sources (need lint stubs) SRCS+= alloca.S byte_swap_2.S byte_swap_4.S fabs.S \ @@ -21,10 +21,10 @@ SRCS+= fpclassifyf_ieee754.c fpclassifyd SRCS+= isinff_ieee754.c isinfd_ieee754.c SRCS+= isnanf_ieee754.c isnand_ieee754.c SRCS+= isfinitef_ieee754.c isfinited_ieee754.c -SRCS+= signbitf_ieee754.c signbitd_ieee754.c +SRCS+= signbitf_ieee754.c signbitd_ieee754.c signbitl_ieee754.c SRCS+= nanf.c infinityl.c -SRCS+= fpclassifyl.c isfinitel.c isinfl.c isnanl.c signbitl.c +SRCS+= fpclassifyl.c isfinitel.c isinfl.c isnanl.c # "internal" objects (don't provide part of the user-visible API) SRCS+= divsi3.S fixdfsi.S fixunsdfsi.S udivsi3.S Index: src/lib/libc/arch/m68k/gen/Makefile.inc diff -u src/lib/libc/arch/m68k/gen/Makefile.inc:1.35 src/lib/libc/arch/m68k/gen/Makefile.inc:1.36 --- src/lib/libc/arch/m68k/gen/Makefile.inc:1.35 Wed Mar 22 23:11:07 2017 +++ src/lib/libc/arch/m68k/gen/Makefile.inc Fri Apr 26 09:03:46 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.35 2017/03/22 23:11:07 chs Exp $ +# $NetBSD: Makefile.inc,v 1.36 2019/04/26 09:03:46 maya Exp $ SRCS+= alloca.S fabs.S @@ -18,7 +18,8 @@ SRCS+= nanf.c SRCS+= infinityl_dbl_ieee754.c .else SRCS+= infinityl.c -SRCS+= fpclassifyl.c isfinitel.c isinfl.c isnanl.c signbitl.c +SRCS+= fpclassifyl.c isfinitel.c isinfl.c isnanl.c +SRCS+= signbitl_ieee754.c .endif SRCS+= ashlsi3.S ashrsi3.S \ Index: src/lib/libc/arch/sparc64/gen/Makefile.inc diff -u src/lib/libc/arch/sparc64/gen/Makefile.inc:1.19 src/lib/libc/arch/sparc64/gen/Makefile.inc:1.20 --- src/lib/libc/arch/sparc64/gen/Makefile.inc:1.19 Sun Dec 6 07:12:17 2009 +++ src/lib/libc/arch/sparc64/gen/Makefile.inc Fri Apr 26 09:03:46 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.19 2009/12/06 07:12:17 uebayasi Exp $ +# $NetBSD: Makefile.inc,v 1.20 2019/04/26 09:03:46 maya Exp $ SRCS+= fabs.S modf.S SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \ @@ -10,10 +10,10 @@ SRCS+= fpclassifyf_ieee754.c fpclassifyd SRCS+= isfinitef_ieee754.c isfinited_ieee754.c SRCS+= isinff_ieee754.c isinfd_ieee754.c SRCS+= isnanf_ieee754.c isnand_ieee754.c -SRCS+= signbitf_ieee754.c signbitd_ieee754.c +SRCS+= signbitf_ieee754.c signbitd_ieee754.c signbitl_ieee754.c SRCS+= nanf.c infinityl.c -SRCS+= fpclassifyl.c isfinitel.c isinfl.c isnanl.c signbitl.c +SRCS+= fpclassifyl.c isfinitel.c isinfl.c isnanl.c SRCS+= bswap16.c bswap32.c bswap64.c SRCS+= setjmp.S Index: src/lib/libc/arch/x86_64/gen/Makefile.inc diff -u src/lib/libc/arch/x86_64/gen/Makefile.inc:1.18 src/lib/libc/arch/x86_64/gen/Makefile.inc:1.19 --- src/lib/libc/arch/x86_64/gen/Makefile.inc:1.18 Wed Jul 15 14:27:49 2015 +++ src/lib/libc/arch/x86_64/gen/Makefile.inc Fri Apr 26 09:03:46 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.18 2015/07/15 14:27:49 pooka Exp $ +# $NetBSD: Makefile.inc,v 1.19 2019/04/26 09:03:46 maya Exp $ # objects built from assembler sources (need lint stubs) SRCS+= alloca.S byte_swap_2.S byte_swap_4.S byte_swap_8.S fabs.S \ @@ -21,10 +21
CVS commit: src
Module Name:src
Committed By: maya
Date: Fri Apr 26 08:52:16 UTC 2019
Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/tests/lib/libm: Makefile
Added Files:
src/tests/lib/libm: t_bit.c
Log Message:
Add a test case for signbit.
(paranoia prior to a libm change)
To generate a diff of this commit:
cvs rdiff -u -r1.282 -r1.283 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.811 -r1.812 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.45 -r1.46 src/tests/lib/libm/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libm/t_bit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.282 src/distrib/sets/lists/debug/mi:1.283
--- src/distrib/sets/lists/debug/mi:1.282 Wed Apr 24 11:43:20 2019
+++ src/distrib/sets/lists/debug/mi Fri Apr 26 08:52:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.282 2019/04/24 11:43:20 kamil Exp $
+# $NetBSD: mi,v 1.283 2019/04/26 08:52:16 maya Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -2202,6 +2202,7 @@
./usr/libdata/debug/usr/tests/lib/libm/t_acos.debug tests-lib-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/lib/libm/t_asin.debug tests-lib-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/lib/libm/t_atan.debug tests-lib-debug debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/lib/libm/t_bit.debug tests-lib-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/lib/libm/t_cabsl.debug tests-lib-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/lib/libm/t_casinh.debug tests-lib-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/lib/libm/t_cbrt.debug tests-lib-debug debug,atf,compattestfile
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.811 src/distrib/sets/lists/tests/mi:1.812
--- src/distrib/sets/lists/tests/mi:1.811 Wed Apr 24 11:43:20 2019
+++ src/distrib/sets/lists/tests/mi Fri Apr 26 08:52:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.811 2019/04/24 11:43:20 kamil Exp $
+# $NetBSD: mi,v 1.812 2019/04/26 08:52:16 maya Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3036,6 +3036,7 @@
./usr/tests/lib/libm/t_acos tests-lib-tests compattestfile,atf
./usr/tests/lib/libm/t_asin tests-lib-tests compattestfile,atf
./usr/tests/lib/libm/t_atan tests-lib-tests compattestfile,atf
+./usr/tests/lib/libm/t_bit tests-lib-tests compattestfile,atf
./usr/tests/lib/libm/t_cabsl tests-lib-tests compattestfile,atf
./usr/tests/lib/libm/t_casinh tests-lib-tests compattestfile,atf
./usr/tests/lib/libm/t_cbrt tests-lib-tests compattestfile,atf
Index: src/tests/lib/libm/Makefile
diff -u src/tests/lib/libm/Makefile:1.45 src/tests/lib/libm/Makefile:1.46
--- src/tests/lib/libm/Makefile:1.45 Wed Nov 7 03:56:18 2018
+++ src/tests/lib/libm/Makefile Fri Apr 26 08:52:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2018/11/07 03:56:18 riastradh Exp $
+# $NetBSD: Makefile,v 1.46 2019/04/26 08:52:16 maya Exp $
.include
@@ -18,6 +18,7 @@ CPPFLAGS.t_fmod.c+= -I${.CURDIR}/../libc
TESTS_C+= t_acos
TESTS_C+= t_asin
TESTS_C+= t_atan
+TESTS_C+= t_bit
TESTS_C+= t_casinh
TESTS_C+= t_cbrt
TESTS_C+= t_ceil
Added files:
Index: src/tests/lib/libm/t_bit.c
diff -u /dev/null src/tests/lib/libm/t_bit.c:1.1
--- /dev/null Fri Apr 26 08:52:16 2019
+++ src/tests/lib/libm/t_bit.c Fri Apr 26 08:52:16 2019
@@ -0,0 +1,102 @@
+/* $NetBSD: t_bit.c,v 1.1 2019/04/26 08:52:16 maya Exp $ */
+
+/*
+ * Written by Maya Rashish
+ * Public domain.
+ *
+ * Testing signbit{,f,l} function correctly
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+static const struct {
+ double input;
+ bool is_negative;
+} values[] = {
+ { -1, true},
+ { -123, true},
+ { -123E6, true},
+#ifdef INFINITY
+ { -INFINITY, true},
+ { INFINITY, false},
+#endif
+ { 123E6, false},
+ { 0, false},
+ { -FLT_MIN, true},
+ { FLT_MIN, false},
+ /*
+ * Cannot be accurately represented as float,
+ * but sign should be preserved
+ */
+ { DBL_MAX, false},
+ { -DBL_MAX, true},
+};
+
+#ifdef __HAVE_LONG_DOUBLE
+static const struct {
+ long double input;
+ bool is_negative;
+} ldbl_values[] = {
+ { -LDBL_MIN, true},
+ { LDBL_MIN, false},
+ { LDBL_MAX, false},
+ { -LDBL_MAX, true},
+};
+#endif
+
+ATF_TC(signbit);
+ATF_TC_HEAD(signbit, tc)
+{
+ atf_tc_set_md_var(tc, "descr","Check that signbit functions correctly");
+}
+
+ATF_TC_BODY(signbit, tc)
+{
+ double iterator_d;
+ float iterator_f;
+
+ for (unsigned int i = 0; i < __arraycount(values); i++) {
+ iterator_d = values[i].input;
+ iterator_f = (float) values[i].input;
+ if (signbit(iterator_f) != values[
CVS commit: src
Module Name:src Committed By: maya Date: Thu Apr 25 23:17:24 UTC 2019 Modified Files: src/distrib/sets/lists/comp: mi src/lib/libm: Makefile src/lib/libm/man: cos.3 Log Message: document cosl with MLINKS and in the man page To generate a diff of this commit: cvs rdiff -u -r1.2270 -r1.2271 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.208 -r1.209 src/lib/libm/Makefile cvs rdiff -u -r1.15 -r1.16 src/lib/libm/man/cos.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2270 src/distrib/sets/lists/comp/mi:1.2271 --- src/distrib/sets/lists/comp/mi:1.2270 Wed Apr 24 11:43:20 2019 +++ src/distrib/sets/lists/comp/mi Thu Apr 25 23:17:24 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2270 2019/04/24 11:43:20 kamil Exp $ +# $NetBSD: mi,v 1.2271 2019/04/25 23:17:24 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -6235,6 +6235,7 @@ ./usr/share/man/cat3/cosf.0 comp-c-catman .cat ./usr/share/man/cat3/cosh.0 comp-c-catman .cat ./usr/share/man/cat3/coshf.0 comp-c-catman .cat +./usr/share/man/cat3/cosl.0 comp-c-catman .cat ./usr/share/man/cat3/cpow.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cpowf.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cpowl.0 comp-c-catman complex,.cat @@ -14235,6 +14236,7 @@ ./usr/share/man/html3/cosf.html comp-c-htmlman html ./usr/share/man/html3/cosh.html comp-c-htmlman html ./usr/share/man/html3/coshf.html comp-c-htmlman html +./usr/share/man/html3/cosl.html comp-c-htmlman html ./usr/share/man/html3/cpow.html comp-c-htmlman complex,html ./usr/share/man/html3/cpowf.html comp-c-htmlman complex,html ./usr/share/man/html3/cpowl.html comp-c-htmlman complex,html @@ -22178,6 +22180,7 @@ ./usr/share/man/man3/cosf.3 comp-c-man .man ./usr/share/man/man3/cosh.3 comp-c-man .man ./usr/share/man/man3/coshf.3 comp-c-man .man +./usr/share/man/man3/cosl.3 comp-c-man .man ./usr/share/man/man3/cpow.3 comp-c-man complex,.man ./usr/share/man/man3/cpowf.3 comp-c-man complex,.man ./usr/share/man/man3/cpowl.3 comp-c-man complex,.man Index: src/lib/libm/Makefile diff -u src/lib/libm/Makefile:1.208 src/lib/libm/Makefile:1.209 --- src/lib/libm/Makefile:1.208 Wed Apr 17 07:45:23 2019 +++ src/lib/libm/Makefile Thu Apr 25 23:17:24 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.208 2019/04/17 07:45:23 mrg Exp $ +# $NetBSD: Makefile,v 1.209 2019/04/25 23:17:24 maya Exp $ # # @(#)Makefile 5.1beta 93/09/24 # @@ -383,6 +383,7 @@ MLINKS+=ceil.3 ceilf.3 \ MLINKS+=copysign.3 copysignf.3 \ copysign.3 copysignl.3 MLINKS+=cos.3 cosf.3 +MLINKS+=cos.3 cosl.3 MLINKS+=cosh.3 coshf.3 MLINKS+=erf.3 erff.3 \ erf.3 erfl.3 \ Index: src/lib/libm/man/cos.3 diff -u src/lib/libm/man/cos.3:1.15 src/lib/libm/man/cos.3:1.16 --- src/lib/libm/man/cos.3:1.15 Thu Aug 7 16:44:47 2003 +++ src/lib/libm/man/cos.3 Thu Apr 25 23:17:24 2019 @@ -26,14 +26,15 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)cos.3 5.1 (Berkeley) 5/2/91 -.\" $NetBSD: cos.3,v 1.15 2003/08/07 16:44:47 agc Exp $ +.\" $NetBSD: cos.3,v 1.16 2019/04/25 23:17:24 maya Exp $ .\" -.Dd May 2, 1991 +.Dd April 26, 2019 .Dt COS 3 .Os .Sh NAME .Nm cos , -.Nm cosf +.Nm cosf , +.Nm cosl .Nd cosine function .Sh LIBRARY .Lb libm @@ -43,11 +44,14 @@ .Fn cos "double x" .Ft float .Fn cosf "float x" +.Ft long double +.Fn cosl "long double x" .Sh DESCRIPTION The -.Fn cos +.Fn cos , +.Fn cosf , and -.Fn cosf +.Fn cosl functions compute the cosine of .Fa x (measured in radians).
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: maya
Date: Thu Apr 25 22:58:24 UTC 2019
Modified Files:
src/tests/lib/libm: t_cos.c
Log Message:
Expand to cover long double somewhat.
The given data is for double, so use DBL_EPSILON and don't expect better
results.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libm/t_cos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libm/t_cos.c
diff -u src/tests/lib/libm/t_cos.c:1.7 src/tests/lib/libm/t_cos.c:1.8
--- src/tests/lib/libm/t_cos.c:1.7 Sat Nov 10 23:04:16 2018
+++ src/tests/lib/libm/t_cos.c Thu Apr 25 22:58:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_cos.c,v 1.7 2018/11/10 23:04:16 riastradh Exp $ */
+/* $NetBSD: t_cos.c,v 1.8 2019/04/25 22:58:23 maya Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -60,6 +60,107 @@ static const struct {
{ 360, 6.283185307179586, 1., 999 },
};
+#ifdef __HAVE_LONG_DOUBLE
+/*
+ * cosl(3)
+ */
+ATF_TC(cosl_angles);
+ATF_TC_HEAD(cosl_angles, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Test some selected angles");
+}
+
+ATF_TC_BODY(cosl_angles, tc)
+{
+ /*
+ * XXX The given data is for double, so take that
+ * into account and expect less precise results..
+ */
+ const long double eps = DBL_EPSILON;
+ size_t i;
+
+ for (i = 0; i < __arraycount(angles); i++) {
+ int deg = angles[i].angle;
+ long double theta = angles[i].x;
+ long double cos_theta = angles[i].y;
+
+ assert(cos_theta != 0);
+ if (!(fabsl((cosl(theta) - cos_theta)/cos_theta) <= eps)) {
+ atf_tc_fail_nonfatal("cos(%d deg = %.17Lg) = %.17Lg"
+ " != %.17Lg",
+ deg, theta, cosl(theta), cos_theta);
+ }
+ }
+}
+
+ATF_TC(cosl_nan);
+ATF_TC_HEAD(cosl_nan, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Test cosl(NaN) == NaN");
+}
+
+ATF_TC_BODY(cosl_nan, tc)
+{
+ const long double x = 0.0L / 0.0L;
+
+ ATF_CHECK(isnan(x) != 0);
+ ATF_CHECK(isnan(cosl(x)) != 0);
+}
+
+ATF_TC(cosl_inf_neg);
+ATF_TC_HEAD(cosl_inf_neg, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Test cosl(-Inf) == NaN");
+}
+
+ATF_TC_BODY(cosl_inf_neg, tc)
+{
+ const long double x = -1.0L / 0.0L;
+
+ ATF_CHECK(isnan(cosl(x)) != 0);
+}
+
+ATF_TC(cosl_inf_pos);
+ATF_TC_HEAD(cosl_inf_pos, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Test cosl(+Inf) == NaN");
+}
+
+ATF_TC_BODY(cosl_inf_pos, tc)
+{
+ const long double x = 1.0L / 0.0L;
+
+ ATF_CHECK(isnan(cosl(x)) != 0);
+}
+
+
+ATF_TC(cosl_zero_neg);
+ATF_TC_HEAD(cosl_zero_neg, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Test cosl(-0.0) == 1.0");
+}
+
+ATF_TC_BODY(cosl_zero_neg, tc)
+{
+ const long double x = -0.0L;
+
+ ATF_CHECK(cosl(x) == 1.0);
+}
+
+ATF_TC(cosl_zero_pos);
+ATF_TC_HEAD(cosl_zero_pos, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Test cosl(+0.0) == 1.0");
+}
+
+ATF_TC_BODY(cosl_zero_pos, tc)
+{
+ const long double x = 0.0L;
+
+ ATF_CHECK(cosl(x) == 1.0);
+}
+#endif
+
/*
* cos(3)
*/
@@ -260,6 +361,14 @@ ATF_TC_BODY(cosf_zero_pos, tc)
ATF_TP_ADD_TCS(tp)
{
+#ifdef __HAVE_LONG_DOUBLE
+ ATF_TP_ADD_TC(tp, cosl_angles);
+ ATF_TP_ADD_TC(tp, cosl_nan);
+ ATF_TP_ADD_TC(tp, cosl_inf_neg);
+ ATF_TP_ADD_TC(tp, cosl_inf_pos);
+ ATF_TP_ADD_TC(tp, cosl_zero_neg);
+ ATF_TP_ADD_TC(tp, cosl_zero_pos);
+#endif
ATF_TP_ADD_TC(tp, cos_angles);
ATF_TP_ADD_TC(tp, cos_nan);
CVS commit: src/external/mit/xorg/lib/libgbm
Module Name:src
Committed By: maya
Date: Thu Apr 25 09:03:54 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libgbm: Makefile
Log Message:
Link against expat.
Helps us pass a qt5-qtbase gbm configure check, and avoid PLIST issues.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libgbm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libgbm/Makefile
diff -u src/external/mit/xorg/lib/libgbm/Makefile:1.5 src/external/mit/xorg/lib/libgbm/Makefile:1.6
--- src/external/mit/xorg/lib/libgbm/Makefile:1.5 Sat Apr 20 17:31:22 2019
+++ src/external/mit/xorg/lib/libgbm/Makefile Thu Apr 25 09:03:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/04/20 17:31:22 maya Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/25 09:03:54 maya Exp $
.include
@@ -47,6 +47,7 @@ INCSDIR= ${X11INCDIR}
LIBDPLIBS= glapi ${.CURDIR}/../libglapi
LIBDPLIBS+= drm ${.CURDIR}/../libdrm
+LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
PKGCONFIG= gbm
PKGDIST.gbm= ${X11SRCDIR.Mesa}/src/gbm/main
CVS commit: src/external/bsd/ntp/dist/ntpd
Module Name:src
Committed By: maya
Date: Wed Apr 24 11:55:05 UTC 2019
Modified Files:
src/external/bsd/ntp/dist/ntpd: ntp_config.c
Log Message:
Only warn about being unable to make a smaller stack if asking for debug
messages.
Between ASLR and stack clash random-sized padding, we can't make small
stacks reliably. Not doing so isn't a problem, so don't warn users about
it on every boot.
PR bin/51118
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/ntp/dist/ntpd/ntp_config.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/ntpd/ntp_config.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.20 src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.21
--- src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.20 Mon Dec 24 02:58:39 2018
+++ src/external/bsd/ntp/dist/ntpd/ntp_config.c Wed Apr 24 11:55:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_config.c,v 1.20 2018/12/24 02:58:39 christos Exp $ */
+/* $NetBSD: ntp_config.c,v 1.21 2019/04/24 11:55:05 maya Exp $ */
/* ntp_config.c
*
@@ -5252,7 +5252,7 @@ ntp_rlimit(
}
rl.rlim_cur = rl_value;
if (-1 == setrlimit(RLIMIT_STACK, &rl)) {
-msyslog(LOG_ERR,
+msyslog(LOG_DEBUG,
"ntp_rlimit: Cannot set RLIMIT_STACK: %m");
}
}
CVS commit: src
Module Name:src Committed By: maya Date: Mon Apr 22 21:58:57 UTC 2019 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4/man4.evbarm: Makefile Added Files: src/share/man/man4/man4.evbarm: awge.4 Log Message: Add awge(4) man page To generate a diff of this commit: cvs rdiff -u -r1.1642 -r1.1643 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/man4.evbarm/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.evbarm/awge.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1642 src/distrib/sets/lists/man/mi:1.1643 --- src/distrib/sets/lists/man/mi:1.1642 Tue Mar 26 12:22:07 2019 +++ src/distrib/sets/lists/man/mi Mon Apr 22 21:58:56 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1642 2019/03/26 12:22:07 pgoyette Exp $ +# $NetBSD: mi,v 1.1643 2019/04/22 21:58:56 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1076,6 +1076,7 @@ ./usr/share/man/cat4/et.0 man-sys-catman .cat ./usr/share/man/cat4/etherip.0 man-obsolete obsolete ./usr/share/man/cat4/etphy.0 man-sys-catman .cat +./usr/share/man/cat4/evbarm/awge.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/bcmgpio.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/cpsw.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/epgpio.0 man-sys-catman .cat @@ -4237,6 +4238,7 @@ ./usr/share/man/html4/et.html man-sys-htmlman html ./usr/share/man/html4/etherip.html man-obsolete obsolete ./usr/share/man/html4/etphy.html man-sys-htmlman html +./usr/share/man/html4/evbarm/awge.html man-sys-htmlman html ./usr/share/man/html4/evbarm/bcmgpio.html man-sys-htmlman html ./usr/share/man/html4/evbarm/cpsw.html man-sys-htmlman html ./usr/share/man/html4/evbarm/epgpio.html man-sys-htmlman html @@ -7170,6 +7172,7 @@ ./usr/share/man/man4/et.4 man-sys-man .man ./usr/share/man/man4/etherip.4 man-obsolete obsolete ./usr/share/man/man4/etphy.4 man-sys-man .man +./usr/share/man/man4/evbarm/awge.4 man-sys-man .man ./usr/share/man/man4/evbarm/bcmgpio.4 man-sys-man .man ./usr/share/man/man4/evbarm/cpsw.4 man-sys-man .man ./usr/share/man/man4/evbarm/epgpio.4 man-sys-man .man Index: src/share/man/man4/man4.evbarm/Makefile diff -u src/share/man/man4/man4.evbarm/Makefile:1.7 src/share/man/man4/man4.evbarm/Makefile:1.8 --- src/share/man/man4/man4.evbarm/Makefile:1.7 Thu Apr 6 14:35:15 2017 +++ src/share/man/man4/man4.evbarm/Makefile Mon Apr 22 21:58:57 2019 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2017/04/06 14:35:15 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/04/22 21:58:57 maya Exp $ -MAN= bcmgpio.4 cpsw.4 epgpio.4 gxio.4 intro.4 iopaau.4 iopwdog.4 +MAN= awge.4 bcmgpio.4 cpsw.4 epgpio.4 gxio.4 intro.4 iopaau.4 iopwdog.4 MANSUBDIR=/evbarm Added files: Index: src/share/man/man4/man4.evbarm/awge.4 diff -u /dev/null src/share/man/man4/man4.evbarm/awge.4:1.1 --- /dev/null Mon Apr 22 21:58:57 2019 +++ src/share/man/man4/man4.evbarm/awge.4 Mon Apr 22 21:58:57 2019 @@ -0,0 +1,45 @@ +.\" $NetBSD: awge.4,v 1.1 2019/04/22 21:58:57 maya Exp $ +.\" +.\" written by Maya Rashish, 2019 +.\" This file is in the Public Domain +.\" +.Dd April 23, 2019 +.Dt AWGE 4 +.Os +.Sh NAME +.Nm awge +.Nd DesignWare Gigabit Ethernet +.Sh SYNOPSIS +.Cd "awge* at fdt?" +.Sh DESCRIPTION +The +.Nm +driver provides support for the DesignWare GMAC Ethernet. +.Sh SEE ALSO +.Xr arp 4 , +.Xr ifmedia 4 , +.Xr mii 4 , +.Xr netintro 4 , +.Xr ifconfig 8 +.Rs +.%A Synopsys +.%T DesignWare Ethernet GMAC IP +.%D April, 2019 +.%U https://www.synopsys.com/dw/ipdir.php?ds=dwc_ether_mac10_100_1000_unive +.Re +.Sh HISTORY +The name +.Nm +was chosen due to the hardware appearing in Allwinner boards, +but +.Nm +in use in boards by other manufacturers. +.Pp +The +.Nm +device driver was written by +.An Matt Thomas +and +.An Martin Husemann . +It first appeared in +.Nx 7.0 .
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: maya
Date: Mon Apr 22 14:53:51 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_emac.c
Log Message:
remove unused mii to fix the build
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/sunxi/sunxi_emac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_emac.c
diff -u src/sys/arch/arm/sunxi/sunxi_emac.c:1.24 src/sys/arch/arm/sunxi/sunxi_emac.c:1.25
--- src/sys/arch/arm/sunxi/sunxi_emac.c:1.24 Mon Apr 22 08:05:01 2019
+++ src/sys/arch/arm/sunxi/sunxi_emac.c Mon Apr 22 14:53:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_emac.c,v 1.24 2019/04/22 08:05:01 msaitoh Exp $ */
+/* $NetBSD: sunxi_emac.c,v 1.25 2019/04/22 14:53:51 maya Exp $ */
/*-
* Copyright (c) 2016-2017 Jared McNeill
@@ -33,7 +33,7 @@
#include "opt_net_mpsafe.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.24 2019/04/22 08:05:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.25 2019/04/22 14:53:51 maya Exp $");
#include
#include
@@ -908,7 +908,6 @@ static int
sunxi_emac_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct sunxi_emac_softc *sc = ifp->if_softc;
- struct mii_data *mii = &sc->mii;
int error, s;
#ifndef EMAC_MPSAFE
CVS commit: src/etc
Module Name:src Committed By: maya Date: Mon Apr 22 13:32:14 UTC 2019 Modified Files: src/etc/etc.amd64: boot.cfg src/etc/etc.i386: boot.cfg Log Message: Express more confidence in our ability to boot on hardware with ACPI enabled and don't warn our users that it might not and already suggest workarounds. The ability to disable ACPI and SMP is still there, by dropping to the boot prompt. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/etc/etc.amd64/boot.cfg cvs rdiff -u -r1.5 -r1.6 src/etc/etc.i386/boot.cfg Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.amd64/boot.cfg diff -u src/etc/etc.amd64/boot.cfg:1.5 src/etc/etc.amd64/boot.cfg:1.6 --- src/etc/etc.amd64/boot.cfg:1.5 Fri Mar 2 00:25:26 2018 +++ src/etc/etc.amd64/boot.cfg Mon Apr 22 13:32:13 2019 @@ -1,7 +1,5 @@ menu=Boot normally:rndseed /var/db/entropy-file;boot menu=Boot single user:rndseed /var/db/entropy-file;boot -s -menu=Disable ACPI:rndseed /var/db/entropy-file;boot -2 -menu=Disable ACPI and SMP:rndseed /var/db/entropy-file;boot -12 menu=Drop to boot prompt:prompt default=1 timeout=5 Index: src/etc/etc.i386/boot.cfg diff -u src/etc/etc.i386/boot.cfg:1.5 src/etc/etc.i386/boot.cfg:1.6 --- src/etc/etc.i386/boot.cfg:1.5 Fri Mar 2 00:25:26 2018 +++ src/etc/etc.i386/boot.cfg Mon Apr 22 13:32:13 2019 @@ -1,7 +1,5 @@ menu=Boot normally:rndseed /var/db/entropy-file;boot menu=Boot single user:rndseed /var/db/entropy-file;boot -s -menu=Disable ACPI:rndseed /var/db/entropy-file;boot -2 -menu=Disable ACPI and SMP:rndseed /var/db/entropy-file;boot -12 menu=Drop to boot prompt:prompt default=1 timeout=5
CVS commit: src/distrib
Module Name:src Committed By: maya Date: Mon Apr 22 13:27:40 UTC 2019 Modified Files: src/distrib/amd64/cdroms/bootcd: boot.cfg.in src/distrib/amd64/cdroms/installcd: boot.cfg.in src/distrib/amd64/installimage: boot.cfg.in src/distrib/amd64/uefi-installimage: boot.cfg.in src/distrib/i386/cdroms/bootcd: boot.cfg.in src/distrib/i386/cdroms/installcd: boot.cfg.in src/distrib/i386/floppies/common: boot.cfg src/distrib/i386/installimage: boot.cfg.in Log Message: Express more confidence in our ability to boot on hardware with ACPI enabled and don't warn our users that it might not and already suggest workarounds. The ability to disable ACPI and SMP is still there, by dropping to the boot prompt. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/bootcd/boot.cfg.in cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/installcd/boot.cfg.in cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage/boot.cfg.in cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/uefi-installimage/boot.cfg.in cvs rdiff -u -r1.9 -r1.10 src/distrib/i386/cdroms/bootcd/boot.cfg.in cvs rdiff -u -r1.8 -r1.9 src/distrib/i386/cdroms/installcd/boot.cfg.in cvs rdiff -u -r1.3 -r1.4 src/distrib/i386/floppies/common/boot.cfg cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/installimage/boot.cfg.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/amd64/cdroms/bootcd/boot.cfg.in diff -u src/distrib/amd64/cdroms/bootcd/boot.cfg.in:1.3 src/distrib/amd64/cdroms/bootcd/boot.cfg.in:1.4 --- src/distrib/amd64/cdroms/bootcd/boot.cfg.in:1.3 Tue Jan 18 00:16:13 2011 +++ src/distrib/amd64/cdroms/bootcd/boot.cfg.in Mon Apr 22 13:27:39 2019 @@ -1,15 +1,12 @@ banner=Welcome to the NetBSD @@VERSION@@ boot-only install CD banner banner= -banner=This CD contains only the installation program. Binary sets to complete the +banner=This media contains only the installation program. Binary sets to complete the banner=installation must be downloaded separately. The installer can download them banner=if this machine has a working internet connection. banner= -banner=ACPI (Advanced Configuration and Power Interface) should work on all modern -banner=and legacy hardware. However if you do encounter a problem while booting, -banner=try disabling it and report a bug at http://www.NetBSD.org/. +banner=If you encounter a problem while booting, report a bug at +banner=https://www.NetBSD.org/. menu=Install NetBSD:boot netbsd -menu=Install NetBSD (no ACPI):boot netbsd -2 -menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12 menu=Drop to boot prompt:prompt timeout=30 Index: src/distrib/amd64/cdroms/installcd/boot.cfg.in diff -u src/distrib/amd64/cdroms/installcd/boot.cfg.in:1.3 src/distrib/amd64/cdroms/installcd/boot.cfg.in:1.4 --- src/distrib/amd64/cdroms/installcd/boot.cfg.in:1.3 Tue Jan 18 00:16:13 2011 +++ src/distrib/amd64/cdroms/installcd/boot.cfg.in Mon Apr 22 13:27:39 2019 @@ -1,11 +1,8 @@ banner=Welcome to the NetBSD @@VERSION@@ installation CD banner banner= -banner=ACPI (Advanced Configuration and Power Interface) should work on all modern -banner=and legacy hardware. However if you do encounter a problem while booting, -banner=try disabling it and report a bug at http://www.NetBSD.org/. +banner=If you encounter a problem while booting, report a bug at +banner=https://www.NetBSD.org/. menu=Install NetBSD:boot netbsd -menu=Install NetBSD (no ACPI):boot netbsd -2 -menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12 menu=Drop to boot prompt:prompt timeout=30 Index: src/distrib/amd64/installimage/boot.cfg.in diff -u src/distrib/amd64/installimage/boot.cfg.in:1.1 src/distrib/amd64/installimage/boot.cfg.in:1.2 --- src/distrib/amd64/installimage/boot.cfg.in:1.1 Sun Jan 22 03:53:29 2012 +++ src/distrib/amd64/installimage/boot.cfg.in Mon Apr 22 13:27:40 2019 @@ -1,12 +1,9 @@ banner=Welcome to the NetBSD/@@MACHINE@@ @@VERSION@@ installation image banner banner= -banner=ACPI (Advanced Configuration and Power Interface) should work on all modern -banner=and legacy hardware. However if you do encounter a problem while booting, -banner=try disabling it and report a bug at http://www.NetBSD.org/. +banner=If you encounter a problem while booting, report a bug at +banner=https://www.NetBSD.org/. menu=Install NetBSD:boot netbsd -menu=Install NetBSD (no ACPI):boot netbsd -2 -menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12 menu=Drop to boot prompt:prompt timeout=30 clear=1 Index: src/distrib/amd64/uefi-installimage/boot.cfg.in diff -u src/distrib/amd64/uefi-installimage/boot.cfg.in:1.1 src/distrib/amd64/uefi-installimage/b
CVS commit: src
Module Name:src
Committed By: maya
Date: Sun Apr 21 11:45:09 UTC 2019
Modified Files:
src/sbin/resize_ffs: resize_ffs.c
src/sys/arch/sparc64/dev: pyro.c
src/sys/dev: dksubr.c
src/sys/dev/iscsi: iscsi_globals.h iscsi_text.c iscsi_utils.c
src/sys/dev/pci: voyager.c
src/tests/modules: t_modctl.c
Log Message:
wether -> whether
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sbin/resize_ffs/resize_ffs.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc64/dev/pyro.c
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/dksubr.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/iscsi/iscsi_globals.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/iscsi/iscsi_text.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/iscsi/iscsi_utils.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/voyager.c
cvs rdiff -u -r1.13 -r1.14 src/tests/modules/t_modctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/resize_ffs/resize_ffs.c
diff -u src/sbin/resize_ffs/resize_ffs.c:1.53 src/sbin/resize_ffs/resize_ffs.c:1.54
--- src/sbin/resize_ffs/resize_ffs.c:1.53 Mon Oct 9 05:24:26 2017
+++ src/sbin/resize_ffs/resize_ffs.c Sun Apr 21 11:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: resize_ffs.c,v 1.53 2017/10/09 05:24:26 mlelstv Exp $ */
+/* $NetBSD: resize_ffs.c,v 1.54 2019/04/21 11:45:08 maya Exp $ */
/* From sources sent on February 17, 2003 */
/*-
* As its sole author, I explicitly place this code in the public
@@ -36,7 +36,7 @@
*/
#include
-__RCSID("$NetBSD: resize_ffs.c,v 1.53 2017/10/09 05:24:26 mlelstv Exp $");
+__RCSID("$NetBSD: resize_ffs.c,v 1.54 2019/04/21 11:45:08 maya Exp $");
#include
#include
@@ -2086,7 +2086,7 @@ write_sbs(void)
}
/*
- * Check to see wether new size changes the filesystem
+ * Check to see whether new size changes the filesystem
* return exit code
*/
static int
Index: src/sys/arch/sparc64/dev/pyro.c
diff -u src/sys/arch/sparc64/dev/pyro.c:1.18 src/sys/arch/sparc64/dev/pyro.c:1.19
--- src/sys/arch/sparc64/dev/pyro.c:1.18 Thu Nov 10 06:44:35 2016
+++ src/sys/arch/sparc64/dev/pyro.c Sun Apr 21 11:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pyro.c,v 1.18 2016/11/10 06:44:35 macallan Exp $ */
+/* $NetBSD: pyro.c,v 1.19 2019/04/21 11:45:08 maya Exp $ */
/* from: $OpenBSD: pyro.c,v 1.20 2010/12/05 15:15:14 kettenis Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pyro.c,v 1.18 2016/11/10 06:44:35 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pyro.c,v 1.19 2019/04/21 11:45:08 maya Exp $");
#include
#include
@@ -497,7 +497,7 @@ pyro_bus_map(bus_space_tag_t t, bus_addr
/*
* BUS_SPACE_MAP_PREFETCHABLE causes hard hangs on schizo, so weed it
- * out for now until someone can verify wether it works on pyro
+ * out for now until someone can verify whether it works on pyro
*/
flags &= ~BUS_SPACE_MAP_PREFETCHABLE;
@@ -535,7 +535,7 @@ pyro_bus_mmap(bus_space_tag_t t, bus_add
/*
* BUS_SPACE_MAP_PREFETCHABLE causes hard hangs on schizo, so weed it
- * out for now until someone can verify wether it works on pyro
+ * out for now until someone can verify whether it works on pyro
*/
flags &= ~BUS_SPACE_MAP_PREFETCHABLE;
Index: src/sys/dev/dksubr.c
diff -u src/sys/dev/dksubr.c:1.107 src/sys/dev/dksubr.c:1.108
--- src/sys/dev/dksubr.c:1.107 Wed Mar 27 19:13:34 2019
+++ src/sys/dev/dksubr.c Sun Apr 21 11:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.107 2019/03/27 19:13:34 martin Exp $ */
+/* $NetBSD: dksubr.c,v 1.108 2019/04/21 11:45:08 maya Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.107 2019/03/27 19:13:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.108 2019/04/21 11:45:08 maya Exp $");
#include
#include
@@ -812,7 +812,7 @@ dk_dump(struct dk_softc *dksc, dev_t dev
p->p_fstype));
return ENXIO;
}
- /* Check wether dump goes to a wedge */
+ /* Check whether dump goes to a wedge */
if (dksc->sc_dkdev.dk_nwedges == 0) {
DPRINTF(DKDB_DUMP, ("%s: dump to raw\n", __func__));
return ENXIO;
Index: src/sys/dev/iscsi/iscsi_globals.h
diff -u src/sys/dev/iscsi/iscsi_globals.h:1.24 src/sys/dev/iscsi/iscsi_globals.h:1.25
--- src/sys/dev/iscsi/iscsi_globals.h:1.24 Sun Apr 21 11:26:46 2019
+++ src/sys/dev/iscsi/iscsi_globals.h Sun Apr 21 11:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_globals.h,v 1.24 2019/04/21 11:26:46 mlelstv Exp $ */
+/* $NetBSD: iscsi_globals.h,v 1.25 2019/04/21 11:45:08 maya Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -532,7 +532,7 @@ extern login_isid_t iscsi_InitiatorISID;
#ifdef ISCSI_DEBUG
extern int iscsi_debug_level; /* How much debug info to display */
-extern bool iscsi_hex_bignums; /* Wether to encode parameters in hex or base64 */
+extern bool iscsi_hex_bignums; /* W
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: maya
Date: Sat Apr 20 17:31:22 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libEGL: Makefile
src/external/mit/xorg/lib/libgbm: Makefile
Log Message:
Add missing file. Allows linking webkit-gtk (which has a process link
against libEGL/libgbm).
Thanks leot@ for the report!
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libgbm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libEGL/Makefile
diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.2 src/external/mit/xorg/lib/libEGL/Makefile:1.3
--- src/external/mit/xorg/lib/libEGL/Makefile:1.2 Thu Apr 18 10:42:25 2019
+++ src/external/mit/xorg/lib/libEGL/Makefile Sat Apr 20 17:31:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/04/18 10:42:25 maya Exp $
+# $NetBSD: Makefile,v 1.3 2019/04/20 17:31:22 maya Exp $
.include
@@ -38,13 +38,18 @@ SRCS.drivers/dri2= \
#SRCS.drivers/dri2+= \
# platform_x11_dri3.c
+.PATH: ${X11SRCDIR.Mesa}/src/util
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c
SRCS.util= \
- UTILdebug.c
-CPPFLAGS.UTILdebug.c+= -I${X11SRCDIR.Mesa}/src/util \
+ UTILdebug.c \
+ u_process.c
+
+.for file in ${SRCS.util}
+CPPFLAGS.${file}+= -I${X11SRCDIR.Mesa}/src/util \
-I${X11SRCDIR.Mesa}/src/mesa \
-I${X11SRCDIR.Mesa}/src \
-I${X11SRCDIR.Mesa}/src/gallium/include
+.endfor
.PATH: ${X11SRCDIR.Mesa}/include/EGL
INCS= \
Index: src/external/mit/xorg/lib/libgbm/Makefile
diff -u src/external/mit/xorg/lib/libgbm/Makefile:1.4 src/external/mit/xorg/lib/libgbm/Makefile:1.5
--- src/external/mit/xorg/lib/libgbm/Makefile:1.4 Tue Apr 16 21:20:51 2019
+++ src/external/mit/xorg/lib/libgbm/Makefile Sat Apr 20 17:31:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/04/16 21:20:51 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/20 17:31:22 maya Exp $
.include
@@ -15,7 +15,8 @@ SRCS.dri= \
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c
SRCS.util= \
- UTILdebug.c
+ UTILdebug.c \
+ u_process.c
CPPFLAGS.UTILdebug.c+= -I${X11SRCDIR.Mesa}/src/util \
-I${X11SRCDIR.Mesa}/src/mesa \
-I${X11SRCDIR.Mesa}/src \
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maya Date: Thu Apr 18 17:13:00 UTC 2019 Modified Files: src/sys/arch/amd64/conf: GENERIC INSTALL Log Message: Follow arm64 and provide two sizes of fonts, so a larger one is chosen for larger displays. To generate a diff of this commit: cvs rdiff -u -r1.523 -r1.524 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.94 -r1.95 src/sys/arch/amd64/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.523 src/sys/arch/amd64/conf/GENERIC:1.524 --- src/sys/arch/amd64/conf/GENERIC:1.523 Thu Apr 18 16:46:11 2019 +++ src/sys/arch/amd64/conf/GENERIC Thu Apr 18 17:13:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.523 2019/04/18 16:46:11 christos Exp $ +# $NetBSD: GENERIC,v 1.524 2019/04/18 17:13:00 maya Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.523 $" +#ident "GENERIC-$Revision: 1.524 $" maxusers 64 # estimated number of users @@ -1185,6 +1185,9 @@ pseudo-device nsmb # experimental - SM # wscons pseudo-devices pseudo-device wsmux # mouse & keyboard multiplexor pseudo-device wsfont +# Give us a choice of fonts based on monitor size +options FONT_BOLD8x16 +options FONT_BOLD16x32 # pseudo audio device driver pseudo-device pad Index: src/sys/arch/amd64/conf/INSTALL diff -u src/sys/arch/amd64/conf/INSTALL:1.94 src/sys/arch/amd64/conf/INSTALL:1.95 --- src/sys/arch/amd64/conf/INSTALL:1.94 Tue Dec 11 16:52:49 2018 +++ src/sys/arch/amd64/conf/INSTALL Thu Apr 18 17:13:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.94 2018/12/11 16:52:49 maya Exp $ +# $NetBSD: INSTALL,v 1.95 2019/04/18 17:13:00 maya Exp $ # # INSTALL - Installation kernel. # @@ -8,9 +8,11 @@ include "arch/amd64/conf/GENERIC" options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=115200 -#ident "INSTALL-$Revision: 1.94 $" +#ident "INSTALL-$Revision: 1.95 $" no options MEMORY_DISK_DYNAMIC +no options FONT_BOLD16x32 +no options FONT_BOLD8x16 options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk support options MEMORY_DISK_ROOT_SIZE=1 # size of memory disk, in blocks
CVS commit: src/external/mit/xorg/lib/libEGL
Module Name:src
Committed By: maya
Date: Thu Apr 18 10:42:25 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libEGL: Makefile
Log Message:
We use pthread functions, link against pthread.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libEGL/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libEGL/Makefile
diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.1 src/external/mit/xorg/lib/libEGL/Makefile:1.2
--- src/external/mit/xorg/lib/libEGL/Makefile:1.1 Tue Apr 16 21:21:51 2019
+++ src/external/mit/xorg/lib/libEGL/Makefile Thu Apr 18 10:42:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/04/16 21:21:51 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2019/04/18 10:42:25 maya Exp $
.include
@@ -104,7 +104,8 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
xcb-sync ${.CURDIR}/../libxcb/sync \
xcb ${.CURDIR}/../libxcb/libxcb \
expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
- m ${NETBSDSRCDIR}/lib/libm
+ m ${NETBSDSRCDIR}/lib/libm \
+ pthread ${NETBSDSRCDIR}/lib/libpthread
MKLINT=no
CVS commit: src
Module Name:src
Committed By: maya
Date: Wed Apr 17 12:30:51 UTC 2019
Modified Files:
src/lib/libperfuse: perfuse.c
src/usr.sbin/perfused: msg.c
Log Message:
fix typo
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/lib/libperfuse/perfuse.c
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/perfused/msg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/perfuse.c
diff -u src/lib/libperfuse/perfuse.c:1.41 src/lib/libperfuse/perfuse.c:1.42
--- src/lib/libperfuse/perfuse.c:1.41 Fri Nov 16 02:39:02 2018
+++ src/lib/libperfuse/perfuse.c Wed Apr 17 12:30:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: perfuse.c,v 1.41 2018/11/16 02:39:02 manu Exp $ */
+/* $NetBSD: perfuse.c,v 1.42 2019/04/17 12:30:51 maya Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -199,7 +199,7 @@ perfuse_open(const char *path, int flags
}
/*
- * Set a buffer lentgh large enough so that enough FUSE packets
+ * Set a buffer length large enough so that enough FUSE packets
* will fit.
*/
opt = perfuse_bufvar_from_env("PERFUSE_BUFSIZE",
@@ -231,7 +231,7 @@ perfuse_open(const char *path, int flags
}
/*
- * Set a buffer lentgh large enough so that enough FUSE packets
+ * Set a buffer length large enough so that enough FUSE packets
* will fit.
*/
opt = perfuse_bufvar_from_env("PERFUSE_BUFSIZE",
Index: src/usr.sbin/perfused/msg.c
diff -u src/usr.sbin/perfused/msg.c:1.24 src/usr.sbin/perfused/msg.c:1.25
--- src/usr.sbin/perfused/msg.c:1.24 Wed Oct 19 01:31:05 2016
+++ src/usr.sbin/perfused/msg.c Wed Apr 17 12:30:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.c,v 1.24 2016/10/19 01:31:05 christos Exp $ */
+/* $NetBSD: msg.c,v 1.25 2019/04/17 12:30:51 maya Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -78,7 +78,7 @@ perfused_open_sock(void)
(void)strcpy(sun.sun_path, _PATH_FUSE);
/*
- * Set a buffer lentgh large enough so that a few FUSE packets
+ * Set a buffer length large enough so that a few FUSE packets
* will fit.
*/
opt = perfuse_bufvar_from_env("PERFUSE_BUFSIZE", 16 * FUSE_BUFSIZE);
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: maya Date: Tue Apr 16 07:40:03 UTC 2019 Modified Files: src/sys/arch/riscv/include: math.h Log Message: RISC-V ELF psABI says ILP32 also defaults to 128bit long double. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/include/math.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/riscv/include/math.h diff -u src/sys/arch/riscv/include/math.h:1.2 src/sys/arch/riscv/include/math.h:1.3 --- src/sys/arch/riscv/include/math.h:1.2 Sat Apr 13 15:57:31 2019 +++ src/sys/arch/riscv/include/math.h Tue Apr 16 07:40:02 2019 @@ -1,7 +1,4 @@ -/* $NetBSD: math.h,v 1.2 2019/04/13 15:57:31 maya Exp $ */ +/* $NetBSD: math.h,v 1.3 2019/04/16 07:40:02 maya Exp $ */ #define __HAVE_NANF - -#if defined(_LP64) || defined(_KERNEL) #define __HAVE_LONG_DOUBLE 128 -#endif
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: maya Date: Tue Apr 16 07:08:52 UTC 2019 Modified Files: src/sys/arch/riscv/include: int_fmtio.h Log Message: We're now using gcc netbsd-stdint.h instead of our own definitions, so match those with the format types XXX wrong for 32bit. XXX unclear if changing the fast types was the right call To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/include/int_fmtio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/riscv/include/int_fmtio.h diff -u src/sys/arch/riscv/include/int_fmtio.h:1.2 src/sys/arch/riscv/include/int_fmtio.h:1.3 --- src/sys/arch/riscv/include/int_fmtio.h:1.2 Sat Apr 13 15:56:18 2019 +++ src/sys/arch/riscv/include/int_fmtio.h Tue Apr 16 07:08:52 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.2 2019/04/13 15:56:18 maya Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.3 2019/04/16 07:08:52 maya Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -101,7 +101,11 @@ #define PRIo8 "hho" /* uint8_t */ #define PRIo16 "ho" /* uint16_t */ #define PRIo32 "o" /* uint32_t */ +#ifdef _LP64 +#define PRIo64 "lo" /* uint64_t */ +#else #define PRIo64 "llo" /* uint64_t */ +#endif #define PRIoLEAST8 "o" /* uint_least8_t */ #define PRIoLEAST16 "hho" /* uint_least16_t */ #define PRIoLEAST32 "ho" /* uint_least32_t */ @@ -224,8 +228,8 @@ #else #define SCNdLEAST64 "lld" /* int_least64_t */ #endif -#define SCNdFAST8 "hhd" /* int_fast8_t */ -#define SCNdFAST16 "hd" /* int_fast16_t */ +#define SCNdFAST8 "d" /* int_fast8_t */ +#define SCNdFAST16 "d" /* int_fast16_t */ #define SCNdFAST32 "d" /* int_fast32_t */ #ifdef _LP64 #define SCNdFAST64 "ld" /* int_fast64_t */ @@ -252,8 +256,8 @@ #else #define SCNiLEAST64 "lli" /* int_least64_t */ #endif -#define SCNiFAST8 "hhi" /* int_fast8_t */ -#define SCNiFAST16 "hi" /* int_fast16_t */ +#define SCNiFAST8 "i" /* int_fast8_t */ +#define SCNiFAST16 "i" /* int_fast16_t */ #define SCNiFAST32 "i" /* int_fast32_t */ #ifdef _LP64 #define SCNiFAST64 "li" /* int_fast64_t */ @@ -282,8 +286,8 @@ #else #define SCNoLEAST64 "llo" /* uint_least64_t */ #endif -#define SCNoFAST8 "hho" /* uint_fast8_t */ -#define SCNoFAST16 "ho" /* uint_fast16_t */ +#define SCNoFAST8 "o" /* uint_fast8_t */ +#define SCNoFAST16 "o" /* uint_fast16_t */ #define SCNoFAST32 "o" /* uint_fast32_t */ #ifdef _LP64 #define SCNoFAST64 "lo" /* uint_fast64_t */ @@ -310,8 +314,8 @@ #else #define SCNuLEAST64 "llu" /* uint_least64_t */ #endif -#define SCNuFAST8 "hhu" /* uint_fast8_t */ -#define SCNuFAST16 "hu" /* uint_fast16_t */ +#define SCNuFAST8 "u" /* uint_fast8_t */ +#define SCNuFAST16 "u" /* uint_fast16_t */ #define SCNuFAST32 "u" /* uint_fast32_t */ #ifdef _LP64 #define SCNuFAST64 "lu" /* uint_fast64_t */ @@ -338,8 +342,8 @@ #else #define SCNxLEAST64 "llx" /* uint_least64_t */ #endif -#define SCNxFAST8 "hhx" /* uint_fast8_t */ -#define SCNxFAST16 "hx" /* uint_fast16_t */ +#define SCNxFAST8 "x" /* uint_fast8_t */ +#define SCNxFAST16 "x" /* uint_fast16_t */ #define SCNxFAST32 "x" /* uint_fast32_t */ #ifdef _LP64 #define SCNxFAST64 "lx" /* uint_fast64_t */
CVS commit: src/external/gpl3/gcc/dist/gcc/config/riscv
Module Name:src Committed By: maya Date: Mon Apr 15 21:13:36 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/gcc/config/riscv: netbsd.h Log Message: Remove unused definition. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h diff -u src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.9 src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.10 --- src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.9 Mon Apr 15 18:49:07 2019 +++ src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h Mon Apr 15 21:13:36 2019 @@ -20,9 +20,6 @@ along with this program; see the file CO the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#undef TARGET_USE_GP -#define TARGET_USE_GP 0 - #undef DRIVER_SELF_SPECS #define DRIVER_SELF_SPECS ""
CVS commit: src/libexec/ld.elf_so/arch/riscv
Module Name:src
Committed By: maya
Date: Mon Apr 15 19:13:04 UTC 2019
Modified Files:
src/libexec/ld.elf_so/arch/riscv: mdreloc.c
Log Message:
r_symndx is no longer declared, use symnum and initialize it before use.
Completes the changes in the commit:
"Replace COMBREL with just-in-time check in _rtld_relocate_nonplt_objects."
http://mail-index.netbsd.org/source-changes/2017/06/19/msg085496.html
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/libexec/ld.elf_so/arch/riscv/mdreloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/riscv/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/riscv/mdreloc.c:1.4 src/libexec/ld.elf_so/arch/riscv/mdreloc.c:1.5
--- src/libexec/ld.elf_so/arch/riscv/mdreloc.c:1.4 Thu Aug 10 19:03:26 2017
+++ src/libexec/ld.elf_so/arch/riscv/mdreloc.c Mon Apr 15 19:13:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mdreloc.c,v 1.4 2017/08/10 19:03:26 joerg Exp $ */
+/* $NetBSD: mdreloc.c,v 1.5 2019/04/15 19:13:03 maya Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.4 2017/08/10 19:03:26 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.5 2019/04/15 19:13:03 maya Exp $");
#endif /* not lint */
#include
@@ -131,7 +131,8 @@ _rtld_relocate_nonplt_objects(Obj_Entry
break;
case R_TYPE(RELATIVE): {
- def = obj->symtab + r_symndx;
+ symnum = ELF_R_SYM(rela->r_info);
+ def = obj->symtab + symnum;
Elf_Addr val = (Elf_Addr)obj->relocbase + rela->r_addend;
CVS commit: src/external/gpl3/gcc/dist/gcc/config/riscv
Module Name:src
Committed By: maya
Date: Mon Apr 15 18:49:07 UTC 2019
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/riscv: netbsd.h
Log Message:
Re-do previous:
emulate the addition of NETBSD_SUBTARGET_EXTRA_SPECS usually done by
SUBTARGET_EXTRA_SPECS (not used in risc-v) with EXTRA_SPECS.
Go back to using %(netbsd_link_spec) in our link spec, now that it's
a valid string.
Try to mimic other riscv OSes in our LINK_SPEC. they all start with
"-melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX
and a definition of LD_EMUL_SUFFIX,
let's copy the LD_EMUL_SUFFIX linux uses.
Now we can link executables.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.8 src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.9
--- src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.8 Mon Apr 15 14:19:20 2019
+++ src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h Mon Apr 15 18:49:07 2019
@@ -48,17 +48,20 @@ Boston, MA 02111-1307, USA. */
#undef LIB_SPEC
#define LIB_SPEC NETBSD_LIB_SPEC
-#undef LINK_SPEC
-#define LINK_SPEC NETBSD_LINK_SPEC_ELF
-/* Provide a LINK_SPEC appropriate for a NetBSD/mips target.
- This is a copy of LINK_SPEC from tweaked for
- the MIPS target. */
+#define EXTRA_SPECS NETBSD_SUBTARGET_EXTRA_SPECS
+
+#define LD_EMUL_SUFFIX \
+ "%{mabi=lp64d:}" \
+ "%{mabi=lp64f:_lp64f}" \
+ "%{mabi=lp64:_lp64}" \
+ "%{mabi=ilp32d:}" \
+ "%{mabi=ilp32f:_ilp32f}" \
+ "%{mabi=ilp32:_ilp32}"
#undef LINK_SPEC
-#define LINK_SPEC \
- "%{m64:-m elf64lriscv} \
- %{m32:-m elf32lriscv}" \
- NETBSD_LINK_SPEC_ELF
+#define LINK_SPEC "\
+-melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \
+%(netbsd_link_spec)"
#undef NETBSD_ENTRY_POINT
#define NETBSD_ENTRY_POINT "_start"
CVS commit: src/lib/libm
Module Name:src
Committed By: maya
Date: Mon Apr 15 18:44:26 UTC 2019
Modified Files:
src/lib/libm: Makefile
Log Message:
we need rintl (long double) to link binaries
To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.206 src/lib/libm/Makefile:1.207
--- src/lib/libm/Makefile:1.206 Fri Feb 22 18:17:22 2019
+++ src/lib/libm/Makefile Mon Apr 15 18:44:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.206 2019/02/22 18:17:22 maya Exp $
+# $NetBSD: Makefile,v 1.207 2019/04/15 18:44:26 maya Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -176,6 +176,8 @@ WARNS?=5
.elif (${LIBC_MACHINE_CPU} == "riscv")
.PATH: ${.CURDIR}/arch/riscv
+COMMON_SRCS+= s_rintl.c
+
.if ${MKSOFTFLOAT} == "no"
COMMON_SRCS += fenv.c
ARCH_SRCS = e_sqrt.S e_sqrtf.S
CVS commit: src/lib/libc/arch/riscv/gdtoa
Module Name:src Committed By: maya Date: Mon Apr 15 18:41:06 UTC 2019 Modified Files: src/lib/libc/arch/riscv/gdtoa: Makefile.inc Log Message: Cargo cult follow the other 128bit long double architecture (sparc64). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/riscv/gdtoa/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/riscv/gdtoa/Makefile.inc diff -u src/lib/libc/arch/riscv/gdtoa/Makefile.inc:1.1 src/lib/libc/arch/riscv/gdtoa/Makefile.inc:1.2 --- src/lib/libc/arch/riscv/gdtoa/Makefile.inc:1.1 Fri Sep 19 17:36:25 2014 +++ src/lib/libc/arch/riscv/gdtoa/Makefile.inc Mon Apr 15 18:41:06 2019 @@ -1,3 +1,5 @@ -# $NetBSD: Makefile.inc,v 1.1 2014/09/19 17:36:25 matt Exp $ +# $NetBSD: Makefile.inc,v 1.2 2019/04/15 18:41:06 maya Exp $ + +SRCS+= strtof.c strtold_pQ.c +SRCS+= strtopQ.c -SRCS+= strtof.c
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common
Module Name:src Committed By: maya Date: Mon Apr 15 15:58:23 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common: sanitizer_linux.cc Log Message: Provide riscv implementation. XXX this is MI, why not use it for everyone? To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 \ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.26 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.27 --- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.26 Tue Feb 5 12:56:43 2019 +++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc Mon Apr 15 15:58:23 2019 @@ -1542,6 +1542,11 @@ void GetPcSpBp(void *context, uptr *pc, *pc = _UC_MACHINE_PC(ucontext); *sp = _UC_MACHINE_SP(ucontext); *bp = ucontext->uc_mcontext.__gregs[1]; /* XXX */ +#elif defined(__riscv) && SANITIZER_NETBSD + ucontext_t *ucontext = (ucontext_t*)context; + *pc = _UC_MACHINE_PC(ucontext); + *sp = _UC_MACHINE_SP(ucontext); + *bp = _UC_MACHINE_FP(ucontext); #elif defined(__s390__) ucontext_t *ucontext = (ucontext_t*)context; # if defined(__s390x__)
CVS commit: src/share/mk
Module Name:src
Committed By: maya
Date: Mon Apr 15 15:56:40 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Don't build compat libraries for riscv, for now.
To generate a diff of this commit:
cvs rdiff -u -r1.1128 -r1.1129 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1128 src/share/mk/bsd.own.mk:1.1129
--- src/share/mk/bsd.own.mk:1.1128 Fri Apr 5 15:58:17 2019
+++ src/share/mk/bsd.own.mk Mon Apr 15 15:56:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1128 2019/04/05 15:58:17 maya Exp $
+# $NetBSD: bsd.own.mk,v 1.1129 2019/04/15 15:56:40 maya Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -962,7 +962,7 @@ MK${var}:= yes
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" \
|| ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
|| ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "aarch64" \
-|| ${MACHINE_ARCH} == "riscv64" || !empty(MACHINE_ARCH:Mearm*)
+|| !empty(MACHINE_ARCH:Mearm*)
MKCOMPAT?= yes
.else
# Don't let this build where it really isn't supported.
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64
Module Name:src
Committed By: maya
Date: Mon Apr 15 14:51:23 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64: c++config.h
defs.mk
Added Files:
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64: symver-config.h
Log Message:
more fake mknative
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/c++config.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/defs.mk
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/symver-config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/c++config.h:1.5 src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/c++config.h:1.6
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/c++config.h:1.5 Tue Jul 11 15:21:34 2017
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/c++config.h Mon Apr 15 14:51:23 2019
@@ -1,10 +1,10 @@
/* This file is automatically generated. DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp */
-/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */
+/* Generated from: NetBSD: mknative-gcc,v 1.101 2019/02/23 06:54:45 mrg Exp */
+/* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */
// Predefined symbols and macros -*- C++ -*-
-// Copyright (C) 1997-2013 Free Software Foundation, Inc.
+// Copyright (C) 1997-2017 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -34,8 +34,11 @@
#ifndef _GLIBCXX_CXX_CONFIG_H
#define _GLIBCXX_CXX_CONFIG_H 1
-// The current version of the C++ library in compressed ISO date format.
-#define __GLIBCXX__ 20141219
+// The major release number for the GCC release the C++ library belongs to.
+#define _GLIBCXX_RELEASE 7
+
+// The datestamp of the C++ library in compressed ISO date format.
+#define __GLIBCXX__ 20181206
// Macros for various attributes.
// _GLIBCXX_PURE
@@ -107,14 +110,40 @@
# endif
#endif
+#ifndef _GLIBCXX14_CONSTEXPR
+# if __cplusplus >= 201402L
+# define _GLIBCXX14_CONSTEXPR constexpr
+# else
+# define _GLIBCXX14_CONSTEXPR
+# endif
+#endif
+
+#ifndef _GLIBCXX17_CONSTEXPR
+# if __cplusplus > 201402L
+# define _GLIBCXX17_CONSTEXPR constexpr
+# else
+# define _GLIBCXX17_CONSTEXPR
+# endif
+#endif
+
+#ifndef _GLIBCXX17_INLINE
+# if __cplusplus > 201402L
+# define _GLIBCXX17_INLINE inline
+# else
+# define _GLIBCXX17_INLINE
+# endif
+#endif
+
// Macro for noexcept, to support in mixed 03/0x mode.
#ifndef _GLIBCXX_NOEXCEPT
# if __cplusplus >= 201103L
# define _GLIBCXX_NOEXCEPT noexcept
+# define _GLIBCXX_NOEXCEPT_IF(_COND) noexcept(_COND)
# define _GLIBCXX_USE_NOEXCEPT noexcept
# define _GLIBCXX_THROW(_EXC)
# else
# define _GLIBCXX_NOEXCEPT
+# define _GLIBCXX_NOEXCEPT_IF(_COND)
# define _GLIBCXX_USE_NOEXCEPT throw()
# define _GLIBCXX_THROW(_EXC) throw(_EXC)
# endif
@@ -125,14 +154,22 @@
#endif
#ifndef _GLIBCXX_THROW_OR_ABORT
-# if __EXCEPTIONS
+# if __cpp_exceptions
# define _GLIBCXX_THROW_OR_ABORT(_EXC) (throw (_EXC))
# else
# define _GLIBCXX_THROW_OR_ABORT(_EXC) (__builtin_abort())
# endif
#endif
-// Macro for extern template, ie controling template linkage via use
+#if __cpp_noexcept_function_type
+#define _GLIBCXX_NOEXCEPT_PARM , bool _NE
+#define _GLIBCXX_NOEXCEPT_QUAL noexcept (_NE)
+#else
+#define _GLIBCXX_NOEXCEPT_PARM
+#define _GLIBCXX_NOEXCEPT_QUAL
+#endif
+
+// Macro for extern template, ie controlling template linkage via use
// of extern keyword on template declaration. As documented in the g++
// manual, it inhibits all implicit instantiations and is used
// throughout the library to avoid multiple weak definitions for
@@ -154,7 +191,9 @@
namespace __profile { }
namespace __cxx1998 { }
-namespace __detail { }
+namespace __detail {
+ namespace __variant { }// C++17
+}
namespace rel_ops { }
@@ -169,10 +208,16 @@
namespace decimal { }
-namespace chrono { }
-namespace placeholders { }
-namespace regex_constants { }
-namespace this_thread { }
+namespace chrono { }// C++11
+namespace placeholders { }// C++11
+namespace regex_constants { } // C++11
+namespace this_thread { }// C++11
+inline namespace literals {// C++14
+ inline namespace chrono_literals { } // C++14
+ inline namespace complex_literals { } // C++14
+ inline namespace string_literals { } // C++14
+ inline namespace string_view_literals { } // C++17
+}
}
namespace abi { }
@@ -195,6 +240,37 @@ name
CVS commit: src/external/gpl3/gcc/dist/gcc/config/riscv
Module Name:src Committed By: maya Date: Mon Apr 15 14:19:20 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/gcc/config/riscv: netbsd.h Log Message: don't redefine types. UINTMAX_TYPE / INTMAX_TYPE are mostly not redefined on netbsd. These choices contradict typical 64bit archs, perhaps we don't want them. XXX is the SIZE_TYPE default for riscv reasonable? (long unsigned int for 64bit abi, unsigned int for 32bit abi) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h diff -u src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.7 src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.8 --- src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.7 Sat Apr 13 15:53:32 2019 +++ src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h Mon Apr 15 14:19:20 2019 @@ -62,12 +62,3 @@ Boston, MA 02111-1307, USA. */ #undef NETBSD_ENTRY_POINT #define NETBSD_ENTRY_POINT "_start" - -#undef SIZE_TYPE -#define SIZE_TYPE "long unsigned int" - -#undef INTMAX_TYPE -#define INTMAX_TYPE "long long int" - -#undef UINTMAX_TYPE -#define UINTMAX_TYPE "long long unsigned int"
