svn commit: r284445 - in head/sys/dev/cxgbe: . common
Author: np
Date: Tue Jun 16 12:36:29 2015
New Revision: 284445
URL: https://svnweb.freebsd.org/changeset/base/284445
Log:
cxgbe(4): Add the ability to dump mailbox commands and replies. It is
enabled/disabled via bit 0 of adapter-debug_flags (which is available
at dev.t5nex.n.debug_flags).
MFC after:1 week
Modified:
head/sys/dev/cxgbe/adapter.h
head/sys/dev/cxgbe/common/t4_hw.c
head/sys/dev/cxgbe/t4_main.c
Modified: head/sys/dev/cxgbe/adapter.h
==
--- head/sys/dev/cxgbe/adapter.hTue Jun 16 12:10:55 2015
(r28)
+++ head/sys/dev/cxgbe/adapter.hTue Jun 16 12:36:29 2015
(r284445)
@@ -206,6 +206,9 @@ enum {
INTR_OFLD_RXQ = (1 5), /* All TOE rxq's take interrupts */
INTR_NM_RXQ = (1 6), /* All netmap rxq's take interrupts */
INTR_ALL= (INTR_RXQ | INTR_OFLD_RXQ | INTR_NM_RXQ),
+
+ /* adapter debug_flags */
+ DF_DUMP_MBOX= (1 0),
};
#define IS_DOOMED(pi) ((pi)-flags DOOMED)
@@ -762,6 +765,7 @@ struct adapter {
int active_ulds;/* ULDs activated on this adapter */
#endif
int flags;
+ int debug_flags;
char ifp_lockname[16];
struct mtx ifp_lock;
@@ -846,6 +850,24 @@ struct adapter {
#define TXQ_LOCK_ASSERT_OWNED(txq) EQ_LOCK_ASSERT_OWNED((txq)-eq)
#define TXQ_LOCK_ASSERT_NOTOWNED(txq) EQ_LOCK_ASSERT_NOTOWNED((txq)-eq)
+#define CH_DUMP_MBOX(sc, mbox, data_reg) \
+ do { \
+ if (sc-debug_flags DF_DUMP_MBOX) { \
+ log(LOG_NOTICE, \
+ %s mbox %u: %016llx %016llx %016llx %016llx \
+ %016llx %016llx %016llx %016llx\n, \
+ device_get_nameunit(sc-dev), mbox, \
+ (unsigned long long)t4_read_reg64(sc, data_reg), \
+ (unsigned long long)t4_read_reg64(sc, data_reg +
8), \
+ (unsigned long long)t4_read_reg64(sc, data_reg +
16), \
+ (unsigned long long)t4_read_reg64(sc, data_reg +
24), \
+ (unsigned long long)t4_read_reg64(sc, data_reg +
32), \
+ (unsigned long long)t4_read_reg64(sc, data_reg +
40), \
+ (unsigned long long)t4_read_reg64(sc, data_reg +
48), \
+ (unsigned long long)t4_read_reg64(sc, data_reg +
56)); \
+ } \
+ } while (0)
+
#define for_each_txq(pi, iter, q) \
for (q = pi-adapter-sge.txq[pi-first_txq], iter = 0; \
iter pi-ntxq; ++iter, ++q)
Modified: head/sys/dev/cxgbe/common/t4_hw.c
==
--- head/sys/dev/cxgbe/common/t4_hw.c Tue Jun 16 12:10:55 2015
(r28)
+++ head/sys/dev/cxgbe/common/t4_hw.c Tue Jun 16 12:36:29 2015
(r284445)
@@ -262,6 +262,8 @@ int t4_wr_mbox_meat(struct adapter *adap
for (i = 0; i size; i += 8, p++)
t4_write_reg64(adap, data_reg + i, be64_to_cpu(*p));
+ CH_DUMP_MBOX(adap, mbox, data_reg);
+
t4_write_reg(adap, ctl_reg, F_MBMSGVALID | V_MBOWNER(X_MBOWNER_FW));
t4_read_reg(adap, ctl_reg); /* flush write */
@@ -287,6 +289,8 @@ int t4_wr_mbox_meat(struct adapter *adap
continue;
}
+ CH_DUMP_MBOX(adap, mbox, data_reg);
+
res = t4_read_reg64(adap, data_reg);
if (G_FW_CMD_OP(res 32) == FW_DEBUG_CMD) {
fw_asrt(adap, data_reg);
Modified: head/sys/dev/cxgbe/t4_main.c
==
--- head/sys/dev/cxgbe/t4_main.cTue Jun 16 12:10:55 2015
(r28)
+++ head/sys/dev/cxgbe/t4_main.cTue Jun 16 12:36:29 2015
(r284445)
@@ -585,6 +585,9 @@ t4_attach(device_t dev)
sc = device_get_softc(dev);
sc-dev = dev;
+#ifdef INVARIANTS
+ sc-debug_flags = DF_DUMP_MBOX;
+#endif
pci_enable_busmaster(dev);
if (pci_find_cap(dev, PCIY_EXPRESS, i) == 0) {
@@ -4603,6 +4606,9 @@ t4_sysctls(struct adapter *sc)
SYSCTL_ADD_INT(ctx, children, OID_AUTO, lro_timeout, CTLFLAG_RW,
sc-lro_timeout, 0, lro inactive-flush timeout (in us));
+ SYSCTL_ADD_INT(ctx, children, OID_AUTO, debug_flags, CTLFLAG_RW,
+ sc-debug_flags, 0, flags to enable runtime debugging);
+
#ifdef SBUF_DRAIN
/*
* dev.t4nex.X.misc. Marked CTLFLAG_SKIP to avoid information overload.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r284211 - in head/sys: kern sys
Mateusz,
have you noticed this email?
On Wed, Jun 10, 2015 at 06:44:45PM +0300, Gleb Smirnoff wrote:
T On Wed, Jun 10, 2015 at 09:34:51AM +, Mateusz Guzik wrote:
T M Author: mjg
T M Date: Wed Jun 10 09:34:50 2015
T M New Revision: 284211
T M URL: https://svnweb.freebsd.org/changeset/base/284211
T M
T M Log:
T M fd: use atomics to manage fd_refcnt and fd_holcnt
T M
T M This gets rid of fdesc_mtx.
T ..
T M Modified: head/sys/sys/filedesc.h
T M
==
T M --- head/sys/sys/filedesc.h Wed Jun 10 05:39:48 2015
(r284210)
T M +++ head/sys/sys/filedesc.h Wed Jun 10 09:34:50 2015
(r284211)
T M @@ -83,8 +83,8 @@ struct filedesc {
T M int fd_lastfile;/* high-water mark of fd_ofiles */
T M int fd_freefile;/* approx. next free file */
T M u_short fd_cmask; /* mask for file creation */
T M - u_short fd_refcnt; /* thread reference count */
T M - u_short fd_holdcnt; /* hold count on structure + mutex */
T M + int fd_refcnt; /* thread reference count */
T M + int fd_holdcnt; /* hold count on structure + mutex */
T M struct sx fd_sx; /* protects members of this struct */
T M struct kqlist fd_kqlist; /* list of kqueues on this filedesc */
T M int fd_holdleaderscount;/* block fdfree() for shared close() */
T
T Shouldn't they be volatile u_int?
T
T --
T Totus tuus, Glebius.
T
--
Totus tuus, Glebius.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r284198 - head/bin/ls
On 15/06/2015 19:49, Warner Losh wrote: I’ve yet to see why ls —libxo is better than a separate program articulated anywhere other than libxo all the things.” Having a clear statement about why it is needed, why changing it vs having a separate program, etc would help. But is seems overly gratuitous with little benefit. +1, I don't see how libxo-ized ls(1) adds value. e.g. in Python, one can use pathlib and scandir to walk arbitrarily wide and deep hierarchies, much as 'file ... | xargs foo'. It has even (with hard work by koobs) supported FreeBSD's stat.st_flags since 2.3. So anything ls(1) can do, Python could do anyway. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284447 - head/sys/dev/mii
Author: marius Date: Tue Jun 16 13:27:06 2015 New Revision: 284447 URL: https://svnweb.freebsd.org/changeset/base/284447 Log: Merge from NetBSD: o rev. 1.10: Nuke trailing whitespace. o rev. 1.15: Fix typo in comment. o rev. 1.16: Add the following registers from IEEE 802.3-2009 Clause 22: - PSE control register (0x0b) - PSE status register (0x0c) - MMD access control register (0x0d) - MMD access address data register (0x0e) o rev. 1.17 (comments only): The bit location of link ability is different between 1000Base-X and others (see Annex 28B.2 and 28D). o rev. 1.18: Nuke dupe word. Obtained from:NetBSD MFC after:1 week Sponsored by: genua mbh Modified: head/sys/dev/mii/mii.h Modified: head/sys/dev/mii/mii.h == --- head/sys/dev/mii/mii.h Tue Jun 16 13:09:18 2015(r284446) +++ head/sys/dev/mii/mii.h Tue Jun 16 13:27:06 2015(r284447) @@ -1,4 +1,4 @@ -/* $NetBSD: mii.h,v 1.9 2001/05/31 03:07:14 thorpej Exp $ */ +/* $NetBSD: mii.h,v 1.18 2014/06/16 14:43:22 msaitoh Exp $ */ /*- * Copyright (c) 1997 Manuel Bouyer. All rights reserved. @@ -87,7 +87,7 @@ /* * Note that the EXTSTAT bit indicates that there is extended status * info available in register 15, but 802.3 section 22.2.4.3 also - * states that that all 1000 Mb/s capable PHYs will set this bit to 1. + * states that all 1000 Mb/s capable PHYs will set this bit to 1. */ #defineBMSR_MEDIAMASK (BMSR_100T4|BMSR_100TXFDX|BMSR_100TXHDX| \ @@ -111,6 +111,7 @@ #define ANAR_NP0x8000 /* Next page (ro) */ #defineANAR_ACK0x4000 /* link partner abilities acknowledged (ro) */ #define ANAR_RF0x2000 /* remote fault (ro) */ + /* Annex 28B.2 */ #defineANAR_FC 0x0400 /* local device supports PAUSE */ #define ANAR_T40x0200 /* local device supports 100bT4 */ #define ANAR_TX_FD 0x0100 /* local device supports 100bTx FD */ @@ -123,6 +124,7 @@ #defineANAR_PAUSE_ASYM (2 10) #defineANAR_PAUSE_TOWARDS (3 10) + /* Annex 28D */ #defineANAR_X_FD 0x0020 /* local device supports 1000BASE-X FD */ #defineANAR_X_HD 0x0040 /* local device supports 1000BASE-X HD */ #defineANAR_X_PAUSE_NONE (0 7) @@ -184,12 +186,47 @@ #defineGTSR_MAN_MS_FLT 0x8000 /* master/slave config fault */ #defineGTSR_MS_RES 0x4000 /* result: 1 = master, 0 = slave */ #defineGTSR_LRS0x2000 /* local rx status, 1 = ok */ -#defineGTSR_RRS0x1000 /* remove rx status, 1 = ok */ +#defineGTSR_RRS0x1000 /* remote rx status, 1 = ok */ #defineGTSR_LP_1000TFDX 0x0800 /* link partner 1000baseT FDX capable */ #defineGTSR_LP_1000THDX 0x0400 /* link partner 1000baseT HDX capable */ #defineGTSR_LP_ASM_DIR 0x0200 /* link partner asym. pause dir. capable */ #defineGTSR_IDLE_ERR 0x00ff /* IDLE error count */ +#defineMII_PSECR 0x0b/* PSE control register */ +#definePSECR_PACTLMASK 0x000c /* pair control mask */ +#definePSECR_PSEENMASK 0x0003 /* PSE enable mask */ +#definePSECR_PINOUTB 0x0008 /* PSE pinout Alternative B */ +#definePSECR_PINOUTA 0x0004 /* PSE pinout Alternative A */ +#definePSECR_FOPOWTST 0x0002 /* Force Power Test Mode */ +#definePSECR_PSEEN 0x0001 /* PSE Enabled */ +#definePSECR_PSEDIS0x /* PSE Disabled */ + +#defineMII_PSESR 0x0c/* PSE status register */ +#definePSESR_PWRDENIED 0x1000 /* Power Denied */ +#definePSESR_VALSIG0x0800 /* Valid PD signature detected */ +#definePSESR_INVALSIG 0x0400 /* Inalid PD signature detected */ +#definePSESR_SHORTCIRC 0x0200 /* Short circuit condition detected */ +#definePSESR_OVERLOAD 0x0100 /* Overload condition detected */ +#definePSESR_MPSABSENT 0x0080 /* MPS absent condition detected */ +#definePSESR_PDCLMASK 0x0070 /* PD Class mask */ +#definePSESR_STATMASK 0x000e /* PSE Status mask */ +#definePSESR_PAIRCTABL 0x0001 /* PAIR Control Ability */ +#definePSESR_PDCL_4(4 4)/* Class 4 */ +#definePSESR_PDCL_3(3 4)/* Class 3 */ +#definePSESR_PDCL_2(2 4)/* Class 2 */ +#definePSESR_PDCL_1(1 4)/* Class 1 */ +#definePSESR_PDCL_0(0 4)/* Class 0 */ + +#defineMII_MMDACR 0x0d/* MMD access control register */ +#defineMMDACR_FUNCMASK 0xc000 /* function */ +#defineMMDACR_DADDRMASK 0x001f /* device address */ +#defineMMDACR_FN_ADDRESS (0 14) /* address */ +#defineMMDACR_FN_DATANPI (1 14) /*
svn commit: r284444 - stable/10/sys/dev/e1000
Author: sbruno
Date: Tue Jun 16 12:10:55 2015
New Revision: 28
URL: https://svnweb.freebsd.org/changeset/base/28
Log:
MFC r283923
Simplify hang detection by stealing the techniques used in ixl(4) and
applying them to em(4).
Rely on iterations through the local timer, and the tx queue state to
determine if an actual hang has occurred. Any time a descriptor is used
(packet sent), the tx queue is flagged as busy. Then when txeof runs, it
either clears the flag when all is clean, or resets it to 1 if ANY are
cleaned, if nothing is cleaned it increments the flag.
Local timer simply checks to see if busy ever reaches MAX (10, which
is compile time configurable), and then sets it as HUNG, at that point
there is one more timer cycle in which to have any cleans, if not a
watchdog reset will occur.
Modified:
stable/10/sys/dev/e1000/if_em.c
stable/10/sys/dev/e1000/if_em.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/e1000/if_em.c
==
--- stable/10/sys/dev/e1000/if_em.c Tue Jun 16 09:52:36 2015
(r284443)
+++ stable/10/sys/dev/e1000/if_em.c Tue Jun 16 12:10:55 2015
(r28)
@@ -1,6 +1,6 @@
/**
- Copyright (c) 2001-2014, Intel Corporation
+ Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -953,11 +953,9 @@ em_mq_start_locked(struct ifnet *ifp, st
break;
}
- if (enq 0) {
-/* Set the watchdog */
-txr-queue_status = EM_QUEUE_WORKING;
- txr-watchdog_time = ticks;
- }
+ /* Mark the queue as having work */
+ if ((enq 0) (txr-busy == EM_TX_IDLE))
+ txr-busy = EM_TX_BUSY;
if (txr-tx_avail EM_MAX_SCATTER)
em_txeof(txr);
@@ -1042,12 +1040,12 @@ em_start_locked(struct ifnet *ifp, struc
break;
}
+ /* Mark the queue as having work */
+ if (txr-busy == EM_TX_IDLE)
+ txr-busy = EM_TX_BUSY;
+
/* Send a copy of the frame to the BPF listener */
ETHER_BPF_MTAP(ifp, m_head);
-
- /* Set timeout in case hardware has problems transmitting. */
- txr-watchdog_time = ticks;
-txr-queue_status = EM_QUEUE_WORKING;
}
return;
@@ -2114,8 +2112,6 @@ retry:
*/
tx_buffer = txr-tx_buffers[first];
tx_buffer-next_eop = last;
- /* Update the watchdog time early and often */
- txr-watchdog_time = ticks;
/*
* Advance the Transmit Descriptor Tail (TDT), this tells the E1000
@@ -2297,15 +2293,16 @@ em_local_timer(void *arg)
** and the HUNG state will be static if set.
*/
for (int i = 0; i adapter-num_queues; i++, txr++) {
- if ((txr-queue_status == EM_QUEUE_HUNG)
- (adapter-pause_frames == 0))
+ /* Last cycle a queue was declared hung */
+ if (txr-busy == EM_TX_HUNG)
goto hung;
+ if (txr-busy = EM_TX_MAXTRIES)
+ txr-busy = EM_TX_HUNG;
/* Schedule a TX tasklet if needed */
if (txr-tx_avail = EM_MAX_SCATTER)
taskqueue_enqueue(txr-tq, txr-tx_task);
}
- adapter-pause_frames = 0;
callout_reset(adapter-timer, hz, em_local_timer, adapter);
#ifndef DEVICE_POLLING
/* Trigger an RX interrupt to guarantee mbuf refresh */
@@ -2324,7 +2321,6 @@ hung:
txr-me, txr-tx_avail, txr-next_to_clean);
ifp-if_drv_flags = ~IFF_DRV_RUNNING;
adapter-watchdog_events++;
- adapter-pause_frames = 0;
em_init_locked(adapter);
}
@@ -2392,9 +2388,9 @@ em_update_link_status(struct adapter *ad
if (bootverbose)
device_printf(dev, Link is Down\n);
adapter-link_active = 0;
- /* Link down, disable watchdog */
+ /* Link down, disable hang detection */
for (int i = 0; i adapter-num_queues; i++, txr++)
- txr-queue_status = EM_QUEUE_IDLE;
+ txr-busy = EM_TX_IDLE;
if_link_state_change(ifp, LINK_STATE_DOWN);
}
}
@@ -2426,10 +2422,10 @@ em_stop(void *arg)
ifp-if_drv_flags = ~IFF_DRV_RUNNING;
ifp-if_drv_flags |= IFF_DRV_OACTIVE;
-/* Unarm watchdog timer. */
+/* Disarm Hang Detection. */
for (int i = 0; i adapter-num_queues; i++, txr++) {
EM_TX_LOCK(txr);
- txr-queue_status = EM_QUEUE_IDLE;
+ txr-busy = EM_TX_IDLE;
svn commit: r284446 - in head/sys: compat/linux compat/svr4 fs/fdescfs i386/ibcs2 kern security/audit sys ufs/ffs
Author: mjg
Date: Tue Jun 16 13:09:18 2015
New Revision: 284446
URL: https://svnweb.freebsd.org/changeset/base/284446
Log:
Replace struct filedesc argument in getvnode with struct thread
This is is a step towards removal of spurious arguments.
Modified:
head/sys/compat/linux/linux_file.c
head/sys/compat/svr4/svr4_misc.c
head/sys/fs/fdescfs/fdesc_vnops.c
head/sys/i386/ibcs2/ibcs2_misc.c
head/sys/kern/vfs_acl.c
head/sys/kern/vfs_extattr.c
head/sys/kern/vfs_syscalls.c
head/sys/security/audit/audit_arg.c
head/sys/sys/filedesc.h
head/sys/ufs/ffs/ffs_alloc.c
Modified: head/sys/compat/linux/linux_file.c
==
--- head/sys/compat/linux/linux_file.c Tue Jun 16 12:36:29 2015
(r284445)
+++ head/sys/compat/linux/linux_file.c Tue Jun 16 13:09:18 2015
(r284446)
@@ -348,8 +348,7 @@ getdents_common(struct thread *td, struc
} else
justone = 0;
- error = getvnode(td-td_proc-p_fd, args-fd,
- cap_rights_init(rights, CAP_READ), fp);
+ error = getvnode(td, args-fd, cap_rights_init(rights, CAP_READ), fp);
if (error != 0)
return (error);
Modified: head/sys/compat/svr4/svr4_misc.c
==
--- head/sys/compat/svr4/svr4_misc.cTue Jun 16 12:36:29 2015
(r284445)
+++ head/sys/compat/svr4/svr4_misc.cTue Jun 16 13:09:18 2015
(r284446)
@@ -262,8 +262,7 @@ svr4_sys_getdents64(td, uap)
DPRINTF((svr4_sys_getdents64(%d, *, %d)\n,
uap-fd, uap-nbytes));
- error = getvnode(td-td_proc-p_fd, uap-fd,
- cap_rights_init(rights, CAP_READ), fp);
+ error = getvnode(td, uap-fd, cap_rights_init(rights, CAP_READ), fp);
if (error != 0)
return (error);
@@ -442,8 +441,7 @@ svr4_sys_getdents(td, uap)
if (uap-nbytes 0)
return (EINVAL);
- error = getvnode(td-td_proc-p_fd, uap-fd,
- cap_rights_init(rights, CAP_READ), fp);
+ error = getvnode(td, uap-fd, cap_rights_init(rights, CAP_READ), fp);
if (error != 0)
return (error);
@@ -623,7 +621,6 @@ svr4_sys_fchroot(td, uap)
struct svr4_sys_fchroot_args *uap;
{
cap_rights_t rights;
- struct filedesc *fdp = td-td_proc-p_fd;
struct vnode*vp;
struct file *fp;
int error;
@@ -631,7 +628,7 @@ svr4_sys_fchroot(td, uap)
if ((error = priv_check(td, PRIV_VFS_FCHROOT)) != 0)
return error;
/* XXX: we have the chroot priv... what cap might we need? all? */
- if ((error = getvnode(fdp, uap-fd, cap_rights_init(rights), fp)) !=
0)
+ if ((error = getvnode(td, uap-fd, cap_rights_init(rights), fp)) != 0)
return error;
vp = fp-f_vnode;
VREF(vp);
Modified: head/sys/fs/fdescfs/fdesc_vnops.c
==
--- head/sys/fs/fdescfs/fdesc_vnops.c Tue Jun 16 12:36:29 2015
(r284445)
+++ head/sys/fs/fdescfs/fdesc_vnops.c Tue Jun 16 13:09:18 2015
(r284446)
@@ -482,7 +482,7 @@ fdesc_setattr(ap)
/*
* Allow setattr where there is an underlying vnode.
*/
- error = getvnode(td-td_proc-p_fd, fd,
+ error = getvnode(td, fd,
cap_rights_init(rights, CAP_EXTATTR_SET), fp);
if (error) {
/*
Modified: head/sys/i386/ibcs2/ibcs2_misc.c
==
--- head/sys/i386/ibcs2/ibcs2_misc.cTue Jun 16 12:36:29 2015
(r284445)
+++ head/sys/i386/ibcs2/ibcs2_misc.cTue Jun 16 13:09:18 2015
(r284446)
@@ -342,8 +342,7 @@ ibcs2_getdents(td, uap)
#defineBSD_DIRENT(cp) ((struct dirent *)(cp))
#defineIBCS2_RECLEN(reclen)(reclen + sizeof(u_short))
- error = getvnode(td-td_proc-p_fd, uap-fd,
- cap_rights_init(rights, CAP_READ), fp);
+ error = getvnode(td, uap-fd, cap_rights_init(rights, CAP_READ), fp);
if (error != 0)
return (error);
if ((fp-f_flag FREAD) == 0) {
@@ -498,8 +497,7 @@ ibcs2_read(td, uap)
u_long *cookies = NULL, *cookiep;
int ncookies;
- error = getvnode(td-td_proc-p_fd, uap-fd,
- cap_rights_init(rights, CAP_READ), fp);
+ error = getvnode(td, uap-fd, cap_rights_init(rights, CAP_READ), fp);
if (error != 0) {
if (error == EINVAL)
return sys_read(td, (struct read_args *)uap);
Modified: head/sys/kern/vfs_acl.c
==
--- head/sys/kern/vfs_acl.c Tue Jun 16 12:36:29 2015(r284445)
+++ head/sys/kern/vfs_acl.c Tue Jun 16 13:09:18 2015(r284446)
@@ -406,7 +406,7 @@ sys___acl_get_fd(struct
svn commit: r284448 - svnadmin/conf
Author: philip Date: Tue Jun 16 13:56:16 2015 New Revision: 284448 URL: https://svnweb.freebsd.org/changeset/base/284448 Log: Release kp's mentors from the burden of reviewing his many patches. May Kristof's collection of pointy hats remain small! :-) Suggested by: gnn (co-mentor) Mmentors Modified: svnadmin/conf/mentors Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Tue Jun 16 13:27:06 2015(r284447) +++ svnadmin/conf/mentors Tue Jun 16 13:56:16 2015(r284448) @@ -23,7 +23,6 @@ jkh rwatson jonathan rwatson jwdrmacklem kadesaiken Co-mentor: scottl, ambrisko -kp philip Co-mentor: gnn mahrensmckusick miwi rwatson monthadar adrian ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284450 - head/sys/dev/atkbdc
Author: glebius Date: Tue Jun 16 15:39:34 2015 New Revision: 284450 URL: https://svnweb.freebsd.org/changeset/base/284450 Log: Fix miss from r284320. Coverity: 1018895 Modified: head/sys/dev/atkbdc/psm.c Modified: head/sys/dev/atkbdc/psm.c == --- head/sys/dev/atkbdc/psm.c Tue Jun 16 15:14:40 2015(r284449) +++ head/sys/dev/atkbdc/psm.c Tue Jun 16 15:39:34 2015(r284450) @@ -5102,7 +5102,7 @@ enable_trackpoint(struct psm_softc *sc, id = read_aux_data(kbdc); if (id 0x01) return (FALSE); - if (sc != NULL) + if (arg == PROBE) sc-tphw = id; if (!trackpoint_support) return (FALSE); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r284198 - head/bin/ls
On 15/06/2015 5:19 AM, Garrett Cooper wrote: Next time someone else converts ANYTHING to libxo -- write tests FIRST to make sure you're not breaking legacy behavior. If you need help figuring out how to do that, I'll be more than happy to document it on a wiki page, with simple, concise directions. Please do so anyway, these kinds of things are great (simple) ways for people inside and outside the project to start contributing to. *Then* perhaps we can hook in some code coverage checks into our CI, publish the numbers and go from there. Koobs ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284449 - head/sys/arm/arm
Author: bz Date: Tue Jun 16 15:14:40 2015 New Revision: 284449 URL: https://svnweb.freebsd.org/changeset/base/284449 Log: Trying to unbreak arm.LINT by properly putting the conditional include for dtrace further down in the include list where it belongs. Reviewed by: andrew Modified: head/sys/arm/arm/trap.c Modified: head/sys/arm/arm/trap.c == --- head/sys/arm/arm/trap.c Tue Jun 16 13:56:16 2015(r284448) +++ head/sys/arm/arm/trap.c Tue Jun 16 15:14:40 2015(r284449) @@ -78,10 +78,6 @@ * Created : 28/11/94 */ -#ifdef KDTRACE_HOOKS -#include sys/dtrace_bsd.h -#endif - #include sys/cdefs.h __FBSDID($FreeBSD$); @@ -109,6 +105,10 @@ __FBSDID($FreeBSD$); #include sys/kdb.h #endif +#ifdef KDTRACE_HOOKS +#include sys/dtrace_bsd.h +#endif + extern char fusubailout[]; #ifdef DEBUG ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284454 - head
Author: imp
Date: Tue Jun 16 17:55:20 2015
New Revision: 284454
URL: https://svnweb.freebsd.org/changeset/base/284454
Log:
A more compatible fix to MK_META_MODE not being defined. Also, encase
bmake specific constructs not needed for make bootstrap so fmake
doesn't see them. This works with fmake just well enough for us to
build bmake to build the rest of the tree without fatal errors. Tested
only with fmake package.
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Tue Jun 16 17:27:53 2015(r284453)
+++ head/Makefile Tue Jun 16 17:55:20 2015(r284454)
@@ -99,7 +99,10 @@
#
# For more information, see the build(7) manual page.
#
-.if ${MK_META_MODE:Uno} == yes
+
+# Note: we use this awkward construct to be compatible with FreeBSD's
+# old make used in 10.0 and 9.2 and earlier.
+.if defined(MK_META_MODE) ${MK_META_MODE} == yes
# targets/Makefile plays the role of top-level
.include targets/Makefile
.else
@@ -522,6 +525,7 @@ universe_epilogue:
buildLINT:
${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT
+.if defined(.PARSEDIR)
# This makefile does not run in meta mode
.MAKE.MODE= normal
# Normally the things we run from here don't either.
@@ -539,5 +543,6 @@ UPDATE_DEPENDFILE= NO
MAKE_JOB_ERROR_TOKEN= no
.export MAKE_JOB_ERROR_TOKEN
.endif
+.endif # bmake
.endif # META_MODE
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284451 - head/lib/libc/arm/aeabi
Author: andrew
Date: Tue Jun 16 16:40:25 2015
New Revision: 284451
URL: https://svnweb.freebsd.org/changeset/base/284451
Log:
Export the ARM __aeabi_mem* functions from libc, they are needed by the gcc
from ports as it doesn't include these in the copy of libgcc it installs
uses.
Obtained from:ABT Systems Ltd
Modified:
head/lib/libc/arm/aeabi/Makefile.inc
head/lib/libc/arm/aeabi/Symbol.map
Modified: head/lib/libc/arm/aeabi/Makefile.inc
==
--- head/lib/libc/arm/aeabi/Makefile.incTue Jun 16 15:39:34 2015
(r284450)
+++ head/lib/libc/arm/aeabi/Makefile.incTue Jun 16 16:40:25 2015
(r284451)
@@ -27,13 +27,5 @@ SRCS+= aeabi_memcmp.S \
aeabi_memmove.S \
aeabi_memset.S
-# Mark the functions as hidden so they are not available outside of libc.
-CFLAGS.aeabi_memcmp.S= -DVISIBILITY_HIDDEN
-CFLAGS.aeabi_memcpy.S= -DVISIBILITY_HIDDEN
-CFLAGS.aeabi_memmove.S=-DVISIBILITY_HIDDEN
-CFLAGS.aeabi_memset.S= -DVISIBILITY_HIDDEN
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
-
-
SYM_MAPS+=${LIBC_SRCTOP}/arm/aeabi/Symbol.map
Modified: head/lib/libc/arm/aeabi/Symbol.map
==
--- head/lib/libc/arm/aeabi/Symbol.map Tue Jun 16 15:39:34 2015
(r284450)
+++ head/lib/libc/arm/aeabi/Symbol.map Tue Jun 16 16:40:25 2015
(r284451)
@@ -52,4 +52,21 @@ FBSDprivate_1.0 {
__aeabi_i2d;
__aeabi_i2f;
+
+
+ __aeabi_memclr;
+ __aeabi_memclr4;
+ __aeabi_memclr8;
+ __aeabi_memcmp;
+ __aeabi_memcmp4;
+ __aeabi_memcmp8;
+ __aeabi_memcpy;
+ __aeabi_memcpy4;
+ __aeabi_memcpy8;
+ __aeabi_memmove;
+ __aeabi_memmove4;
+ __aeabi_memmove8;
+ __aeabi_memset;
+ __aeabi_memset4;
+ __aeabi_memset8;
};
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284455 - stable/10/sys/sparc64/pci
Author: emaste Date: Tue Jun 16 18:39:11 2015 New Revision: 284455 URL: https://svnweb.freebsd.org/changeset/base/284455 Log: MFC r281930 by jhb: Update this driver to not save copies of registers that are no longer used after r281874. While here, also update it to always write the parent's PCI bus number to the primary bus register. Modified: stable/10/sys/sparc64/pci/apb.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/sparc64/pci/apb.c == --- stable/10/sys/sparc64/pci/apb.c Tue Jun 16 17:55:20 2015 (r284454) +++ stable/10/sys/sparc64/pci/apb.c Tue Jun 16 18:39:11 2015 (r284455) @@ -171,20 +171,14 @@ apb_attach(device_t dev) * Get current bridge configuration. */ sc-sc_bsc.ops_pcib_sc.domain = pci_get_domain(dev); - sc-sc_bsc.ops_pcib_sc.secstat = - pci_read_config(dev, PCIR_SECSTAT_1, 2); - sc-sc_bsc.ops_pcib_sc.command = - pci_read_config(dev, PCIR_COMMAND, 2); - sc-sc_bsc.ops_pcib_sc.pribus = - pci_read_config(dev, PCIR_PRIBUS_1, 1); + sc-sc_bsc.ops_pcib_sc.pribus = pci_get_bus(dev); + pci_write_config(dev, PCIR_PRIBUS_1, sc-sc_bsc.ops_pcib_sc.pribus, 1); sc-sc_bsc.ops_pcib_sc.bus.sec = pci_read_config(dev, PCIR_SECBUS_1, 1); sc-sc_bsc.ops_pcib_sc.bus.sub = pci_read_config(dev, PCIR_SUBBUS_1, 1); sc-sc_bsc.ops_pcib_sc.bridgectl = pci_read_config(dev, PCIR_BRIDGECTL_1, 2); - sc-sc_bsc.ops_pcib_sc.seclat = - pci_read_config(dev, PCIR_SECLAT_1, 1); sc-sc_iomap = pci_read_config(dev, APBR_IOMAP, 1); sc-sc_memmap = pci_read_config(dev, APBR_MEMMAP, 1); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284453 - head
Author: andrew
Date: Tue Jun 16 17:27:53 2015
New Revision: 284453
URL: https://svnweb.freebsd.org/changeset/base/284453
Log:
Add a comment to the end of the world and kernel cases in the universe
target to help follow the make magic.
Obtained from:ABT Systems Ltd
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Tue Jun 16 17:24:20 2015(r284452)
+++ head/Makefile Tue Jun 16 17:27:53 2015(r284453)
@@ -450,7 +450,8 @@ universe_${target}_${target_arch}: unive
${MAKEFAIL}))
@echo ${target}.${target_arch} ${UNIVERSE_TARGET} completed on
`LC_ALL=C date`
.endfor
-.endif
+.endif # !MAKE_JUST_KERNELS
+
.if !defined(MAKE_JUST_WORLDS)
# If we are building world and kernels wait for the required worlds to finish
.if !defined(MAKE_JUST_KERNELS)
@@ -468,7 +469,7 @@ universe_${target}_kernels: universe_${t
.endif
@cd ${.CURDIR} ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \
universe_kernels
-.endif
+.endif # !MAKE_JUST_WORLDS
@echo ${target} completed on `LC_ALL=C date`
.endfor
universe_kernels: universe_kernconfs
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284456 - head
Author: andrew
Date: Tue Jun 16 18:43:08 2015
New Revision: 284456
URL: https://svnweb.freebsd.org/changeset/base/284456
Log:
Add a universe_${target}_worlds target to simplify the logic to find when
to start building kernels.
Obtained from:ABT Systems Ltd
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Tue Jun 16 18:39:11 2015(r284455)
+++ head/Makefile Tue Jun 16 18:43:08 2015(r284456)
@@ -438,9 +438,12 @@ universe_epilogue: universe_${target}
universe_${target}: universe_${target}_prologue
universe_${target}_prologue: universe_prologue
@echo ${target} started on `LC_ALL=C date`
+universe_${target}_worlds:
+
.if !defined(MAKE_JUST_KERNELS)
.for target_arch in ${TARGET_ARCHES_${target}}
universe_${target}: universe_${target}_${target_arch}
+universe_${target}_worlds: universe_${target}_${target_arch}
universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
@echo ${target}.${target_arch} ${UNIVERSE_TARGET} started on
`LC_ALL=C date`
@(cd ${.CURDIR} env __MAKE_CONF=/dev/null \
@@ -456,13 +459,8 @@ universe_${target}_${target_arch}: unive
.endif # !MAKE_JUST_KERNELS
.if !defined(MAKE_JUST_WORLDS)
-# If we are building world and kernels wait for the required worlds to finish
-.if !defined(MAKE_JUST_KERNELS)
-.for target_arch in ${TARGET_ARCHES_${target}}
-universe_${target}_kernels: universe_${target}_${target_arch}
-.endfor
-.endif
universe_${target}: universe_${target}_kernels
+universe_${target}_kernels: universe_${target}_worlds
universe_${target}_kernels: universe_${target}_prologue .MAKE
.if exists(${KERNSRCDIR}/${target}/conf/NOTES)
@(cd ${KERNSRCDIR}/${target}/conf env __MAKE_CONF=/dev/null \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284466 - svnadmin/conf
Author: delphij Date: Tue Jun 16 21:07:33 2015 New Revision: 284466 URL: https://svnweb.freebsd.org/changeset/base/284466 Log: Raise my size limit temporarily. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf == --- svnadmin/conf/sizelimit.confTue Jun 16 21:07:07 2015 (r284465) +++ svnadmin/conf/sizelimit.confTue Jun 16 21:07:33 2015 (r284466) @@ -22,7 +22,7 @@ bapt brooks # cy -#delphij +delphij des dim ed ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284470 - head/sys/dev/bxe
Author: davidcs
Date: Tue Jun 16 21:11:32 2015
New Revision: 284470
URL: https://svnweb.freebsd.org/changeset/base/284470
Log:
In bxe_init_mcast_macs_list(): mc_mac-mac needs to point to the multicast
mac address
In bxe_set_mc_list(): added missing BXE_MCAST_UNLOCK()
In __ecore_vlan_mac_h_exec_pending(): need to check for ECORE_PENDING
Submitted by:gary.zambr...@qlogic.com
Modified:
head/sys/dev/bxe/bxe.c
head/sys/dev/bxe/ecore_sp.c
Modified: head/sys/dev/bxe/bxe.c
==
--- head/sys/dev/bxe/bxe.c Tue Jun 16 21:11:31 2015(r284469)
+++ head/sys/dev/bxe/bxe.c Tue Jun 16 21:11:32 2015(r284470)
@@ -12525,6 +12525,7 @@ bxe_init_mcast_macs_list(struct bxe_soft
BLOGE(sc, Failed to allocate temp mcast list\n);
return (-1);
}
+bzero(mta, (sizeof(unsigned char) * ETHER_ADDR_LEN * mc_count));
mc_mac = malloc(sizeof(*mc_mac) * mc_count, M_DEVBUF,
(M_NOWAIT | M_ZERO));
@@ -12533,12 +12534,13 @@ bxe_init_mcast_macs_list(struct bxe_soft
BLOGE(sc, Failed to allocate temp mcast list\n);
return (-1);
}
+bzero(mc_mac, (sizeof(*mc_mac) * mc_count));
if_multiaddr_array(ifp, mta, mcnt, mc_count); /* mta and mcnt not
expected
to be different */
for(i=0; i mcnt; i++) {
-bcopy((mta + (i * ETHER_ADDR_LEN)), mc_mac-mac, ETHER_ADDR_LEN);
+ mc_mac-mac = (uint8_t *)(mta + (i * ETHER_ADDR_LEN));
ECORE_LIST_PUSH_TAIL(mc_mac-link, p-mcast_list);
BLOGD(sc, DBG_LOAD,
@@ -12583,6 +12585,7 @@ bxe_set_mc_list(struct bxe_softc *sc)
rc = ecore_config_mcast(sc, rparam, ECORE_MCAST_CMD_DEL);
if (rc 0) {
BLOGE(sc, Failed to clear multicast configuration: %d\n, rc);
+BXE_MCAST_UNLOCK(sc);
return (rc);
}
Modified: head/sys/dev/bxe/ecore_sp.c
==
--- head/sys/dev/bxe/ecore_sp.c Tue Jun 16 21:11:31 2015(r284469)
+++ head/sys/dev/bxe/ecore_sp.c Tue Jun 16 21:11:32 2015(r284470)
@@ -474,7 +474,7 @@ static void __ecore_vlan_mac_h_exec_pend
o-head_exe_request = FALSE;
o-saved_ramrod_flags = 0;
rc = ecore_exe_queue_step(sc, o-exe_queue, ramrod_flags);
- if (rc != ECORE_SUCCESS) {
+ if ((rc != ECORE_SUCCESS) (rc != ECORE_PENDING)) {
ECORE_ERR(execution of pending commands failed with rc %d\n,
rc);
#ifdef ECORE_STOP_ON_ERROR
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284469 - head
Author: andrew
Date: Tue Jun 16 21:11:31 2015
New Revision: 284469
URL: https://svnweb.freebsd.org/changeset/base/284469
Log:
Remove unneeded dependencies, these are now handled through the _done
target.
Obtained from:ABT Systems Ltd
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Tue Jun 16 21:08:25 2015(r284468)
+++ head/Makefile Tue Jun 16 21:11:31 2015(r284469)
@@ -442,7 +442,6 @@ universe_${target}_worlds:
.if !defined(MAKE_JUST_KERNELS)
.for target_arch in ${TARGET_ARCHES_${target}}
-universe_${target}: universe_${target}_${target_arch}
universe_${target}_worlds: universe_${target}_${target_arch}
universe_${target}_done: universe_${target}_worlds
universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
@@ -460,7 +459,6 @@ universe_${target}_${target_arch}: unive
.endif # !MAKE_JUST_KERNELS
.if !defined(MAKE_JUST_WORLDS)
-universe_${target}: universe_${target}_kernels
universe_${target}_done: universe_${target}_kernels
universe_${target}_kernels: universe_${target}_worlds
universe_${target}_kernels: universe_${target}_prologue .MAKE
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284452 - head/sys/arm/arm
Author: andrew Date: Tue Jun 16 17:24:20 2015 New Revision: 284452 URL: https://svnweb.freebsd.org/changeset/base/284452 Log: Write to the PRRR (Primary Region Remap Register) rather than reading from it during the early boot. Found By: Patrick Wildt patr...@bitrig.org Sponsored by: ABT Systems Ltd Modified: head/sys/arm/arm/locore-v6.S Modified: head/sys/arm/arm/locore-v6.S == --- head/sys/arm/arm/locore-v6.STue Jun 16 16:40:25 2015 (r284451) +++ head/sys/arm/arm/locore-v6.STue Jun 16 17:24:20 2015 (r284452) @@ -240,7 +240,7 @@ ASENTRY_NP(init_mmu) * - All is set to uncacheable memory */ ldr r0, =0xA - mrc CP15_PRRR(r0) + mcr CP15_PRRR(r0) mov r0, #0 mcr CP15_NMRR(r0) #endif ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284468 - svnadmin/conf
Author: delphij Date: Tue Jun 16 21:08:25 2015 New Revision: 284468 URL: https://svnweb.freebsd.org/changeset/base/284468 Log: Revert previous changeset after commit. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf == --- svnadmin/conf/sizelimit.confTue Jun 16 21:07:53 2015 (r284467) +++ svnadmin/conf/sizelimit.confTue Jun 16 21:08:25 2015 (r284468) @@ -22,7 +22,7 @@ bapt brooks # cy -delphij +#delphij des dim ed ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284471 - head
Author: andrew
Date: Tue Jun 16 21:29:46 2015
New Revision: 284471
URL: https://svnweb.freebsd.org/changeset/base/284471
Log:
Move the universe done dependency on the worlds completing out of the
loop, we only need to add it once.
Obtained from:ABT Systems Ltd
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Tue Jun 16 21:11:32 2015(r284470)
+++ head/Makefile Tue Jun 16 21:29:46 2015(r284471)
@@ -441,9 +441,9 @@ universe_${target}_prologue: universe_pr
universe_${target}_worlds:
.if !defined(MAKE_JUST_KERNELS)
+universe_${target}_done: universe_${target}_worlds
.for target_arch in ${TARGET_ARCHES_${target}}
universe_${target}_worlds: universe_${target}_${target_arch}
-universe_${target}_done: universe_${target}_worlds
universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
@echo ${target}.${target_arch} ${UNIVERSE_TARGET} started on
`LC_ALL=C date`
@(cd ${.CURDIR} env __MAKE_CONF=/dev/null \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284474 - head/usr.sbin/syslogd
Author: rpaulo
Date: Tue Jun 16 22:26:22 2015
New Revision: 284474
URL: https://svnweb.freebsd.org/changeset/base/284474
Log:
syslogd: support multiple -b options.
It's now possible to bind multiple sockets to different IP addresses.
PR: 159305
Submitted by: Kurt Lidl lidl pix.net
Sponsored by: Pi-Coral, Inc.
Modified:
head/usr.sbin/syslogd/syslogd.8
head/usr.sbin/syslogd/syslogd.c
Modified: head/usr.sbin/syslogd/syslogd.8
==
--- head/usr.sbin/syslogd/syslogd.8 Tue Jun 16 22:25:08 2015
(r284473)
+++ head/usr.sbin/syslogd/syslogd.8 Tue Jun 16 22:26:22 2015
(r284474)
@@ -28,7 +28,7 @@
.\ @(#)syslogd.8 8.1 (Berkeley) 6/6/93
.\ $FreeBSD$
.\
-.Dd March 3, 2015
+.Dd June 16, 2015
.Dt SYSLOGD 8
.Os
.Sh NAME
@@ -194,6 +194,8 @@ The default
.Ar service
is
.Ql syslog .
+This option can be specified multiple times to bind to
+multiple addresses and/or ports.
.It Fl C
Create log files that do not exist (permission is set to
.Li 0600 ) .
Modified: head/usr.sbin/syslogd/syslogd.c
==
--- head/usr.sbin/syslogd/syslogd.c Tue Jun 16 22:25:08 2015
(r284473)
+++ head/usr.sbin/syslogd/syslogd.c Tue Jun 16 22:26:22 2015
(r284474)
@@ -124,6 +124,15 @@ const char ctty[] = _PATH_CONSOLE;
#defineMAXUNAMES 20 /* maximum number of user names */
/*
+ * List of hosts for binding.
+ */
+static STAILQ_HEAD(, host) hqueue;
+struct host {
+ char*name;
+ STAILQ_ENTRY(host) next;
+};
+
+/*
* Unix sockets.
* We have two default sockets, one with 666 permissions,
* and one for privileged programs.
@@ -275,7 +284,7 @@ static int Foreground = 0; /* Run in for
static int resolve = 1;/* resolve hostname */
static charLocalHostName[MAXHOSTNAMELEN]; /* our hostname */
static const char *LocalDomain;/* our local domain name */
-static int *finet; /* Internet datagram socket */
+static int *finet; /* Internet datagram sockets */
static int fklog = -1; /* /dev/klog */
static int Initialized;/* set when we have initialized ourselves */
static int MarkInterval = 20 * 60; /* interval between marks in seconds */
@@ -348,10 +357,10 @@ main(int argc, char *argv[])
struct sockaddr_storage frominet;
fd_set *fdsr = NULL;
char line[MAXLINE + 1];
- char *bindhostname;
const char *hname;
struct timeval tv, *tvp;
struct sigaction sact;
+ struct host *host;
struct funix *fx, *fx1;
sigset_t mask;
pid_t ppid = 1, spid;
@@ -360,7 +369,8 @@ main(int argc, char *argv[])
if (madvise(NULL, 0, MADV_PROTECT) != 0)
dprintf(madvise() failed: %s\n, strerror(errno));
- bindhostname = NULL;
+ STAILQ_INIT(hqueue);
+
while ((ch = getopt(argc, argv, 468Aa:b:cCdf:Fkl:m:nNop:P:sS:Tuv))
!= -1)
switch (ch) {
@@ -383,8 +393,13 @@ main(int argc, char *argv[])
usage();
break;
case 'b':
- bindhostname = optarg;
+ {
+ if ((host = malloc(sizeof(struct host))) == NULL)
+ err(1, malloc failed);
+ host-name = optarg;
+ STAILQ_INSERT_TAIL(hqueue, host, next);
break;
+ }
case 'c':
no_compress++;
break;
@@ -433,7 +448,7 @@ main(int argc, char *argv[])
if (strlen(name) = sizeof(sunx.sun_path))
errx(1, %s path too long, exiting, name);
if ((fx = malloc(sizeof(struct funix))) == NULL)
- errx(1, malloc failed);
+ err(1, malloc failed);
fx-s = -1;
fx-name = name;
fx-mode = mode;
@@ -555,8 +570,26 @@ main(int argc, char *argv[])
}
increase_rcvbuf(fx-s);
}
- if (SecureMode = 1)
- finet = socksetup(family, bindhostname);
+ if (SecureMode = 1) {
+ if (STAILQ_EMPTY(hqueue))
+ finet = socksetup(family, NULL);
+ STAILQ_FOREACH(host, hqueue, next) {
+ int *finet0, total;
+ finet0 = socksetup(family, host-name);
+ if (finet0 !finet) {
+ finet = finet0;
+ } else if (finet0 finet) {
+ total = *finet0 + *finet + 1;
+ finet = realloc(finet, total * sizeof(int));
+
svn commit: r284464 - in head: . share/mk usr.bin usr.bin/make
Author: imp
Date: Tue Jun 16 20:58:33 2015
New Revision: 284464
URL: https://svnweb.freebsd.org/changeset/base/284464
Log:
Remove old fmake. It wasn't built by default for some time. Users that
really need it can find it in the devel/fmake port or pkg install fmake.
Note: This commit is orthogonal to the question 'can we fmake buildworld'.
Differential Revision: https://reviews.freebsd.org/D2840
Deleted:
head/usr.bin/make/
Modified:
head/UPDATING
head/share/mk/src.opts.mk
head/usr.bin/Makefile
Modified: head/UPDATING
==
--- head/UPDATING Tue Jun 16 20:34:39 2015(r284463)
+++ head/UPDATING Tue Jun 16 20:58:33 2015(r284464)
@@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
ln -s 'abort:false,junk:false' /etc/malloc.conf.)
+20150616:
+ FreeBSD's old make (fmake) has been removed from the system. It is
+ available as the devel/fmake port or via pkg install fmake.
+
20150615:
The fix for the issue described in the 20150614 sendmail entry
below has been been committed in revision 284436. The work
Modified: head/share/mk/src.opts.mk
==
--- head/share/mk/src.opts.mk Tue Jun 16 20:34:39 2015(r284463)
+++ head/share/mk/src.opts.mk Tue Jun 16 20:58:33 2015(r284464)
@@ -179,7 +179,6 @@ __DEFAULT_NO_OPTIONS = \
BSD_GREP \
CLANG_EXTRAS \
EISA \
-FMAKE \
HESIOD \
LLDB \
NAND \
Modified: head/usr.bin/Makefile
==
--- head/usr.bin/Makefile Tue Jun 16 20:34:39 2015(r284463)
+++ head/usr.bin/Makefile Tue Jun 16 20:58:33 2015(r284464)
@@ -253,10 +253,6 @@ SUBDIR+= file
SUBDIR+= finger
.endif
-.if ${MK_FMAKE} != no
-SUBDIR+= make
-.endif
-
.if ${MK_FTP} != no
SUBDIR+= ftp
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r284436 - head/contrib/sendmail/src
On Tue, 2015-06-16 at 02:58 +, Gregory Neil Shapiro wrote: Author: gshapiro Date: Tue Jun 16 02:58:50 2015 New Revision: 284436 URL: https://svnweb.freebsd.org/changeset/base/284436 Log: The import of openssl to address the FreeBSD-SA-15:10.openssl security advisory includes a change which rejects handshakes with DH parameters below 768 bits. sendmail releases prior to 8.15.2 (not yet released), defaulted to a 512 bit DH parameter setting for client connections. This commit chages that default to 1024 bits. sendmail 8.15.2, when released well use a default of 2048 bits. If upstream will be using 2048 bits, why not simply use that? -- Shawn Webb HardenedBSD GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE signature.asc Description: This is a digitally signed message part
svn commit: r284458 - in vendor-sys/acpica/dist: . source/common source/compiler source/components/debugger source/components/disassembler source/components/dispatcher source/components/events sour...
Author: jkim Date: Tue Jun 16 19:48:16 2015 New Revision: 284458 URL: https://svnweb.freebsd.org/changeset/base/284458 Log: Import ACPICA 20150616. Added: vendor-sys/acpica/dist/source/include/platform/acefiex.h (contents, props changed) Modified: vendor-sys/acpica/dist/changes.txt vendor-sys/acpica/dist/source/common/adisasm.c vendor-sys/acpica/dist/source/common/ahids.c vendor-sys/acpica/dist/source/common/ahpredef.c vendor-sys/acpica/dist/source/common/ahuuids.c vendor-sys/acpica/dist/source/common/dmextern.c vendor-sys/acpica/dist/source/common/dmrestag.c vendor-sys/acpica/dist/source/common/dmtable.c vendor-sys/acpica/dist/source/common/dmtbdump.c vendor-sys/acpica/dist/source/common/dmtbinfo.c vendor-sys/acpica/dist/source/common/getopt.c vendor-sys/acpica/dist/source/compiler/aslanalyze.c vendor-sys/acpica/dist/source/compiler/aslascii.c vendor-sys/acpica/dist/source/compiler/aslcodegen.c vendor-sys/acpica/dist/source/compiler/aslcompile.c vendor-sys/acpica/dist/source/compiler/aslcompiler.h vendor-sys/acpica/dist/source/compiler/aslcompiler.l vendor-sys/acpica/dist/source/compiler/asldefine.h vendor-sys/acpica/dist/source/compiler/aslerror.c vendor-sys/acpica/dist/source/compiler/aslfileio.c vendor-sys/acpica/dist/source/compiler/aslfiles.c vendor-sys/acpica/dist/source/compiler/aslfold.c vendor-sys/acpica/dist/source/compiler/aslglobal.h vendor-sys/acpica/dist/source/compiler/aslmain.c vendor-sys/acpica/dist/source/compiler/aslmapenter.c vendor-sys/acpica/dist/source/compiler/aslmapoutput.c vendor-sys/acpica/dist/source/compiler/aslmethod.c vendor-sys/acpica/dist/source/compiler/aslopcodes.c vendor-sys/acpica/dist/source/compiler/asloperands.c vendor-sys/acpica/dist/source/compiler/aslopt.c vendor-sys/acpica/dist/source/compiler/asloptions.c vendor-sys/acpica/dist/source/compiler/aslprintf.c vendor-sys/acpica/dist/source/compiler/aslstartup.c vendor-sys/acpica/dist/source/compiler/aslsupport.l vendor-sys/acpica/dist/source/compiler/asltypes.h vendor-sys/acpica/dist/source/compiler/aslutils.c vendor-sys/acpica/dist/source/compiler/asluuid.c vendor-sys/acpica/dist/source/compiler/dtcompile.c vendor-sys/acpica/dist/source/compiler/dtexpress.c vendor-sys/acpica/dist/source/compiler/dtfield.c vendor-sys/acpica/dist/source/compiler/dtio.c vendor-sys/acpica/dist/source/compiler/dtparser.y vendor-sys/acpica/dist/source/compiler/dtsubtable.c vendor-sys/acpica/dist/source/compiler/dttable.c vendor-sys/acpica/dist/source/compiler/dttemplate.c vendor-sys/acpica/dist/source/compiler/dttemplate.h vendor-sys/acpica/dist/source/compiler/dtutils.c vendor-sys/acpica/dist/source/compiler/prparser.y vendor-sys/acpica/dist/source/compiler/prscan.c vendor-sys/acpica/dist/source/compiler/prutils.c vendor-sys/acpica/dist/source/components/debugger/dbcmds.c vendor-sys/acpica/dist/source/components/debugger/dbconvert.c vendor-sys/acpica/dist/source/components/debugger/dbdisply.c vendor-sys/acpica/dist/source/components/debugger/dbexec.c vendor-sys/acpica/dist/source/components/debugger/dbfileio.c vendor-sys/acpica/dist/source/components/debugger/dbhistry.c vendor-sys/acpica/dist/source/components/debugger/dbinput.c vendor-sys/acpica/dist/source/components/debugger/dbmethod.c vendor-sys/acpica/dist/source/components/debugger/dbnames.c vendor-sys/acpica/dist/source/components/debugger/dbtest.c vendor-sys/acpica/dist/source/components/debugger/dbutils.c vendor-sys/acpica/dist/source/components/debugger/dbxface.c vendor-sys/acpica/dist/source/components/disassembler/dmbuffer.c vendor-sys/acpica/dist/source/components/disassembler/dmcstyle.c vendor-sys/acpica/dist/source/components/disassembler/dmopcode.c vendor-sys/acpica/dist/source/components/dispatcher/dsfield.c vendor-sys/acpica/dist/source/components/dispatcher/dsinit.c vendor-sys/acpica/dist/source/components/dispatcher/dsobject.c vendor-sys/acpica/dist/source/components/dispatcher/dsutils.c vendor-sys/acpica/dist/source/components/dispatcher/dswload.c vendor-sys/acpica/dist/source/components/events/evgpe.c vendor-sys/acpica/dist/source/components/events/evgpeinit.c vendor-sys/acpica/dist/source/components/executer/exconfig.c vendor-sys/acpica/dist/source/components/executer/exconvrt.c vendor-sys/acpica/dist/source/components/executer/exdebug.c vendor-sys/acpica/dist/source/components/executer/exdump.c vendor-sys/acpica/dist/source/components/executer/exfield.c vendor-sys/acpica/dist/source/components/executer/exfldio.c vendor-sys/acpica/dist/source/components/executer/exmisc.c vendor-sys/acpica/dist/source/components/executer/exnames.c vendor-sys/acpica/dist/source/components/executer/exoparg2.c vendor-sys/acpica/dist/source/components/executer/exoparg3.c vendor-sys/acpica/dist/source/components/executer/exregion.c vendor-sys/acpica/dist/source/components/executer/exstorob.c vendor-sys/acpica
svn commit: r284459 - vendor-sys/acpica/20150616
Author: jkim Date: Tue Jun 16 19:49:12 2015 New Revision: 284459 URL: https://svnweb.freebsd.org/changeset/base/284459 Log: Tag ACPICA 20150616. Added: vendor-sys/acpica/20150616/ - copied from r284458, vendor-sys/acpica/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284457 - head
Author: andrew
Date: Tue Jun 16 19:23:34 2015
New Revision: 284457
URL: https://svnweb.freebsd.org/changeset/base/284457
Log:
Add a new target universe_${target}_done to print the completion message.
Without this we could print this message in the wrong place when building
with MAKE_JUST_WORLDS is set.
Obtained from:ABT Systems Ltd
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Tue Jun 16 18:43:08 2015(r284456)
+++ head/Makefile Tue Jun 16 19:23:34 2015(r284457)
@@ -444,6 +444,7 @@ universe_${target}_worlds:
.for target_arch in ${TARGET_ARCHES_${target}}
universe_${target}: universe_${target}_${target_arch}
universe_${target}_worlds: universe_${target}_${target_arch}
+universe_${target}_done: universe_${target}_worlds
universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
@echo ${target}.${target_arch} ${UNIVERSE_TARGET} started on
`LC_ALL=C date`
@(cd ${.CURDIR} env __MAKE_CONF=/dev/null \
@@ -460,6 +461,7 @@ universe_${target}_${target_arch}: unive
.if !defined(MAKE_JUST_WORLDS)
universe_${target}: universe_${target}_kernels
+universe_${target}_done: universe_${target}_kernels
universe_${target}_kernels: universe_${target}_worlds
universe_${target}_kernels: universe_${target}_prologue .MAKE
.if exists(${KERNSRCDIR}/${target}/conf/NOTES)
@@ -471,6 +473,10 @@ universe_${target}_kernels: universe_${t
@cd ${.CURDIR} ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \
universe_kernels
.endif # !MAKE_JUST_WORLDS
+
+# Tell the user the worlds and kernels have completed
+universe_${target}: universe_${target}_done
+universe_${target}_done:
@echo ${target} completed on `LC_ALL=C date`
.endfor
universe_kernels: universe_kernconfs
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284460 - in stable/10: sys/contrib/dev/acpica sys/contrib/dev/acpica/common sys/contrib/dev/acpica/compiler sys/contrib/dev/acpica/components/debugger sys/contrib/dev/acpica/components...
Author: jkim Date: Tue Jun 16 20:00:53 2015 New Revision: 284460 URL: https://svnweb.freebsd.org/changeset/base/284460 Log: MFC: r283092, r283966 Merge ACPICA 20150515. Relnotes: yes Added: stable/10/sys/contrib/dev/acpica/common/ahtable.c - copied unchanged from r283092, head/sys/contrib/dev/acpica/common/ahtable.c stable/10/sys/contrib/dev/acpica/include/acuuid.h - copied, changed from r283092, head/sys/contrib/dev/acpica/include/acuuid.h Modified: stable/10/sys/contrib/dev/acpica/changes.txt stable/10/sys/contrib/dev/acpica/common/adisasm.c stable/10/sys/contrib/dev/acpica/common/ahpredef.c stable/10/sys/contrib/dev/acpica/common/ahuuids.c stable/10/sys/contrib/dev/acpica/common/dmextern.c stable/10/sys/contrib/dev/acpica/common/dmtable.c stable/10/sys/contrib/dev/acpica/common/dmtbdump.c stable/10/sys/contrib/dev/acpica/common/dmtbinfo.c stable/10/sys/contrib/dev/acpica/compiler/aslascii.c stable/10/sys/contrib/dev/acpica/compiler/aslcompiler.h stable/10/sys/contrib/dev/acpica/compiler/aslcompiler.l stable/10/sys/contrib/dev/acpica/compiler/asldefine.h stable/10/sys/contrib/dev/acpica/compiler/aslfiles.c stable/10/sys/contrib/dev/acpica/compiler/aslmessages.c stable/10/sys/contrib/dev/acpica/compiler/aslmessages.h stable/10/sys/contrib/dev/acpica/compiler/aslprepkg.c stable/10/sys/contrib/dev/acpica/compiler/aslstartup.c stable/10/sys/contrib/dev/acpica/compiler/aslutils.c stable/10/sys/contrib/dev/acpica/compiler/dtcompile.c stable/10/sys/contrib/dev/acpica/compiler/dtcompiler.h stable/10/sys/contrib/dev/acpica/compiler/dtio.c stable/10/sys/contrib/dev/acpica/compiler/dtsubtable.c stable/10/sys/contrib/dev/acpica/compiler/dttable.c stable/10/sys/contrib/dev/acpica/compiler/dttemplate.c stable/10/sys/contrib/dev/acpica/compiler/dttemplate.h stable/10/sys/contrib/dev/acpica/compiler/dtutils.c stable/10/sys/contrib/dev/acpica/compiler/preprocess.h stable/10/sys/contrib/dev/acpica/compiler/prscan.c stable/10/sys/contrib/dev/acpica/compiler/prutils.c stable/10/sys/contrib/dev/acpica/components/debugger/dbfileio.c stable/10/sys/contrib/dev/acpica/components/debugger/dbinput.c stable/10/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c stable/10/sys/contrib/dev/acpica/components/hardware/hwpci.c stable/10/sys/contrib/dev/acpica/components/namespace/nsprepkg.c stable/10/sys/contrib/dev/acpica/components/namespace/nsrepair.c stable/10/sys/contrib/dev/acpica/components/parser/psopinfo.c stable/10/sys/contrib/dev/acpica/components/utilities/utfileio.c stable/10/sys/contrib/dev/acpica/components/utilities/uthex.c stable/10/sys/contrib/dev/acpica/components/utilities/utxferror.c stable/10/sys/contrib/dev/acpica/include/acdebug.h stable/10/sys/contrib/dev/acpica/include/acdisasm.h stable/10/sys/contrib/dev/acpica/include/aclocal.h stable/10/sys/contrib/dev/acpica/include/acparser.h stable/10/sys/contrib/dev/acpica/include/acpixf.h stable/10/sys/contrib/dev/acpica/include/acpredef.h stable/10/sys/contrib/dev/acpica/include/actbl.h stable/10/sys/contrib/dev/acpica/include/actbl1.h stable/10/sys/contrib/dev/acpica/include/actbl2.h stable/10/sys/contrib/dev/acpica/include/actbl3.h stable/10/sys/contrib/dev/acpica/include/actypes.h stable/10/sys/contrib/dev/acpica/include/acutils.h stable/10/sys/contrib/dev/acpica/include/platform/acenv.h stable/10/sys/contrib/dev/acpica/include/platform/acenvex.h stable/10/usr.sbin/acpi/acpidb/acpidb.c stable/10/usr.sbin/acpi/iasl/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/contrib/dev/acpica/changes.txt == --- stable/10/sys/contrib/dev/acpica/changes.txtTue Jun 16 19:49:12 2015(r284459) +++ stable/10/sys/contrib/dev/acpica/changes.txtTue Jun 16 20:00:53 2015(r284460) @@ -1,4 +1,52 @@ +08 April 2015. Summary of changes for version 20150515: + +This release implements most of ACPI 6.0 as described below. + +1) ACPICA kernel-resident subsystem: + +Implemented runtime argument checking and return value checking for all +new ACPI 6.0 predefined names. This includes: _BTH, _CR3, _DSD, _LPI, +_MTL, _PRR, _RDI, _RST, _TFP, _TSN. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. + + Current Release: +Non-Debug Version: 99.9K Code, 27.5K Data, 127.4K Total +Debug Version: 195.2K Code, 80.8K Data, 276.0K Total + Previous Release: +Non-Debug Version: 99.1K Code, 27.3K Data, 126.4K Total +Debug Version: 192.8K Code, 79.9K Data, 272.7K Total + + +2) iASL Compiler/Disassembler and Tools: + +iASL compiler: Added
svn commit: r284462 - head/sys/kern
Author: pfg
Date: Tue Jun 16 20:19:00 2015
New Revision: 284462
URL: https://svnweb.freebsd.org/changeset/base/284462
Log:
Use nitems() macro instead of __arraycount()
Modified:
head/sys/kern/stack_protector.c
Modified: head/sys/kern/stack_protector.c
==
--- head/sys/kern/stack_protector.c Tue Jun 16 20:01:01 2015
(r284461)
+++ head/sys/kern/stack_protector.c Tue Jun 16 20:19:00 2015
(r284462)
@@ -17,15 +17,14 @@ __stack_chk_fail(void)
panic(stack overflow detected; backtrace may be corrupted);
}
-#define __arraycount(__x) (sizeof(__x) / sizeof(__x[0]))
static void
__stack_chk_init(void *dummy __unused)
{
size_t i;
- long guard[__arraycount(__stack_chk_guard)];
+ long guard[nitems(__stack_chk_guard)];
arc4rand(guard, sizeof(guard), 0);
- for (i = 0; i __arraycount(guard); i++)
+ for (i = 0; i nitems(guard); i++)
__stack_chk_guard[i] = guard[i];
}
SYSINIT(stack_chk, SI_SUB_RANDOM, SI_ORDER_ANY, __stack_chk_init, NULL);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284481 - in head: bin/cat bin/ls gnu/lib/libgcc gnu/usr.bin/binutils/as gnu/usr.bin/binutils/ld gnu/usr.bin/binutils/libbinutils include kerberos5/lib/libasn1 kerberos5/lib/libheimbase...
Author: sjg Date: Tue Jun 16 23:37:19 2015 New Revision: 284481 URL: https://svnweb.freebsd.org/changeset/base/284481 Log: new depends Added: head/lib/clang/liblldb/Makefile.depend (contents, props changed) head/lib/clang/liblldbAPI/Makefile.depend (contents, props changed) head/lib/clang/liblldbBreakpoint/Makefile.depend (contents, props changed) head/lib/clang/liblldbCommands/Makefile.depend (contents, props changed) head/lib/clang/liblldbCore/Makefile.depend (contents, props changed) head/lib/clang/liblldbDataFormatters/Makefile.depend (contents, props changed) head/lib/clang/liblldbExpression/Makefile.depend (contents, props changed) head/lib/clang/liblldbHostCommon/Makefile.depend (contents, props changed) head/lib/clang/liblldbHostFreeBSD/Makefile.depend (contents, props changed) head/lib/clang/liblldbHostPOSIX/Makefile.depend (contents, props changed) head/lib/clang/liblldbInterpreter/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginDisassemblerLLVM/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginInstructionARM/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginInstructionARM64/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginObjectFileELF/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginObjectFileJIT/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginPlatformFreeBSD/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginPlatformGDB/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginProcessElfCore/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginProcessPOSIX/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginProcessUtility/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile.depend (contents, props changed) head/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile.depend (contents, props changed) head/lib/clang/liblldbSymbol/Makefile.depend (contents, props changed) head/lib/clang/liblldbTarget/Makefile.depend (contents, props changed) head/lib/clang/liblldbUtility/Makefile.depend (contents, props changed) head/usr.bin/addr2line/Makefile.depend (contents, props changed) head/usr.bin/clang/lldb/Makefile.depend (contents, props changed) head/usr.bin/nm/Makefile.depend (contents, props changed) head/usr.bin/readelf/Makefile.depend (contents, props changed) head/usr.bin/size/Makefile.depend (contents, props changed) head/usr.bin/strings/Makefile.depend (contents, props changed) Modified: head/bin/cat/Makefile.depend head/bin/ls/Makefile.depend head/gnu/lib/libgcc/Makefile.depend head/gnu/usr.bin/binutils/as/Makefile.depend head/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 head/gnu/usr.bin/binutils/libbinutils/Makefile.depend head/include/Makefile.depend head/kerberos5/lib/libasn1/Makefile.depend head/kerberos5/lib/libheimbase/Makefile.depend head/kerberos5/lib/libheimipcc/Makefile.depend head/kerberos5/lib/libhx509/Makefile.depend head/kerberos5/lib/libkrb5/Makefile.depend head/kerberos5/lib/libroken/Makefile.depend head/kerberos5/lib/libwind/Makefile.depend head/lib/clang/libllvmexecutionengine/Makefile.depend head/lib/clang/libllvmmcdisassembler/Makefile.depend head/lib/clang/libllvmmcjit/Makefile.depend head/lib/clang/libllvmruntimedyld/Makefile.depend head/lib/libbegemot/Makefile.depend
svn commit: r284480 - head/gnu/lib/libgcc
Author: sjg
Date: Tue Jun 16 23:36:20 2015
New Revision: 284480
URL: https://svnweb.freebsd.org/changeset/base/284480
Log:
Hook extra libs to _LIBS so bsd.lib.mk can do its thing
Differential Revision:D2843
Reviewed by: imp
Modified:
head/gnu/lib/libgcc/Makefile
Modified: head/gnu/lib/libgcc/Makefile
==
--- head/gnu/lib/libgcc/MakefileTue Jun 16 23:32:28 2015
(r284479)
+++ head/gnu/lib/libgcc/MakefileTue Jun 16 23:36:20 2015
(r284480)
@@ -338,7 +338,7 @@ libgcc_eh.a:${EH_OBJS_T}
@${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q`
${RANLIB} ${RANLIBFLAGS} ${.TARGET}
-all: libgcc_eh.a
+_LIBS+= libgcc_eh.a
.if ${MK_PROFILE} != no
libgcc_eh_p.a: ${EH_OBJS_P}
@@ -346,7 +346,8 @@ libgcc_eh_p.a: ${EH_OBJS_P}
@rm -f ${.TARGET}
@${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q`
${RANLIB} ${RANLIBFLAGS} ${.TARGET}
-all: libgcc_eh_p.a
+
+_LIBS+= libgcc_eh_p.a
.endif
_libinstall: _lib-eh-install
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284475 - head/usr.sbin/syslogd
Author: rpaulo Date: Tue Jun 16 22:31:38 2015 New Revision: 284475 URL: https://svnweb.freebsd.org/changeset/base/284475 Log: syslogd: don't leak finet0. Submitted by: Kurt Lidl lidl pix.net Sponsored by: Pi-Coral, Inc. Modified: head/usr.sbin/syslogd/syslogd.c Modified: head/usr.sbin/syslogd/syslogd.c == --- head/usr.sbin/syslogd/syslogd.c Tue Jun 16 22:26:22 2015 (r284474) +++ head/usr.sbin/syslogd/syslogd.c Tue Jun 16 22:31:38 2015 (r284475) @@ -587,6 +587,7 @@ main(int argc, char *argv[]) finet[(*finet)+i] = finet0[i]; } *finet = total - 1; + free(finet0); } } } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284476 - head/usr.sbin/syslogd
Author: rpaulo
Date: Tue Jun 16 22:42:19 2015
New Revision: 284476
URL: https://svnweb.freebsd.org/changeset/base/284476
Log:
syslogd: re-read the timezone when receive a SIGHUP.
syslogd already re-reads the configuration file and the hostname when
receiving a SIGHUP, so it makes sense to reset the timezone.
Special care was taken to ensure we don't break installations running
with a custom TZ variable.
PR: 196905
Submitted by: Kurt Lidl lidl pix.net
Sponsored by: Pi-Coral, Inc.
Modified:
head/usr.sbin/syslogd/syslogd.c
Modified: head/usr.sbin/syslogd/syslogd.c
==
--- head/usr.sbin/syslogd/syslogd.c Tue Jun 16 22:31:38 2015
(r284475)
+++ head/usr.sbin/syslogd/syslogd.c Tue Jun 16 22:42:19 2015
(r284476)
@@ -1603,6 +1603,24 @@ init(int signo)
}
/*
+* Load / reload timezone data (in case it changed).
+*
+* Just calling tzset() again does not work, the timezone code
+* caches the result. However, by setting the TZ variable, one
+* can defeat the caching and have the timezone code really
+* reload the timezone data. Respect any initial setting of
+* TZ, in case the system is configured specially.
+*/
+ dprintf(loading timezone data via tzset()\n);
+ if (getenv(TZ)) {
+ tzset();
+ } else {
+ setenv(TZ, :/etc/localtime, 1);
+ tzset();
+ unsetenv(TZ);
+ }
+
+ /*
* Close all open log files.
*/
Initialized = 0;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284477 - head/sys/dev/filemon
Author: sjg
Date: Tue Jun 16 23:03:15 2015
New Revision: 284477
URL: https://svnweb.freebsd.org/changeset/base/284477
Log:
Bump the version since we now handle openat
Modified:
head/sys/dev/filemon/filemon.h
Modified: head/sys/dev/filemon/filemon.h
==
--- head/sys/dev/filemon/filemon.h Tue Jun 16 22:42:19 2015
(r284476)
+++ head/sys/dev/filemon/filemon.h Tue Jun 16 23:03:15 2015
(r284477)
@@ -30,5 +30,5 @@
#define FILEMON_SET_FD _IOWR('S', 1, int)
#define FILEMON_SET_PID_IOWR('S', 2, pid_t)
-#define FILEMON_VERSION4 /* output format
+#define FILEMON_VERSION5 /* output format
(bump when adding record types) */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284479 - head
Author: sjg
Date: Tue Jun 16 23:32:28 2015
New Revision: 284479
URL: https://svnweb.freebsd.org/changeset/base/284479
Log:
Make mention of make.conf being included earlier and what to do about it.
Reviewed by: NGie
Modified:
head/UPDATING
Modified: head/UPDATING
==
--- head/UPDATING Tue Jun 16 23:06:43 2015(r284478)
+++ head/UPDATING Tue Jun 16 23:32:28 2015(r284479)
@@ -32,6 +32,23 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
ln -s 'abort:false,junk:false' /etc/malloc.conf.)
20150616:
+ /etc/make.conf now included earlier.
+ sys.mk now includes /etc/make.conf and {local,src}.sys.mk earlier
+ than previously.
+ This makes it simple to interpose external toolchains etc.
+ However it may cause problems for users who have things like::
+
+ INSTALL+= something
+
+ in /etc/make.conf, since INSTALL is not yet defined.
+ A safe fix for that is to have::
+
+ INSTALL?= install
+ INSTALL+= something
+
+ which is equivalent to previous behavior.
+
+20150616:
FreeBSD's old make (fmake) has been removed from the system. It is
available as the devel/fmake port or via pkg install fmake.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284482 - in head/targets/pseudo: clang toolchain userland/gnu
Author: sjg
Date: Tue Jun 16 23:38:44 2015
New Revision: 284482
URL: https://svnweb.freebsd.org/changeset/base/284482
Log:
Support WITH_LLDB
Remove entries from userland/gnu that conflict with toolchain
Modified:
head/targets/pseudo/clang/Makefile.depend
head/targets/pseudo/toolchain/Makefile.depend
head/targets/pseudo/userland/gnu/Makefile.depend
Modified: head/targets/pseudo/clang/Makefile.depend
==
--- head/targets/pseudo/clang/Makefile.depend Tue Jun 16 23:37:19 2015
(r284481)
+++ head/targets/pseudo/clang/Makefile.depend Tue Jun 16 23:38:44 2015
(r284482)
@@ -2,6 +2,10 @@
# This file is not autogenerated - take care!
+.if !defined(MK_LLDB)
+.include src.opts.mk
+.endif
+
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
@@ -11,5 +15,9 @@ DIRDEPS = \
usr.bin/clang/clang-tblgen \
usr.bin/clang/tblgen \
+.if ${MK_LLDB} == yes
+DIRDEPS+= \
+ usr.bin/clang/lldb
+.endif
.include dirdeps.mk
Modified: head/targets/pseudo/toolchain/Makefile.depend
==
--- head/targets/pseudo/toolchain/Makefile.depend Tue Jun 16 23:37:19
2015(r284481)
+++ head/targets/pseudo/toolchain/Makefile.depend Tue Jun 16 23:38:44
2015(r284482)
@@ -31,7 +31,7 @@ DIRDEPS+= \
.endif
-DIRDEPS= \
+DIRDEPS+= \
usr.bin/xinstall \
gnu/usr.bin/binutils/ar \
gnu/usr.bin/binutils/as \
Modified: head/targets/pseudo/userland/gnu/Makefile.depend
==
--- head/targets/pseudo/userland/gnu/Makefile.dependTue Jun 16 23:37:19
2015(r284481)
+++ head/targets/pseudo/userland/gnu/Makefile.dependTue Jun 16 23:38:44
2015(r284482)
@@ -16,7 +16,6 @@ DIRDEPS = \
gnu/lib/libssp/libssp_nonshared \
gnu/lib/libstdc++ \
gnu/lib/libsupc++ \
- gnu/usr.bin/binutils/addr2line \
gnu/usr.bin/binutils/ar \
gnu/usr.bin/binutils/as \
gnu/usr.bin/binutils/doc \
@@ -25,14 +24,9 @@ DIRDEPS = \
gnu/usr.bin/binutils/libbinutils \
gnu/usr.bin/binutils/libiberty \
gnu/usr.bin/binutils/libopcodes \
- gnu/usr.bin/binutils/nm \
gnu/usr.bin/binutils/objcopy \
gnu/usr.bin/binutils/objdump \
gnu/usr.bin/binutils/ranlib \
- gnu/usr.bin/binutils/readelf \
- gnu/usr.bin/binutils/size \
- gnu/usr.bin/binutils/strings \
- gnu/usr.bin/binutils/strip \
gnu/usr.bin/dialog \
gnu/usr.bin/diff/doc \
gnu/usr.bin/diff3 \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284478 - head/share/mk
Author: sjg
Date: Tue Jun 16 23:06:43 2015
New Revision: 284478
URL: https://svnweb.freebsd.org/changeset/base/284478
Log:
Normally a staging conflict causes an error.
When bootstrapping different options, it is handy to be able to
make those warnings.
Modified:
head/share/mk/meta.stage.mk
Modified: head/share/mk/meta.stage.mk
==
--- head/share/mk/meta.stage.mk Tue Jun 16 23:03:15 2015(r284477)
+++ head/share/mk/meta.stage.mk Tue Jun 16 23:06:43 2015(r284478)
@@ -60,14 +60,23 @@ LN_CP_SCRIPT = LnCp() { \
ln $$1 $$2 2 /dev/null || \
cp -p $$1 $$2; }
+# a staging conflict should cause an error
+# a warning is handy when bootstapping different options.
+STAGE_CONFLICT?= ERROR
+.if ${STAGE_CONFLICT:tl} == error
+STAGE_CONFLICT_ACTION= exit 1;
+.else
+STAGE_CONFLICT_ACTION=
+.endif
+
# it is an error for more than one src dir to try and stage
# the same file
STAGE_DIRDEP_SCRIPT = ${LN_CP_SCRIPT}; StageDirdep() { \
t=$$1; \
if [ -s $$t.dirdep ]; then \
cmp -s .dirdep $$t.dirdep return; \
- echo ERROR: $$t installed by `cat $$t.dirdep` not ${_dirdep} 2; \
- exit 1; \
+ echo ${STAGE_CONFLICT}: $$t installed by `cat $$t.dirdep` not
${_dirdep} 2; \
+ ${STAGE_CONFLICT_ACTION} \
fi; \
LnCp .dirdep $$t.dirdep || exit 1; }
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284493 - stable/10/lib/libthr/thread
Author: kib Date: Wed Jun 17 04:18:30 2015 New Revision: 284493 URL: https://svnweb.freebsd.org/changeset/base/284493 Log: MFC r284385: Fix typo in comment. Modified: stable/10/lib/libthr/thread/thr_sig.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libthr/thread/thr_sig.c == --- stable/10/lib/libthr/thread/thr_sig.c Wed Jun 17 03:23:45 2015 (r284492) +++ stable/10/lib/libthr/thread/thr_sig.c Wed Jun 17 04:18:30 2015 (r284493) @@ -293,8 +293,8 @@ check_cancel(struct pthread *curthread, * 2) because _thr_ast() may be called by *THR_CRITICAL_LEAVE() which is used by rtld rwlock *and any libthr internal locks, when rtld rwlock -*is used, it is mostly caused my an unresolved PLT. -*those routines may clear the TDP_WAKEUP flag by +*is used, it is mostly caused by an unresolved PLT. +*Those routines may clear the TDP_WAKEUP flag by *invoking some system calls, in those cases, we *also should reenable the flag. * 3) thread is in sigsuspend(), and the syscall insists ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284494 - head/bin/ls
Author: kan
Date: Wed Jun 17 04:26:48 2015
New Revision: 284494
URL: https://svnweb.freebsd.org/changeset/base/284494
Log:
Continue ubreaking ``env LANG=ru_RU.KOI8-R ls -l''.
File names are in current locale as well.
Modified:
head/bin/ls/print.c
Modified: head/bin/ls/print.c
==
--- head/bin/ls/print.c Wed Jun 17 04:18:30 2015(r284493)
+++ head/bin/ls/print.c Wed Jun 17 04:26:48 2015(r284494)
@@ -178,7 +178,7 @@ printlong(const DISPLAY *dp)
sp = p-fts_statp;
name = getname(p-fts_name);
if (name)
- xo_emit({ke:name}, name);
+ xo_emit({ke:name/%hs}, name);
if (f_inode)
xo_emit({:inode/%*ju} ,
dp-s_inode, (uintmax_t)sp-st_ino);
@@ -214,7 +214,7 @@ printlong(const DISPLAY *dp)
#endif
if (name) {
- xo_emit({dk:name}, name);
+ xo_emit({dk:name/%hs}, name);
free(name);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284495 - in head/sys: kern ufs/ffs
Author: kib
Date: Wed Jun 17 04:46:58 2015
New Revision: 284495
URL: https://svnweb.freebsd.org/changeset/base/284495
Log:
vfs_msync(), called from syncer vnode fsync VOP, only iterates over
the active vnode list for the given mount point, with the assumption
that vnodes with dirty pages are active. This is enforced by
vinactive() doing vm_object_page_clean() pass over the vnode pages.
The issue is, if vinactive() cannot be called during vput() due to the
vnode being only shared-locked, we might end up with the dirty pages
for the vnode on the free list. Such vnode is invisible to syncer,
and pages are only cleaned on the vnode reactivation. In other words,
the race results in the broken guarantee that user data, written
through the mmap(2), is written to the disk not later than in 30
seconds after the write.
Fix this by keeping the vnode which is freed but still owing
inactivation, on the active list. When syncer loops find such vnode,
it is deactivated and cleaned by the final vput() call.
Tested by:pho
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Modified:
head/sys/kern/vfs_subr.c
head/sys/ufs/ffs/ffs_vfsops.c
Modified: head/sys/kern/vfs_subr.c
==
--- head/sys/kern/vfs_subr.cWed Jun 17 04:26:48 2015(r284494)
+++ head/sys/kern/vfs_subr.cWed Jun 17 04:46:58 2015(r284495)
@@ -173,6 +173,11 @@ static int reassignbufcalls;
SYSCTL_INT(_vfs, OID_AUTO, reassignbufcalls, CTLFLAG_RW, reassignbufcalls, 0,
Number of calls to reassignbuf);
+static u_long free_owe_inact;
+SYSCTL_ULONG(_vfs, OID_AUTO, free_owe_inact, CTLFLAG_RD, free_owe_inact, 0,
+Number of times free vnodes kept on active list due to VFS
+owing inactivation);
+
/*
* Cache for the mount type id assigned to NFS. This is used for
* special checks in nfs/nfs_nqlease.c and vm/vnode_pager.c.
@@ -2368,11 +2373,8 @@ vholdl(struct vnode *vp)
CTR2(KTR_VFS, %s: vp %p, __func__, vp);
#ifdef INVARIANTS
/* getnewvnode() calls v_incr_usecount() without holding interlock. */
- if (vp-v_type != VNON || vp-v_data != NULL) {
+ if (vp-v_type != VNON || vp-v_data != NULL)
ASSERT_VI_LOCKED(vp, vholdl);
- VNASSERT(vp-v_holdcnt 0 || (vp-v_iflag VI_FREE) != 0,
- vp, (vholdl: free vnode is held));
- }
#endif
vp-v_holdcnt++;
if ((vp-v_iflag VI_FREE) == 0)
@@ -2443,23 +2445,29 @@ vdropl(struct vnode *vp)
VNASSERT(vp-v_holdcnt == 0, vp,
(vdropl: freeing when we shouldn't));
active = vp-v_iflag VI_ACTIVE;
- vp-v_iflag = ~VI_ACTIVE;
- mp = vp-v_mount;
- mtx_lock(vnode_free_list_mtx);
- if (active) {
- TAILQ_REMOVE(mp-mnt_activevnodelist, vp,
- v_actfreelist);
- mp-mnt_activevnodelistsize--;
- }
- if (vp-v_iflag VI_AGE) {
- TAILQ_INSERT_HEAD(vnode_free_list, vp, v_actfreelist);
+ if ((vp-v_iflag VI_OWEINACT) == 0) {
+ vp-v_iflag = ~VI_ACTIVE;
+ mp = vp-v_mount;
+ mtx_lock(vnode_free_list_mtx);
+ if (active) {
+ TAILQ_REMOVE(mp-mnt_activevnodelist, vp,
+ v_actfreelist);
+ mp-mnt_activevnodelistsize--;
+ }
+ if (vp-v_iflag VI_AGE) {
+ TAILQ_INSERT_HEAD(vnode_free_list, vp,
+ v_actfreelist);
+ } else {
+ TAILQ_INSERT_TAIL(vnode_free_list, vp,
+ v_actfreelist);
+ }
+ freevnodes++;
+ vp-v_iflag = ~VI_AGE;
+ vp-v_iflag |= VI_FREE;
+ mtx_unlock(vnode_free_list_mtx);
} else {
- TAILQ_INSERT_TAIL(vnode_free_list, vp, v_actfreelist);
+ atomic_add_long(free_owe_inact, 1);
}
- freevnodes++;
- vp-v_iflag = ~VI_AGE;
- vp-v_iflag |= VI_FREE;
- mtx_unlock(vnode_free_list_mtx);
VI_UNLOCK(vp);
return;
}
Modified: head/sys/ufs/ffs/ffs_vfsops.c
==
--- head/sys/ufs/ffs/ffs_vfsops.c Wed Jun 17 04:26:48 2015
(r284494)
+++ head/sys/ufs/ffs/ffs_vfsops.c Wed Jun 17 04:46:58 2015
(r284495)
@@ -1410,6 +1410,14 @@ ffs_statfs(mp, sbp)
return (0);
}
+static bool
+sync_doupdate(struct inode *ip)
+{
+
+ return
Re: svn commit: r284494 - head/bin/ls
On 17.06.2015 7:26, Alexander Kabaev wrote:
Author: kan
Date: Wed Jun 17 04:26:48 2015
New Revision: 284494
URL: https://svnweb.freebsd.org/changeset/base/284494
Log:
Continue ubreaking ``env LANG=ru_RU.KOI8-R ls -l''.
File names are in current locale as well.
Thanx, fixed now.
Modified:
head/bin/ls/print.c
Modified: head/bin/ls/print.c
==
--- head/bin/ls/print.c Wed Jun 17 04:18:30 2015(r284493)
+++ head/bin/ls/print.c Wed Jun 17 04:26:48 2015(r284494)
@@ -178,7 +178,7 @@ printlong(const DISPLAY *dp)
sp = p-fts_statp;
name = getname(p-fts_name);
if (name)
- xo_emit({ke:name}, name);
+ xo_emit({ke:name/%hs}, name);
if (f_inode)
xo_emit({:inode/%*ju} ,
dp-s_inode, (uintmax_t)sp-st_ino);
@@ -214,7 +214,7 @@ printlong(const DISPLAY *dp)
#endif
if (name) {
- xo_emit({dk:name}, name);
+ xo_emit({dk:name/%hs}, name);
free(name);
}
--
http://ache.vniz.net/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r284489 - head/bin/ls
On Tue, 16 Jun 2015 20:24:07 -0700
Marcel Moolenaar mar...@xcllnt.net wrote:
On Jun 16, 2015, at 8:15 PM, Andrey Chernov a...@freebsd.org
wrote:
On 17.06.2015 6:12, Marcel Moolenaar wrote:
Author: marcel
Date: Wed Jun 17 03:12:08 2015
New Revision: 284489
URL: https://svnweb.freebsd.org/changeset/base/284489
Log:
Unbreak ``env LANG=ru_RU.KOI8-R ls -l''.
Time strings are in the current locale.
Thanx, but the same treatment should be for file names too: they
are in the current locale. ls -l drops them otherwise.
filenames are already printed with the h attribute, so
something else may be wrong.
--
Marcel Moolenaar
mar...@xcllnt.net
No, not in ls -l. You need this in printlong:
- xo_emit({ke:name}, name);
+ xo_emit({ke:name/%hs}, name)
- xo_emit({dk:name}, name);
+ xo_emit({dk:name/%hs}, name);
--
Alexander Kabaev
pgpww0IEEcOez.pgp
Description: OpenPGP digital signature
svn commit: r284484 - in stable/10: contrib/top usr.bin/top
Author: marcel
Date: Wed Jun 17 02:30:12 2015
New Revision: 284484
URL: https://svnweb.freebsd.org/changeset/base/284484
Log:
MFC 284165:
Move contrib/top/top.X to contrib/top/top.xs and move
contrib/top/top.local.H to contrib/top/top.local.hs.
Change the makefile accordingly.
Added:
stable/10/contrib/top/top.local.hs
- copied unchanged from r284165, head/contrib/top/top.local.hs
stable/10/contrib/top/top.xs
- copied unchanged from r284165, head/contrib/top/top.xs
Deleted:
stable/10/contrib/top/top.X
stable/10/contrib/top/top.local.H
Modified:
stable/10/usr.bin/top/Makefile
Directory Properties:
stable/10/ (props changed)
Copied: stable/10/contrib/top/top.local.hs (from r284165,
head/contrib/top/top.local.hs)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/contrib/top/top.local.hs Wed Jun 17 02:30:12 2015
(r284484, copy of r284165, head/contrib/top/top.local.hs)
@@ -0,0 +1,68 @@
+/*
+ * Top - a top users display for Berkeley Unix
+ *
+ * Definitions for things that might vary between installations.
+ */
+
+/*
+ * The space command forces an immediate update. Sometimes, on loaded
+ * systems, this update will take a significant period of time (because all
+ * the output is buffered). So, if the short-term load average is above
+ * LoadMax, then top will put the cursor home immediately after the space
+ * is pressed before the next update is attempted. This serves as a visual
+ * acknowledgement of the command. On Suns, LoadMax will get multiplied by
+ * FSCALE before being compared to avenrun[0]. Therefore, LoadMax
+ * should always be specified as a floating point number.
+ */
+#ifndef LoadMax
+#define LoadMax %LoadMax%
+#endif
+
+/*
+ * Table_size defines the size of the hash tables used to map uid to
+ * username. The number of users in /etc/passwd CANNOT be greater than
+ * this number. If the error message table overflow: too many users
+ * is printed by top, then Table_size needs to be increased. Things will
+ * work best if the number is a prime number that is about twice the number
+ * of lines in /etc/passwd.
+ */
+#ifndef Table_size
+#define Table_size %TableSize%
+#endif
+
+/*
+ * Nominal_TOPN is used as the default TOPN when Default_TOPN is Infinity
+ * and the output is a dumb terminal. If we didn't do this, then
+ * installations who use a default TOPN of Infinity will get every
+ * process in the system when running top on a dumb terminal (or redirected
+ * to a file). Note that Nominal_TOPN is a default: it can still be
+ * overridden on the command line, even with the value infinity.
+ */
+#ifndef Nominal_TOPN
+#define Nominal_TOPN %NominalTopn%
+#endif
+
+#ifndef Default_TOPN
+#define Default_TOPN %topn%
+#endif
+
+#ifndef Default_DELAY
+#define Default_DELAY %delay%
+#endif
+
+/*
+ * If the local system's getpwnam interface uses random access to retrieve
+ * a record (i.e.: 4.3 systems, Sun yellow pages), then defining
+ * RANDOM_PW will take advantage of that fact. If RANDOM_PW is defined,
+ * then getpwnam is used and the result is cached. If not, then getpwent
+ * is used to read and cache the password entries sequentially until the
+ * desired one is found.
+ *
+ * We initially set RANDOM_PW to something which is controllable by the
+ * Configure script. Then if its value is 0, we undef it.
+ */
+
+#define RANDOM_PW %random%
+#if RANDOM_PW == 0
+#undef RANDOM_PW
+#endif
Copied: stable/10/contrib/top/top.xs (from r284165, head/contrib/top/top.xs)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/contrib/top/top.xsWed Jun 17 02:30:12 2015
(r284484, copy of r284165, head/contrib/top/top.xs)
@@ -0,0 +1,448 @@
+.\ NOTE: changes to the manual page for top should be made in the
+.\file top.X and NOT in the file top.1.
+.\ $FreeBSD$
+.nr N %topn%
+.nr D %delay%
+.TH TOP 1 Local
+.UC 4
+.SH NAME
+top \- display and update information about the top cpu processes
+.SH SYNOPSIS
+.B top
+[
+.B \-abCHIijnPqStuvz
+] [
+.BI \-d count
+] [
+.BI \-m io | cpu
+] [
+.BI \-o field
+] [
+.BI \-s time
+] [
+.BI \-J jail
+] [
+.BI \-U username
+] [
+.I number
+]
+.SH DESCRIPTION
+.\ This defines appropriate quote strings for nroff and troff
+.ds lq \
+.ds rq \
+.if t .ds lq ``
+.if t .ds rq ''
+.\ Just in case these number registers aren't set yet...
+.if \nN==0 .nr N 10
+.if \nD==0 .nr D 2
+.I Top
+displays the top
+.if !\nN==-1 \nN
+processes on the system and periodically updates this information.
+.if \nN==-1 \
+\{\
+If standard output is an intelligent terminal (see below) then
+as many processes as will fit on the terminal screen are displayed
+by default. Otherwise, a good number of them are shown (around 20).
+.\}
+Raw cpu percentage is used to rank
svn commit: r284485 - stable/10/contrib/sendmail/src
Author: gshapiro
Date: Wed Jun 17 02:39:10 2015
New Revision: 284485
URL: https://svnweb.freebsd.org/changeset/base/284485
Log:
MFC: The import of openssl to address the FreeBSD-SA-15:10.openssl security
advisory includes a change which rejects handshakes with DH parameters
below 768 bits. sendmail releases prior to 8.15.2 (not yet released),
defaulted to a 512 bit DH parameter setting for client connections.
This commit chages that default to 1024 bits. sendmail 8.15.2, when
released well use a default of 2048 bits.
Modified:
stable/10/contrib/sendmail/src/tls.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/sendmail/src/tls.c
==
--- stable/10/contrib/sendmail/src/tls.cWed Jun 17 02:30:12 2015
(r284484)
+++ stable/10/contrib/sendmail/src/tls.cWed Jun 17 02:39:10 2015
(r284485)
@@ -650,7 +650,7 @@ inittls(ctx, req, options, srv, certfile
** 1024generate 1024 bit parameters
** 2048generate 2048 bit parameters
** /file/name read parameters from /file/name
- ** default is: 1024 for server, 512 for client (OK? XXX)
+ ** default is: 1024
*/
if (bitset(TLS_I_TRY_DH, req))
@@ -676,8 +676,8 @@ inittls(ctx, req, options, srv, certfile
}
if (dhparam == NULL)
{
- dhparam = srv ? 1 : 5;
- req |= (srv ? TLS_I_DH1024 : TLS_I_DH512);
+ dhparam = 1;
+ req |= TLS_I_DH1024;
}
else if (*dhparam == '/')
{
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284486 - head/usr.bin/calendar/calendars
Author: acm (ports committer) Date: Wed Jun 17 02:43:20 2015 New Revision: 284486 URL: https://svnweb.freebsd.org/changeset/base/284486 Log: - Add acm@ entry Modified: head/usr.bin/calendar/calendars/calendar.freebsd Modified: head/usr.bin/calendar/calendars/calendar.freebsd == --- head/usr.bin/calendar/calendars/calendar.freebsdWed Jun 17 02:39:10 2015(r284485) +++ head/usr.bin/calendar/calendars/calendar.freebsdWed Jun 17 02:43:20 2015(r284486) @@ -199,6 +199,7 @@ 06/06 Alan Eldridge al...@freebsd.org died in Denver, Colorado, 2003 06/07 Jimmy Olgeni olg...@freebsd.org born in Milano, Italy, 1976 06/07 Benjamin Close ben...@freebsd.org born in Adelaide, Australia, 1978 +06/11 Alonso Cardenas Marquez a...@freebsd.org born in Arequipa, Peru, 1979 06/14 Josh Paetzel jpaet...@freebsd.org born in Minneapolis, Minnesota, United States, 1973 06/17 Tilman Linneweh ar...@freebsd.org born in Weinheim, Baden-Wuerttemberg, Germany, 1978 06/18 Li-Wen Hsu lw...@freebsd.org born in Taipei, Taiwan, Republic of China, 1984 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284487 - stable/10
Author: gshapiro Date: Wed Jun 17 02:47:30 2015 New Revision: 284487 URL: https://svnweb.freebsd.org/changeset/base/284487 Log: MFC: The fix for the issue described in the 20150614 sendmail entry has been been committed in revision 284485.. Modified: stable/10/UPDATING Modified: stable/10/UPDATING == --- stable/10/UPDATING Wed Jun 17 02:43:20 2015(r284486) +++ stable/10/UPDATING Wed Jun 17 02:47:30 2015(r284487) @@ -16,6 +16,13 @@ from older versions of FreeBSD, try WITH stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20150615: + The fix for the issue described in the 20150614 sendmail entry + below has been been committed in revision 284485. The work + around described in that entry is no longer needed unless the + default setting is overridden by a confDH_PARAMETERS configuration + setting of '5' or pointing to a 512 bit DH parameter file. + 20150614: The import of openssl to address the FreeBSD-SA-15:10.openssl security advisory includes a change which rejects handshakes ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284488 - stable/9/contrib/sendmail/src
Author: gshapiro
Date: Wed Jun 17 03:11:25 2015
New Revision: 284488
URL: https://svnweb.freebsd.org/changeset/base/284488
Log:
MFC: The import of openssl to address the FreeBSD-SA-15:10.openssl security
advisory includes a change which rejects handshakes with DH parameters
below 768 bits. sendmail releases prior to 8.15.2 (not yet released),
defaulted to a 512 bit DH parameter setting for client connections.
This commit chages that default to 1024 bits. sendmail 8.15.2, when
released well use a default of 2048 bits.
Modified:
stable/9/contrib/sendmail/src/tls.c
Directory Properties:
stable/9/contrib/sendmail/ (props changed)
Modified: stable/9/contrib/sendmail/src/tls.c
==
--- stable/9/contrib/sendmail/src/tls.c Wed Jun 17 02:47:30 2015
(r284487)
+++ stable/9/contrib/sendmail/src/tls.c Wed Jun 17 03:11:25 2015
(r284488)
@@ -650,7 +650,7 @@ inittls(ctx, req, options, srv, certfile
** 1024generate 1024 bit parameters
** 2048generate 2048 bit parameters
** /file/name read parameters from /file/name
- ** default is: 1024 for server, 512 for client (OK? XXX)
+ ** default is: 1024
*/
if (bitset(TLS_I_TRY_DH, req))
@@ -676,8 +676,8 @@ inittls(ctx, req, options, srv, certfile
}
if (dhparam == NULL)
{
- dhparam = srv ? 1 : 5;
- req |= (srv ? TLS_I_DH1024 : TLS_I_DH512);
+ dhparam = 1;
+ req |= TLS_I_DH1024;
}
else if (*dhparam == '/')
{
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284489 - head/bin/ls
Author: marcel
Date: Wed Jun 17 03:12:08 2015
New Revision: 284489
URL: https://svnweb.freebsd.org/changeset/base/284489
Log:
Unbreak ``env LANG=ru_RU.KOI8-R ls -l''.
Time strings are in the current locale.
Modified:
head/bin/ls/print.c
Modified: head/bin/ls/print.c
==
--- head/bin/ls/print.c Wed Jun 17 03:11:25 2015(r284488)
+++ head/bin/ls/print.c Wed Jun 17 03:12:08 2015(r284489)
@@ -425,7 +425,7 @@ printtime(const char *field, time_t ftim
format = d_first ? %e %b %Y : %b %e %Y;
strftime(longstring, sizeof(longstring), format, localtime(ftime));
- snprintf(fmt, sizeof(fmt), {:%s/%%s} , field);
+ snprintf(fmt, sizeof(fmt), {:%s/%%hs} , field);
xo_attr(value, %ld, (long) ftime);
xo_emit(fmt, longstring);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r284489 - head/bin/ls
On 17.06.2015 6:12, Marcel Moolenaar wrote:
Author: marcel
Date: Wed Jun 17 03:12:08 2015
New Revision: 284489
URL: https://svnweb.freebsd.org/changeset/base/284489
Log:
Unbreak ``env LANG=ru_RU.KOI8-R ls -l''.
Time strings are in the current locale.
Thanx, but the same treatment should be for file names too: they are in
the current locale. ls -l drops them otherwise.
Modified:
head/bin/ls/print.c
Modified: head/bin/ls/print.c
==
--- head/bin/ls/print.c Wed Jun 17 03:11:25 2015(r284488)
+++ head/bin/ls/print.c Wed Jun 17 03:12:08 2015(r284489)
@@ -425,7 +425,7 @@ printtime(const char *field, time_t ftim
format = d_first ? %e %b %Y : %b %e %Y;
strftime(longstring, sizeof(longstring), format, localtime(ftime));
- snprintf(fmt, sizeof(fmt), {:%s/%%s} , field);
+ snprintf(fmt, sizeof(fmt), {:%s/%%hs} , field);
xo_attr(value, %ld, (long) ftime);
xo_emit(fmt, longstring);
}
--
http://ache.vniz.net/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284490 - stable/9
Author: gshapiro Date: Wed Jun 17 03:19:31 2015 New Revision: 284490 URL: https://svnweb.freebsd.org/changeset/base/284490 Log: Add a note regarding the change to sendmail'c default DH parameter size for client connections. Modified: stable/9/UPDATING Modified: stable/9/UPDATING == --- stable/9/UPDATING Wed Jun 17 03:12:08 2015(r284489) +++ stable/9/UPDATING Wed Jun 17 03:19:31 2015(r284490) @@ -11,6 +11,14 @@ handbook: Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20150615: + The latest version of openssl rejects TLS handshakes with DH + parameters below 768 bits. sendmail releases prior to 8.15.2 + (not yet released), defaulted to a 512 bit DH parameter setting + for client connections. To improve interoperability, the + sendmail default for client connections has been raised to + 1024 bits. + 20140717: It is no longer necessary to include the dwarf version in your DEBUG options in your kernel config file. The bug that required it to be ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284492 - stable/8
Author: gshapiro Date: Wed Jun 17 03:23:45 2015 New Revision: 284492 URL: https://svnweb.freebsd.org/changeset/base/284492 Log: Add a note regarding the change to sendmail'c default DH parameter size for client connections. Modified: stable/8/UPDATING Modified: stable/8/UPDATING == --- stable/8/UPDATING Wed Jun 17 03:22:18 2015(r284491) +++ stable/8/UPDATING Wed Jun 17 03:23:45 2015(r284492) @@ -15,6 +15,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20150615: + The latest version of openssl rejects TLS handshakes with DH + parameters below 768 bits. sendmail releases prior to 8.15.2 + (not yet released), defaulted to a 512 bit DH parameter setting + for client connections. To improve interoperability, the + sendmail default for client connections has been raised to + 1024 bits. + 20140216: The nve(4) driver for NVIDIA nForce MCP Ethernet adapters has been deprecated and will not be part of FreeBSD 11.0 and later ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284491 - stable/8/contrib/sendmail/src
Author: gshapiro
Date: Wed Jun 17 03:22:18 2015
New Revision: 284491
URL: https://svnweb.freebsd.org/changeset/base/284491
Log:
MFC: The import of openssl to address the FreeBSD-SA-15:10.openssl security
advisory includes a change which rejects handshakes with DH parameters
below 768 bits. sendmail releases prior to 8.15.2 (not yet released),
defaulted to a 512 bit DH parameter setting for client connections.
This commit chages that default to 1024 bits. sendmail 8.15.2, when
released well use a default of 2048 bits.
Modified:
stable/8/contrib/sendmail/src/tls.c
Directory Properties:
stable/8/contrib/sendmail/ (props changed)
Modified: stable/8/contrib/sendmail/src/tls.c
==
--- stable/8/contrib/sendmail/src/tls.c Wed Jun 17 03:19:31 2015
(r284490)
+++ stable/8/contrib/sendmail/src/tls.c Wed Jun 17 03:22:18 2015
(r284491)
@@ -650,7 +650,7 @@ inittls(ctx, req, options, srv, certfile
** 1024generate 1024 bit parameters
** 2048generate 2048 bit parameters
** /file/name read parameters from /file/name
- ** default is: 1024 for server, 512 for client (OK? XXX)
+ ** default is: 1024
*/
if (bitset(TLS_I_TRY_DH, req))
@@ -676,8 +676,8 @@ inittls(ctx, req, options, srv, certfile
}
if (dhparam == NULL)
{
- dhparam = srv ? 1 : 5;
- req |= (srv ? TLS_I_DH1024 : TLS_I_DH512);
+ dhparam = 1;
+ req |= TLS_I_DH1024;
}
else if (*dhparam == '/')
{
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r284489 - head/bin/ls
On Jun 16, 2015, at 8:15 PM, Andrey Chernov a...@freebsd.org wrote: On 17.06.2015 6:12, Marcel Moolenaar wrote: Author: marcel Date: Wed Jun 17 03:12:08 2015 New Revision: 284489 URL: https://svnweb.freebsd.org/changeset/base/284489 Log: Unbreak ``env LANG=ru_RU.KOI8-R ls -l''. Time strings are in the current locale. Thanx, but the same treatment should be for file names too: they are in the current locale. ls -l drops them otherwise. filenames are already printed with the h attribute, so something else may be wrong. -- Marcel Moolenaar mar...@xcllnt.net signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r284483 - head/secure/lib/libcrypt
Author: allanjude (doc committer)
Date: Tue Jun 16 23:57:29 2015
New Revision: 284483
URL: https://svnweb.freebsd.org/changeset/base/284483
Log:
Add compatibility with $2y$ bcrypt hashes
crypt_blowfish and many implementations based on it (Apache, PHP, PostgreSQL)
implemented $2y$ before OpenBSD went with $2b$. This changes marks them as
equivalent.
http://www.openwall.com/lists/announce/2011/07/17/1
This change is required for applications that use the base crypt()
implementation (including nginx) to be able to validate $2y$ hashes
Reviewed by: eadler
Approved by: delphij
MFC after:1 week
Relnotes: yes
Sponsored by: ScaleEngine Inc.
Differential Revision:https://reviews.freebsd.org/D2742
Modified:
head/secure/lib/libcrypt/crypt-blowfish.c
Modified: head/secure/lib/libcrypt/crypt-blowfish.c
==
--- head/secure/lib/libcrypt/crypt-blowfish.c Tue Jun 16 23:38:44 2015
(r284482)
+++ head/secure/lib/libcrypt/crypt-blowfish.c Tue Jun 16 23:57:29 2015
(r284483)
@@ -167,6 +167,9 @@ crypt_blowfish(const char *key, const ch
switch (salt[1]) {
case 'a': /* 'ab' should not yield the same as
'abab' */
case 'b': /* cap input length at 72 bytes */
+case 'y': /* same as 'b', for compatibility
+* with openwall crypt_blowfish
+*/
minr = salt[1];
salt++;
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r284436 - head/contrib/sendmail/src
This commit chages that default to 1024 bits. sendmail 8.15.2, when released well use a default of 2048 bits. If upstream will be using 2048 bits, why not simply use that? The upstream is going to do this with a precomputed 2048 bit DH parameter. To keep this interim fix simple and not a performance degradation, I went with a run-time generated 1024 bit. Sites which wish to use 2048 run time can override the default in their configuration. Likewise, when 8.15.2 is imported, sites that prefer not to use a precomputed DH parameter can create their own by overriding the default to use a run-time or their own precomputed (but unique) using a DH parameter file on the local file system. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r284425 - head/usr.sbin/freebsd-update
On Mon, Jun 15, 2015 at 08:12:15PM +, Xin LI wrote: Author: delphij Date: Mon Jun 15 20:12:15 2015 New Revision: 284425 URL: https://svnweb.freebsd.org/changeset/base/284425 Log: Skip src component if /usr/src is empty. Submitted by: kczekirda I can't find anyone with that freebsd login id. If it's a non-committer, please use a real name or email address, or at least something that doesn't look like a freebsd login id. -- Joel ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284438 - stable/10/sys/netinet
Author: tuexen
Date: Tue Jun 16 08:21:58 2015
New Revision: 284438
URL: https://svnweb.freebsd.org/changeset/base/284438
Log:
MFC r284326:
In case of an output error, continue with the next net, don't try to
continue sending on the same net.
This fixes a bug where an invalid mbuf chain was constructed, if a
full size frame of control chunks should be sent and there is a
output error.
Based on a discussion with rrs@, change move to the next net. This fixes
the bug and improves the behaviour.
Thanks to Irene Ruengeler for spending a lot of time in narrowing this
problem down.
Modified:
stable/10/sys/netinet/sctp_output.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netinet/sctp_output.c
==
--- stable/10/sys/netinet/sctp_output.c Tue Jun 16 03:03:26 2015
(r284437)
+++ stable/10/sys/netinet/sctp_output.c Tue Jun 16 08:21:58 2015
(r284438)
@@ -8001,6 +8001,7 @@ again_one_more_time:
} else {
r_mtu = mtu;
}
+ error = 0;
//
/* ASCONF transmission */
//
@@ -8159,7 +8160,7 @@ again_one_more_time:
sctp_move_chunks_from_net(stcb, net);
}
*reason_code = 7;
- continue;
+ break;
} else
asoc-ifp_had_enobuf = 0;
if (*now_filled == 0) {
@@ -8202,6 +8203,10 @@ again_one_more_time:
}
}
}
+ if (error != 0) {
+ /* try next net */
+ continue;
+ }
//
/* Control transmission */
//
@@ -8436,7 +8441,7 @@ again_one_more_time:
sctp_move_chunks_from_net(stcb, net);
}
*reason_code = 7;
- continue;
+ break;
} else
asoc-ifp_had_enobuf = 0;
/* Only HB or ASCONF advances time */
@@ -8482,6 +8487,10 @@ again_one_more_time:
}
}
}
+ if (error != 0) {
+ /* try next net */
+ continue;
+ }
/* JRI: if dest is in PF state, do not send data to it */
if ((asoc-sctp_cmt_on_off 0)
(net != stcb-asoc.alternate)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284441 - stable/10/usr.bin/sockstat
Author: tuexen
Date: Tue Jun 16 08:36:57 2015
New Revision: 284441
URL: https://svnweb.freebsd.org/changeset/base/284441
Log:
MFC r284351:
Simplify printaddr(). No functional change.
MFC r284352:
Allow more than one socket entry for a file descriptor. This is needed
for supporting 1-to-many style SCTP sockets. For other sochets, there
is no functional change.
MFC r284353:
Allow more than one local or remote address per socket. This is needed to
support SCTP (and MPTCP in the future). No functional change for existing
protocols.
MFC r284354:
Add support for SCTP.
MFC r284355:
When using -L the code skips a socket if the local or foreign
address is loopback. So it is shown if both are not loopback.
The man page says that it is shown if the local or foreign
address is not loopback. Change the man page to reflect the
code.
Modified:
stable/10/usr.bin/sockstat/sockstat.1
stable/10/usr.bin/sockstat/sockstat.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/sockstat/sockstat.1
==
--- stable/10/usr.bin/sockstat/sockstat.1 Tue Jun 16 08:26:33 2015
(r284440)
+++ stable/10/usr.bin/sockstat/sockstat.1 Tue Jun 16 08:36:57 2015
(r284441)
@@ -27,7 +27,7 @@
.\
.\ $FreeBSD$
.\
-.Dd April 7, 2015
+.Dd June 13, 2015
.Dt SOCKSTAT 1
.Os
.Sh NAME
@@ -61,7 +61,7 @@ Show connected sockets.
.It Fl j Ar jid
Show only sockets belonging to the specified jail ID.
.It Fl L
-Only show Internet sockets if the local or foreign addresses are not
+Only show Internet sockets if the local and foreign addresses are not
in the loopback network prefix
.Li 127.0.0.0/8 ,
or do not contain the IPv6 loopback address
Modified: stable/10/usr.bin/sockstat/sockstat.c
==
--- stable/10/usr.bin/sockstat/sockstat.c Tue Jun 16 08:26:33 2015
(r284440)
+++ stable/10/usr.bin/sockstat/sockstat.c Tue Jun 16 08:36:57 2015
(r284441)
@@ -43,6 +43,7 @@ __FBSDID($FreeBSD$);
#include netinet/in.h
#include netinet/in_pcb.h
+#include netinet/sctp.h
#include netinet/tcp.h
#include netinet/tcp_seq.h
#include netinet/tcp_var.h
@@ -71,7 +72,7 @@ static int opt_v; /* Verbose mode */
/*
* Default protocols to use if no -P was defined.
*/
-static const char *default_protos[] = {tcp, udp, divert };
+static const char *default_protos[] = {sctp, tcp, udp, divert };
static size_t default_numprotos =
sizeof(default_protos) / sizeof(default_protos[0]);
@@ -84,6 +85,11 @@ static int *ports;
#define SET_PORT(p) do { ports[p / INT_BIT] |= 1 (p % INT_BIT); } while (0)
#define CHK_PORT(p) (ports[p / INT_BIT] (1 (p % INT_BIT)))
+struct addr {
+ struct sockaddr_storage address;
+ struct addr *next;
+};
+
struct sock {
void *socket;
void *pcb;
@@ -92,8 +98,8 @@ struct sock {
int family;
int proto;
const char *protoname;
- struct sockaddr_storage laddr;
- struct sockaddr_storage faddr;
+ struct addr *laddr;
+ struct addr *faddr;
struct sock *next;
};
@@ -249,6 +255,241 @@ sockaddr(struct sockaddr_storage *sa, in
}
static void
+gather_sctp(void)
+{
+ struct sock *sock;
+ struct addr *laddr, *prev_laddr, *faddr, *prev_faddr;
+ struct xsctp_inpcb *xinpcb;
+ struct xsctp_tcb *xstcb;
+ struct xsctp_raddr *xraddr;
+ struct xsctp_laddr *xladdr;
+ const char *varname;
+ size_t len, offset;
+ char *buf;
+ int hash, vflag;
+ int no_stcb, local_all_loopback, foreign_all_loopback;
+
+ vflag = 0;
+ if (opt_4)
+ vflag |= INP_IPV4;
+ if (opt_6)
+ vflag |= INP_IPV6;
+
+ varname = net.inet.sctp.assoclist;
+ if (sysctlbyname(varname, 0, len, 0, 0) 0) {
+ if (errno != ENOENT)
+ err(1, sysctlbyname());
+ return;
+ }
+ if ((buf = (char *)malloc(len)) == NULL) {
+ err(1, malloc());
+ return;
+ }
+ if (sysctlbyname(varname, buf, len, 0, 0) 0) {
+ err(1, sysctlbyname());
+ free(buf);
+ return;
+ }
+ xinpcb = (struct xsctp_inpcb *)(void *)buf;
+ offset = sizeof(struct xsctp_inpcb);
+ while ((offset len) (xinpcb-last == 0)) {
+ if ((sock = calloc(1, sizeof *sock)) == NULL)
+ err(1, malloc());
+ sock-socket = xinpcb-socket;
+ sock-proto = IPPROTO_SCTP;
+ sock-protoname = sctp;
+ if (xinpcb-flags SCTP_PCB_FLAGS_BOUND_V6) {
+ sock-family = AF_INET6;
+ sock-vflag = INP_IPV6;
+ } else {
+ sock-family = AF_INET;
+
svn commit: r284439 - stable/10/sys/netinet
Author: tuexen
Date: Tue Jun 16 08:24:08 2015
New Revision: 284439
URL: https://svnweb.freebsd.org/changeset/base/284439
Log:
MFC r284331:
Code cleanup.
Modified:
stable/10/sys/netinet/sctp_output.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netinet/sctp_output.c
==
--- stable/10/sys/netinet/sctp_output.c Tue Jun 16 08:21:58 2015
(r284438)
+++ stable/10/sys/netinet/sctp_output.c Tue Jun 16 08:24:08 2015
(r284439)
@@ -8125,6 +8125,12 @@ again_one_more_time:
* it is used to do appropriate
* source address selection.
*/
+ if (*now_filled == 0) {
+ (void)SCTP_GETTIME_TIMEVAL(now);
+ *now_filled = 1;
+ }
+ net-last_sent_time = *now;
+ hbflag = 0;
if ((error =
sctp_lowlevel_chunk_output(inp, stcb, net,
(struct sockaddr *)net-ro._l_addr,
outchain, auth_offset, auth,
@@ -8135,21 +8141,18 @@ again_one_more_time:
net-port, NULL,
0, 0,
so_locked))) {
- if (error == ENOBUFS) {
- asoc-ifp_had_enobuf =
1;
-
SCTP_STAT_INCR(sctps_lowlevelerr);
- }
+ /*
+* error, we could not
+* output
+*/
+ SCTPDBG(SCTP_DEBUG_OUTPUT3,
Gak send error %d\n, error);
if (from_where == 0) {
SCTP_STAT_INCR(sctps_lowlevelerrusr);
}
- if (*now_filled == 0) {
-
(void)SCTP_GETTIME_TIMEVAL(net-last_sent_time);
- *now_filled = 1;
- *now =
net-last_sent_time;
- } else {
- net-last_sent_time =
*now;
+ if (error == ENOBUFS) {
+ asoc-ifp_had_enobuf =
1;
+
SCTP_STAT_INCR(sctps_lowlevelerr);
}
- hbflag = 0;
/* error, could not output */
if (error == EHOSTUNREACH) {
/*
@@ -8161,16 +8164,9 @@ again_one_more_time:
}
*reason_code = 7;
break;
- } else
- asoc-ifp_had_enobuf = 0;
- if (*now_filled == 0) {
-
(void)SCTP_GETTIME_TIMEVAL(net-last_sent_time);
- *now_filled = 1;
- *now = net-last_sent_time;
} else {
- net-last_sent_time = *now;
+ asoc-ifp_had_enobuf = 0;
}
- hbflag = 0;
/*
* increase the number we sent, if a
* cookie is sent we don't tell them
@@ -8403,6 +8399,15 @@ again_one_more_time:
sctp_timer_start(SCTP_TIMER_TYPE_COOKIE, inp, stcb, net);
cookie = 0;
}
+ /* Only HB or ASCONF advances time */
+
svn commit: r284440 - stable/10/sys/netinet
Author: tuexen
Date: Tue Jun 16 08:26:33 2015
New Revision: 284440
URL: https://svnweb.freebsd.org/changeset/base/284440
Log:
MFC r284332:
Fix the reporting of the PMTUD state for specific paths.
Modified:
stable/10/sys/netinet/sctp_usrreq.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netinet/sctp_usrreq.c
==
--- stable/10/sys/netinet/sctp_usrreq.c Tue Jun 16 08:24:08 2015
(r284439)
+++ stable/10/sys/netinet/sctp_usrreq.c Tue Jun 16 08:26:33 2015
(r284440)
@@ -2464,9 +2464,9 @@ flags_out:
}
/* get flags for PMTU */
if (net-dest_state
SCTP_ADDR_NO_PMTUD) {
- paddrp-spp_flags |=
SPP_PMTUD_ENABLE;
- } else {
paddrp-spp_flags |=
SPP_PMTUD_DISABLE;
+ } else {
+ paddrp-spp_flags |=
SPP_PMTUD_ENABLE;
}
if (net-dscp 0x01) {
paddrp-spp_dscp = net-dscp
0xfc;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284442 - head/sys/kern
Author: mjg
Date: Tue Jun 16 09:08:30 2015
New Revision: 284442
URL: https://svnweb.freebsd.org/changeset/base/284442
Log:
fd: don't unnecessary copy capabilities in _fget
Modified:
head/sys/kern/kern_descrip.c
Modified: head/sys/kern/kern_descrip.c
==
--- head/sys/kern/kern_descrip.cTue Jun 16 08:36:57 2015
(r284441)
+++ head/sys/kern/kern_descrip.cTue Jun 16 09:08:30 2015
(r284442)
@@ -2433,11 +2433,9 @@ _fget(struct thread *td, int fd, struct
*fpp = NULL;
fdp = td-td_proc-p_fd;
- if (needrightsp != NULL)
- needrights = *needrightsp;
- else
- cap_rights_init(needrights);
- error = fget_unlocked(fdp, fd, needrights, fp, seqp);
+ if (needrightsp == NULL)
+ needrightsp = cap_rights_init(needrights);
+ error = fget_unlocked(fdp, fd, needrightsp, fp, seqp);
if (error != 0)
return (error);
if (fp-f_ops == badfileops) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284443 - in head/sys: compat/svr4 kern ofed/include/linux security/audit
Author: mjg
Date: Tue Jun 16 09:52:36 2015
New Revision: 284443
URL: https://svnweb.freebsd.org/changeset/base/284443
Log:
fd: make rights a mandatory argument to fget_unlocked
Modified:
head/sys/compat/svr4/svr4_misc.c
head/sys/kern/kern_descrip.c
head/sys/ofed/include/linux/file.h
head/sys/security/audit/audit_arg.c
Modified: head/sys/compat/svr4/svr4_misc.c
==
--- head/sys/compat/svr4/svr4_misc.cTue Jun 16 09:08:30 2015
(r284442)
+++ head/sys/compat/svr4/svr4_misc.cTue Jun 16 09:52:36 2015
(r284443)
@@ -622,6 +622,7 @@ svr4_sys_fchroot(td, uap)
struct thread *td;
struct svr4_sys_fchroot_args *uap;
{
+ cap_rights_t rights;
struct filedesc *fdp = td-td_proc-p_fd;
struct vnode*vp;
struct file *fp;
@@ -630,7 +631,7 @@ svr4_sys_fchroot(td, uap)
if ((error = priv_check(td, PRIV_VFS_FCHROOT)) != 0)
return error;
/* XXX: we have the chroot priv... what cap might we need? all? */
- if ((error = getvnode(fdp, uap-fd, 0, fp)) != 0)
+ if ((error = getvnode(fdp, uap-fd, cap_rights_init(rights), fp)) !=
0)
return error;
vp = fp-f_vnode;
VREF(vp);
Modified: head/sys/kern/kern_descrip.c
==
--- head/sys/kern/kern_descrip.cTue Jun 16 09:08:30 2015
(r284442)
+++ head/sys/kern/kern_descrip.cTue Jun 16 09:52:36 2015
(r284443)
@@ -746,7 +746,8 @@ kern_fcntl(struct thread *td, int fd, in
arg = arg ? 128 * 1024: 0;
/* FALLTHROUGH */
case F_READAHEAD:
- error = fget_unlocked(fdp, fd, NULL, fp, NULL);
+ error = fget_unlocked(fdp, fd,
+ cap_rights_init(rights), fp, NULL);
if (error != 0)
break;
if (fp-f_type != DTYPE_VNODE) {
@@ -2368,11 +2369,9 @@ fget_unlocked(struct filedesc *fdp, int
if (fp == NULL)
return (EBADF);
#ifdef CAPABILITIES
- if (needrightsp != NULL) {
- error = cap_check(haverights, needrightsp);
- if (error != 0)
- return (error);
- }
+ error = cap_check(haverights, needrightsp);
+ if (error != 0)
+ return (error);
#endif
retry:
count = fp-f_count;
Modified: head/sys/ofed/include/linux/file.h
==
--- head/sys/ofed/include/linux/file.h Tue Jun 16 09:08:30 2015
(r284442)
+++ head/sys/ofed/include/linux/file.h Tue Jun 16 09:52:36 2015
(r284443)
@@ -33,6 +33,7 @@
#include sys/file.h
#include sys/filedesc.h
#include sys/refcount.h
+#include sys/capsicum.h
#include sys/proc.h
#include linux/fs.h
@@ -46,10 +47,11 @@ extern struct fileops linuxfileops;
static inline struct linux_file *
linux_fget(unsigned int fd)
{
+ cap_rights_t rights;
struct file *file;
- if (fget_unlocked(curthread-td_proc-p_fd, fd, NULL, file,
- NULL) != 0) {
+ if (fget_unlocked(curthread-td_proc-p_fd, fd,
+ cap_rights_init(rights), file, NULL) != 0) {
return (NULL);
}
return (struct linux_file *)file-f_data;
@@ -71,10 +73,11 @@ fput(struct linux_file *filp)
static inline void
put_unused_fd(unsigned int fd)
{
+ cap_rights_t rights;
struct file *file;
- if (fget_unlocked(curthread-td_proc-p_fd, fd, NULL, file,
- NULL) != 0) {
+ if (fget_unlocked(curthread-td_proc-p_fd, fd,
+ cap_rights_init(rights), file, NULL) != 0) {
return;
}
/*
@@ -91,10 +94,11 @@ put_unused_fd(unsigned int fd)
static inline void
fd_install(unsigned int fd, struct linux_file *filp)
{
+ cap_rights_t rights;
struct file *file;
- if (fget_unlocked(curthread-td_proc-p_fd, fd, NULL, file,
- NULL) != 0) {
+ if (fget_unlocked(curthread-td_proc-p_fd, fd,
+ cap_rights_init(rights), file, NULL) != 0) {
file = NULL;
}
filp-_file = file;
Modified: head/sys/security/audit/audit_arg.c
==
--- head/sys/security/audit/audit_arg.c Tue Jun 16 09:08:30 2015
(r284442)
+++ head/sys/security/audit/audit_arg.c Tue Jun 16 09:52:36 2015
(r284443)
@@ -32,6 +32,7 @@ __FBSDID($FreeBSD$);
#include sys/param.h
#include sys/filedesc.h
+#include sys/capsicum.h
#include sys/ipc.h
#include sys/mount.h
#include sys/proc.h
@@ -894,6 +895,7 @@ audit_arg_fcntl_rights(uint32_t fcntlrig
void
audit_sysclose(struct thread *td, int fd)
{
+ cap_rights_t rights;
