CVS commit: [netbsd-7] src
Module Name:src
Committed By: snj
Date: Thu May 14 07:11:53 UTC 2015
Modified Files:
src/distrib/amd64/cdroms [netbsd-7]: Makefile.cdrom
src/distrib/amd64/installimage [netbsd-7]: Makefile spec.inst
src/distrib/common [netbsd-7]: Makefile.dhcpcd list.dhcpcd
src/distrib/i386/cdroms [netbsd-7]: Makefile.cdrom
src/distrib/i386/installimage [netbsd-7]: Makefile spec.inst
src/distrib/sparc64/cdroms/installcd [netbsd-7]: Makefile
src/distrib/vax/cdroms/installcd [netbsd-7]: Makefile
src/usr.sbin/sysinst [netbsd-7]: msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl net.c
Removed Files:
src/distrib/common [netbsd-7]: 10-resolv.conf 99-print-sysinst
Log Message:
Pull up following revision(s) (requested by martin in ticket #759):
distrib/amd64/cdroms/Makefile.cdrom: revision 1.12
distrib/amd64/installimage/Makefile: revision 1.5
distrib/amd64/installimage/spec.inst: revision 1.2
distrib/common/10-resolv.conf: file removal
distrib/common/99-print-sysinst: file removal
distrib/common/Makefile.dhcpcd: revision 1.2
distrib/common/list.dhcpcd: revision 1.3
distrib/i386/cdroms/Makefile.cdrom: revision 1.32
distrib/i386/installimage/Makefile: revision 1.5
distrib/i386/installimage/spec.inst: revision 1.2
distrib/sparc64/cdroms/installcd/Makefile: revision 1.20
distrib/vax/cdroms/installcd/Makefile: revision 1.10
usr.sbin/sysinst/msg.mi.de: revision 1.4
usr.sbin/sysinst/msg.mi.en: revision 1.4
usr.sbin/sysinst/msg.mi.es: revision 1.4
usr.sbin/sysinst/msg.mi.fr: revision 1.4
usr.sbin/sysinst/msg.mi.pl: revision 1.4
usr.sbin/sysinst/net.c: revisions 1.5-1.8, 1.11-1.15
The dhcpcd utilties in pkgsrc require dhcpcd to be running in master mode.
So set dhcpcd to start like so, but restrict it to the configured interface
still instead of ifconfig_foo=dhcp.
--
Use the 20-resolv.conf hook from dhcpcd rather than the minimal one.
Extract configured information from resolv.conf and hostname instead
of scraping the last dhcpcd script run.
This will allow the use of DHCPv6 and IPv6RA DNS details in the future.
--
dhcpcd will already have configured the system at this point, so
don't bother writing it manually.
--
Don't prompt for hostname or domain if obtained from DHCP.
--
Change the display order so it's protocol agnostic at the top,
then IPv4 then IPv6.
--
Strip newline from the gateway correctly.
--
Show the IP6 address instead of yes
--
Fix a bogus gcc warning: dhcp_config may be used uninitialized
--
Punt custom dhcpcd hooks in favour up upstream hooks
--
For the benefit of gcc 4.5, rename a local "nl" variable to "nline",
so it doesn't collide with the global curses nl() function.
To generate a diff of this commit:
cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.4 -r1.4.2.1 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.1.22.1 src/distrib/amd64/installimage/spec.inst
cvs rdiff -u -r1.1 -r0 src/distrib/common/10-resolv.conf \
src/distrib/common/99-print-sysinst
cvs rdiff -u -r1.1 -r1.1.28.1 src/distrib/common/Makefile.dhcpcd
cvs rdiff -u -r1.2 -r1.2.24.1 src/distrib/common/list.dhcpcd
cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.4.2.2 -r1.4.2.3 src/distrib/i386/installimage/Makefile
cvs rdiff -u -r1.1 -r1.1.22.1 src/distrib/i386/installimage/spec.inst
cvs rdiff -u -r1.18.2.1 -r1.18.2.2 \
src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.8.2.1 -r1.8.2.2 src/distrib/vax/cdroms/installcd/Makefile
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/usr.sbin/sysinst/msg.mi.de \
src/usr.sbin/sysinst/msg.mi.es src/usr.sbin/sysinst/msg.mi.fr
cvs rdiff -u -r1.2.4.5 -r1.2.4.6 src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.2.4.4 -r1.2.4.5 src/usr.sbin/sysinst/msg.mi.pl
cvs rdiff -u -r1.2.4.3 -r1.2.4.4 src/usr.sbin/sysinst/net.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/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.10.2.1 src/distrib/amd64/cdroms/Makefile.cdrom:1.10.2.2
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.10.2.1 Fri Aug 15 10:23:22 2014
+++ src/distrib/amd64/cdroms/Makefile.cdrom Thu May 14 07:11:53 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.10.2.1 2014/08/15 10:23:22 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.10.2.2 2015/05/14 07:11:53 snj Exp $
.include
@@ -65,9 +65,6 @@ CDRUNTIME+= ./usr/share/misc/terminfo.cd
CDRUNTIME+= ./usr/share/locale
image_md_pre:
- ${MKDIR} cdrom/libexec/dhcpcd-hooks
- ${INSTALL} ${COPY} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
- ${INSTALL} ${COPY} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/get
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: maxv
Date: Thu May 14 07:27:14 UTC 2015
Modified Files:
src/sys/dev/pci: hifn7751.c
Log Message:
Use-after-free. Found by Brainy.
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/hifn7751.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/pci/hifn7751.c
diff -u src/sys/dev/pci/hifn7751.c:1.60 src/sys/dev/pci/hifn7751.c:1.61
--- src/sys/dev/pci/hifn7751.c:1.60 Sat May 9 21:57:56 2015
+++ src/sys/dev/pci/hifn7751.c Thu May 14 07:27:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hifn7751.c,v 1.60 2015/05/09 21:57:56 riastradh Exp $ */
+/* $NetBSD: hifn7751.c,v 1.61 2015/05/14 07:27:14 maxv Exp $ */
/* $FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */
/* $OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $ */
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.60 2015/05/09 21:57:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.61 2015/05/14 07:27:14 maxv Exp $");
#include
#include
@@ -3106,8 +3106,10 @@ hifn_mkmbuf_chain(int totlen, struct mbu
if (len == MHLEN)
M_DUP_PKTHDR(m0, mtemplate);
MCLGET(m0, M_DONTWAIT);
- if (!(m0->m_flags & M_EXT))
- m_freem(m0);
+ if (!(m0->m_flags & M_EXT)) {
+ m_freem(m0);
+ return (NULL);
+ }
len = MCLBYTES;
totlen -= len;
CVS commit: [netbsd-7] src/usr.sbin/sysinst
Module Name:src
Committed By: snj
Date: Thu May 14 07:27:47 UTC 2015
Modified Files:
src/usr.sbin/sysinst [netbsd-7]: msg.mbr.fr msg.mi.fr
Log Message:
Pull up following revision(s) (requested by martin in ticket #755):
usr.sbin/sysinst/msg.mbr.fr: revisions 1.3, 1.4
usr.sbin/sysinst/msg.mi.fr: revisions 1.6, 1.7
Several fixes for the French translation. Looks like the '{\n' break the
interface: the "No" buttons sometimes disappear.
--
Fix the French translation.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/msg.mbr.fr
cvs rdiff -u -r1.2.4.3 -r1.2.4.4 src/usr.sbin/sysinst/msg.mi.fr
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/msg.mbr.fr
diff -u src/usr.sbin/sysinst/msg.mbr.fr:1.2 src/usr.sbin/sysinst/msg.mbr.fr:1.2.4.1
--- src/usr.sbin/sysinst/msg.mbr.fr:1.2 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/msg.mbr.fr Thu May 14 07:27:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mbr.fr,v 1.2 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: msg.mbr.fr,v 1.2.4.1 2015/05/14 07:27:47 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,7 +41,7 @@ sur une partie de celui-ci.
Une installation sur une partie du disque crée une partition, ou `slice', pour
NetBSD dans le secteur de démarrage (Master Boot Record, alias MBR) de votre
disque. Une installation sur la totalité du disque est `dangereusement
-dédiée' : elle réinitialise complétement le MBR, ce qui efface tout système
+dédiée' : elle réinitialise complètement le MBR, ce qui efface tout système
d'exploitation ou données existants sur le disque. Cela rend également
impossible l'installation ultérieure d'un deuxième système d'exploitation,
sauf si vous réinstallez complètement NetBSD en utilisant uniquement une
@@ -93,7 +93,7 @@ BIOS pour votre disque.
La géométrie physique est %d cylindres %d secteurs %d têtes\n}
message biosguess
-{En utilisant les informations déja présentes sur le disque, il semble que
+{En utilisant les informations déjà présentes sur le disque, il semble que
la géométrie utilisée par le BIOS soit de %d cylindres, %d secteurs et %d têtes\n}
message realgeom
Index: src/usr.sbin/sysinst/msg.mi.fr
diff -u src/usr.sbin/sysinst/msg.mi.fr:1.2.4.3 src/usr.sbin/sysinst/msg.mi.fr:1.2.4.4
--- src/usr.sbin/sysinst/msg.mi.fr:1.2.4.3 Thu May 14 07:11:53 2015
+++ src/usr.sbin/sysinst/msg.mi.fr Thu May 14 07:27:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.2.4.3 2015/05/14 07:11:53 snj Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.2.4.4 2015/05/14 07:27:47 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -95,7 +95,8 @@ procédure va effectuer les actions suiva
(Une fois le partitionnement configuré, le système d'installation vous
demandera de confirmer avant d'appliquer toute modification sur votre
-disque dur.
+disque dur.)
+
Souhaitez-vous continuer ?
}
@@ -107,24 +108,22 @@ Vous devriez faire une sauvegarde complè
continuer la procédure de mise à jour.
Voulez-vous vraiment mettre à jour NetBSD ?
(Ceci est le dernier avertissement avant que cette
-procédure ne modifie votre disque).
+procédure ne modifie votre disque.)
}
message reinstallusure
{Décompressons maintenant les composants de NetBSD sur un disque dur
-démarrable.
-Cette procédure va rapatrier et décompresser les composants
-sur un disque démarrable déjà partitionnné.
-Elle n'inscrit pas de "label" sur le disque,
-n'installe pas de nouveaux secteurs d'amorçage et ne modifie
-pas les fichiers de configuration existants
-(Quittez et choisissez `installer' ou `mettre à jour').
-Vous devriez déjà avoir fait une installation
-ou une mise à jour avant de démarrer cette procédure !
+démarrable. Cette procédure va rapatrier et décompresser les composants
+sur un disque démarrable déjà partitionnné. Elle n'inscrit pas de "label" sur
+le disque, n'installe pas de nouveaux secteurs d'amorçage et ne modifie
+pas les fichiers de configuration existants. (Quittez et choisissez `installer'
+ou `mettre à jour' si vous désirez ces options.)
+Vous devriez déjà avoir fait une installation ou une mise à jour avant de
+démarrer cette procédure !
Voulez-vous réellement réinstaller les composants NetBSD ?
(Ceci est le dernier avertissement avant que cette procédure ne commence à
-modifier vos disques).
+modifier vos disques.)
}
message mount_failed
@@ -188,7 +187,7 @@ choix possible, arrondi au cylindre-près
Si vous choisissez "Secteurs", vous pourrez choisir précisément
les tailles.
Sur les disques modernes, la taille réelle des cylindres est variable
-et il y a peu d'intéret à aligner les partitions sur les cylindres.
+et il y a peu d'intérêt à aligner les partitions sur les cylindres.
Pour les disques plus anciens, il est recommandé de choisir des tailles
de partitions arrondies au cylindre-près, pour plus de performance.
@@ -233,
CVS commit: [netbsd-7] src/usr.sbin/sysinst
Module Name:src Committed By: snj Date: Thu May 14 07:58:50 UTC 2015 Modified Files: src/usr.sbin/sysinst [netbsd-7]: configmenu.c defs.h disks.c install.c label.c mbr.c menus.mi net.c partman.c upgrade.c util.c src/usr.sbin/sysinst/arch/arc [netbsd-7]: md.c src/usr.sbin/sysinst/arch/atari [netbsd-7]: md.c src/usr.sbin/sysinst/arch/cobalt [netbsd-7]: md.c src/usr.sbin/sysinst/arch/emips [netbsd-7]: md.c src/usr.sbin/sysinst/arch/evbarm [netbsd-7]: md.c src/usr.sbin/sysinst/arch/evbarm64 [netbsd-7]: md.c src/usr.sbin/sysinst/arch/hp300 [netbsd-7]: md.c src/usr.sbin/sysinst/arch/i386 [netbsd-7]: md.c src/usr.sbin/sysinst/arch/mac68k [netbsd-7]: md.c menus.md.de menus.md.en menus.md.es menus.md.pl src/usr.sbin/sysinst/arch/mvme68k [netbsd-7]: md.c src/usr.sbin/sysinst/arch/ofppc [netbsd-7]: md.c src/usr.sbin/sysinst/arch/prep [netbsd-7]: md.c menus.md.en src/usr.sbin/sysinst/arch/x68k [netbsd-7]: md.c Log Message: Pull up following revision(s) (requested by martin in ticket #756): usr.sbin/sysinst/arch/arc/md.c: revision 1.4 usr.sbin/sysinst/arch/atari/md.c: revision 1.3 usr.sbin/sysinst/arch/cobalt/md.c: revision 1.4 usr.sbin/sysinst/arch/emips/md.c: revision 1.3 usr.sbin/sysinst/arch/evbarm/md.c: revision 1.4 usr.sbin/sysinst/arch/evbarm64/md.c: revision 1.2 usr.sbin/sysinst/arch/hp300/md.c: revision 1.4 usr.sbin/sysinst/arch/i386/md.c: revision 1.6 usr.sbin/sysinst/arch/mac68k/md.c: revision 1.3 usr.sbin/sysinst/arch/mac68k/md.c: revision 1.4 usr.sbin/sysinst/arch/mac68k/menus.md.de: revisions 1.3, 1.4 usr.sbin/sysinst/arch/mac68k/menus.md.en: revisions 1.3, 1.4 usr.sbin/sysinst/arch/mac68k/menus.md.es: revisions 1.3, 1.4 usr.sbin/sysinst/arch/mac68k/menus.md.pl: revisions 1.3, 1.4 usr.sbin/sysinst/arch/mvme68k/md.c: revision 1.4 usr.sbin/sysinst/arch/ofppc/md.c: revision 1.3 usr.sbin/sysinst/arch/prep/md.c: revisions 1.3, 1.4 usr.sbin/sysinst/arch/prep/menus.md.en: revision 1.2 usr.sbin/sysinst/arch/x68k/md.c: revision 1.4 usr.sbin/sysinst/configmenu.c: revisions 1.4, 1.5 usr.sbin/sysinst/defs.h: revisions 1.8, 1.9 usr.sbin/sysinst/disks.c: revision 1.9 usr.sbin/sysinst/install.c: revision 1.4 usr.sbin/sysinst/label.c: revision 1.3 usr.sbin/sysinst/mbr.c: revision 1.5 usr.sbin/sysinst/menus.mi: revisions 1.9, 1.10 usr.sbin/sysinst/net.c: revisions 1.18-1.20 usr.sbin/sysinst/partman.c: revision 1.10 usr.sbin/sysinst/upgrade.c: revision 1.4 usr.sbin/sysinst/util.c: revisions 1.6, 1.7 Backout the previous incorrect fix for PR 49440 and redo it more globaly: get rid of the global "yesno", introduce utility functions "ask_yesno()" and "ask_noyes()" instead, greatly simplifying a lot of code. Pass in a pointer to the return value to various "set source" menus. -- Make it compile on architectures that do not support INET6 in sysinst -- Remove a few more (ab-)usages of "yesno". -- More (ab-)usages of "yesno" -- Make "ask_yesno" and "ask_noyes" take a const char * as argument, moving the deconst() dance into the utility functions and simplifying all callers. -- Missed a few more "yesno" in previous To generate a diff of this commit: cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/usr.sbin/sysinst/configmenu.c \ src/usr.sbin/sysinst/install.c src/usr.sbin/sysinst/upgrade.c cvs rdiff -u -r1.3.4.4 -r1.3.4.5 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.4.4.4 -r1.4.4.5 src/usr.sbin/sysinst/disks.c \ src/usr.sbin/sysinst/menus.mi cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/label.c cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/usr.sbin/sysinst/mbr.c cvs rdiff -u -r1.2.4.4 -r1.2.4.5 src/usr.sbin/sysinst/net.c cvs rdiff -u -r1.4.4.3 -r1.4.4.4 src/usr.sbin/sysinst/partman.c cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/usr.sbin/sysinst/util.c cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/usr.sbin/sysinst/arch/arc/md.c cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/atari/md.c cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/usr.sbin/sysinst/arch/cobalt/md.c cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/emips/md.c cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/evbarm/md.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/usr.sbin/sysinst/arch/evbarm64/md.c cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/usr.sbin/sysinst/arch/hp300/md.c cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/usr.sbin/sysinst/arch/i386/md.c cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/mac68k/md.c \ src/usr.sbin/sysinst/arch/mac68k/menus.md.de \ src/usr.sbin/sysinst/arch/mac68k/menus.md.en \ src/usr.sbin/sysinst/arch/mac68k/menus.md.es \ src/usr.sbin/sysinst/arch/mac68k/menus.md.pl cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/usr.sbin/sysinst/arch/mvme68k/md.c cvs rdiff -u -r1.2 -r1.2.4.1 src
CVS commit: [netbsd-7] src
Module Name:src
Committed By: snj
Date: Thu May 14 08:15:48 UTC 2015
Modified Files:
src/bin/ksh [netbsd-7]: Makefile
src/bin/ps [netbsd-7]: print.c
src/external/bsd/iscsi/dist/src/lib [netbsd-7]: parameters.c target.c
src/external/gpl2/lvm2/dist/lib/commands [netbsd-7]: toolcontext.c
src/external/gpl2/lvm2/dist/lib/format1 [netbsd-7]: import-export.c
src/gnu/dist/texinfo/makeinfo [netbsd-7]: xml.c
src/sbin/bioctl [netbsd-7]: bioctl.c
src/usr.sbin/isdn/isdnd [netbsd-7]: msghdl.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #758):
bin/ksh/Makefile: revision 1.31
bin/ps/print.c: revision 1.123
external/bsd/iscsi/dist/src/lib/parameters.c: revision 1.4
external/bsd/iscsi/dist/src/lib/target.c: revision 1.9
external/gpl2/lvm2/dist/lib/commands/toolcontext.c: revision 1.8
external/gpl2/lvm2/dist/lib/format1/import-export.c: revision 1.2
gnu/dist/texinfo/makeinfo/xml.c: revision 1.2
sbin/bioctl/bioctl.c: revision 1.16
usr.sbin/isdn/isdnd/msghdl.c: revision 1.12
Drop pointer checks that are always true.
--
Comment out impossible code.
--
Remove tautologic check.
--
Skip vendor if the string is empty.
Use l_wmesg if the string is not empty. Don't bother checking l_name for
nullness.
--
Array can't be null.
--
Show display if it is not empty.
--
Make cast warnings for clang non-fatal.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.22.1 src/bin/ksh/Makefile
cvs rdiff -u -r1.122 -r1.122.2.1 src/bin/ps/print.c
cvs rdiff -u -r1.3 -r1.3.12.1 \
src/external/bsd/iscsi/dist/src/lib/parameters.c
cvs rdiff -u -r1.7 -r1.7.26.1 src/external/bsd/iscsi/dist/src/lib/target.c
cvs rdiff -u -r1.7 -r1.7.24.1 \
src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.24.1 \
src/external/gpl2/lvm2/dist/lib/format1/import-export.c
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.38.1 src/gnu/dist/texinfo/makeinfo/xml.c
cvs rdiff -u -r1.15 -r1.15.20.1 src/sbin/bioctl/bioctl.c
cvs rdiff -u -r1.11 -r1.11.24.1 src/usr.sbin/isdn/isdnd/msghdl.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/ksh/Makefile
diff -u src/bin/ksh/Makefile:1.30 src/bin/ksh/Makefile:1.30.22.1
--- src/bin/ksh/Makefile:1.30 Sun Oct 16 17:12:11 2011
+++ src/bin/ksh/Makefile Thu May 14 08:15:47 2015
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2011/10/16 17:12:11 joerg Exp $
+# $NetBSD: Makefile,v 1.30.22.1 2015/05/14 08:15:47 snj Exp $
WARNS=3
+CWARNFLAGS.clang+= -Wno-error=cast-qual
.include
Index: src/bin/ps/print.c
diff -u src/bin/ps/print.c:1.122 src/bin/ps/print.c:1.122.2.1
--- src/bin/ps/print.c:1.122 Sun Apr 20 22:48:59 2014
+++ src/bin/ps/print.c Thu May 14 08:15:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.122 2014/04/20 22:48:59 dholland Exp $ */
+/* $NetBSD: print.c,v 1.122.2.1 2015/05/14 08:15:47 snj 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.122 2014/04/20 22:48:59 dholland Exp $");
+__RCSID("$NetBSD: print.c,v 1.122.2.1 2015/05/14 08:15:47 snj Exp $");
#endif
#endif /* not lint */
@@ -947,7 +947,7 @@ wchan(void *arg, VARENT *ve, enum mode m
l = arg;
v = ve->var;
if (l->l_wchan) {
- if (l->l_wmesg) {
+ if (l->l_wmesg[0]) {
strprintorsetwidth(v, l->l_wmesg, mode);
v->width = min(v->width, KI_WMESGLEN);
} else {
@@ -1464,7 +1464,7 @@ lname(void *arg, VARENT *ve, enum mode m
l = arg;
v = ve->var;
- if (l->l_name && l->l_name[0] != '\0') {
+ if (l->l_name[0] != '\0') {
strprintorsetwidth(v, l->l_name, mode);
v->width = min(v->width, KI_LNAMELEN);
} else {
Index: src/external/bsd/iscsi/dist/src/lib/parameters.c
diff -u src/external/bsd/iscsi/dist/src/lib/parameters.c:1.3 src/external/bsd/iscsi/dist/src/lib/parameters.c:1.3.12.1
--- src/external/bsd/iscsi/dist/src/lib/parameters.c:1.3 Thu Mar 15 04:06:54 2012
+++ src/external/bsd/iscsi/dist/src/lib/parameters.c Thu May 14 08:15:47 2015
@@ -919,12 +919,7 @@ answer:
if (strcmp(value, "?") == 0) {
iscsi_trace(TRACE_ISCSI_PARAM, "got inquiry for param \"%s\"\n", param->key);
if (param->value_l) {
-if (param->value_l->value) {
- (void) strlcpy(param->answer_tx, param->value_l->value, sizeof(param->answer_tx));
-} else {
- iscsi_err(__FILE__, __LINE__, "param \"%s\" has NULL value_l->value\n", param->key);
- param->answer_tx[0] = 0x0;
-}
+(void) strlcpy(param->answer_tx, param->value_l->value, sizeof(param->answer_tx));
} else {
iscsi_err(__FILE__, __LINE__, "param \"%s\" has NULL value_l\n", param->key);
param->answer_tx[0] = 0x0;
Index: src/external/bsd/iscsi/dist/src/lib/target.c
diff -u src/external/bsd/iscsi/dist/src/lib/target.c:1.7 src/exter
CVS commit: [netbsd-7] src/doc
Module Name:src
Committed By: snj
Date: Thu May 14 08:18:59 UTC 2015
Modified Files:
src/doc [netbsd-7]: CHANGES-7.0
Log Message:
755, 756, 758, 759
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.296 -r1.1.2.297 src/doc/CHANGES-7.0
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-7.0
diff -u src/doc/CHANGES-7.0:1.1.2.296 src/doc/CHANGES-7.0:1.1.2.297
--- src/doc/CHANGES-7.0:1.1.2.296 Thu May 14 06:44:57 2015
+++ src/doc/CHANGES-7.0 Thu May 14 08:18:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.296 2015/05/14 06:44:57 snj Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.297 2015/05/14 08:18:58 snj Exp $
A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
until the 7.0 release:
@@ -23029,3 +23029,84 @@ usr.sbin/syslogd/syslogd.c 1.120
- don't truncate IP addresses when reading syslogd.conf
[jnemeth, ticket #760]
+distrib/amd64/cdroms/Makefile.cdrom 1.12
+distrib/amd64/installimage/Makefile 1.5
+distrib/amd64/installimage/spec.inst 1.2
+distrib/common/10-resolv.conf delete
+distrib/common/99-print-sysinst delete
+distrib/common/Makefile.dhcpcd 1.2
+distrib/common/list.dhcpcd 1.3
+distrib/i386/cdroms/Makefile.cdrom 1.32
+distrib/i386/installimage/Makefile 1.5
+distrib/i386/installimage/spec.inst 1.2
+distrib/sparc64/cdroms/installcd/Makefile 1.20
+distrib/vax/cdroms/installcd/Makefile 1.10
+usr.sbin/sysinst/msg.mi.de 1.4
+usr.sbin/sysinst/msg.mi.en 1.4
+usr.sbin/sysinst/msg.mi.es 1.4
+usr.sbin/sysinst/msg.mi.fr 1.4
+usr.sbin/sysinst/msg.mi.pl 1.4
+usr.sbin/sysinst/net.c1.5-1.8, 1.11-1.16
+
+ Changes to sysinst's network handling:
+ - When enabling dhcpcd in rc.conf, set master mode, but still
+ restrict to the configured network interface.
+ - Use upstream dhcpcd hooks rather than custom ones
+ - Don't prompt for hostname or domain if already obtained via DHCP
+ - Menu improvements
+ [martin, ticket #759]
+
+usr.sbin/sysinst/msg.mbr.fr 1.3, 1.4
+usr.sbin/sysinst/msg.mi.fr 1.6, 1.7
+
+ Several fixes for the French translation. Looks like '{\n'
+ breaks the interface: the "No" buttons sometimes disappear.
+ [martin, ticket #755]
+
+usr.sbin/sysinst/arch/arc/md.c 1.4
+usr.sbin/sysinst/arch/atari/md.c 1.3
+usr.sbin/sysinst/arch/cobalt/md.c 1.4
+usr.sbin/sysinst/arch/emips/md.c 1.3
+usr.sbin/sysinst/arch/evbarm/md.c 1.4
+usr.sbin/sysinst/arch/evbarm64/md.c 1.2
+usr.sbin/sysinst/arch/hp300/md.c 1.4
+usr.sbin/sysinst/arch/i386/md.c 1.6
+usr.sbin/sysinst/arch/mac68k/md.c 1.3
+usr.sbin/sysinst/arch/mac68k/md.c 1.4
+usr.sbin/sysinst/arch/mac68k/menus.md.de 1.3, 1.4
+usr.sbin/sysinst/arch/mac68k/menus.md.en 1.3, 1.4
+usr.sbin/sysinst/arch/mac68k/menus.md.es 1.3, 1.4
+usr.sbin/sysinst/arch/mac68k/menus.md.pl 1.3, 1.4
+usr.sbin/sysinst/arch/mvme68k/md.c 1.4
+usr.sbin/sysinst/arch/ofppc/md.c 1.3
+usr.sbin/sysinst/arch/prep/md.c 1.3, 1.4
+usr.sbin/sysinst/arch/prep/menus.md.en 1.2
+usr.sbin/sysinst/arch/x68k/md.c 1.4
+usr.sbin/sysinst/configmenu.c 1.4, 1.5
+usr.sbin/sysinst/defs.h1.8, 1.9
+usr.sbin/sysinst/disks.c 1.9
+usr.sbin/sysinst/install.c 1.4
+usr.sbin/sysinst/label.c 1.3
+usr.sbin/sysinst/mbr.c1.5
+usr.sbin/sysinst/menus.mi 1.9, 1.10
+usr.sbin/sysinst/net.c1.18-1.20
+usr.sbin/sysinst/partman.c 1.10
+usr.sbin/sysinst/upgrade.c 1.4
+usr.sbin/sysinst/util.c1.6, 1.7
+
+ Get rid of the global variable "yesno" and all its (ab-)uses.
+ [martin, ticket #756]
+
+bin/ksh/Makefile1.31
+bin/ps/print.c 1.123
+external/bsd/iscsi/dist/src/lib/parameters.c 1.4
+external/bsd/iscsi/dist/src/lib/target.c 1.9
+external/gpl2/lvm2/dist/lib/commands/toolcontext.c 1.8
+external/gpl2/lvm2/dist/lib/format1/import-export.c 1.2
+gnu/dist/texinfo/makeinfo/xml.c 1.2
+sbin/bioctl/bioctl.c1.16
+usr.sbin/isdn/isdnd/msghdl.c 1.12
+
+ Fix various clang warnings.
+ [joerg, ticket #758]
+
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: jmcneill Date: Thu May 14 10:23:03 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_car.c tegra_carreg.h Log Message: enable SATA OOB clock To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/nvidia/tegra_car.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/nvidia/tegra_carreg.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/arm/nvidia/tegra_car.c diff -u src/sys/arch/arm/nvidia/tegra_car.c:1.12 src/sys/arch/arm/nvidia/tegra_car.c:1.13 --- src/sys/arch/arm/nvidia/tegra_car.c:1.12 Thu May 14 00:00:44 2015 +++ src/sys/arch/arm/nvidia/tegra_car.c Thu May 14 10:23:03 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_car.c,v 1.12 2015/05/14 00:00:44 jmcneill Exp $ */ +/* $NetBSD: tegra_car.c,v 1.13 2015/05/14 10:23:03 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill @@ -29,7 +29,7 @@ #include "locators.h" #include -__KERNEL_RCSID(0, "$NetBSD: tegra_car.c,v 1.12 2015/05/14 00:00:44 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tegra_car.c,v 1.13 2015/05/14 10:23:03 jmcneill Exp $"); #include #include @@ -494,6 +494,7 @@ tegra_car_periph_sata_enable(void) /* Turn on the clocks to SATA and de-assert resets */ bus_space_write_4(bst, bsh, CAR_CLK_ENB_W_SET_REG, CAR_DEV_W_SATACOLD); bus_space_write_4(bst, bsh, CAR_CLK_ENB_V_SET_REG, CAR_DEV_V_SATA); + bus_space_write_4(bst, bsh, CAR_CLK_ENB_V_SET_REG, CAR_DEV_V_SATA_OOB); bus_space_write_4(bst, bsh, CAR_RST_DEV_W_CLR_REG, CAR_DEV_W_SATACOLD); bus_space_write_4(bst, bsh, CAR_RST_DEV_V_CLR_REG, CAR_DEV_V_SATA); } Index: src/sys/arch/arm/nvidia/tegra_carreg.h diff -u src/sys/arch/arm/nvidia/tegra_carreg.h:1.13 src/sys/arch/arm/nvidia/tegra_carreg.h:1.14 --- src/sys/arch/arm/nvidia/tegra_carreg.h:1.13 Thu May 14 00:00:44 2015 +++ src/sys/arch/arm/nvidia/tegra_carreg.h Thu May 14 10:23:03 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_carreg.h,v 1.13 2015/05/14 00:00:44 jmcneill Exp $ */ +/* $NetBSD: tegra_carreg.h,v 1.14 2015/05/14 10:23:03 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill @@ -258,6 +258,7 @@ #define CAR_DEV_V_HDA __BIT(29) #define CAR_DEV_V_SATA __BIT(28) +#define CAR_DEV_V_SATA_OOB __BIT(27) #define CAR_DEV_V_ACTMON __BIT(23) #define CAR_DEV_V_ATOMICS __BIT(16) #define CAR_DEV_V_HDA2CODEC_2X __BIT(15)
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Thu May 14 10:44:15 UTC 2015
Modified Files:
src/lib/libedit: chartype.h map.c tty.c
Log Message:
fix warnings on ubuntu 32 bit (Miki Rozloznik)
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libedit/chartype.h
cvs rdiff -u -r1.34 -r1.35 src/lib/libedit/map.c
cvs rdiff -u -r1.46 -r1.47 src/lib/libedit/tty.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/libedit/chartype.h
diff -u src/lib/libedit/chartype.h:1.13 src/lib/libedit/chartype.h:1.14
--- src/lib/libedit/chartype.h:1.13 Sat Feb 21 21:16:19 2015
+++ src/lib/libedit/chartype.h Thu May 14 06:44:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: chartype.h,v 1.13 2015/02/22 02:16:19 christos Exp $ */
+/* $NetBSD: chartype.h,v 1.14 2015/05/14 10:44:15 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -72,6 +72,7 @@
#define FUN(prefix,rest) prefix ## _w ## rest
#define FUNW(type) type ## _w
#define TYPE(type) type ## W
+#define FCHAR "%lc"
#define FSTR "%ls"
#define STR(x) L ## x
#define UC(c) c
@@ -126,6 +127,7 @@ Width(wchar_t c)
#define FUN(prefix,rest) prefix ## _ ## rest
#define FUNW(type) type
#define TYPE(type) type
+#define FCHAR "%c"
#define FSTR "%s"
#define STR(x) x
#define UC(c) (unsigned char)(c)
Index: src/lib/libedit/map.c
diff -u src/lib/libedit/map.c:1.34 src/lib/libedit/map.c:1.35
--- src/lib/libedit/map.c:1.34 Sun Jul 6 14:15:34 2014
+++ src/lib/libedit/map.c Thu May 14 06:44:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: map.c,v 1.34 2014/07/06 18:15:34 christos Exp $ */
+/* $NetBSD: map.c,v 1.35 2015/05/14 10:44:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: map.c,v 1.34 2014/07/06 18:15:34 christos Exp $");
+__RCSID("$NetBSD: map.c,v 1.35 2015/05/14 10:44:15 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -1300,8 +1300,8 @@ map_bind(EditLine *el, int argc, const C
return 0;
default:
(void) fprintf(el->el_errfile,
-"" FSTR ": Invalid switch `%c'.\n",
-argv[0], p[1]);
+"" FSTR ": Invalid switch `" FCHAR "'.\n",
+argv[0], (Int)p[1]);
}
else
break;
Index: src/lib/libedit/tty.c
diff -u src/lib/libedit/tty.c:1.46 src/lib/libedit/tty.c:1.47
--- src/lib/libedit/tty.c:1.46 Wed Jun 18 14:52:49 2014
+++ src/lib/libedit/tty.c Thu May 14 06:44:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.46 2014/06/18 18:52:49 christos Exp $ */
+/* $NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: tty.c,v 1.46 2014/06/18 18:52:49 christos Exp $");
+__RCSID("$NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -1171,8 +1171,8 @@ tty_stty(EditLine *el, int argc __attrib
break;
default:
(void) fprintf(el->el_errfile,
- "%s: Unknown switch `%c'.\n",
- name, argv[0][1]);
+ "%s: Unknown switch `" FCHAR "'.\n",
+ name, (Int)argv[0][1]);
return -1;
}
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Thu May 14 13:53:36 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: tmux-2.0 is out. To generate a diff of this commit: cvs rdiff -u -r1.1224 -r1.1225 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1224 src/doc/3RDPARTY:1.1225 --- src/doc/3RDPARTY:1.1224 Sat May 2 15:23:49 2015 +++ src/doc/3RDPARTY Thu May 14 13:53:36 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1224 2015/05/02 15:23:49 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1225 2015/05/14 13:53:36 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1299,7 +1299,7 @@ for the import. Package: tmux Version: 1.9a -Current Vers: 1.9a +Current Vers: 2.0 Maintainer: Nicholas Marriott Archive site: http://downloads.sourceforge.net/tmux/ Home page: http://tmux.sourceforge.net/
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Thu May 14 13:59:15 UTC 2015 Modified Files: src/share/man/man9: devsw_attach.9 Log Message: Minus needs a backslash, add it. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/devsw_attach.9 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/man9/devsw_attach.9 diff -u src/share/man/man9/devsw_attach.9:1.1 src/share/man/man9/devsw_attach.9:1.2 --- src/share/man/man9/devsw_attach.9:1.1 Thu May 14 00:08:44 2015 +++ src/share/man/man9/devsw_attach.9 Thu May 14 13:59:15 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: devsw_attach.9,v 1.1 2015/05/14 00:08:44 pgoyette Exp $ +.\" $NetBSD: devsw_attach.9,v 1.2 2015/05/14 13:59:15 wiz Exp $ .\" .\" Copyright (c) 2015 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -103,14 +103,14 @@ should be set to and .Em bmajor to -.Dv -1 . +.Dv \-1 . The .Em devname , major number, and device type (character or block) must correspond to the device file which will be opened by user programs. By passing -.Dv -1 +.Dv \-1 to the function for the .Em cmajor or
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Thu May 14 13:59:57 UTC 2015 Modified Files: src/share/man/man9: module.9 Log Message: Sort sections. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/share/man/man9/module.9 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/man9/module.9 diff -u src/share/man/man9/module.9:1.35 src/share/man/man9/module.9:1.36 --- src/share/man/man9/module.9:1.35 Wed May 13 22:31:16 2015 +++ src/share/man/man9/module.9 Thu May 14 13:59:57 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: module.9,v 1.35 2015/05/13 22:31:16 pgoyette Exp $ +.\" $NetBSD: module.9,v 1.36 2015/05/14 13:59:57 wiz Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -418,6 +418,10 @@ Note however that modules loaded manuall .Xr modload 8 are never auto-unloaded. .El +.Sh EXAMPLES +A set of example modules is available in the +.Pa src/sys/modules.examples +directory hierarchy. .Sh CODE REFERENCES The core of the kernel module implementation is in .Pa sys/kern/kern_module.c @@ -446,10 +450,6 @@ needed when a module is loaded or unload deals with resolution of relocatable symbols. .Fn module_init_md is for finding modules passed in by the boot loader. -.Sh EXAMPLES -A set of example modules is available in the -.Pa src/sys/modules.examples -directory hierarchy. .Sh SEE ALSO .Xr modctl 2 , .Xr module 7 ,
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: matt Date: Thu May 14 17:15:56 UTC 2015 Modified Files: src/sys/arch/arm/arm: cpufunc_asm_pj4b.S Log Message: Use movw/movw To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm/cpufunc_asm_pj4b.S 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/arm/cpufunc_asm_pj4b.S diff -u src/sys/arch/arm/arm/cpufunc_asm_pj4b.S:1.8 src/sys/arch/arm/arm/cpufunc_asm_pj4b.S:1.9 --- src/sys/arch/arm/arm/cpufunc_asm_pj4b.S:1.8 Thu May 14 05:39:32 2015 +++ src/sys/arch/arm/arm/cpufunc_asm_pj4b.S Thu May 14 17:15:56 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc_asm_pj4b.S,v 1.8 2015/05/14 05:39:32 hsuenaga Exp $ */ +/* $NetBSD: cpufunc_asm_pj4b.S,v 1.9 2015/05/14 17:15:56 matt Exp $ */ /*** Copyright (C) Marvell International Ltd. and its affiliates @@ -41,9 +41,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI #include #include -.Lpj4b_l2_barrier_reg: - .word _C_LABEL(armadaxp_l2_barrier_reg) - /* LINTSTUB: void pj4b_cpu_sleep(int); */ ENTRY(pj4b_cpu_sleep) dsb @@ -92,7 +89,8 @@ END(pj4b_config) /* LINTSTUB: void pj4b_io_coherency_barrier(vaddr_t, paddr_t, vsize_t); */ ENTRY_NP(pj4b_io_coherency_barrier) - ldr r0, .Lpj4b_l2_barrier_reg + movw r0, #:lower16:_C_LABEL(armadaxp_l2_barrier_reg) + movt r0, #:upper16:_C_LABEL(armadaxp_l2_barrier_reg) ldr r0, [r0] @ MVSOC_MLMB_CIB_BARRIER mov r1, #1 @ MVSOC_MLMB_CIB_BARRIER_TRIGGER str r1, [r0]
CVS commit: src/sys/kern
Module Name:src
Committed By: chs
Date: Thu May 14 17:31:24 UTC 2015
Modified Files:
src/sys/kern: subr_disk.c
Log Message:
in bounds_check_with_*, reject negative block numbers and avoid
a potential overflow in calculating the size of the request.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/kern/subr_disk.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/kern/subr_disk.c
diff -u src/sys/kern/subr_disk.c:1.112 src/sys/kern/subr_disk.c:1.113
--- src/sys/kern/subr_disk.c:1.112 Tue May 5 22:09:24 2015
+++ src/sys/kern/subr_disk.c Thu May 14 17:31:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk.c,v 1.112 2015/05/05 22:09:24 mlelstv Exp $ */
+/* $NetBSD: subr_disk.c,v 1.113 2015/05/14 17:31:24 chs Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2000, 2009 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.112 2015/05/05 22:09:24 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.113 2015/05/14 17:31:24 chs Exp $");
#include
#include
@@ -314,7 +314,18 @@ bounds_check_with_mediasize(struct buf *
{
int64_t sz;
- sz = howmany(bp->b_bcount, secsize);
+ if (bp->b_blkno < 0) {
+ /* Reject negative offsets immediately. */
+ bp->b_error = EINVAL;
+ return 0;
+ }
+
+ sz = howmany((int64_t)bp->b_bcount, secsize);
+
+ /*
+ * bp->b_bcount is a 32-bit value, and we rejected a negative
+ * bp->b_blkno already, so "bp->b_blkno + sz" cannot overflow.
+ */
if (bp->b_blkno + sz > mediasize) {
sz = mediasize - bp->b_blkno;
@@ -348,6 +359,12 @@ bounds_check_with_label(struct disk *dk,
uint64_t p_size, p_offset, labelsector;
int64_t sz;
+ if (bp->b_blkno < 0) {
+ /* Reject negative offsets immediately. */
+ bp->b_error = EINVAL;
+ return -1;
+ }
+
/* Protect against division by zero. XXX: Should never happen?!?! */
if (lp->d_secpercyl == 0) {
bp->b_error = EINVAL;
@@ -363,8 +380,14 @@ bounds_check_with_label(struct disk *dk,
#endif
labelsector = (labelsector + dk->dk_labelsector) << dk->dk_blkshift;
- sz = howmany(bp->b_bcount, DEV_BSIZE);
- if ((bp->b_blkno + sz) > p_size) {
+ sz = howmany((int64_t)bp->b_bcount, DEV_BSIZE);
+
+ /*
+ * bp->b_bcount is a 32-bit value, and we rejected a negative
+ * bp->b_blkno already, so "bp->b_blkno + sz" cannot overflow.
+ */
+
+ if (bp->b_blkno + sz > p_size) {
sz = p_size - bp->b_blkno;
if (sz == 0) {
/* If exactly at end of disk, return EOF. */
CVS commit: src/sys/nfs
Module Name:src
Committed By: chs
Date: Thu May 14 17:35:54 UTC 2015
Modified Files:
src/sys/nfs: nfs_vnops.c
Log Message:
in nfs_writerpc(), avoid a signed/unsigned problem in computing the
number of bytes to back up in the uio when we need to resend a write RPC
(eg. after a server crash) on a 64-bit platform. should fix PR 35448.
To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 src/sys/nfs/nfs_vnops.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/nfs/nfs_vnops.c
diff -u src/sys/nfs/nfs_vnops.c:1.307 src/sys/nfs/nfs_vnops.c:1.308
--- src/sys/nfs/nfs_vnops.c:1.307 Mon Apr 20 23:03:09 2015
+++ src/sys/nfs/nfs_vnops.c Thu May 14 17:35:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vnops.c,v 1.307 2015/04/20 23:03:09 riastradh Exp $ */
+/* $NetBSD: nfs_vnops.c,v 1.308 2015/05/14 17:35:54 chs Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.307 2015/04/20 23:03:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.308 2015/05/14 17:35:54 chs Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -1311,7 +1311,7 @@ retry:
byte_count = 0; /* count of bytes actually written */
while (tsiz > 0) {
uint32_t datalen; /* data bytes need to be allocated in mbuf */
- uint32_t backup;
+ size_t backup;
bool stalewriteverf = false;
nfsstats.rpccnt[NFSPROC_WRITE]++;
CVS commit: src/doc
Module Name:src Committed By: joerg Date: Thu May 14 19:27:23 UTC 2015 Modified Files: src/doc: TODO.clang Log Message: The relocation relaxation issue in AES on ARM has been resolved differently, so remove hack marker. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/doc/TODO.clang Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.clang diff -u src/doc/TODO.clang:1.16 src/doc/TODO.clang:1.17 --- src/doc/TODO.clang:1.16 Thu Mar 19 19:27:14 2015 +++ src/doc/TODO.clang Thu May 14 19:27:23 2015 @@ -1,4 +1,4 @@ -$NetBSD: TODO.clang,v 1.16 2015/03/19 19:27:14 joerg Exp $ +$NetBSD: TODO.clang,v 1.17 2015/05/14 19:27:23 joerg Exp $ Hacks for the clang integration --- @@ -11,6 +11,3 @@ g++ otherwise crashes on trivial input. src/external/mit/xorg/lib/pixman uses -fno-integrated-as on ARM for the macro (ab)use. - -src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm -uses -fno-integrated-as to work-around a bug in the relaxation handling.
CVS commit: src/lib/libm/src
Module Name:src
Committed By: joerg
Date: Thu May 14 19:26:12 UTC 2015
Modified Files:
src/lib/libm/src: s_copysign.c s_copysignl.c
Log Message:
copysignl is also needed for PowerPC's double-double format, so special
case that. Functional support was added earlier, but not enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libm/src/s_copysign.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/src/s_copysignl.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/libm/src/s_copysign.c
diff -u src/lib/libm/src/s_copysign.c:1.12 src/lib/libm/src/s_copysign.c:1.13
--- src/lib/libm/src/s_copysign.c:1.12 Fri Nov 14 14:53:17 2014
+++ src/lib/libm/src/s_copysign.c Thu May 14 19:26:12 2015
@@ -12,7 +12,7 @@
#include
#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_copysign.c,v 1.12 2014/11/14 14:53:17 joerg Exp $");
+__RCSID("$NetBSD: s_copysign.c,v 1.13 2015/05/14 19:26:12 joerg Exp $");
#endif
/*
@@ -24,7 +24,7 @@ __RCSID("$NetBSD: s_copysign.c,v 1.12 20
#include "math.h"
#include "math_private.h"
-#ifndef __HAVE_LONG_DOUBLE
+#if !defined(__HAVE_LONG_DOUBLE) && !defined(__HAVE_IBM_LONGDOUBLE)
__strong_alias(_copysignl, copysign)
__weak_alias(copysignl, copysign)
#endif
Index: src/lib/libm/src/s_copysignl.c
diff -u src/lib/libm/src/s_copysignl.c:1.4 src/lib/libm/src/s_copysignl.c:1.5
--- src/lib/libm/src/s_copysignl.c:1.4 Fri Nov 14 14:53:17 2014
+++ src/lib/libm/src/s_copysignl.c Thu May 14 19:26:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: s_copysignl.c,v 1.4 2014/11/14 14:53:17 joerg Exp $ */
+/* $NetBSD: s_copysignl.c,v 1.5 2015/05/14 19:26:12 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -26,13 +26,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: s_copysignl.c,v 1.4 2014/11/14 14:53:17 joerg Exp $");
+__RCSID("$NetBSD: s_copysignl.c,v 1.5 2015/05/14 19:26:12 joerg Exp $");
#include "namespace.h"
#include
#include
-#ifdef __HAVE_LONG_DOUBLE
+#if defined(__HAVE_LONG_DOUBLE) || defined(__HAVE_IBM_LONGDOUBLE)
#ifdef __weak_alias
__weak_alias(copysignl, _copysignl)
@@ -69,4 +69,4 @@ copysignl(long double x, long double y)
return ux.ldblu_ld;
}
#endif
-#endif /* __HAVE_LONG_DOUBLE */
+#endif /* __HAVE_LONG_DOUBLE || __HAVE_IBM_LONGDOUBLE */
CVS commit: [netbsd-7] src
Module Name:src Committed By: snj Date: Fri May 15 03:44:19 UTC 2015 Modified Files: src/share/man/man4 [netbsd-7]: options.4 src/sys/arch/amd64/conf [netbsd-7]: ALL GENERIC src/sys/arch/dreamcast/conf [netbsd-7]: GENERIC src/sys/arch/epoc32/conf [netbsd-7]: GENERIC src/sys/arch/evbarm/conf [netbsd-7]: BCM5301X BCM56340 IMX23_OLINUXINO std.beagle std.kobo std.netwalker src/sys/arch/evbppc/conf [netbsd-7]: P2020DS RB800 TWRP1025 src/sys/arch/hp300/conf [netbsd-7]: GENERIC src/sys/arch/hpcsh/conf [netbsd-7]: GENERIC src/sys/arch/i386/conf [netbsd-7]: GENERIC MONOLITHIC src/sys/arch/landisk/conf [netbsd-7]: GENERIC src/sys/arch/luna68k/conf [netbsd-7]: GENERIC src/sys/arch/macppc/conf [netbsd-7]: GENERIC GENERIC_601 src/sys/arch/mmeye/conf [netbsd-7]: MMEYE_WLF src/sys/arch/news68k/conf [netbsd-7]: GENERIC src/sys/arch/sandpoint/conf [netbsd-7]: GENERIC src/sys/arch/shark/conf [netbsd-7]: GENERIC src/sys/arch/sparc/conf [netbsd-7]: GENERIC src/sys/arch/sparc64/conf [netbsd-7]: GENERIC src/sys/arch/sun3/conf [netbsd-7]: GENERIC GENERIC3X src/sys/arch/x68k/conf [netbsd-7]: GENERIC src/sys/arch/zaurus/conf [netbsd-7]: GENERIC src/sys/conf [netbsd-7]: files src/sys/kern [netbsd-7]: kern_module.c Log Message: Pull up following revision(s) (requested by jnemeth in ticket #762): share/man/man4/options.4: revision 1.442 sys/arch/amd64/conf/ALL: revision 1.18 sys/arch/amd64/conf/GENERIC: revision 1.396 sys/arch/dreamcast/conf/GENERIC: revision 1.119 sys/arch/epoc32/conf/GENERIC: revision 1.6 sys/arch/evbarm/conf/BCM5301X: revision 1.24 sys/arch/evbarm/conf/BCM56340: revision 1.9 sys/arch/evbarm/conf/IMX23_OLINUXINO: revision 1.9 sys/arch/evbarm/conf/std.beagle: revision 1.13 sys/arch/evbarm/conf/std.kobo: revision 1.2 sys/arch/evbarm/conf/std.netwalker: revision 1.10 sys/arch/evbppc/conf/P2020DS: revision 1.25 sys/arch/evbppc/conf/RB800: revision 1.30 sys/arch/evbppc/conf/TWRP1025: revision 1.18 sys/arch/hp300/conf/GENERIC: revision 1.187 sys/arch/hpcsh/conf/GENERIC: revision 1.104 sys/arch/i386/conf/GENERIC: revision 1. sys/arch/i386/conf/MONOLITHIC: revision 1.17 sys/arch/landisk/conf/GENERIC: revision 1.43 sys/arch/luna68k/conf/GENERIC: revision 1.117 sys/arch/macppc/conf/GENERIC: revision 1.316 sys/arch/macppc/conf/GENERIC_601: revision 1.5 sys/arch/mmeye/conf/MMEYE_WLF: revision 1.16 sys/arch/news68k/conf/GENERIC: revision 1.123 sys/arch/sandpoint/conf/GENERIC: revision 1.85 sys/arch/shark/conf/GENERIC: revision 1.119 sys/arch/sparc/conf/GENERIC: revision 1.246 sys/arch/sparc64/conf/GENERIC: revision 1.174 sys/arch/sun3/conf/GENERIC3X: revision 1.125 sys/arch/sun3/conf/GENERIC: revision 1.169 sys/arch/x68k/conf/GENERIC: revision 1.177 sys/arch/zaurus/conf/GENERIC: revision 1.62 sys/conf/files: revision 1.1099 sys/kern/kern_module.c: revisions 1.98, 1.99 Create an "options MODULAR_DEFAULT_AUTOLOAD" config option and add it to all kernel configs that contain "options MODULAR". This option turns on module autoloading by default (which is the current default). This allows people who don't want module autoloading on by default to disable it by simply removing/commentting this line. -- fix typo. (s/MODULE_DEFAULT_AUTOLOAD/MODULAR_DEFAULT_AUTOLOAD/) To generate a diff of this commit: cvs rdiff -u -r1.439.2.1 -r1.439.2.2 src/share/man/man4/options.4 cvs rdiff -u -r1.13.2.2 -r1.13.2.3 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.392.2.6 -r1.392.2.7 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.115.6.2 -r1.115.6.3 src/sys/arch/dreamcast/conf/GENERIC cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/arch/epoc32/conf/GENERIC cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/arch/evbarm/conf/BCM5301X cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/arch/evbarm/conf/BCM56340 cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/arch/evbarm/conf/IMX23_OLINUXINO cvs rdiff -u -r1.12 -r1.12.4.1 src/sys/arch/evbarm/conf/std.beagle cvs rdiff -u -r1.1 -r1.1.4.1 src/sys/arch/evbarm/conf/std.kobo cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/arch/evbarm/conf/std.netwalker cvs rdiff -u -r1.21 -r1.21.2.1 src/sys/arch/evbppc/conf/P2020DS cvs rdiff -u -r1.26 -r1.26.6.1 src/sys/arch/evbppc/conf/RB800 cvs rdiff -u -r1.14 -r1.14.4.1 src/sys/arch/evbppc/conf/TWRP1025 cvs rdiff -u -r1.184.2.3 -r1.184.2.4 src/sys/arch/hp300/conf/GENERIC cvs rdiff -u -r1.101.4.2 -r1.101.4.3 src/sys/arch/hpcsh/conf/GENERIC cvs rdiff -u -r1.1107.2.6 -r1.1107.2.7 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.16 -r1.16.28.1 src/sys/arch/i386/conf/MONOLITHIC cvs rdiff -u -r1.40.4.2 -r1.40.4.3 src/sys/arch/landisk/conf/GENERIC cvs rdiff
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src
Committed By: snj
Date: Fri May 15 03:50:36 UTC 2015
Modified Files:
src/sys/dev/pci [netbsd-7]: hifn7751.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #763):
sys/dev/pci/hifn7751.c: revisions 1.58, 1.61
fix mbuf leak on failure (Brainy)
--
Use-after-free. Found by Brainy.
To generate a diff of this commit:
cvs rdiff -u -r1.56.2.2 -r1.56.2.3 src/sys/dev/pci/hifn7751.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/pci/hifn7751.c
diff -u src/sys/dev/pci/hifn7751.c:1.56.2.2 src/sys/dev/pci/hifn7751.c:1.56.2.3
--- src/sys/dev/pci/hifn7751.c:1.56.2.2 Mon May 11 06:15:46 2015
+++ src/sys/dev/pci/hifn7751.c Fri May 15 03:50:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hifn7751.c,v 1.56.2.2 2015/05/11 06:15:46 msaitoh Exp $ */
+/* $NetBSD: hifn7751.c,v 1.56.2.3 2015/05/15 03:50:36 snj Exp $ */
/* $FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */
/* $OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $ */
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.56.2.2 2015/05/11 06:15:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.56.2.3 2015/05/15 03:50:36 snj Exp $");
#include
#include
@@ -3105,8 +3105,10 @@ hifn_mkmbuf_chain(int totlen, struct mbu
if (len == MHLEN)
M_DUP_PKTHDR(m0, mtemplate);
MCLGET(m0, M_DONTWAIT);
- if (!(m0->m_flags & M_EXT))
- m_freem(m0);
+ if (!(m0->m_flags & M_EXT)) {
+ m_freem(m0);
+ return (NULL);
+ }
len = MCLBYTES;
totlen -= len;
@@ -3121,6 +3123,7 @@ hifn_mkmbuf_chain(int totlen, struct mbu
}
MCLGET(m, M_DONTWAIT);
if (!(m->m_flags & M_EXT)) {
+ m_freem(m);
m_freem(m0);
return (NULL);
}
CVS commit: [netbsd-7] src/sys/sys
Module Name:src Committed By: snj Date: Fri May 15 03:52:38 UTC 2015 Modified Files: src/sys/sys [netbsd-7]: ctype_inline.h Log Message: Pull up following revision(s) (requested by joerg in ticket #767): sys/sys/ctype_inline.h: revision 1.4 Fix spelling of feature test macro. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.10.1 src/sys/sys/ctype_inline.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/sys/ctype_inline.h diff -u src/sys/sys/ctype_inline.h:1.3 src/sys/sys/ctype_inline.h:1.3.10.1 --- src/sys/sys/ctype_inline.h:1.3 Sat Apr 13 10:21:21 2013 +++ src/sys/sys/ctype_inline.h Fri May 15 03:52:38 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ctype_inline.h,v 1.3 2013/04/13 10:21:21 joerg Exp $ */ +/* $NetBSD: ctype_inline.h,v 1.3.10.1 2015/05/15 03:52:38 snj Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -66,7 +66,7 @@ #define _toupper(c) ((c) - 'a' + 'A') #endif -#if defined(_ISO_C99_SOURCE) || (_POSIX_C_SOURCE - 0) > 200112L || \ +#if defined(_ISOC99_SOURCE) || (_POSIX_C_SOURCE - 0) > 200112L || \ (_XOPEN_SOURCE - 0) > 600 || defined(_NETBSD_SOURCE) #define isblank(c) ((int)((_ctype_tab_ + 1)[(c)] & _CTYPE_BL)) #endif
CVS commit: [netbsd-7] src/external/historical/nawk/bin
Module Name:src Committed By: snj Date: Fri May 15 03:54:39 UTC 2015 Modified Files: src/external/historical/nawk/bin [netbsd-7]: awk.1 Log Message: Pull up following revision(s) (requested by wiz in ticket #768): external/historical/nawk/bin/awk.1: revision 1.4 Fix important typo, from Joachim Henke on netbsd-docs. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.4.1 src/external/historical/nawk/bin/awk.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/historical/nawk/bin/awk.1 diff -u src/external/historical/nawk/bin/awk.1:1.3 src/external/historical/nawk/bin/awk.1:1.3.4.1 --- src/external/historical/nawk/bin/awk.1:1.3 Sun Mar 23 01:29:12 2014 +++ src/external/historical/nawk/bin/awk.1 Fri May 15 03:54:39 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: awk.1,v 1.3 2014/03/23 01:29:12 dholland Exp $ +.\" $NetBSD: awk.1,v 1.3.4.1 2015/05/15 03:54:39 snj Exp $ .\" .\" Copyright (C) Lucent Technologies 1997 .\" All Rights Reserved @@ -22,7 +22,7 @@ .\" ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF .\" THIS SOFTWARE. .\" -.Dd May 25, 2008 +.Dd April 6, 2015 .Dt AWK 1 .Os .Sh NAME @@ -485,7 +485,7 @@ for the first occurrence of the regular in the target string .Ar t . If -.Ar s +.Ar t is not given, .Va $0 is used.
CVS commit: [netbsd-7] src/sys/netinet6
Module Name:src
Committed By: snj
Date: Fri May 15 03:58:06 UTC 2015
Modified Files:
src/sys/netinet6 [netbsd-7]: scope6.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #770):
sys/netinet6/scope6.c: revision 1.10
Drop impossible check.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/netinet6/scope6.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/netinet6/scope6.c
diff -u src/sys/netinet6/scope6.c:1.9 src/sys/netinet6/scope6.c:1.9.2.1
--- src/sys/netinet6/scope6.c:1.9 Sat May 17 21:26:20 2014
+++ src/sys/netinet6/scope6.c Fri May 15 03:58:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: scope6.c,v 1.9 2014/05/17 21:26:20 rmind Exp $ */
+/* $NetBSD: scope6.c,v 1.9.2.1 2015/05/15 03:58:06 snj Exp $ */
/* $KAME$ */
/*-
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.9 2014/05/17 21:26:20 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.9.2.1 2015/05/15 03:58:06 snj Exp $");
#include
#include
@@ -411,9 +411,6 @@ in6_setscope(struct in6_addr *in6, const
scope = in6_addrscope(in6);
- if (!sid->s6id_list)
- return 0;
-
switch (scope) {
case IPV6_ADDR_SCOPE_INTFACELOCAL: /* should be interface index */
zoneid = sid->s6id_list[IPV6_ADDR_SCOPE_INTFACELOCAL];
CVS commit: [netbsd-7] src/external/bsd/iscsi/dist/src/lib
Module Name:src
Committed By: snj
Date: Fri May 15 04:00:50 UTC 2015
Modified Files:
src/external/bsd/iscsi/dist/src/lib [netbsd-7]: disk.c target.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #771):
external/bsd/iscsi/dist/src/lib/disk.c: revision 1.9
external/bsd/iscsi/dist/src/lib/target.c: revision 1.8
the buffer is also used when there is no input
--
make seek test routine work with the configured block size.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.10.1 src/external/bsd/iscsi/dist/src/lib/disk.c
cvs rdiff -u -r1.7.26.1 -r1.7.26.2 \
src/external/bsd/iscsi/dist/src/lib/target.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/iscsi/dist/src/lib/disk.c
diff -u src/external/bsd/iscsi/dist/src/lib/disk.c:1.8 src/external/bsd/iscsi/dist/src/lib/disk.c:1.8.10.1
--- src/external/bsd/iscsi/dist/src/lib/disk.c:1.8 Sat Sep 29 07:18:21 2012
+++ src/external/bsd/iscsi/dist/src/lib/disk.c Fri May 15 04:00:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disk.c,v 1.8 2012/09/29 07:18:21 mlelstv Exp $ */
+/* $NetBSD: disk.c,v 1.8.10.1 2015/05/15 04:00:50 snj Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -703,33 +703,38 @@ device_set_var(const char *var, const ch
/* allocate some space for a disk/extent, using an lseek, read and
* write combination */
static int
-de_allocate(disc_de_t *de, char *filename)
+de_allocate(disc_de_t *de, char *filename, uint64_t blocklen)
{
off_t size;
- char block[DEFAULT_TARGET_BLOCK_LEN];
+ char *block;
+ block = malloc(blocklen);
size = de_getsize(de);
- if (de_lseek(de, size - sizeof(block), SEEK_SET) == -1) {
+ if (de_lseek(de, size - blocklen, SEEK_SET) == -1) {
iscsi_err(__FILE__, __LINE__,
"error seeking \"%s\"\n", filename);
+ free(block);
return 0;
}
- if (de_read(de, block, sizeof(block)) == -1) {
+ if (de_read(de, block, blocklen) == -1) {
iscsi_err(__FILE__, __LINE__,
"error reading \"%s\"\n", filename);
+ free(block);
return 0;
}
- if (de_write(de, block, sizeof(block)) == -1) {
+ if (de_write(de, block, blocklen) == -1) {
iscsi_err(__FILE__, __LINE__,
"error writing \"%s\"\n", filename);
+ free(block);
return 0;
}
+ free(block);
return 1;
}
/* allocate space as desired */
static int
-allocate_space(disc_target_t *tp)
+allocate_space(disc_target_t *tp, uint64_t blocklen)
{
uint32_t i;
@@ -737,10 +742,10 @@ allocate_space(disc_target_t *tp)
following write() in de_allocate is non-destructive */
switch(tp->de.type) {
case DE_EXTENT:
- return de_allocate(&tp->de, tp->target);
+ return de_allocate(&tp->de, tp->target, blocklen);
case DE_DEVICE:
for (i = 0 ; i < tp->de.u.dp->c ; i++) {
- if (!de_allocate(&tp->de.u.dp->xv[i], tp->target)) {
+ if (!de_allocate(&tp->de.u.dp->xv[i], tp->target, blocklen)) {
return 0;
}
}
@@ -877,7 +882,7 @@ device_init(iscsi_target_t *tgt, targv_t
"error opening \"%s\"\n", idisk->filename);
return -1;
}
- if (!(tp->flags & TARGET_READONLY) && !allocate_space(tp)) {
+ if (!(tp->flags & TARGET_READONLY) && !allocate_space(tp, idisk->blocklen)) {
iscsi_err(__FILE__, __LINE__,
"error allocating space for \"%s\"\n", tp->target);
return -1;
@@ -1514,7 +1519,7 @@ disk_read(target_session_t *sess, iscsi_
(unsigned) bytec;
args->length = (unsigned) bytec;
args->send_sg_len = 1;
- args->status = 0;
+ args->status = SCSI_SUCCESS;
args->send_buffer = ptr;
return 0;
out:
Index: src/external/bsd/iscsi/dist/src/lib/target.c
diff -u src/external/bsd/iscsi/dist/src/lib/target.c:1.7.26.1 src/external/bsd/iscsi/dist/src/lib/target.c:1.7.26.2
--- src/external/bsd/iscsi/dist/src/lib/target.c:1.7.26.1 Thu May 14 08:15:47 2015
+++ src/external/bsd/iscsi/dist/src/lib/target.c Fri May 15 04:00:50 2015
@@ -321,9 +321,7 @@ scsi_command_t(target_session_t *sess, u
* there is input data and set the length of the input to
* either scsi_cmd.trans_len or scsi_cmd.bidi_trans_len,
* depending on whether scsi_cmd.output was set. */
- if (scsi_cmd.input) {
- scsi_cmd.send_data = sess->buff;
- }
+ scsi_cmd.send_data = sess->buff;
scsi_cmd.input = 0;
cmd.scsi_cmd = &scsi_cmd;
cmd.callback = NULL;
CVS commit: [netbsd-7] src/sys
Module Name:src
Committed By: snj
Date: Fri May 15 04:12:07 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic [netbsd-7]: amlogic_genfb.c
src/sys/arch/arm/arm [netbsd-7]: disassem.c
src/sys/arch/arm/omap [netbsd-7]: am335x_cm_padconf.c sitara_cm.h
src/sys/dev/ic [netbsd-7]: i82557var.h rtl8169.c
src/sys/dev/ieee1394 [netbsd-7]: fwcrom.c
src/sys/external/bsd/dwc2 [netbsd-7]: dwc2.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #772):
sys/arch/arm/amlogic/amlogic_genfb.c: revision 1.4
sys/arch/arm/arm/disassem.c: revision 1.25
sys/arch/arm/omap/am335x_cm_padconf.c: revision 1.3
sys/arch/arm/omap/sitara_cm.h: revision 1.2
sys/dev/ic/i82557var.h: revision 1.51
sys/dev/ic/rtl8169.c: revision 1.143
sys/dev/ieee1394/fwcrom.c: revision 1.17
sys/external/bsd/dwc2/dwc2.c: revision 1.32
dwc2_hubd appears to be unused so #if 0 it in order to appease clang
--
Preserve const.
--
No reason not to make the string const.
--
Drop unnecessary-but-harmful casts.
--
Replace void * cast with proper __UNVOLATILE.
--
Preserve const.
--
amlogic_genfb_hdmi_write_4 is currently unused, mark it as such.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/arm/amlogic/amlogic_genfb.c
cvs rdiff -u -r1.24.4.2 -r1.24.4.3 src/sys/arch/arm/arm/disassem.c
cvs rdiff -u -r1.2 -r1.2.14.1 src/sys/arch/arm/omap/am335x_cm_padconf.c
cvs rdiff -u -r1.1 -r1.1.14.1 src/sys/arch/arm/omap/sitara_cm.h
cvs rdiff -u -r1.50 -r1.50.22.1 src/sys/dev/ic/i82557var.h
cvs rdiff -u -r1.140.2.1 -r1.140.2.2 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.14.4.1 -r1.14.4.2 src/sys/dev/ieee1394/fwcrom.c
cvs rdiff -u -r1.31 -r1.31.2.1 src/sys/external/bsd/dwc2/dwc2.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/amlogic/amlogic_genfb.c
diff -u src/sys/arch/arm/amlogic/amlogic_genfb.c:1.1.2.4 src/sys/arch/arm/amlogic/amlogic_genfb.c:1.1.2.5
--- src/sys/arch/arm/amlogic/amlogic_genfb.c:1.1.2.4 Mon Apr 6 01:48:25 2015
+++ src/sys/arch/arm/amlogic/amlogic_genfb.c Fri May 15 04:12:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_genfb.c,v 1.1.2.4 2015/04/06 01:48:25 snj Exp $ */
+/* $NetBSD: amlogic_genfb.c,v 1.1.2.5 2015/05/15 04:12:07 snj Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amlogic_genfb.c,v 1.1.2.4 2015/04/06 01:48:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_genfb.c,v 1.1.2.5 2015/05/15 04:12:07 snj Exp $");
#include
#include
@@ -137,7 +137,7 @@ amlogic_genfb_hdmi_read_4(struct amlogic
return bus_space_read_4(sc->sc_bst, sc->sc_hdmi_bsh, HDMI_DATA_REG);
}
-static inline void
+static __unused inline void
amlogic_genfb_hdmi_write_4(struct amlogic_genfb_softc *sc, uint32_t addr,
uint32_t data)
{
Index: src/sys/arch/arm/arm/disassem.c
diff -u src/sys/arch/arm/arm/disassem.c:1.24.4.2 src/sys/arch/arm/arm/disassem.c:1.24.4.3
--- src/sys/arch/arm/arm/disassem.c:1.24.4.2 Sun Jan 4 11:43:53 2015
+++ src/sys/arch/arm/arm/disassem.c Fri May 15 04:12:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disassem.c,v 1.24.4.2 2015/01/04 11:43:53 martin Exp $ */
+/* $NetBSD: disassem.c,v 1.24.4.3 2015/05/15 04:12:07 snj Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -49,7 +49,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.24.4.2 2015/01/04 11:43:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.24.4.3 2015/05/15 04:12:07 snj Exp $");
#include
@@ -321,7 +321,7 @@ static void disassemble_printaddr(u_int
vaddr_t
disasm(const disasm_interface_t *di, vaddr_t loc, int altfmt)
{
- struct arm32_insn *i_ptr = (struct arm32_insn *)&arm32_i;
+ const struct arm32_insn *i_ptr = (const struct arm32_insn *)&arm32_i;
u_int insn;
int matchp;
Index: src/sys/arch/arm/omap/am335x_cm_padconf.c
diff -u src/sys/arch/arm/omap/am335x_cm_padconf.c:1.2 src/sys/arch/arm/omap/am335x_cm_padconf.c:1.2.14.1
--- src/sys/arch/arm/omap/am335x_cm_padconf.c:1.2 Mon May 6 18:53:40 2013
+++ src/sys/arch/arm/omap/am335x_cm_padconf.c Fri May 15 04:12:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: am335x_cm_padconf.c,v 1.2 2013/05/06 18:53:40 rkujawa Exp $ */
+/* $NetBSD: am335x_cm_padconf.c,v 1.2.14.1 2015/05/15 04:12:07 snj Exp $ */
/*-
* Copyright (c) 2012 Damjan Marion
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: am335x_cm_padconf.c,v 1.2 2013/05/06 18:53:40 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am335x_cm_padconf.c,v 1.2.14.1 2015/05/15 04:12:07 snj Exp $");
#include
#include
@@ -295,8 +295,8 @@ const struct sitara_cm_padconf ti_padcon
const struct sitara_cm_device sitara_cm_dev = {
.padconf_muxmode_mask = 0x7,
.padconf_sate_mask = 0x78,
- .padstate = (struct sitara_cm_padstate *) &ti_padstate_devmap,
- .padconf = (struct sitar
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Fri May 15 04:16:23 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 762, 763, 767, 768, 770-772 To generate a diff of this commit: cvs rdiff -u -r1.1.2.297 -r1.1.2.298 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.297 src/doc/CHANGES-7.0:1.1.2.298 --- src/doc/CHANGES-7.0:1.1.2.297 Thu May 14 08:18:58 2015 +++ src/doc/CHANGES-7.0 Fri May 15 04:16:23 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.297 2015/05/14 08:18:58 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.298 2015/05/15 04:16:23 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -23110,3 +23110,89 @@ usr.sbin/isdn/isdnd/msghdl.c 1.12 Fix various clang warnings. [joerg, ticket #758] +share/man/man4/options.4 1.442 +sys/arch/amd64/conf/ALL1.18 +sys/arch/amd64/conf/GENERIC 1.396 +sys/arch/dreamcast/conf/GENERIC 1.119 +sys/arch/epoc32/conf/GENERIC 1.6 +sys/arch/evbarm/conf/BCM5301X 1.24 +sys/arch/evbarm/conf/BCM56340 1.9 +sys/arch/evbarm/conf/IMX23_OLINUXINO 1.9 +sys/arch/evbarm/conf/std.beagle 1.13 +sys/arch/evbarm/conf/std.cubie 1.4 +sys/arch/evbarm/conf/std.kobo 1.2 +sys/arch/evbarm/conf/std.netwalker 1.10 +sys/arch/evbarm/conf/std.odroid 1.4 +sys/arch/evbarm/conf/std.rpi 1.15 +sys/arch/evbppc/conf/P2020DS 1.25 +sys/arch/evbppc/conf/RB800 1.30 +sys/arch/evbppc/conf/TWRP1025 1.18 +sys/arch/hp300/conf/GENERIC 1.187 +sys/arch/hpcsh/conf/GENERIC 1.104 +sys/arch/i386/conf/GENERIC 1. +sys/arch/i386/conf/MONOLITHIC 1.17 +sys/arch/landisk/conf/GENERIC 1.43 +sys/arch/luna68k/conf/GENERIC 1.117 +sys/arch/macppc/conf/GENERIC 1.316 +sys/arch/macppc/conf/GENERIC_601 1.5 +sys/arch/mmeye/conf/MMEYE_WLF 1.16 +sys/arch/news68k/conf/GENERIC 1.123 +sys/arch/sandpoint/conf/GENERIC 1.85 +sys/arch/shark/conf/GENERIC 1.119 +sys/arch/sparc/conf/GENERIC 1.246 +sys/arch/sparc64/conf/GENERIC 1.174 +sys/arch/sun3/conf/GENERIC 1.169 +sys/arch/sun3/conf/GENERIC3X 1.125 +sys/arch/x68k/conf/GENERIC 1.177 +sys/arch/zaurus/conf/GENERIC 1.62 +sys/conf/files 1.1099 +sys/kern/kern_module.c1.98, 1.99 + + Create an "options MODULAR_DEFAULT_AUTOLOAD" config option and add + it to all kernel configs that contain "options MODULAR". This + option turns on module autoloading by default (which is the current + default). This allows people who don't want module autoloading on + by default to disable it by simply removing/commentting this line. + [jnemeth, ticket #762] + +sys/dev/pci/hifn7751.c1.58, 1.61 + + Fix a memory leak and a use-after-free. + [maxv, ticket #763] + +sys/sys/ctype_inline.h1.4 + + Fix spelling of feature test macro: _ISOC99_SOURCE, not + _ISO_C99_SOURCE. + [joerg, ticket #767] + +external/historical/nawk/bin/awk.1 1.4 + + Fix important typo. + [wiz, ticket #768] + +sys/netinet6/scope6.c1.10 + + Drop impossible check. + [joerg, ticket #770] + +external/bsd/iscsi/dist/src/lib/disk.c 1.9 +external/bsd/iscsi/dist/src/lib/target.c 1.8 + + iscsi: + - Set scsi_cmd.send_data unconditionally. + - Make seek test routine work with the configured block size. + [joerg, ticket #771] + +sys/arch/arm/amlogic/amlogic_genfb.c 1.4 +sys/arch/arm/arm/disassem.c 1.25 +sys/arch/arm/omap/am335x_cm_padconf.c 1.3 +sys/arch/arm/omap/sitara_cm.h 1.2 +sys/dev/ic/i82557var.h1.51 +sys/dev/ic/rtl8169.c1.143 +sys/dev/ieee1394/fwcrom.c 1.17 +sys/external/bsd/dwc2/dwc2.c 1.32 + + Fix various clang warnings. + [joerg, ticket #772] +
CVS commit: src/etc/etc.evbarm
Module Name:src
Committed By: matt
Date: Fri May 15 06:11:06 UTC 2015
Modified Files:
src/etc/etc.evbarm: Makefile.inc
Log Message:
alphabetize armv7 kernels
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/etc/etc.evbarm/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/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.73 src/etc/etc.evbarm/Makefile.inc:1.74
--- src/etc/etc.evbarm/Makefile.inc:1.73 Thu May 14 00:59:03 2015
+++ src/etc/etc.evbarm/Makefile.inc Fri May 15 06:11:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.73 2015/05/14 00:59:03 jmcneill Exp $
+# $NetBSD: Makefile.inc,v 1.74 2015/05/15 06:11:06 matt Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -76,6 +76,8 @@ KERNEL_SETS.armv6hf+= RPI2
EVBARM_BOARDS.armv6+= TISDP2420
EVBARM_BOARDS.armv6hf+= TISDP2420
#EVBARM_BOARDS.armv6+= TISDP2430
+EVBARM_BOARDS.armv7+= ALLWINNER_A80
+EVBARM_BOARDS.armv7hf+= ALLWINNER_A80
EVBARM_BOARDS.armv7+= ARMADAXP
EVBARM_BOARDS.armv7hf+= ARMADAXP
EVBARM_BOARDS.armv7+= BCM5301X
@@ -96,11 +98,11 @@ EVBARM_BOARDS.armv7+= CUBIETRUCK
EVBARM_BOARDS.armv7hf+= CUBIETRUCK
EVBARM_BOARDS.armv7+= HUMMINGBIRD_A31
EVBARM_BOARDS.armv7hf+= HUMMINGBIRD_A31
-EVBARM_BOARDS.armv7+= ALLWINNER_A80
-EVBARM_BOARDS.armv7hf+= ALLWINNER_A80
#EVBARM_BOARDS.armv7+= IGEPV2
EVBARM_BOARDS.armv7+= JETSONTK1
EVBARM_BOARDS.armv7hf+= JETSONTK1
+EVBARM_BOARDS.armv7+= KOBO
+EVBARM_BOARDS.armv7hf+= KOBO
EVBARM_BOARDS.armv7+= MIRABOX
EVBARM_BOARDS.armv7hf+= MIRABOX
#EVBARM_BOARDS.armv7+= N900
@@ -116,8 +118,6 @@ EVBARM_BOARDS.armv7+= PANDABOARD
EVBARM_BOARDS.armv7hf+= PANDABOARD
EVBARM_BOARDS.armv7+= RPI2
EVBARM_BOARDS.armv7hf+= RPI2
-EVBARM_BOARDS.armv7+= KOBO
-EVBARM_BOARDS.armv7hf+= KOBO
.endif
IMAGE.rel= ${RELEASEDIR}/${RELEASEMACHINEDIR}
CVS commit: src/sys/modules/examples
Module Name:src Committed By: pgoyette Date: Fri May 15 06:21:12 UTC 2015 Modified Files: src/sys/modules/examples: README Log Message: Even though this isn't a man page, it looks like one. So sort the SEE ALSO section accordingly. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/examples/README 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/examples/README diff -u src/sys/modules/examples/README:1.2 src/sys/modules/examples/README:1.3 --- src/sys/modules/examples/README:1.2 Wed May 13 22:41:48 2015 +++ src/sys/modules/examples/README Fri May 15 06:21:12 2015 @@ -1,4 +1,4 @@ - $NetBSD: README,v 1.2 2015/05/13 22:41:48 pgoyette Exp $ + $NetBSD: README,v 1.3 2015/05/15 06:21:12 pgoyette Exp $ Kernel Developer's Manual @@ -43,8 +43,8 @@ DESCRIPTION should not conflict with a real device. SEE ALSO - lua(9lua), modctl(2), modload(8), module(7), module(9), modstat(8), - modunload(8) + modctl(2), module(7), modload(8), modstat(8), modunload(8), module(9), + intro(9lua) HISTORY An example of handling incoming properties first appeared in NetBSD 5.0
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: matt
Date: Fri May 15 06:27:48 UTC 2015
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Update list of armv7 install kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/evbarm/instkernel/instkernel/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/evbarm/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.25 src/distrib/evbarm/instkernel/instkernel/Makefile:1.26
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.25 Wed Nov 5 13:53:22 2014
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Fri May 15 06:27:48 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/11/05 13:53:22 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2015/05/15 06:27:48 matt Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -44,10 +44,26 @@ MDSETTARGETS+= RPI_INSTALL ${SSHRAMDIS
${MACHINE_ARCH} == "earmv7" || \
${MACHINE_ARCH} == "earmv7hf"
# Little endian (any ABI) ARMv7 platforms.
-MDSETTARGETS+= BCM5301X_INSTALL ${RAMDISK} - \
+MDSETTARGETS+= \
+ ALLWINNER_A80_INSTALL ${RAMDISK} - \
+ ARMADAXP_INSTALL ${RAMDISK} - \
+ BCM5301X_INSTALL ${RAMDISK} - \
BEAGLEBONE_INSTALL ${RAMDISK} - \
+ BEAGLEBOARD_INSTALL ${RAMDISK} - \
+ BEAGLEBOARDXM_INSTALL ${RAMDISK} - \
+ BPI_INSTALL ${RAMDISK} - \
CUBIEBOARD_INSTALL ${RAMDISK} - \
- CUBIETRUCK_INSTALL ${RAMDISK} -
+ CUBIETRUCK_INSTALL ${RAMDISK} - \
+ HUMMINGBIRD_A31_INSTALL ${RAMDISK} - \
+ JETSONTK1_INSTALL ${RAMDISK} - \
+ KOBO_INSTALL ${RAMDISK} - \
+ MIRABOX_INSTALL ${RAMDISK} - \
+ NETWALKER_INSTALL ${RAMDISK} - \
+ ODROID-C1_INSTALL ${RAMDISK} - \
+ OMAP5EVM_INSTALL ${RAMDISK} - \
+ OVERO_INSTALL ${RAMDISK} - \
+ PANDABOARD_INSTALL ${RAMDISK} - \
+ RPI2_INSTALL ${SSHRAMDISK} -
.endif
MDSET_RELEASEDIR= installation/instkernel
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: matt
Date: Fri May 15 06:50:41 UTC 2015
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Don't keep two list of build kernels. include etc/etc.evbarm/Makefile.inc
and use it to generate list of MDSETTARGETS.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/evbarm/instkernel/instkernel/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/evbarm/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.26 src/distrib/evbarm/instkernel/instkernel/Makefile:1.27
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.26 Fri May 15 06:27:48 2015
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Fri May 15 06:50:41 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2015/05/15 06:27:48 matt Exp $
+# $NetBSD: Makefile,v 1.27 2015/05/15 06:50:41 matt Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,63 +8,16 @@ RAMDISK= ${RAMDISKDIR}/ramdisk.fs
SSHRAMDISKDIR!= cd ${.CURDIR}/../sshramdisk && ${PRINTOBJDIR}
SSHRAMDISK= ${SSHRAMDISKDIR}/sshramdisk.fs
-.if ${MACHINE_ARCH} == "arm"
-# Little endian platforms.
-MDSETTARGETS= ADI_BRH_INSTALL ${RAMDISK} - \
- CP3100_INSTALL ${RAMDISK} - \
- GEMINI_INSTALL ${RAMDISK} - \
- GUMSTIX_INSTALL ${RAMDISK} - \
- INTEGRATOR_INSTALL ${RAMDISK} - \
- IQ80310_INSTALL ${RAMDISK} - \
- IQ80321_INSTALL ${RAMDISK} - \
- MINI2440_INSTALL ${RAMDISK} - \
- OPENRD_INSTALL ${RAMDISK} - \
- TS7200_INSTALL ${RAMDISK} - \
- TEAMASA_NPWR_INSTALL ${RAMDISK} - \
- KUROBOX_PRO_INSTALL ${RAMDISK} -
-.elif ${MACHINE_ARCH} == "armeb"
-# Big endian platforms.
-MDSETTARGETS= ADI_BRH_INSTALL ${RAMDISK} -
-.endif
-
-.if \
-${MACHINE_ARCH} == "arm" || \
-${MACHINE_ARCH} == "earm" || \
-${MACHINE_ARCH} == "earmhf" || \
-${MACHINE_ARCH} == "earmv6" || \
-${MACHINE_ARCH} == "earmv6hf"
-# Little endian (any ABI) ARMv6 platforms.
-MDSETTARGETS+= RPI_INSTALL ${SSHRAMDISK} -
-.endif
+.include "${NETBSDSRCDIR}/etc/etc.evbarm/Makefile.inc"
-.if \
-${MACHINE_ARCH} == "arm" || \
-${MACHINE_ARCH} == "earm" || \
-${MACHINE_ARCH} == "earmhf" || \
-${MACHINE_ARCH} == "earmv7" || \
-${MACHINE_ARCH} == "earmv7hf"
-# Little endian (any ABI) ARMv7 platforms.
-MDSETTARGETS+= \
- ALLWINNER_A80_INSTALL ${RAMDISK} - \
- ARMADAXP_INSTALL ${RAMDISK} - \
- BCM5301X_INSTALL ${RAMDISK} - \
- BEAGLEBONE_INSTALL ${RAMDISK} - \
- BEAGLEBOARD_INSTALL ${RAMDISK} - \
- BEAGLEBOARDXM_INSTALL ${RAMDISK} - \
- BPI_INSTALL ${RAMDISK} - \
- CUBIEBOARD_INSTALL ${RAMDISK} - \
- CUBIETRUCK_INSTALL ${RAMDISK} - \
- HUMMINGBIRD_A31_INSTALL ${RAMDISK} - \
- JETSONTK1_INSTALL ${RAMDISK} - \
- KOBO_INSTALL ${RAMDISK} - \
- MIRABOX_INSTALL ${RAMDISK} - \
- NETWALKER_INSTALL ${RAMDISK} - \
- ODROID-C1_INSTALL ${RAMDISK} - \
- OMAP5EVM_INSTALL ${RAMDISK} - \
- OVERO_INSTALL ${RAMDISK} - \
- PANDABOARD_INSTALL ${RAMDISK} - \
- RPI2_INSTALL ${SSHRAMDISK} -
+MDSETTARGETS=
+.for i in ${BUILD_KERNELS:M*_INSTALL}
+.if ${i} == "RPI_INSTALL" || ${i} == "RPI2_INSTALL"
+MDSETTARGETS+= ${i} ${SSHRAMDISK} -
+.else
+MDSETTARGETS+= ${i} ${RAMDISK} -
.endif
+.endfor
MDSET_RELEASEDIR= installation/instkernel
@@ -72,7 +25,6 @@ MDSET_SUFFIXES.-= srec create-srec bin
create-srec= ${OBJCOPY} -O srec ${.TARGET:R} ${.TARGET}
create-bin= ${OBJCOPY} -O binary ${.TARGET:R} ${.TARGET}
-
.include "${DISTRIBDIR}/common/Makefile.mdset"
.include
CVS commit: src/etc/etc.evbarm
Module Name:src
Committed By: matt
Date: Fri May 15 06:51:24 UTC 2015
Modified Files:
src/etc/etc.evbarm: Makefile.inc
Log Message:
More sorting.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/etc/etc.evbarm/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/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.74 src/etc/etc.evbarm/Makefile.inc:1.75
--- src/etc/etc.evbarm/Makefile.inc:1.74 Fri May 15 06:11:06 2015
+++ src/etc/etc.evbarm/Makefile.inc Fri May 15 06:51:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.74 2015/05/15 06:11:06 matt Exp $
+# $NetBSD: Makefile.inc,v 1.75 2015/05/15 06:51:24 matt Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -17,6 +17,8 @@ EVBARM_BOARDS.${i}=
KERNEL_SETS.armv4+= IXM1200
EVBARM_BOARDS.xscale+= ADI_BRH
KERNEL_SETS.xscale+= NSLU2
+EVBARM_BOARDS.armv7+= ALLWINNER_A80
+EVBARM_BOARDS.armv7hf+= ALLWINNER_A80
EVBARM_BOARDS.armv7+= BCM5301X
EVBARM_BOARDS.armv7hf+= BCM5301X
#EVBARM_BOARDS.armv7+= BCM56340
@@ -29,8 +31,6 @@ EVBARM_BOARDS.armv7+= CUBIETRUCK
EVBARM_BOARDS.armv7hf+= CUBIETRUCK
EVBARM_BOARDS.armv7+= HUMMINGBIRD_A31
EVBARM_BOARDS.armv7hf+= HUMMINGBIRD_A31
-EVBARM_BOARDS.armv7+= ALLWINNER_A80
-EVBARM_BOARDS.armv7hf+= ALLWINNER_A80
.else
# little endian boards
#EVBARM_BOARDS.armv4+= ARMADILLO210
CVS commit: src
Module Name:src
Committed By: ozaki-r
Date: Fri May 15 06:58:59 UTC 2015
Modified Files:
src/lib/libc/net: getnameinfo.c
src/sbin/route: Makefile
src/usr.bin/netstat: Makefile
Log Message:
Fix rump.{netstat,route} shows host's interface names in link local addresses
Interface names of IPv6 link local addresses are resolved
by getnameinfo(3). So we need to rump-ify it as well as
if_indextoname and getifaddrs.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/lib/libc/net/getnameinfo.c
cvs rdiff -u -r1.27 -r1.28 src/sbin/route/Makefile
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/netstat/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/libc/net/getnameinfo.c
diff -u src/lib/libc/net/getnameinfo.c:1.54 src/lib/libc/net/getnameinfo.c:1.55
--- src/lib/libc/net/getnameinfo.c:1.54 Fri Aug 16 15:27:12 2013
+++ src/lib/libc/net/getnameinfo.c Fri May 15 06:58:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: getnameinfo.c,v 1.54 2013/08/16 15:27:12 christos Exp $ */
+/* $NetBSD: getnameinfo.c,v 1.55 2015/05/15 06:58:59 ozaki-r Exp $ */
/* $KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $ */
/*
@@ -47,10 +47,12 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getnameinfo.c,v 1.54 2013/08/16 15:27:12 christos Exp $");
+__RCSID("$NetBSD: getnameinfo.c,v 1.55 2015/05/15 06:58:59 ozaki-r Exp $");
#endif /* LIBC_SCCS and not lint */
+#ifndef RUMP_ACTION
#include "namespace.h"
+#endif
#include
#include
#include
Index: src/sbin/route/Makefile
diff -u src/sbin/route/Makefile:1.27 src/sbin/route/Makefile:1.28
--- src/sbin/route/Makefile:1.27 Wed Apr 22 03:07:55 2015
+++ src/sbin/route/Makefile Fri May 15 06:58:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/04/22 03:07:55 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.28 2015/05/15 06:58:59 ozaki-r Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include
@@ -8,7 +8,7 @@ MAN= route.8
SRCS= route.c show.c keywords.c rtutil.c
.PATH: ${.CURDIR}/../../lib/libc/net
-RUMPSRCS= if_indextoname.c getifaddrs.c
+RUMPSRCS= if_indextoname.c getifaddrs.c getnameinfo.c
.if (${MKRUMP} != "no")
CPPFLAGS+= -DRUMP_ACTION
.endif
Index: src/usr.bin/netstat/Makefile
diff -u src/usr.bin/netstat/Makefile:1.41 src/usr.bin/netstat/Makefile:1.42
--- src/usr.bin/netstat/Makefile:1.41 Sat Feb 7 19:36:06 2015
+++ src/usr.bin/netstat/Makefile Fri May 15 06:58:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2015/02/07 19:36:06 christos Exp $
+# $NetBSD: Makefile,v 1.42 2015/05/15 06:58:59 ozaki-r Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/12/93
.include
@@ -25,7 +25,7 @@ COPTS.show.c += -Wno-format-nonliteral
.PATH: ${.CURDIR}/../../sbin/route
CPPFLAGS+= -DRUMP_ACTION
RUMPSRCS+= sysctlbyname.c sysctlgetmibinfo.c sysctlnametomib.c
-RUMPSRCS+= if_indextoname.c getifaddrs.c
+RUMPSRCS+= if_indextoname.c getifaddrs.c getnameinfo.c
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6
