d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge HEAD@r272834

Browse Source
This commit is contained in:
melifaro 2014-10-09 18:03:12 +00:00
parent 74b507651f
commit 2cf773b92f
7 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.inc1
View File

@ -315,7 +315,7 @@ X${COMPILER}?= ${CROSS_COMPILER_PREFIX}${${COMPILER}}
X${COMPILER}?= ${${COMPILER}}
.endif
.endfor
XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB STRINGS
XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS
.for BINUTIL in ${XBINUTILS}
.if defined(CROSS_BINUTILS_PREFIX)
X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
@ -327,7 +327,8 @@ WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \
CPP="${XCPP} ${XFLAGS}" \
AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \
RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
SIZE="${XSIZE}"
.if ${XCC:M/*}
XFLAGS= --sysroot=${WORLDTMP}

11
cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
View File

@ -21,7 +21,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd October 24, 2013
.Dd October 8, 2014
.Dt LOCKSTAT 1
.Os
.Sh NAME
@ -238,10 +238,11 @@ Average duration of the events in nanoseconds, as appropriate for the event.
For the profiling event, duration means interrupt latency.
.It Lock
Address of the lock; displayed symbolically if possible.
.It CPU+PIL
CPU plus processor interrupt level (PIL).
For example, if CPU 4 is interrupted while at PIL 6, this will be reported as
cpu[4]+6.
.It CPU+Pri_Class
CPU plus the priority class of the interrupted thread.
For example, if CPU 4 is interrupted while running a timeshare thread, this
will be reported as
.Ql cpu[4]+TShar .
.It Caller
Address of the caller; displayed symbolically if possible.
.El

17
lib/libcrypt/crypt.c
View File

@ -37,24 +37,26 @@ __FBSDID("$FreeBSD$");
#include "crypt.h"
/*
* List of supported crypt(3) formats. The first element in the list will
* be the default.
* List of supported crypt(3) formats.
*
* The default algorithm is the last entry in the list (second-to-last
* array element since the last is a sentinel). The reason for placing
* the default last rather than first is that DES needs to be at the
* bottom for the algorithm guessing logic in crypt(3) to work correctly,
* and it needs to be the default for backward compatibility.
*/
static const struct crypt_format {
const char *const name;
char *(*const func)(const char *, const char *);
const char *const magic;
} crypt_formats[] = {
/* default format */
{ "sha512", crypt_sha512, "$6$" },
/* other supported formats */
{ "md5", crypt_md5, "$1$" },
#ifdef HAS_BLOWFISH
{ "blf", crypt_blowfish, "$2" },
#endif
{ "nth", crypt_nthash, "$3$" },
{ "sha256", crypt_sha256, "$5$" },
{ "sha512", crypt_sha512, "$6$" },
#ifdef HAS_DES
{ "des", crypt_des, "_" },
#endif
@ -63,7 +65,8 @@ static const struct crypt_format {
{ NULL, NULL, NULL }
};
static const struct crypt_format *crypt_format = &crypt_formats[0];
static const struct crypt_format *crypt_format =
&crypt_formats[(sizeof crypt_formats / sizeof *crypt_formats) - 2];
#define DES_SALT_ALPHABET \
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"

8
sys/conf/kern.mk
View File

@ -33,7 +33,13 @@ CWARNEXTRA?= -Wno-error-tautological-compare -Wno-error-empty-body \
.endif
.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40300
CWARNEXTRA?= -Wno-inline
# Catch-all for all the things that are in our tree, but for which we're
# not yet ready for this compiler. Note: we likely only really "support"
# building with gcc 4.8 and newer. Nothing older has been tested.
CWARNEXTRA?= -Wno-error=inline -Wno-error=enum-compare -Wno-error=unused-but-set-variable \
-Wno-error=aggressive-loop-optimizations -Wno-error=maybe-uninitialized \
-Wno-error=unused-local-typedefs -Wno-error=array-bounds -Wno-error=address \
-Wno-error=cast-qual -Wno-error=sequence-point -Wno-error=attributes
.endif
# External compilers may not support our format extensions. Allow them

3
sys/sys/bus.h
View File

@ -327,6 +327,7 @@ int bus_generic_detach(device_t dev);
void bus_generic_driver_added(device_t dev, driver_t *driver);
bus_dma_tag_t
bus_generic_get_dma_tag(device_t dev, device_t child);
int bus_generic_get_domain(device_t dev, device_t child, int *domain);
struct resource_list *
bus_generic_get_resource_list (device_t, device_t);
void bus_generic_new_pass(device_t dev);
@ -365,8 +366,6 @@ int bus_generic_teardown_intr(device_t dev, device_t child,
int bus_generic_write_ivar(device_t dev, device_t child, int which,
uintptr_t value);
int bus_generic_get_domain(device_t dev, device_t child, int *domain);
/*
* Wrapper functions for the BUS_*_RESOURCE methods to make client code
* a little simpler.

2
sys/ufs/ufs/dir.h
View File

@ -110,7 +110,7 @@ struct direct {
*
*/
#define DIRECTSIZ(namlen) \
((offsetof(struct direct, d_name) + \
(((uintptr_t)&((struct direct *)0)->d_name + \
((namlen)+1)*sizeof(((struct direct *)0)->d_name[0]) + 3) & ~3)
#if (BYTE_ORDER == LITTLE_ENDIAN)
#define DIRSIZ(oldfmt, dp) \

4
usr.sbin/pw/pw_user.c
View File

@ -615,7 +615,7 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
pwd->pw_dir = pw_homepolicy(cnf, args, pwd->pw_name);
pwd->pw_shell = pw_shellpolicy(cnf, args, NULL);
lc = login_getpwclass(pwd);
if (lc == NULL || login_setcryptfmt(lc, "md5", NULL) == NULL)
if (lc == NULL || login_setcryptfmt(lc, "sha512", NULL) == NULL)
warn("setting crypt(3) format");
login_close(lc);
pwd->pw_passwd = pw_password(cnf, args, pwd->pw_name);
@ -690,7 +690,7 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
} else {
lc = login_getpwclass(pwd);
if (lc == NULL ||
login_setcryptfmt(lc, "md5", NULL) == NULL)
login_setcryptfmt(lc, "sha512", NULL) == NULL)
warn("setting crypt(3) format");
login_close(lc);
pwd->pw_passwd = pw_pwcrypt(line);